[MediaWiki-commits] [Gerrit] Add index to creditnote_id field to mitigate speed issue on ... - change (wikimedia...crm)
Eileen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268051
Change subject: Add index to creditnote_id field to mitigate speed issue on
doing refunds
..
Add index to creditnote_id field to mitigate speed issue on doing refunds
I had previously improved the query but it's still taking 7 seconds due to the
missing index
I've also added in the index on financial_item.trxn_id which I had previous
added to 4.7.
These have been added to core in an 'upgrade friendly way', meaning adding them
now won't cause us
to hit problems when we later upgrade to 4.7.
https://issues.civicrm.org/jira/browse/CRM-17881
https://issues.civicrm.org/jira/browse/CRM-17882
Bug: T123305
Change-Id: If9a8a1c7360bc8a42bf2d3517abbd5ce3499f5f7
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 24 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/51/268051/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 3180053..4e3a7d8 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -44,6 +44,7 @@
wmf_civicrm_update_7062();
wmf_civicrm_update_7063();
wmf_civicrm_update_7064();
+wmf_civicrm_update_7080();
}
/**
@@ -1627,3 +1628,26 @@
civicrm_api3('OptionValue', 'delete', array('id' =>
$expectedRedundantType['id']));
civicrm_api3('OptionValue', 'create', array('id' =>
$options['values'][0]['id'], 'is_reserved' => TRUE));
}
+
+/**
+ * Add indexes that are missing from CiviCRM 4.6.
+ *
+ * These indexes have been added to 4.7 using the same php function.
+ *
+ * This function checks the index does not already exist before adding it.
+ * This ensures that we will not hit a problem on upgrade as a result of
adding them now.
+ *
+ * Note this could be a slow update.
+ *
+ * https://github.com/civicrm/civicrm-core/pull/7672
+ * https://github.com/civicrm/civicrm-core/pull/7678
+ * https://github.com/civicrm/civicrm-core/pull/7673
+ */
+function wmf_civicrm_update_7080() {
+ civicrm_initialize();
+ $tables = array('civicrm_contribution' => array('creditnote_id'));
+ CRM_Core_BAO_SchemaHandler::createIndexes($tables);
+
+ $tables = array('civicrm_financial_trxn' => array('trxn_id'));
+ CRM_Core_BAO_SchemaHandler::createIndexes($tables);
+}
--
To view, visit https://gerrit.wikimedia.org/r/268051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9a8a1c7360bc8a42bf2d3517abbd5ce3499f5f7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add index to civicrm_financial_item - change (wikimedia...crm)
Eileen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268052
Change subject: Add index to civicrm_financial_item
..
Add index to civicrm_financial_item
(Depends on patch to civicrm repo).
Add an index to improve performance in an upgrade-proof manner
Change-Id: I8a865c99a3212b0fa8a3985078bc5d0d701d2451
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/52/268052/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 4e3a7d8..0204d85 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -45,6 +45,7 @@
wmf_civicrm_update_7063();
wmf_civicrm_update_7064();
wmf_civicrm_update_7080();
+wmf_civicrm_update_7090();
}
/**
@@ -1651,3 +1652,21 @@
$tables = array('civicrm_financial_trxn' => array('trxn_id'));
CRM_Core_BAO_SchemaHandler::createIndexes($tables);
}
+
+/**
+ * T122947 add index to civicrm_financial item.
+ *
+ * The existing one does not start with entity_id so the queries that omit
+ * entity_table dont' use it. It is also logically the wrong way around as the
+ * one with more variation should lead.
+ *
+ * The upstream patch (CRM-17775) removes indexes as well. I have not ported
that part
+ * back at this stage as I'm viewing it as tidy up rather than a performance
+ * fix and leaving 4.7.2 upgrade to catch it.
+ */
+function wmf_civicrm_update_7090() {
+ civicrm_initialize();
+ CRM_Core_BAO_SchemaHandler::createIndexes(array(
+'civicrm_financial_item' => array(array('entity_id', 'entity_table')),
+ ));
+}
--
To view, visit https://gerrit.wikimedia.org/r/268052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a865c99a3212b0fa8a3985078bc5d0d701d2451
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add kube-system service account to abac - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Add kube-system service account to abac
..
tools: Add kube-system service account to abac
Allows it to read everything. Useful for setting up DNS
Change-Id: Id69ae1f4dff81eaa26a93b22fe93f2a28604a213
---
M modules/k8s/templates/abac.json.erb
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/k8s/templates/abac.json.erb
b/modules/k8s/templates/abac.json.erb
index 19f6c96..63315c3 100644
--- a/modules/k8s/templates/abac.json.erb
+++ b/modules/k8s/templates/abac.json.erb
@@ -1,5 +1,6 @@
{"readonly": true, "resource": "swaggerapi"}
{"readonly": true, "nonResourcePath": "/api"}
+{"user": "system:serviceaccount:kube-system:default", "readonly": true}
<%- @users.each do |user| -%>
<%- if user['type'] == 'namespaced' -%>
<%- @namespace_allowed_resources.each do |resource| -%>
--
To view, visit https://gerrit.wikimedia.org/r/268050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id69ae1f4dff81eaa26a93b22fe93f2a28604a213
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Add kube-system service account to abac - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268050
Change subject: tools: Add kube-system service account to abac
..
tools: Add kube-system service account to abac
Allows it to read everything. Useful for setting up DNS
Change-Id: Id69ae1f4dff81eaa26a93b22fe93f2a28604a213
---
M modules/k8s/templates/abac.json.erb
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/268050/1
diff --git a/modules/k8s/templates/abac.json.erb
b/modules/k8s/templates/abac.json.erb
index 19f6c96..63315c3 100644
--- a/modules/k8s/templates/abac.json.erb
+++ b/modules/k8s/templates/abac.json.erb
@@ -1,5 +1,6 @@
{"readonly": true, "resource": "swaggerapi"}
{"readonly": true, "nonResourcePath": "/api"}
+{"user": "system:serviceaccount:kube-system:default", "readonly": true}
<%- @users.each do |user| -%>
<%- if user['type'] == 'namespaced' -%>
<%- @namespace_allowed_resources.each do |resource| -%>
--
To view, visit https://gerrit.wikimedia.org/r/268050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id69ae1f4dff81eaa26a93b22fe93f2a28604a213
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ORES.php - change (mediawiki...ORES)
Ladsgroup has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268049
Change subject: Add ORES.php
..
Add ORES.php
Change-Id: I86e3083527142d19341a1ca28b12b5340b6e7b66
---
A ORES.php
1 file changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES
refs/changes/49/268049/1
diff --git a/ORES.php b/ORES.php
new file mode 100644
index 000..81d4851
--- /dev/null
+++ b/ORES.php
@@ -0,0 +1,30 @@
+https://www.mediawiki.org/wiki/Manual:Extension_registration
for more details.
+ *
+ * @file
+ * @ingroup Extensions
+ * @copyright 2015-2016 Revscoring team and others;
+ * @license CC0
+ */
+
+if ( function_exists( 'wfLoadExtension' ) ) {
+ wfLoadExtension( 'ORES' );
+
+ // Keep i18n globals so mergeMessageFileList.php doesn't break
+ $wgMessagesDirs['ORES'] = array(
+ __DIR__ . '/i18n',
+ );
+
+ /* wfWarn(
+ 'Deprecated PHP entry point used for VisualEditor extension. Please use
wfLoadExtension '.
+ 'instead, see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return true;
+}
+
+die( 'This version of the ORES extension requires MediaWiki 1.25+.' );
--
To view, visit https://gerrit.wikimedia.org/r/268049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86e3083527142d19341a1ca28b12b5340b6e7b66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] A/B/C test of control vs textcat vs accept-lang + textcat - change (operations/mediawiki-config)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268048
Change subject: A/B/C test of control vs textcat vs accept-lang + textcat
..
A/B/C test of control vs textcat vs accept-lang + textcat
This must not be deployed until after If916d32af is merged, which
is waiting on textcat to be added to wmf vendor repositories.
Bug: T121542
Change-Id: Id78fb0de06f9c800b0e9e3e7fbf0e96d75f546f5
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 33 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/48/268048/1
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 6e305af..b7abe84 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -132,6 +132,8 @@
$wgCirrusSearchWikiToNameMap = $wmgCirrusSearchWikiToNameMap;
$wgCirrusSearchLanguageToWikiMap = $wmgCirrusSearchLanguageToWikiMap;
+$wgCirrusSearchTextcatModel = "$IP/vendor/wikimedia/textcat/LM-query";
+
$wgHooks['CirrusSearchMappingConfig'][] = function( array &$config,
$mappingConfigBuilder ) {
$config['page']['properties']['popularity_score'] = array(
'type' => 'double',
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cb4c687..85082e7 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15926,6 +15926,37 @@
'wmgCirrusSearchUserTesting' => array(
'default' => array(
),
+ 'enwiki' => array(
+ 'sampleRate' => 10,
+ // variables applied to all buckets
+ 'globals' => array(
+ 'wgCirrusSearchInterwikiThreshold' => 3,
+ 'wgCirrusSearchLanguageDetectors' => array(
+ 'textcat' =>
'CirrusSearch\\LanguageDetector\\TextCat',
+ )
+ ),
+ 'buckets' => array(
+ // control bucket. setup threshold and detector but
don't turn on the
+ // language query
+ 'a' => array(
+ 'wgCirrusSearchEnableAltLanguage' => false,
+ ),
+ // test bucket. try textcat and append results when < 3
results found>
+ 'b' => array(
+ 'wgCirrusSearchEnableAltLanguage' => true,
+ 'wgCirrusSearchInterwikiProv' => 'iwsw6',
+ ),
+ // test bucket. try accept-language, fallback to textcat
+ 'c' => array(
+ 'wgCirrusSearchEnableAltLanguage' => true,
+ 'wgCirrusSearchInterwikiProv' => 'iwsw7',
+ 'wgCirrusSearchLanguageDetectors' => array(
+ 'accept-lang' =>
'CirrusSearch\\LanguageDetector\\AcceptLanguage',
+ 'textcat' =>
'CirrusSearch\\LanguageDetector\\TextCat',
+ ),
+ ),
+ ),
+ ),
),
// Enable interwiki search by language detection. The list of language
--
To view, visit https://gerrit.wikimedia.org/r/268048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id78fb0de06f9c800b0e9e3e7fbf0e96d75f546f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set up php55lint jobs, adapt phplint macro for $PHP_BIN (re-do) - change (integration/config)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268047
Change subject: Set up php55lint jobs, adapt phplint macro for $PHP_BIN (re-do)
..
Set up php55lint jobs, adapt phplint macro for $PHP_BIN (re-do)
Change-Id: Ife2b8c76925d1ef7f39c468bd0637a26364bd618
---
M jjb/job-templates.yaml
M jjb/macro.yaml
M jjb/mediawiki.yaml
3 files changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/47/268047/1
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 3cf3046..041ff35 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -290,6 +290,16 @@
builders:
- phplint
+- job:
+name: 'php55lint'
+node: contintLabsSlave && phpflavor-php55
+defaults: use-remote-zuul-shallow-clone
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - phplint
+
# Deprecated non-generic phplint job. You should
# use the above 'phplint' job. Due to a performance issue
# with Git on Ubuntu Precise (details on T92042), this is
@@ -307,6 +317,18 @@
builders:
- phplint
+- job-template:
+name: '{name}-php55lint'
+node: contintLabsSlave && phpflavor-php55
+defaults: use-remote-zuul-no-submodules
+concurrent: true
+properties:
+ - throttle-one-per-node
+triggers:
+ - zuul
+builders:
+ - phplint
+
- job:
name: 'phpunit'
node: contintLabsSlave && UbuntuPrecise
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index bbf87f8..74ae7f1 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -533,8 +533,10 @@
name: phplint
builders:
- shell: |
+. /srv/deployment/integration/slave-scripts/bin/global-set-env.sh
+$PHP_BIN -v
/srv/deployment/integration/slave-scripts/bin/git-changed-in-head php
php5 inc phtml module install \
-| xargs -n1 -t php -l
+| xargs -n1 -t $PHP_BIN -l
- builder:
name: tox
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 72901c3..b33b075 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -371,6 +371,7 @@
- 'mediawiki-core-doxygen-publish'
- mediawiki-gate
- '{name}-php53lint'
+ - '{name}-php55lint'
- 'mediawiki-phpunit-{phpflavor}'
- 'mediawiki-phpunit-parsertests-{phpflavor}'
- 'mediawiki-phpunit-{phpflavor}-composer'
--
To view, visit https://gerrit.wikimedia.org/r/268047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife2b8c76925d1ef7f39c468bd0637a26364bd618
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] rt-testing testreduce client: use --num-workers 0 for Parsoid - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268046
Change subject: rt-testing testreduce client: use --num-workers 0 for Parsoid
..
rt-testing testreduce client: use --num-workers 0 for Parsoid
* The RT-testing code starts a Parsoid server via apiServer.js
apiServer.js has an on-exit handler that restarts a crashed
server on the same port as before. This ensures that the testreduce
client can continue posting on the same port without needing to
know about parsoid restarts.
* Earlier, we used to spawn a cluster master (with 1 worker) which
left the restart at the discretion of server.js. In node 0.10
the workers were restarting on the same port. But, in node 4.2,
looks like the workers were restarting on a random port.
This led to testreduce clients posting to nonexisting Parsoid
servers and failing miserably.
Change-Id: I0e5d8c38a8b56382ad84e6309c741ba02e320ba2
---
M tests/apiServer.js
M tests/testreduce/rtTestWrapper.js
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/46/268046/1
diff --git a/tests/apiServer.js b/tests/apiServer.js
index 03f8c0a..2a1e811 100644
--- a/tests/apiServer.js
+++ b/tests/apiServer.js
@@ -121,7 +121,7 @@
console.warn('Restarting server at: ', url);
forkedServers.delete(url);
}
- resolve(startServer(opts));
+ startServer(opts);
});
forkedServer.child.on('message', function(m) {
diff --git a/tests/testreduce/rtTestWrapper.js
b/tests/testreduce/rtTestWrapper.js
index 6e62bc3..a7e9ac4 100644
--- a/tests/testreduce/rtTestWrapper.js
+++ b/tests/testreduce/rtTestWrapper.js
@@ -26,9 +26,9 @@
// If no Parsoid server was passed, start our own
var p = apiServer.startParsoidServer({
serverArgv: [
- // We want the cluster master so that timeouts
on stuck titles
- // lead to a restart.
- '--num-workers', '1',
+ // Don't start a cluster master so that
apiServer
+ // can restart Parsoid on the same port as
before.
+ '--num-workers', '0',
'--config', parsoidConfig,
],
quiet: true,
--
To view, visit https://gerrit.wikimedia.org/r/268046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e5d8c38a8b56382ad84e6309c741ba02e320ba2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add ABC aka AbuseFilterCheck utility class to query AbuseFilter - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Add ABC aka AbuseFilterCheck utility class to query AbuseFilter
..
Add ABC aka AbuseFilterCheck utility class to query AbuseFilter
Change-Id: I2bcca60290a5b7b6cb0c2829f00b8a21e256eea2
---
M extension.json
A includes/AbuseFilterCheck.php
2 files changed, 102 insertions(+), 0 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 637376d..76667a8 100644
--- a/extension.json
+++ b/extension.json
@@ -71,6 +71,7 @@
"ApiQueryContentTranslationStats":
"api/ApiQueryContentTranslationStats.php",
"ApiQueryPublishedTranslations":
"api/ApiQueryPublishedTranslations.php",
"ContentTranslationHooks": "ContentTranslation.hooks.php",
+ "ContentTranslation\\AbuseFilterCheck":
"includes/AbuseFilterCheck.php",
"ContentTranslation\\CorporaLookup":
"includes/CorporaLookup.php",
"ContentTranslation\\Database": "includes/Database.php",
"ContentTranslation\\Draft": "includes/Draft.php",
diff --git a/includes/AbuseFilterCheck.php b/includes/AbuseFilterCheck.php
new file mode 100644
index 000..2c35043
--- /dev/null
+++ b/includes/AbuseFilterCheck.php
@@ -0,0 +1,101 @@
+ [
+ * 'warn' => [
+ * 'action' => 'warn',
+ * 'parameters' => [ 'abusefilter-warning' ]
+ * ]
+ * ]
+ * ];
+ * @endcode
+ *
+ * With type 'warn' there is also warning_html for html warning message.
+ *
+ * @file
+ * @copyright See AUTHORS.txt
+ * @license GPL-2.0+
+ */
+
+namespace ContentTranslation;
+
+class AbuseFilterCheck {
+ /**
+* Check a title for any rule violations.
+*
+* @param \User $user User performing the action
+* @param \Title $title Title to check
+* @return array List of any rule violations
+*/
+ public function checkTitle( \User $user, \Title $title ) {
+ if ( !class_exists( 'AbuseFilter' ) ) {
+ return array();
+ }
+
+ $vars = new \AbuseFilterVariableHolder();
+
+ $vars->addHolders(
+ \AbuseFilter::generateUserVars( $user ),
+ \AbuseFilter::generateTitleVars( $title, 'ARTICLE' )
+ );
+
+ return $this->getResults( $vars );
+ }
+
+ /**
+* Check some text for rule violations.
+*
+* @param \User $user User performing the action
+* @param \Title $title Title to check
+* @param string $text Text to check
+* @return array List of any rule violations
+*/
+ public function checkSection( \User $user, \Title $title, $text ) {
+ if ( !class_exists( 'AbuseFilter' ) ) {
+ return array();
+ }
+
+ $vars = new \AbuseFilterVariableHolder();
+
+ $vars->addHolders(
+ \AbuseFilter::generateUserVars( $user ),
+ \AbuseFilter::generateTitleVars( $title, 'ARTICLE' ),
+ \AbuseFilter::getEditVars( $title )
+ );
+
+ $vars->setVar( 'action', 'edit' );
+ $vars->setVar( 'old_wikitext', '' );
+ $vars->setVar( 'new_wikitext', $text );
+
+ return $this->getResults( $vars );
+ }
+
+ protected function getResults( \AbuseFilterVariableHolder $vars ) {
+ $filters = \AbuseFilter::checkAllFilters( $vars );
+ $filters = array_keys( array_filter( $filters ) );
+ $actions = \AbuseFilter::getConsequencesForFilters( $filters );
+
+ $results = array();
+ foreach ( $actions as $key => $val ) {
+ $rulename =
\AbuseFilter::$filters[$key]->af_public_comments;
+
+ if ( isset( $val['warn']['parameters'][0] ) ) {
+ $val['warning_html'] =
+ wfMessage(
$val['warn']['parameters'][0] )
+ ->params( $rulename )
+ ->parsed();
+ }
+
+ $results[$rulename] = $val;
+ }
+
+ return $results;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/266745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bcca60290a5b7b6cb0c2829f00b8a21e256eea2
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-c
[MediaWiki-commits] [Gerrit] Remove info from readme that moved to the testreduce repo - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Remove info from readme that moved to the testreduce repo .. Remove info from readme that moved to the testreduce repo Change-Id: I4cba50db6d134048884c5ebddc9bfa0a73fcfad0 --- M tests/README.md 1 file changed, 2 insertions(+), 52 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/README.md b/tests/README.md index f209203..a123c55 100644 --- a/tests/README.md +++ b/tests/README.md @@ -16,63 +16,13 @@ also specify a test case file as an argument, or symlink `parserTests.txt` from a `mediawiki/core` git checkout. - $ node ./parserTests.js + $ node bin/parserTests.js Several options are available for parserTests: - $ node ./parserTests.js --help + $ node bin/parserTests.js --help Enjoy! - -Running the round-trip test server --- - -In `tests/server/`, to install the necessary packages, run - $ npm install - -You'll need a pre-created MySQL database. Then, copy -`server.settings.js.example` to `server.settings.js` and in that file -edit the connection parameters. You can also override the settings -with command line options, to see them and their default values run: - $ node server --help - -To populate the database with initial data, you might first want to -create a user and a database. For this example we'll use `$USER`, -`$PASSWORD`, and `$DBNAME` to stand for the user, password, and database -you specified in `server.settings.js`: - - $ mysql -u root -p$ROOTPASSWORD mysql - mysql> CREATE USER '$USER'@'localhost' IDENTIFIED BY '$PASSWORD'; - mysql> CREATE DATABASE $DBNAME; - mysql> GRANT ALL PRIVILEGES ON $DBNAME.* TO '$USER'@'localhost'; - mysql> \q - -Now you'll want to create the initial database: - - $ mysql -u$USER -p$PASSWORD $DBNAME < sql/create_everything.mysql - $ node importJson --prefix=enwiki titles.example.en.json - $ node importJson --prefix=eswiki titles.example.es.json - -The script importJson.js takes the same connection parameters as server.js. To -test the handling of non-existent articles, you might want to also do: - - $ node importJson --prefix=enwiki titles.example.bogus.json - $ node importJson --prefix=eswiki titles.example.bogus.json - -Now start the server: - - $ node server - -Running the round-trip test clients - -In `tests/client`, copy `config.example.js` to `config.js` and edit it to your -taste. In separate windows, as many as you want: - - $ cd tests/client - $ node client - -Then take a look at [the statistics](http://localhost:8001/). Running the dumpgrepper --- -- To view, visit https://gerrit.wikimedia.org/r/268040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cba50db6d134048884c5ebddc9bfa0a73fcfad0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: Cscott Gerrit-Reviewer: Subramanya Sastry Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .gitattributes file to remove unnecssary files from package - change (wikimedia/textcat)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/268045 Change subject: Add .gitattributes file to remove unnecssary files from package .. Add .gitattributes file to remove unnecssary files from package Change-Id: I854887acbb6a64bec51753a63fd2b63d46613366 --- A .gitattributes 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/textcat refs/changes/45/268045/1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..0c4c7c3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +.gitattributes export-ignore +.gitignore export-ignore +.gitreview export-ignore +.travis.yml export-ignore +composer.json export-ignore +phpcs.xml export-ignore +phpunit.xml.dist export-ignore +tests export-ignore -- To view, visit https://gerrit.wikimedia.org/r/268045 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I854887acbb6a64bec51753a63fd2b63d46613366 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/textcat Gerrit-Branch: master Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Back port changes to support altering indexes in an upgrade-... - change (wikimedia...civicrm)
Eileen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268044
Change subject: Back port changes to support altering indexes in an
upgrade-proof way
..
Back port changes to support altering indexes in an upgrade-proof way
This is a combination of 2 commits I added to 4.7. The purpose is to add
functions to core to allow
indexes to be added or deleted in a way that won't crash the upgrade script if
they are already present
/ deleted.
Separately I have submitted patches to core to add 2 indexes and drop 2 indexes
in the 4.7.1 upgrade script.
I will separately submit a patch to our wmf_civicrm upgrade script to add the 2
missing indexes using these
functions.
(I'm on the fence about the 2 removals as I have no evidence they are important
for performance and
they are mostly for tidy up purposes. I'll leaning towards leaving for now and
we'll catch them next upgrade.)
https://issues.civicrm.org/jira/browse/CRM-17775
https://issues.civicrm.org/jira/browse/CRM-17882
Backported patches (tests included in original patch but not in the backport)
CRM-17881 extend createIndex function to create combined indexes
CRM-17775 Add safe function for dropping indexes
Bug: T122947
Change-Id: I23fbd5860aec3b66a294e12d7cb2f07feb27aedc
---
M CRM/Core/BAO/SchemaHandler.php
1 file changed, 73 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/44/268044/1
diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php
index 0abdd69..5365f65 100644
--- a/CRM/Core/BAO/SchemaHandler.php
+++ b/CRM/Core/BAO/SchemaHandler.php
@@ -379,7 +379,7 @@
*/
public static function dropColumn($tableName, $columnName) {
$sql = "ALTER TABLE $tableName DROP COLUMN $columnName";
-$dao = CRM_Core_DAO::executeQuery($sql);
+CRM_Core_DAO::executeQuery($sql);
}
/**
@@ -401,13 +401,28 @@
}
/**
+ * Create indexes.
+ *
* @param $tables
+ * Tables to create index for in the format:
+ * array('civicrm_entity_table' => 'entity_id')
+ * OR
+ * array('civicrm_entity_table' => array('entity_id', 'entity_table'))
+ * The latter will create a combined index on the 2 keys (in order).
+ *
+ * Side note - when creating combined indexes the one with the most
variation
+ * goes first - so entity_table always goes after entity_id.
+ *
+ * It probably makes sense to consider more sophisticated options at some
point
+ * but at the moment this is only being as enhanced as fast as the test is.
+ *
+ * @todo add support for length & multilingual on combined keys.
+ *
* @param string $createIndexPrefix
* @param array $substrLenghts
*/
- public static function createIndexes(&$tables, $createIndexPrefix = 'index',
$substrLenghts = array()) {
+ public static function createIndexes($tables, $createIndexPrefix = 'index',
$substrLenghts = array()) {
$queries = array();
-require_once 'CRM/Core/DAO/Domain.php';
$domain = new CRM_Core_DAO_Domain();
$domain->find(TRUE);
$locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales);
@@ -429,16 +444,26 @@
// now check for all fields if the index exists
foreach ($fields as $field) {
-// handle indices over substrings, CRM-6245
-// $lengthName is appended to index name, $lengthSize is the field
size modifier
-$lengthName = isset($substrLenghts[$table][$field]) ?
"_{$substrLenghts[$table][$field]}" : '';
-$lengthSize = isset($substrLenghts[$table][$field]) ?
"({$substrLenghts[$table][$field]})" : '';
+$fieldName = implode('_', (array) $field);
+
+if (is_array($field)) {
+ // No support for these for combined indexes as yet - add a test
when you
+ // want to add that.
+ $lengthName = '';
+ $lengthSize = '';
+}
+else {
+ // handle indices over substrings, CRM-6245
+ // $lengthName is appended to index name, $lengthSize is the field
size modifier
+ $lengthName = isset($substrLenghts[$table][$fieldName]) ?
"_{$substrLenghts[$table][$fieldName]})" : '';
+ $lengthSize = isset($substrLenghts[$table][$fieldName]) ?
"({$substrLenghts[$table][$fieldName]})" : '';
+}
$names = array(
- "index_{$field}{$lengthName}",
- "FK_{$table}_{$field}{$lengthName}",
- "UI_{$field}{$lengthName}",
- "{$createIndexPrefix}_{$field}{$lengthName}",
+ "index_{$fieldName}{$lengthName}",
+ "FK_{$table}_{$fieldName}{$lengthName}",
+ "UI_{$fieldName}{$lengthName}",
+ "{$createIndexPrefix}_{$fieldName}{$lengthName}",
);
// skip to the next $field if one of the above $names exists; handle
multilingual for CRM-4126
@@ -451,13 +476,16 @@
// the index doesn't exist, so create i
[MediaWiki-commits] [Gerrit] Tools: Deploy root web automatically again - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: Tools: Deploy root web automatically again
..
Tools: Deploy root web automatically again
Change-Id: Ia464364afd07a1ca8d2cb3c0c4aed7fe35bac91b
---
M manifests/role/labstools.pp
A modules/toollabs/manifests/admin_web_updater.pp
2 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 40513dd..d35f149 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -53,6 +53,10 @@
class { 'toollabs::toolwatcher':
active => ($::fqdn == $active_host)
}
+
+class { 'toollabs::admin_web_updater':
+active => ($::fqdn == $active_host)
+}
}
class checker {
diff --git a/modules/toollabs/manifests/admin_web_updater.pp
b/modules/toollabs/manifests/admin_web_updater.pp
new file mode 100644
index 000..8a5fe00
--- /dev/null
+++ b/modules/toollabs/manifests/admin_web_updater.pp
@@ -0,0 +1,21 @@
+class toollabs::admin_web_updater(
+$active
+) {
+if $active {
+# Deploy and update root web.
+git::clone { 'labs/toollabs':
+ensure=> latest,
+directory => '/data/project/admin/toollabs',
+owner => "${::labsproject}.admin",
+group => "${::labsproject}.admin",
+mode => '2755',
+}
+
+file { '/data/project/admin/public_html':
+ensure => link,
+force => true,
+target => 'toollabs/www',
+require => Git::Clone['labs/toollabs'],
+}
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/268043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia464364afd07a1ca8d2cb3c0c4aed7fe35bac91b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: coren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] shinken: Indent and align generated configuration - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Indent and align generated configuration
..
shinken: Indent and align generated configuration
Currently, the configuration is generated à la:
| define host {
| usegeneric-host
| host_nametools-mail
| address10.68.16.27
| hostgroupstools,role::labs::tools::mailrelay
| contact_groupstools
| notestools
| }
This change indents the directives and aligns their values by their
longest key:
| define host {
| use generic-host
| host_nametools-mail
| address 10.68.16.27
| hostgroups tools,role::labs::tools::mailrelay
| contact_groups tools
| notestools
| }
I was unable to implement the alignment with jinja2, so I resorted to
standard Python.
Change-Id: Ieef7cc54c1d659e7a88794c9240993944a838af4
---
M modules/shinken/files/shinkengen
M modules/shinken/manifests/shinkengen.pp
2 files changed, 6 insertions(+), 10 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index e687ffe..55058f4 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -33,7 +33,6 @@
"""
import yaml
import ldap3
-import jinja2
from collections import OrderedDict
@@ -44,18 +43,16 @@
Has a type (Host, Hostgroup, Service, etc) and a bunch of key
value pairs that it can output in a format that shinken understands.
"""
-TEMPLATE = jinja2.Template('''define {{ o.type }} {
-{% for key, value in o.properties.items() -%}
-{{ key }}{{ value }}
-{% endfor -%}
-}''')
def __init__(self, type):
self.type = type # Host, HostGroup, Service, whatever
self.properties = OrderedDict()
def __str__(self):
-return ConfigObject.TEMPLATE.render(o=self)
+max_key_len = max(len(key) for key in self.properties.keys())
+config_str = ''.join('%-*s %s\n' % (max_key_len, key, value)
+ for key, value in self.properties.items())
+return 'define %s {\n%s}\n' % (self.type, config_str)
class LDAPSource(object):
@@ -148,4 +145,4 @@
config['output_path'], project
)
with open(hosts_config_path, 'w') as hostsfile:
-hostsfile.write('\n'.join([str(hc) for hc in host_configs]))
+hostsfile.write(''.join([str(hc) for hc in host_configs]))
diff --git a/modules/shinken/manifests/shinkengen.pp
b/modules/shinken/manifests/shinkengen.pp
index 4133d9e..1d6db63 100644
--- a/modules/shinken/manifests/shinkengen.pp
+++ b/modules/shinken/manifests/shinkengen.pp
@@ -25,7 +25,6 @@
package { [
'python3-ldap3', # Custom package of
https://pypi.python.org/pypi/python3-ldap
'python3-yaml',
-'python3-jinja2',
]:
ensure => present,
}
@@ -41,7 +40,7 @@
owner => 'shinken',
group => 'shinken',
mode=> '0555',
-require => Package['python3-ldap3', 'python3-yaml', 'python3-jinja2'],
+require => Package['python3-ldap3', 'python3-yaml'],
}
exec { '/usr/local/bin/shinkengen':
--
To view, visit https://gerrit.wikimedia.org/r/267426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieef7cc54c1d659e7a88794c9240993944a838af4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
Gerrit-Reviewer: Tim Landscheidt
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] shinken: Add role::labs::instance as hostgroup to all instances - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Add role::labs::instance as hostgroup to all instances
..
shinken: Add role::labs::instance as hostgroup to all instances
Previously, the Puppet class role::labs::instance was applied to all
instances by being set in the LDAP records for all instances. This
has since been moved to manifests/site.pp, and the Puppet class has
been removed from LDAP.
shinkengen translates the Puppet classes in the LDAP records to
hostgroups in Shinken, and the standard instance checks in
basic-instance-checks.cfg rely on all hosts being in the hostgroup
role::labs::instance. For instances with no Puppet classes at all
this was fixed in b177a9a5453cf80e9b596fff4a74340095bd0720; this
change adds this hostgroup to all instances and thus completely
restores the previous behaviour.
Bug: T123271
Change-Id: I7f4108a77f040d7820782995ae8448a8315ee34a
---
M modules/shinken/files/shinkengen
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index a981ccc..e687ffe 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -21,6 +21,7 @@
Sets as hostgroup for each instance:
- Name of project instance is a part of
+- role::labs::instance
- Each puppet role explicitly applied to it (via Wikitech)
Sets as contact for each instance a contactgroup with the same name as the
@@ -77,8 +78,7 @@
- ip: Internal IP of this instance
- region: Which OpenStack Region this Instance is in
- puppetClasses: List of puppet classes applied to this instance
via
- configure page in wikitech. Also contains default
- roles `role::labs::instance` and `base`
+ configure page in wikitech.
- project: Name of project the instance is contained in
- name: Name of the instance
- puppetVars: Dictionary containing any custom puppet variables
that
@@ -106,8 +106,7 @@
'ec2id': hostinfo['dc'][0],
'ip': ip,
'region': hostinfo['l'][0],
-# Default to having at least this role if no roles exist
-'puppetClasses': hostinfo.get('puppetClass',
['role::labs::instance']),
+'puppetClasses': hostinfo.get('puppetClass', []),
'project': project,
'name': puppetvars['instancename'],
'puppetVars': puppetvars
@@ -131,9 +130,12 @@
co.properties['use'] = 'generic-host'
co.properties['host_name'] = instance['name']
co.properties['address'] = instance['ip']
-# Each role applied to this instance explicitly, via wikitech,
-# is added as a hostgroup, so we can target particular roles wich
checks.
-co.properties['hostgroups'] = ','.join([project] +
instance['puppetClasses'])
+# Each role applied to this instance explicitly, via
+# wikitech, is added as a hostgroup, so we can target
+# particular roles with checks. role::labs::instance is
+# implicitly applied to all instances via
+# manifests/site.pp, so we need to add it here explicitly.
+co.properties['hostgroups'] = ','.join([project,
'role::labs::instance'] + instance['puppetClasses'])
# For each project added to monitoring we expect a contactgroup
with the same
# name added.
# FIXME: Implement access mechanism more fine grained than
per-project
--
To view, visit https://gerrit.wikimedia.org/r/267039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f4108a77f040d7820782995ae8448a8315ee34a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
Gerrit-Reviewer: Tim Landscheidt
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] dynamicproxy: Remove obsolete code - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: dynamicproxy: Remove obsolete code .. dynamicproxy: Remove obsolete code When dynamicproxy was first deployed, a number of incomplete proxy forward entries were created with "http://"; missing, and the code accommodated for that. Nowadays there are no such entries anymore and the code can be removed. Change-Id: Ia230f008e7e18c5d784469656a9ef37e4d3db59f --- M modules/dynamicproxy/files/urlproxy.lua 1 file changed, 1 insertion(+), 7 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/dynamicproxy/files/urlproxy.lua b/modules/dynamicproxy/files/urlproxy.lua index 7c1da27..27002aa 100644 --- a/modules/dynamicproxy/files/urlproxy.lua +++ b/modules/dynamicproxy/files/urlproxy.lua @@ -33,13 +33,7 @@ local routes = red:array_to_hash(routes_arr) for pattern, backend in pairs(routes) do if ngx.re.match(rest, pattern) ~= nil then -if string.match(backend, '://') then -route = backend -else --- Temp hack since portgrabber did not --- specify the http:// protocol by default -route = 'http://' .. backend -end +route = backend break end end -- To view, visit https://gerrit.wikimedia.org/r/267523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia230f008e7e18c5d784469656a9ef37e4d3db59f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Jackmcbarn Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tools: Deploy root web automatically again - change (operations/puppet)
Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268043
Change subject: Tools: Deploy root web automatically again
..
Tools: Deploy root web automatically again
Change-Id: Ia464364afd07a1ca8d2cb3c0c4aed7fe35bac91b
---
M manifests/role/labstools.pp
A modules/toollabs/manifests/admin_web_updater.pp
2 files changed, 25 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/268043/1
diff --git a/manifests/role/labstools.pp b/manifests/role/labstools.pp
index 40513dd..d35f149 100644
--- a/manifests/role/labstools.pp
+++ b/manifests/role/labstools.pp
@@ -53,6 +53,10 @@
class { 'toollabs::toolwatcher':
active => ($::fqdn == $active_host)
}
+
+class { 'toollabs::admin_web_updater':
+active => ($::fqdn == $active_host)
+}
}
class checker {
diff --git a/modules/toollabs/manifests/admin_web_updater.pp
b/modules/toollabs/manifests/admin_web_updater.pp
new file mode 100644
index 000..8a5fe00
--- /dev/null
+++ b/modules/toollabs/manifests/admin_web_updater.pp
@@ -0,0 +1,21 @@
+class toollabs::admin_web_updater(
+$active
+) {
+if $active {
+# Deploy and update root web.
+git::clone { 'labs/toollabs':
+ensure=> latest,
+directory => '/data/project/admin/toollabs',
+owner => "${::labsproject}.admin",
+group => "${::labsproject}.admin",
+mode => '2755',
+}
+
+file { '/data/project/admin/public_html':
+ensure => link,
+force => true,
+target => 'toollabs/www',
+require => Git::Clone['labs/toollabs'],
+}
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/268043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia464364afd07a1ca8d2cb3c0c4aed7fe35bac91b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Default to what's in server settings example - change (mediawiki...testreduce)
Arlolra has submitted this change and it was merged.
Change subject: Default to what's in server settings example
..
Default to what's in server settings example
Change-Id: I26b940a7bd22747f66d3835d64f725687c26c765
---
M server/importJson.js
M server/server.js
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Arlolra: Verified; Looks good to me, approved
diff --git a/server/importJson.js b/server/importJson.js
index ea9d490..21321c8 100755
--- a/server/importJson.js
+++ b/server/importJson.js
@@ -12,9 +12,9 @@
var defaults = {
'host': 'localhost',
'port': 3306,
- 'database': 'parsoid',
- 'user': 'parsoid',
- 'password': 'parsoidpw',
+ 'database': 'testreduce',
+ 'user': 'testreduce',
+ 'password': 'testreduce',
};
// Settings file
diff --git a/server/server.js b/server/server.js
index 4e8dd55..52dbd78 100644
--- a/server/server.js
+++ b/server/server.js
@@ -16,9 +16,9 @@
var defaults = {
'host': 'localhost',
'port': 3306,
- 'database': 'parsoid',
- 'user': 'parsoid',
- 'password': 'parsoidpw',
+ 'database': 'testreduce',
+ 'user': 'testreduce',
+ 'password': 'testreduce',
'debug': false,
'fetches':6,
'tries': 6,
--
To view, visit https://gerrit.wikimedia.org/r/268042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26b940a7bd22747f66d3835d64f725687c26c765
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/testreduce
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Default to what's in server settings example - change (mediawiki...testreduce)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268042
Change subject: Default to what's in server settings example
..
Default to what's in server settings example
Change-Id: I26b940a7bd22747f66d3835d64f725687c26c765
---
M server/importJson.js
M server/server.js
2 files changed, 6 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/testreduce
refs/changes/42/268042/1
diff --git a/server/importJson.js b/server/importJson.js
index ea9d490..21321c8 100755
--- a/server/importJson.js
+++ b/server/importJson.js
@@ -12,9 +12,9 @@
var defaults = {
'host': 'localhost',
'port': 3306,
- 'database': 'parsoid',
- 'user': 'parsoid',
- 'password': 'parsoidpw',
+ 'database': 'testreduce',
+ 'user': 'testreduce',
+ 'password': 'testreduce',
};
// Settings file
diff --git a/server/server.js b/server/server.js
index 4e8dd55..52dbd78 100644
--- a/server/server.js
+++ b/server/server.js
@@ -16,9 +16,9 @@
var defaults = {
'host': 'localhost',
'port': 3306,
- 'database': 'parsoid',
- 'user': 'parsoid',
- 'password': 'parsoidpw',
+ 'database': 'testreduce',
+ 'user': 'testreduce',
+ 'password': 'testreduce',
'debug': false,
'fetches':6,
'tries': 6,
--
To view, visit https://gerrit.wikimedia.org/r/268042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26b940a7bd22747f66d3835d64f725687c26c765
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/testreduce
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed color from query total - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged. Change subject: Removed color from query total .. Removed color from query total There were to much colors, so I made it look cleaner Change-Id: Iefddd466d050a7dcc2f3a0f4d76d2439def83a60 --- M gui/index.html 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/gui/index.html b/gui/index.html index 4214e22..35535ff 100644 --- a/gui/index.html +++ b/gui/index.html @@ -75,8 +75,8 @@ Execute -Results - in ms +Results + in ms -- To view, visit https://gerrit.wikimedia.org/r/267914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefddd466d050a7dcc2f3a0f4d76d2439def83a60 Gerrit-PatchSet: 2 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Make flannel use proper etcd hosts on proxy too - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: tools: Make flannel use proper etcd hosts on proxy too
..
tools: Make flannel use proper etcd hosts on proxy too
Change-Id: Ia11041937b38525caee8d931edbb0092b324
---
M manifests/role/tools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/manifests/role/tools.pp b/manifests/role/tools.pp
index 6b7ee4e..e8c5ced 100644
--- a/manifests/role/tools.pp
+++ b/manifests/role/tools.pp
@@ -122,7 +122,7 @@
class role::toollabs::k8s::webproxy {
$master_host = hiera('k8s_master')
-$etcd_url = join(prefix(suffix(hiera('etcd_hosts', [$master_host]),
':2379'), 'https://'), ',')
+$etcd_url = join(prefix(suffix(hiera('flannel::etcd_hosts'), ':2379'),
'https://'), ',')
ferm::service { 'flannel-vxlan':
proto => udp,
--
To view, visit https://gerrit.wikimedia.org/r/268041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia11041937b38525caee8d931edbb0092b324
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tools: Make flannel use proper etcd hosts on proxy too - change (operations/puppet)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268041
Change subject: tools: Make flannel use proper etcd hosts on proxy too
..
tools: Make flannel use proper etcd hosts on proxy too
Change-Id: Ia11041937b38525caee8d931edbb0092b324
---
M manifests/role/tools.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/268041/1
diff --git a/manifests/role/tools.pp b/manifests/role/tools.pp
index 6b7ee4e..e8c5ced 100644
--- a/manifests/role/tools.pp
+++ b/manifests/role/tools.pp
@@ -122,7 +122,7 @@
class role::toollabs::k8s::webproxy {
$master_host = hiera('k8s_master')
-$etcd_url = join(prefix(suffix(hiera('etcd_hosts', [$master_host]),
':2379'), 'https://'), ',')
+$etcd_url = join(prefix(suffix(hiera('flannel::etcd_hosts'), ':2379'),
'https://'), ',')
ferm::service { 'flannel-vxlan':
proto => udp,
--
To view, visit https://gerrit.wikimedia.org/r/268041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia11041937b38525caee8d931edbb0092b324
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove info from readme that moved to the testreduce repo - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/268040 Change subject: Remove info from readme that moved to the testreduce repo .. Remove info from readme that moved to the testreduce repo Change-Id: I4cba50db6d134048884c5ebddc9bfa0a73fcfad0 --- M tests/README.md 1 file changed, 2 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/40/268040/1 diff --git a/tests/README.md b/tests/README.md index f209203..a123c55 100644 --- a/tests/README.md +++ b/tests/README.md @@ -16,63 +16,13 @@ also specify a test case file as an argument, or symlink `parserTests.txt` from a `mediawiki/core` git checkout. - $ node ./parserTests.js + $ node bin/parserTests.js Several options are available for parserTests: - $ node ./parserTests.js --help + $ node bin/parserTests.js --help Enjoy! - -Running the round-trip test server --- - -In `tests/server/`, to install the necessary packages, run - $ npm install - -You'll need a pre-created MySQL database. Then, copy -`server.settings.js.example` to `server.settings.js` and in that file -edit the connection parameters. You can also override the settings -with command line options, to see them and their default values run: - $ node server --help - -To populate the database with initial data, you might first want to -create a user and a database. For this example we'll use `$USER`, -`$PASSWORD`, and `$DBNAME` to stand for the user, password, and database -you specified in `server.settings.js`: - - $ mysql -u root -p$ROOTPASSWORD mysql - mysql> CREATE USER '$USER'@'localhost' IDENTIFIED BY '$PASSWORD'; - mysql> CREATE DATABASE $DBNAME; - mysql> GRANT ALL PRIVILEGES ON $DBNAME.* TO '$USER'@'localhost'; - mysql> \q - -Now you'll want to create the initial database: - - $ mysql -u$USER -p$PASSWORD $DBNAME < sql/create_everything.mysql - $ node importJson --prefix=enwiki titles.example.en.json - $ node importJson --prefix=eswiki titles.example.es.json - -The script importJson.js takes the same connection parameters as server.js. To -test the handling of non-existent articles, you might want to also do: - - $ node importJson --prefix=enwiki titles.example.bogus.json - $ node importJson --prefix=eswiki titles.example.bogus.json - -Now start the server: - - $ node server - -Running the round-trip test clients - -In `tests/client`, copy `config.example.js` to `config.js` and edit it to your -taste. In separate windows, as many as you want: - - $ cd tests/client - $ node client - -Then take a look at [the statistics](http://localhost:8001/). Running the dumpgrepper --- -- To view, visit https://gerrit.wikimedia.org/r/268040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cba50db6d134048884c5ebddc9bfa0a73fcfad0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initially hide query editor textarea - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged.
Change subject: Initially hide query editor textarea
..
Initially hide query editor textarea
Change-Id: Ia9ffcf9117275670e317cc4a8f580f633bc0de2d
---
M gui/style.css
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gui/style.css b/gui/style.css
index 2e89baa..b012d54 100644
--- a/gui/style.css
+++ b/gui/style.css
@@ -39,7 +39,7 @@
height: auto !important;
}
-.CodeMirror-scroll {
+.CodeMirror-scroll, .queryEditor {
min-height: 300px;
}
@@ -53,6 +53,10 @@
height: 40px;
}
+.queryEditor {
+ visibility: hidden;
+ padding: 0;
+}
/**
Bootstrap Styles
**/
--
To view, visit https://gerrit.wikimedia.org/r/267925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9ffcf9117275670e317cc4a8f580f633bc0de2d
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Copy over readmes from parsoid repo - change (mediawiki...testreduce)
Arlolra has submitted this change and it was merged. Change subject: Copy over readmes from parsoid repo .. Copy over readmes from parsoid repo Change-Id: I4c6dbedb974533efa21fe8c86cecb95a2851e4f4 --- M client/README M server/README 2 files changed, 49 insertions(+), 4 deletions(-) Approvals: Arlolra: Verified; Looks good to me, approved diff --git a/client/README b/client/README index 3eafd1a..bcd59d7 100644 --- a/client/README +++ b/client/README @@ -1,2 +1,9 @@ -Round-trip testing server client. -See ../README for details. +Running the round-trip test clients +--- + +In `client/`, copy `config.example.js` to `config.js` and edit it to your +taste. In separate windows, as many as you want: + + $ node client + +Then take a look at [the statistics](http://localhost:8001/). diff --git a/server/README b/server/README index b645a0d..ab4a30e 100644 --- a/server/README +++ b/server/README @@ -1,2 +1,40 @@ -Round-trip testing server server. -See ../README for details. +Running the round-trip test server +-- + +In `tests/server/`, to install the necessary packages, run + + $ npm install + +You'll need a pre-created MySQL database. Then, copy +`server.settings.js.example` to `server.settings.js` and in that file +edit the connection parameters. You can also override the settings +with command line options, to see them and their default values run: + + $ node server --help + +To populate the database with initial data, you might first want to +create a user and a database. For this example we'll use `$USER`, +`$PASSWORD`, and `$DBNAME` to stand for the user, password, and database +you specified in `server.settings.js`: + + $ mysql -u root -p$ROOTPASSWORD mysql + mysql> CREATE USER '$USER'@'localhost' IDENTIFIED BY '$PASSWORD'; + mysql> CREATE DATABASE $DBNAME; + mysql> GRANT ALL PRIVILEGES ON $DBNAME.* TO '$USER'@'localhost'; + mysql> \q + +Now you'll want to create the initial database: + + $ mysql -u$USER -p$PASSWORD $DBNAME < sql/create_everything.mysql + $ node importJson --prefix=enwiki titles.example.en.json + $ node importJson --prefix=eswiki titles.example.es.json + +The script importJson.js takes the same connection parameters as server.js. To +test the handling of non-existent articles, you might want to also do: + + $ node importJson --prefix=enwiki titles.example.bogus.json + $ node importJson --prefix=eswiki titles.example.bogus.json + +Now start the server: + + $ node server -- To view, visit https://gerrit.wikimedia.org/r/268039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c6dbedb974533efa21fe8c86cecb95a2851e4f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/testreduce Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Copy over readmes from parsoid repo - change (mediawiki...testreduce)
Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/268039 Change subject: Copy over readmes from parsoid repo .. Copy over readmes from parsoid repo Change-Id: I4c6dbedb974533efa21fe8c86cecb95a2851e4f4 --- M client/README M server/README 2 files changed, 49 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/testreduce refs/changes/39/268039/1 diff --git a/client/README b/client/README index 3eafd1a..bcd59d7 100644 --- a/client/README +++ b/client/README @@ -1,2 +1,9 @@ -Round-trip testing server client. -See ../README for details. +Running the round-trip test clients +--- + +In `client/`, copy `config.example.js` to `config.js` and edit it to your +taste. In separate windows, as many as you want: + + $ node client + +Then take a look at [the statistics](http://localhost:8001/). diff --git a/server/README b/server/README index b645a0d..ab4a30e 100644 --- a/server/README +++ b/server/README @@ -1,2 +1,40 @@ -Round-trip testing server server. -See ../README for details. +Running the round-trip test server +-- + +In `tests/server/`, to install the necessary packages, run + + $ npm install + +You'll need a pre-created MySQL database. Then, copy +`server.settings.js.example` to `server.settings.js` and in that file +edit the connection parameters. You can also override the settings +with command line options, to see them and their default values run: + + $ node server --help + +To populate the database with initial data, you might first want to +create a user and a database. For this example we'll use `$USER`, +`$PASSWORD`, and `$DBNAME` to stand for the user, password, and database +you specified in `server.settings.js`: + + $ mysql -u root -p$ROOTPASSWORD mysql + mysql> CREATE USER '$USER'@'localhost' IDENTIFIED BY '$PASSWORD'; + mysql> CREATE DATABASE $DBNAME; + mysql> GRANT ALL PRIVILEGES ON $DBNAME.* TO '$USER'@'localhost'; + mysql> \q + +Now you'll want to create the initial database: + + $ mysql -u$USER -p$PASSWORD $DBNAME < sql/create_everything.mysql + $ node importJson --prefix=enwiki titles.example.en.json + $ node importJson --prefix=eswiki titles.example.es.json + +The script importJson.js takes the same connection parameters as server.js. To +test the handling of non-existent articles, you might want to also do: + + $ node importJson --prefix=enwiki titles.example.bogus.json + $ node importJson --prefix=eswiki titles.example.bogus.json + +Now start the server: + + $ node server -- To view, visit https://gerrit.wikimedia.org/r/268039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c6dbedb974533efa21fe8c86cecb95a2851e4f4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/testreduce Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove extra whitespace after license-name - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Remove extra whitespace after license-name .. Remove extra whitespace after license-name Change-Id: I7f3e8311a71f30d65626786f9f9151bf29ccc8fe --- M client/WikibaseClient.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ricordisamoa: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php index 46b1990..9a679e3 100644 --- a/client/WikibaseClient.php +++ b/client/WikibaseClient.php @@ -80,7 +80,7 @@ ), 'url' => 'https://www.mediawiki.org/wiki/Extension:Wikibase_Client', 'descriptionmsg' => 'wikibase-client-desc', - 'license-name' => 'GPL-2.0+' + 'license-name' => 'GPL-2.0+' ); $wgWBClientDataTypes = require ( __DIR__ . '/../lib/WikibaseLib.datatypes.php' ); -- To view, visit https://gerrit.wikimedia.org/r/267893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f3e8311a71f30d65626786f9f9151bf29ccc8fe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Ricordisamoa Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: Prepare to port Minerva code to new repository - change (mediawiki...MinervaNeue)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268038
Change subject: WIP: Prepare to port Minerva code to new repository
..
WIP: Prepare to port Minerva code to new repository
TODO:
* Work out the remaining MobileFrontend issues for this to run without
MobileFrontend
* Work out the remaining MobileFrontend issues for MobileFrontend to work
without Minerva
* Security review from Chris
* Big switcheroo
Change-Id: Ia573ed4f24f17bbc327c0d7ef034cbacbc80db73
---
A .gitkeep
A MinervaNeue.php
A README.txt
A includes/MinervaHooks.php
A includes/models/.gitkeep
A includes/modules/.gitkeep
A includes/skins/.gitkeep
A scripts/migrate.py
A skin.json
9 files changed, 175 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/38/268038/1
diff --git a/.gitkeep b/.gitkeep
new file mode 100644
index 000..eab80f0
--- /dev/null
+++ b/.gitkeep
@@ -0,0 +1,3 @@
+includes/skins
+includes/models
+includes/modules
diff --git a/MinervaNeue.php b/MinervaNeue.php
new file mode 100644
index 000..f63fc93
--- /dev/null
+++ b/MinervaNeue.php
@@ -0,0 +1,14 @@
+https://www.mediawiki.org/wiki/Extension_registration for
more details.'
+ ); */
+ return true;
+} else {
+ die( 'This version of the MinervaNeue skin requires MediaWiki 1.25+' );
+}
diff --git a/README.txt b/README.txt
new file mode 100644
index 000..94c580b
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,6 @@
+Porting Minerva code from MobileFrontend to Minerva:
+* Make sure this repository is in your MediaWiki skins directory
+* Make sure MobileFrontend is installed in extensions/MobileFrontend in your
MediaWiki install
+* Run:
+ > python3 scripts/migrate.py
+* Create commits for both MobileFrontend and Minerva to handle the move.
diff --git a/includes/MinervaHooks.php b/includes/MinervaHooks.php
new file mode 100644
index 000..d06ffd7
--- /dev/null
+++ b/includes/MinervaHooks.php
@@ -0,0 +1,31 @@
+https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderGetLessVars
+* @param array &$lessVars Variables already added
+*/
+ public static function onResourceLoaderGetLessVars( &$lessVars ) {
+ global $wgMFDeviceWidthMobileSmall;
+ $lessVars = array_merge( $lessVars,
+ array(
+ 'wgMFDeviceWidthTablet' =>
$lessVars['deviceWidthTablet'],
+ 'wgMFDeviceWidthMobileSmall' =>
"{$wgMFDeviceWidthMobileSmall}px"
+ )
+ );
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/includes/models/.gitkeep b/includes/models/.gitkeep
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/includes/models/.gitkeep
diff --git a/includes/modules/.gitkeep b/includes/modules/.gitkeep
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/includes/modules/.gitkeep
diff --git a/includes/skins/.gitkeep b/includes/skins/.gitkeep
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/includes/skins/.gitkeep
diff --git a/scripts/migrate.py b/scripts/migrate.py
new file mode 100644
index 000..2b9658f
--- /dev/null
+++ b/scripts/migrate.py
@@ -0,0 +1,81 @@
+mfdir = '../../extensions/MobileFrontend'
+configVars = [ "MFContentNamespace", "MFDeviceWidthTablet",
"MFCollapseSectionsByDefault",
+"MFEnableJSConsoleRecruitment", "MFUseCentralAuthToken",
"MFDeviceWidthMobileSmall",
+"MFIgnoreEventLoggingBucketing", "MFPageActions",
"MFSchemaMobileWebLanguageSwitcherSampleRate" ]
+
+import json, shutil, os, subprocess, time
+from collections import OrderedDict
+
+# Do cleanup in preparation for patchsets it will make.
+subprocess.call(["git clean -fd"], shell=True)
+subprocess.call(["git stash && git clean -fd"], shell=True, cwd=mfdir)
+time.sleep(1)
+
+def steal( path ):
+try:
+# ../ because we are in scripts folder
+shutil.move( mfdir + '/' + path, path )
+except FileNotFoundError:
+# probably done in initial steal steps
+pass
+
+# steal templates etc from MobileFrontend
+for root, dirs, files in os.walk(mfdir + '/includes/skins/'):
+for file in files:
+steal('includes/skins/' + file)
+
+# steal LESS stuff
+steal( 'minerva.less' )
+
+f = open(mfdir +'/extension.json', 'r')
+mfExtensionData = json.load(f, object_pairs_hook=OrderedDict)
+f.close()
+f = open('skin.json', 'r')
+minervaSkinData = json.load(f, object_pairs_hook=OrderedDict)
+f.close()
+
+autoload = mfExtensionData["AutoloadClasses"]
+keys_to_remove = []
+for key in autoload:
+if "Minerva" in key or "MenuBuilder" in key or
"MFResourceLoaderParsedMessageModule" in key or "MobileUI" in key or
"MobilePage" in key:
+steal(autoload[key])
+minervaSkinData["AutoloadClasses"][key] = autoload[key]
+keys_to_remove.append(key)
+
+# Remove those keys fo
[MediaWiki-commits] [Gerrit] Use completion specific pool counter - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Use completion specific pool counter
..
Use completion specific pool counter
Depends on I242fda677 being deployed first. Once that config change has
been SWAT'd out we can merge this and let it go out with the next
deployment train.
Bug: T125547
Change-Id: Ia69980f0737c74d5da695b4e66d18136e34f48a2
---
M includes/CompletionSuggester.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Smalyshev: Looks good to me, approved
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index 59d4b28..2cfde24 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -181,7 +181,7 @@
$searcher = $this;
$limit = $this->limit;
$result = Util::doPoolCounterWork(
- 'CirrusSearch-Search',
+ 'CirrusSearch-Completion',
$this->user,
function() use( $searcher, $index, $suggest,
$logContext, $queryOptions,
$profiles, $text , $limit ) {
--
To view, visit https://gerrit.wikimedia.org/r/268030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia69980f0737c74d5da695b4e66d18136e34f48a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
Gerrit-Reviewer: Cindy-the-browser-test-bot
Gerrit-Reviewer: DCausse
Gerrit-Reviewer: Manybubbles
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] updates for Blazegraph 2.0 - change (wikidata...rdf)
jenkins-bot has submitted this change and it was merged.
Change subject: updates for Blazegraph 2.0
..
updates for Blazegraph 2.0
Change-Id: I27559f6a55d7e583d8e3fc1ec8e9c23b186473ac
---
M blazegraph/pom.xml
M
blazegraph/src/main/java/com/bigdata/rdf/internal/NormalizingInlineUriHandler.java
M
blazegraph/src/main/java/com/bigdata/rdf/internal/TrailingSlashRemovingInlineUriHandler.java
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseExtensionFactory.java
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseInlineUriFactory.java
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseVocabulary.java
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/inline/literal/WikibaseDateExtension.java
M
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/AbstractRandomizedBlazegraphStorageTestCase.java
M
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/AbstractRandomizedBlazegraphTestBase.java
A
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/WikibaseDateUnitTest.java
M
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/WikibaseVocabularyUnitTest.java
M common/pom.xml
M dist/pom.xml
M pom.xml
M testTools/pom.xml
M tools/pom.xml
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/Munger.java
M tools/src/main/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandler.java
M
tools/src/test/java/org/wikidata/query/rdf/tool/rdf/NormalizingRdfHandlerUnitTest.java
M war/pom.xml
M war/src/assembly/dist.xml
21 files changed, 184 insertions(+), 70 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 2f81f79..24272e7 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.1.3
+0.2.0-SNAPSHOT
blazegraph
jar
@@ -20,8 +20,8 @@
- com.bigdata
- bigdata
+ com.blazegraph
+ bigdata-core
provided
diff --git
a/blazegraph/src/main/java/com/bigdata/rdf/internal/NormalizingInlineUriHandler.java
b/blazegraph/src/main/java/com/bigdata/rdf/internal/NormalizingInlineUriHandler.java
index e617225..3aae2ac 100644
---
a/blazegraph/src/main/java/com/bigdata/rdf/internal/NormalizingInlineUriHandler.java
+++
b/blazegraph/src/main/java/com/bigdata/rdf/internal/NormalizingInlineUriHandler.java
@@ -1,8 +1,5 @@
package com.bigdata.rdf.internal;
-import java.util.Arrays;
-import java.util.List;
-
import org.openrdf.model.URI;
import com.bigdata.rdf.internal.impl.literal.AbstractLiteralIV;
@@ -19,50 +16,36 @@
* The wrapped handler to which everything is delegated once normalized.
*/
private final InlineURIHandler next;
-/**
- * Prefixes that should be recognized as valid prefixes for this uri but
are
- * not its canonical form.
- */
-private final List normalizedPrefixes;
/**
* Build the handler.
*
* @param next the handler to which to send all normalized localNames
- * @param normalizedPrefixes prefixes that should be recognized as valid
- *prefixes for this uri but are not its canonical form.
+ * @param normalizedPrefix prefix that should be recognized as valid
+ *prefix for this uri but is not its canonical form.
*/
-public NormalizingInlineUriHandler(InlineURIHandler next, String...
normalizedPrefixes) {
-this(next, Arrays.asList(normalizedPrefixes));
-}
-
-public NormalizingInlineUriHandler(InlineURIHandler next, List
normalizedPrefixes) {
-super(next.getNamespace());
+public NormalizingInlineUriHandler(InlineURIHandler next, String
normalizedPrefix) {
+super(normalizedPrefix);
this.next = next;
-this.normalizedPrefixes = normalizedPrefixes;
}
@Override
public void init(Vocabulary vocab) {
-super.init(vocab);
+ // Skip init() since we have no vocab entry for our namespace
+// super.init(vocab);
next.init(vocab);
}
@Override
@SuppressWarnings({"unchecked", "rawtypes"})
protected URIExtensionIV createInlineIV(URI uri) {
-if (namespaceIV == null) {
-// Can't do anything without a namespace.
-return null;
-}
-for (String prefix : normalizedPrefixes) {
-if (uri.stringValue().startsWith(prefix)) {
-AbstractLiteralIV localNameIv =
next.createInlineIV(uri.stringValue().substring(prefix.length()));
-if (localNameIv == null) {
-return null;
-}
-return new URIExtensionIV(localNameIv, namespaceIV);
+String prefix = getNamespace();
+if (uri.stringValue().startsWith(prefix)) {
+AbstractLiteralIV localNameIv =
next.createInlineIV(uri.stringValue().substring
[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...testreduce)
Arlolra has submitted this change and it was merged. Change subject: Add .gitreview .. Add .gitreview Change-Id: I00d26c33531bb7e893c8eab6eceb85608ef51e96 --- A .gitreview 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Arlolra: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..5d72d39 --- /dev/null +++ b/.gitreview @@ -0,0 +1,7 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=mediawiki/services/parsoid/testreduce.git +defaultbranch=master +defaultrebase=0 + -- To view, visit https://gerrit.wikimedia.org/r/268037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00d26c33531bb7e893c8eab6eceb85608ef51e96 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/testreduce Gerrit-Branch: master Gerrit-Owner: Arlolra Gerrit-Reviewer: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...testreduce)
Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/268037 Change subject: Add .gitreview .. Add .gitreview Change-Id: I00d26c33531bb7e893c8eab6eceb85608ef51e96 --- A .gitreview 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/testreduce refs/changes/37/268037/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..5d72d39 --- /dev/null +++ b/.gitreview @@ -0,0 +1,7 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=mediawiki/services/parsoid/testreduce.git +defaultbranch=master +defaultrebase=0 + -- To view, visit https://gerrit.wikimedia.org/r/268037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00d26c33531bb7e893c8eab6eceb85608ef51e96 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/testreduce Gerrit-Branch: master Gerrit-Owner: Arlolra ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP: New language overlay - change (mediawiki...MobileFrontend)
Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268036
Change subject: WIP: New language overlay
..
WIP: New language overlay
Change-Id: I47c6b4df0c42bb15ed4d85fb251cc98af0129378
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A resources/mobile.languages.structured/LanguageOverlay.hogan
A resources/mobile.languages.structured/LanguageOverlay.js
A resources/mobile.languages.structured/LanguageOverlay.less
A resources/mobile.languages.structured/magnifying-glass.svg
M resources/skins.minerva.scripts/init.js
8 files changed, 219 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/36/268036/1
diff --git a/extension.json b/extension.json
index 73fbf09..71c7168 100644
--- a/extension.json
+++ b/extension.json
@@ -1221,6 +1221,28 @@
"2": "mobile-frontend-language-site-choose"
}
},
+ "mobile.languages.structured": {
+ "class": "MFResourceLoaderParsedMessageModule",
+ "dependencies": [
+ "mobile.overlays",
+ "mobile.settings",
+ "mobile.browser"
+ ],
+ "scripts": [
+
"resources/mobile.languages.structured/LanguageOverlay.js"
+ ],
+ "styles": [
+
"resources/mobile.languages.structured/LanguageOverlay.less"
+ ],
+ "templates": {
+ "LanguageOverlay.hogan":
"resources/mobile.languages.structured/LanguageOverlay.hogan"
+ },
+ "messages": {
+ "1":
"mobile-frontend-languages-structured-overlay-preferred-languages-header",
+ "2":
"mobile-frontend-languages-structured-overlay-all-languages-header",
+ "3":
"mobile-frontend-languages-structured-overlay-search-input-placeholder"
+ }
+ },
"mobile.issues": {
"targets": [
"mobile",
diff --git a/i18n/en.json b/i18n/en.json
index 755b5f5..dbaa3e1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -190,6 +190,9 @@
"mobile-frontend-languages-nonexistent-title": "The page \"$1\" does
not exist.",
"mobile-frontend-languages-text": "$1 is available in $2
{{PLURAL:$2|language|languages}}.",
"mobile-frontend-languages-variant-header":
"{{#language:{{CONTENTLANG variants",
+
"mobile-frontend-languages-structured-overlay-preferred-languages-header":
"preferred languages",
+ "mobile-frontend-languages-structured-overlay-all-languages-header":
"all languages",
+
"mobile-frontend-languages-structured-overlay-search-input-placeholder":
"Search for a language",
"mobile-frontend-last-modified-date": "Last edited on $1, at $2",
"mobile-frontend-last-modified-days": "Last edited {{PLURAL:$1|$1
day|$1 days}} ago",
"mobile-frontend-last-modified-hours": "Last edited {{PLURAL:$1|$1
hour|$1 hours}} ago",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1f9b628..7f4c701 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -181,6 +181,9 @@
"mobile-frontend-language-heading": "The title for the list of
languages for a page.\n{{Identical|Language}}",
"mobile-frontend-language-site-choose": "Header for overlay when click
on language on settings page",
"mobile-frontend-language-variant-header": "Header at top of language
selection overlay prompting a user to select variant of the current
language.\n\nSee also:\n* {{msg-mw|Mobile-frontend-languages-variant-header}}",
+
"mobile-frontend-languages-structured-overlay-preferred-languages-header":
"Title of the preferred languages in the structured language overlay",
+ "mobile-frontend-languages-structured-overlay-all-languages-header":
"Title of all languages in the structured language overlay",
+
"mobile-frontend-languages-structured-overlay-search-input-placeholder":
"Instructional text for the language overlay search input box",
"mobile-frontend-languages-404-desc": "The title for this message is
{{msg-mw|Mobile-frontend-languages-404-title}}.",
"mobile-frontend-languages-404-title": "Used as title for the
description {{msg-mw|Mobile-frontend-languages-404-desc}}.",
"mobile-frontend-languages-header": "{{Identical|Language}}",
diff --git a/resources/mobile.languages.structured/LanguageOverlay.hogan
b/resources/mobile.languages.structured/LanguageOverlay.hogan
new file mode 100644
index 000..236d9cc
--- /dev/null
+++ b/resources/mobile.languages.stru
[MediaWiki-commits] [Gerrit] Enables sharing dash settings via URL - change (wikimedia...wetzel)
OliverKeyes has submitted this change and it was merged.
Change subject: Enables sharing dash settings via URL
..
Enables sharing dash settings via URL
This adds a requested feature of allowing users to link to the
dashboard and including settings (selections, choices) in the
URL. This uses Andrzej Oleś's shinyURL package to store params
in the URL and then restore the dashboard parameters from URL.
Change-Id: Ic5a768ffa62a01a2ded7e7ccdc83ec12b126
---
M server.R
M ui.R
M utils.R
3 files changed, 15 insertions(+), 6 deletions(-)
Approvals:
OliverKeyes: Verified; Looks good to me, approved
diff --git a/server.R b/server.R
index 14edc05..f1e87db 100644
--- a/server.R
+++ b/server.R
@@ -3,7 +3,7 @@
existing_date <- Sys.Date() - 1
# Actual server code.
-shinyServer(function(input, output) {
+shinyServer(function(input, output, session) {
if(Sys.Date() != existing_date){
read_actions()
@@ -11,6 +11,8 @@
suppressWarnings(read_tiles())
existing_date <<- Sys.Date()
}
+
+ shinyURL.server(session)
# Wrap time_frame_range to provide global settings
time_frame_range <- function(input_local_timeframe, input_local_daterange) {
@@ -47,7 +49,7 @@
output$tiles_style_series <- renderDygraph({
polloi::data_select(input$tile_style_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
ddply(.(date, style), summarize, `total tiles` = sum(total)) %>%
- tidyr::spread(style, `total tiles`) %>%
+ tidyr::spread(style, `total tiles`, fill = 0) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_style_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_style_series_timeframe,
input$tiles_style_series_timeframe_daterange)) %>%
polloi::make_dygraph("Date", "Tiles", "Total tiles by style",
legend_name = "Style") %>%
@@ -60,7 +62,7 @@
output$tiles_users_series <- renderDygraph({
polloi::data_select(input$tile_users_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
ddply(.(date, style), summarize, `total users` = sum(users)) %>%
- tidyr::spread(style, `total users`) %>%
+ tidyr::spread(style, `total users`, fill = 0) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_users_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_users_series_timeframe,
input$tiles_users_series_timeframe_daterange)) %>%
polloi::make_dygraph("Date", "Users", "Total users by style") %>%
@@ -80,7 +82,7 @@
polloi::data_select(input$tile_zoom_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
subset(zoom %in% as.numeric(input$zoom_level_selector)) %>%
ddply(.(date, zoom), summarize, `total tiles` = sum(total)) %>%
- tidyr::spread(zoom, `total tiles`) %>%
+ tidyr::spread(zoom, `total tiles`, fill = 0) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_zoom_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_zoom_series_timeframe,
input$tiles_zoom_series_timeframe_daterange)) %>%
polloi::make_dygraph("Date", "Tiles", "Total tiles by zoom level") %>%
diff --git a/ui.R b/ui.R
index 1b19d10..adec0f2 100644
--- a/ui.R
+++ b/ui.R
@@ -1,6 +1,7 @@
library(shiny)
library(shinydashboard)
library(dygraphs)
+library(shinyURL)
header <- dashboardHeader(title = "Wikimedia Maps",
dropdownMenuOutput("message_menu"), disable = FALSE)
@@ -30,7 +31,11 @@
conditionalPanel("input.timeframe_global == 'custom'",
dateRangeInput("daterange_global", label =
"Custom Date Range",
start = Sys.Date()-11, end =
Sys.Date()-1, min = "2015-04-14")),
- icon = icon("cog", lib = "glyphicon"))
+ icon = icon("cog", lib = "glyphicon")),
+menuItem(text = "Sharing Options",
+ shinyURL.ui(tinyURL = FALSE),
+ p("Dashboard settings stored in URL.", style = "padding-bottom:
10px;"),
+ icon = icon("share-alt", lib = "glyphicon"))
)
)
diff --git a/utils.R b/utils.R
index 633806e..028d186 100644
--- a/utils.R
+++ b/utils.R
@@ -1,10 +1,12 @@
# Dependencies
library(plyr)
-library(dplyr)
library(magrittr)
+library(dplyr)
+library(tidyr)
library(reshape2)
library(polloi)
library(data.table)
+library(shinyURL) # devtools::install_github("aoles/shinyURL")
# Read in action data and write it into the global scope with sufficient
formatting to be trivially
# used in dygraphs.
--
To view, visit https://gerrit.wikimedia.org/r/268027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5a768ffa62a01a2ded7e7ccdc83ec12b126
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/d
[MediaWiki-commits] [Gerrit] WIP merge antifraud records - change (wikimedia...crm)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268035
Change subject: WIP merge antifraud records
..
WIP merge antifraud records
Adyen will be sending antifraud messages from both DI and SmashPig,
so we need to combine them rather than insert duplicates.
Need to test this a bit locally.
Bug: T122244
Change-Id: Ia3b7a301dce88c02066bff791c3ce787ddecca3a
---
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
1 file changed, 48 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/35/268035/1
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index 4a0adfe..5bf3f81 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -127,9 +127,6 @@
$body = json_decode($msg->body, TRUE);
- $antifraud_breakdown = $body['score_breakdown'];
- unset($body['score_breakdown']);
-
//handle the IP address conversion to binary so we can do database voodoo
later.
if (array_key_exists('user_ip', $body)) {
//check for IPv6
@@ -150,35 +147,19 @@
}
- $id = fredge_insert_data($body, 'payments_fraud', $txnid, true);
-
- if ($id) {
-foreach ($antifraud_breakdown as $test => $score) {
- //format the way the table wants it
- $insert = array(
-'payments_fraud_id' => $id,
-'filter_name' => $test,
-'risk_score' => $score,
- );
- fredge_insert_data($insert, 'payments_fraud_breakdown', $txnid, true);
-}
- }
+ fredge_insert_data($body, 'payments_fraud', $txnid, true);
}
/**
- * take a message, and shovel that data straight into a table.
+ * take a message and insert or update rows in payments_fraud and
payments_fraud_breakdown.
* If the *exact* fields in the table aren't in the message, this will complain
* and drop things. So don't do that.
- * @param array $msg the array-converted message body that you want to shovel
- * into $table.
- * @param type $table the name of the target fredge table that should have the
- * same fields as the $msg
+ * @param array $msg the array-converted message body that you want to upsert.
* @param string $log_identifier Some small string for the log that will help
id
* the message if something goes amiss and we have to log about it.
- * @param boolean $require_all True if we want to require all fields described
in
- * the current schema for $table, otherwise false.
*/
-function fredge_insert_data($msg, $table, $log_identifier, $require_all =
false) {
+function fredge_insert_data($msg, $log_identifier) {
+
static $schemata = null;
if (is_null($schemata)) {
require_once('wmf_fredge_qc.install'); //annoyed I have to do this, but
this seems the cleanest way from here
@@ -194,19 +175,38 @@
}
if ( !is_array($msg) || empty($msg) ){
-$error = "$log_identifier: Trying to insert nothing into table $table.
Dropping message on floor.";
+$error = "$log_identifier: Trying to insert nothing into payments_fraud.
Dropping message on floor.";
throw new FredgeDataValidationException( $error );
}
+ if ( empty($msg['contribution_tracking_id']) || empty($msg['order_id']) ){
+$error = "$log_identifier: missing essential payments_fraud IDs. Dropping
message on floor.";
+throw new FredgeDataValidationException( $error );
+ }
+
+ $id = 0;
+ $mode = 'insert';
+
+ $dbs = wmf_civicrm_get_dbs();
+ $dbs->push('fredge');
+ $query = 'SELECT id FROM payments_fraud WHERE contribution_tracking_id =
:ct_id AND order_id = :order_id LIMIT 1';
+ $result = db_query( $query, array(
+':ct_id' => $msg['contribution_tracking_id'],
+':order_id' => $msg['order_id']
+ ) );
+ if ( $result->rowCount() === 1 ){
+ $id = $result->fetch()->id;
+ $mode = 'update';
+ }
+
$insert = array();
- foreach ($schemata[$table]['fields'] as $field => $definition) {
+ foreach ($schemata['payments_fraud']['fields'] as $field => $definition) {
if (!array_key_exists($field, $msg)) {
- if ($require_all) {
+ if ($mode === 'insert') {
$error = "$log_identifier: Expected field $field bound for table
$table not present! Dropping message on floor.";
throw new FredgeDataValidationException( $error );
//so... add fields to DI first when you do schema changes.
}
- $insert[$field] = null;
} else {
//the field exists. Woot.
@@ -227,13 +227,26 @@
}
//now all you have to do is insert the actual message data.
- $dbs = wmf_civicrm_get_dbs();
- $dbs->push('fredge');
- $id = db_insert($table)
-->fields($insert)
-->execute();
-
- return $id;
+ if ( $mode === 'insert' ) {
+$id = db_insert( 'payments_fraud' )
+ ->fields($insert)
+ ->execute();
+ } else {
+db_update( '
[MediaWiki-commits] [Gerrit] build: Updating development dependencies - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268034
Change subject: build: Updating development dependencies
..
build: Updating development dependencies
* jakub-onderka/php-parallel-lint: 0.9 → 0.9.2
Change-Id: Ia6ea62c97fc8183ff40dc361501a8f09163900ba
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/34/268034/1
diff --git a/composer.json b/composer.json
index 77dbce7..e38111e 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
"require-dev": {
"symfony/dom-crawler": "~2.5",
"symfony/css-selector": "~2.5",
- "jakub-onderka/php-parallel-lint": "0.9"
+ "jakub-onderka/php-parallel-lint": "0.9.2"
},
"scripts": {
"test": [
--
To view, visit https://gerrit.wikimedia.org/r/268034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6ea62c97fc8183ff40dc361501a8f09163900ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: REL1_25
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add composer test with just php-parallel-lint - change (mediawiki...Flow)
Hello Hashar,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/268033
to review the following change.
Change subject: Add composer test with just php-parallel-lint
..
Add composer test with just php-parallel-lint
Introduce the 'composer test' entry point for Wikimedia CI. Initially
with just jakub-onderka/php-parallel-lint.
We usually ignore the whole /vendor/ tree but since Flow has a few third
parties libraries committed and we thus need fine ignore rules:
Add to .gitignore files that are installed by php-parallel-lint package:
vendor/bin/
vendor/jakub-onderka/
While at it instruct jshint to ignore /node_modules/ , shipped by npm.
Convert spaces to tabs in composer.json.
Signed-off-by: Antoine Musso
Change-Id: Id8fef217f22702915b7d7458b2a07a271fbdde8e
---
M .gitignore
M .jshintignore
M composer.json
3 files changed, 17 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/33/268033/1
diff --git a/.gitignore b/.gitignore
index 9319e8b..0a70434 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.svn
*~
*.kate-swp
.*.swp
@@ -7,7 +6,9 @@
node_modules/
tests/browser/.gem
tests/browser/screenshots
+vendor/bin/
vendor/composer/
+vendor/jakub-onderka/
vendor/symfony/
vendor/autoload.php
\#*#
diff --git a/.jshintignore b/.jshintignore
index db20c5e..2e5c281 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,3 +1,4 @@
modules/jquery.scroll.js
modules/vendor/handlebars-v2.0.0-alpha.2.js
+node_modules
modules/vendor/Storer.js
diff --git a/composer.json b/composer.json
index de1290b..77dbce7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,16 @@
{
-"name": "mediawiki/flow",
-"description": "Discussion and collaboration system extension for
MediaWiki",
-"license": "GPL-2.0+",
-"require": {},
-"require-dev": {
-"symfony/dom-crawler": "~2.5",
-"symfony/css-selector": "~2.5"
-}
+ "name": "mediawiki/flow",
+ "description": "Discussion and collaboration system extension for
MediaWiki",
+ "license": "GPL-2.0+",
+ "require": {},
+ "require-dev": {
+ "symfony/dom-crawler": "~2.5",
+ "symfony/css-selector": "~2.5",
+ "jakub-onderka/php-parallel-lint": "0.9"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor/bin --exclude
vendor/jakub-onderka --exclude node_modules"
+ ]
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/268033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8fef217f22702915b7d7458b2a07a271fbdde8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: REL1_25
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Paladox
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load CSS module in mobile - change (mediawiki...ORES)
jenkins-bot has submitted this change and it was merged.
Change subject: Load CSS module in mobile
..
Load CSS module in mobile
Bug: T125496
Change-Id: Ifb89898e5a109142d8483510a903c3942ba6cb66
---
M extension.json
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 32abebe..9eae0a2 100644
--- a/extension.json
+++ b/extension.json
@@ -50,8 +50,12 @@
},
"ResourceModules": {
"ext.ores.styles": {
+ "position": "top",
"styles": "ext.ores.styles.css",
- "position": "top"
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
}
},
"MessagesDirs": {
@@ -86,7 +90,7 @@
}
},
"DefaultUserOptions": {
- "oresDamagingPref": "soft"
+ "oresDamagingPref": "hard"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/268032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb89898e5a109142d8483510a903c3942ba6cb66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load CSS module in mobile - change (mediawiki...ORES)
Ladsgroup has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268032
Change subject: Load CSS module in mobile
..
Load CSS module in mobile
Bug: T125496
Change-Id: Ifb89898e5a109142d8483510a903c3942ba6cb66
---
M extension.json
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES
refs/changes/32/268032/1
diff --git a/extension.json b/extension.json
index 32abebe..9eae0a2 100644
--- a/extension.json
+++ b/extension.json
@@ -50,8 +50,12 @@
},
"ResourceModules": {
"ext.ores.styles": {
+ "position": "top",
"styles": "ext.ores.styles.css",
- "position": "top"
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
}
},
"MessagesDirs": {
@@ -86,7 +90,7 @@
}
},
"DefaultUserOptions": {
- "oresDamagingPref": "soft"
+ "oresDamagingPref": "hard"
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/268032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb89898e5a109142d8483510a903c3942ba6cb66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use a wrapper parameter-function so jobs can have multiple f... - change (integration/config)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268031
Change subject: Use a wrapper parameter-function so jobs can have multiple
functions
..
Use a wrapper parameter-function so jobs can have multiple functions
Work around the zuul limitation that a job may only have one
parameter-function by wrapping them all in Python.
Bug: T125498
Change-Id: Id651c92ae029aacbcfa28974fe1829d2c403199c
---
M tests/test_zuul_doc_functions.py
M tests/test_zuul_ext_dependencies.py
D zuul/doc_functions.py
M zuul/layout.yaml
D zuul/nodepool.py
R zuul/parameter_functions.py
D zuul/php_version.py
7 files changed, 80 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/31/268031/1
diff --git a/tests/test_zuul_doc_functions.py b/tests/test_zuul_doc_functions.py
index 5a9ee6e..a32436f 100644
--- a/tests/test_zuul_doc_functions.py
+++ b/tests/test_zuul_doc_functions.py
@@ -7,7 +7,7 @@
# Import function
execfile(os.path.join(
os.path.dirname(os.path.abspath(__file__)),
-'../zuul/doc_functions.py'))
+'../zuul/parameter_functions.py'))
class TestDocFunctions(unittest.TestCase):
diff --git a/tests/test_zuul_ext_dependencies.py
b/tests/test_zuul_ext_dependencies.py
index 05dac81..87a7c56 100644
--- a/tests/test_zuul_ext_dependencies.py
+++ b/tests/test_zuul_ext_dependencies.py
@@ -4,11 +4,11 @@
from fakes import FakeJob
dependencies = {} # defined for flake8
-set_ext_dependencies = None # defined for flake8
+set_parameters = None # defined for flake8
# Import function
execfile(os.path.join(
os.path.dirname(os.path.abspath(__file__)),
-'../zuul/ext_dependencies.py'))
+'../zuul/parameter_functions.py'))
class TestExtDependencies(unittest.TestCase):
@@ -24,7 +24,7 @@
else:
params = {'ZUUL_PROJECT': 'mediawiki/extensions/Example'}
job = FakeJob(job_name if job_name else 'mwext-testextension-hhvm')
-set_ext_dependencies(None, job, params)
+set_parameters(None, job, params)
return params
def test_ext_name(self):
diff --git a/zuul/doc_functions.py b/zuul/doc_functions.py
deleted file mode 100644
index 4055077..000
--- a/zuul/doc_functions.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import re
-
-tag_re = r'^refs/tags/(.*)'
-
-
-def set_doc_variables(item, job, params):
-change = item.change
-doc_subpath = ''
-
-# ref-updated
-# Tags: 'refs/tags/foo'
-# Branch: 'master'
-if hasattr(change, 'ref'):
-tag = re.match(tag_re, change.ref)
-if tag:
-doc_subpath = tag.group(1)
-else:
-doc_subpath = change.ref
-# Changes
-elif hasattr(change, 'refspec'):
-doc_subpath = change.branch
-
-if doc_subpath:
-params['DOC_SUBPATH'] = doc_subpath
-
-# Normalize the project name by removing /'s
-if 'ZUUL_PROJECT' in params:
-params['DOC_PROJECT'] = params['ZUUL_PROJECT'].replace('/', '-')
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 84e6956..d9d400d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -17,10 +17,7 @@
# - http://ci.openstack.org/zuul/zuul.html#configuration
includes:
- - python-file: 'doc_functions.py'
- - python-file: 'ext_dependencies.py'
- - python-file: 'nodepool.py'
- - python-file: 'php_version.py'
+ - python-file: 'parameter_functions.py'
pipelines:
@@ -579,28 +576,10 @@
#
# See: http://docs.python.org/2/library/re.html#search-vs-match
- - name: ^.*-publish$
-parameter-function: set_doc_variables
- - name: ^mwext-(testextension|qunit|mw-selenium)
-parameter-function: set_ext_dependencies
- - name: ^.*php55.*$
-parameter-function: set_php_bin
-
- - name: ^integration-jjb-config-diff$
-parameter-function: offline_when_complete
- - name: ^tox-.*-jessie$
-parameter-function: offline_when_complete
- - name: ^tox-jessie$
-parameter-function: offline_when_complete
- - name: ^pywikibot-core-tox-.*-jessie$
-parameter-function: offline_when_complete
- - name: ^pywikibot-wikibase-tox-.*-jessie$
-parameter-function: offline_when_complete
- - name: ^integration-config-tox-.*-jessie$
-parameter-function: offline_when_complete
+ - name: .*
+parameter-function: set_parameters
- name: ^rake-jessie$
-parameter-function: offline_when_complete
# Rake entry points have not been backported to wmf branches yet
# -- hashar Nov 10th 2015
branch: (?!^wmf/1\.27\.0-wmf\.[45])
diff --git a/zuul/nodepool.py b/zuul/nodepool.py
deleted file mode 100644
index 55ae421..000
--- a/zuul/nodepool.py
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-# Instruct Jenkins Gearman plugin to put a node offline on job completion.
-# Ie for nodepool
-def offline_when_complete(item, job, params):
-params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
diff --git a/zuul/ext_dependencies.py b/zuul/parameter_functions.py
simil
[MediaWiki-commits] [Gerrit] Use completion specific pool counter - change (mediawiki...CirrusSearch)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268030
Change subject: Use completion specific pool counter
..
Use completion specific pool counter
Depends on I242fda677 being deployed first. Once that config change has
been SWAT'd out we can merge this and let it go out with the next
deployment train.
Bug: T125547
Change-Id: Ia69980f0737c74d5da695b4e66d18136e34f48a2
---
M includes/CompletionSuggester.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/30/268030/1
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index 59d4b28..2cfde24 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -181,7 +181,7 @@
$searcher = $this;
$limit = $this->limit;
$result = Util::doPoolCounterWork(
- 'CirrusSearch-Search',
+ 'CirrusSearch-Completion',
$this->user,
function() use( $searcher, $index, $suggest,
$logContext, $queryOptions,
$profiles, $text , $limit ) {
--
To view, visit https://gerrit.wikimedia.org/r/268030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia69980f0737c74d5da695b4e66d18136e34f48a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create pool counter for CirrusSearch completion suggester - change (operations/mediawiki-config)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/268029 Change subject: Create pool counter for CirrusSearch completion suggester .. Create pool counter for CirrusSearch completion suggester Bug: T125547 Change-Id: I242fda677aa21787da618f6a0bce9b7346826a7a --- M wmf-config/PoolCounterSettings-common.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/29/268029/1 diff --git a/wmf-config/PoolCounterSettings-common.php b/wmf-config/PoolCounterSettings-common.php index c7f4f7e..20f0758 100644 --- a/wmf-config/PoolCounterSettings-common.php +++ b/wmf-config/PoolCounterSettings-common.php @@ -24,6 +24,13 @@ 'workers' => 432, 'maxqueue' => 600, ), + // Super common and mostly fast, replaces Prefix (eventually) + 'CirrusSearch-Completion' => array( + 'class' => 'PoolCounter_Client', + 'timeout' => 15, + 'workers' => 432, + 'maxqueue' => 600, + ), // Regex searches are much heavier then regular searches so we limit the // concurrent number. 'CirrusSearch-Regex' => array( -- To view, visit https://gerrit.wikimedia.org/r/268029 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I242fda677aa21787da618f6a0bce9b7346826a7a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update pygments bundle to 2.1 - change (mediawiki...SyntaxHighlight_GeSHi)
jenkins-bot has submitted this change and it was merged. Change subject: Update pygments bundle to 2.1 .. Update pygments bundle to 2.1 Changelog: https://bitbucket.org/birkenfeld/pygments-main/raw/7614bf7/CHANGES Lots of new lexers: Emacs Lisp, Arduino, Modula-2 with multi-dialect support, Fortran fixed format, Archetype Definition language, Terraform, Jcl, Easytrieve, ParaSail, Boogie, Turtle, Fish Shell, Roboconf, Test Anything Protocol, Shen, Component Pascal, SuperCollider, Shell consoles (Tcsh, PowerShell, MSDOS), Elm and J, Crmsh, Praat, CSound, Ezhil, Thrift, QVT Operational, Hexdump, and CAmkES Configuration. Bug: T125581 Change-Id: Ie881af3d1dff23f08ccc9cbcf5f94a084fa561e1 --- M SyntaxHighlight_GeSHi.compat.php M SyntaxHighlight_GeSHi.lexers.php M modules/pygments.generated.css A pygments/VERSION M pygments/pygmentize 5 files changed, 70 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SyntaxHighlight_GeSHi.compat.php b/SyntaxHighlight_GeSHi.compat.php index 98a1498..9f3a409 100644 --- a/SyntaxHighlight_GeSHi.compat.php +++ b/SyntaxHighlight_GeSHi.compat.php @@ -80,7 +80,6 @@ // Miscellaneous 'cadlisp' => 'lisp', - 'j' => 'objj', 'java5' => 'java', 'php-brief' => 'php', 'povray'=> 'pov', @@ -88,7 +87,6 @@ 'rails' => 'ruby', 'rpmspec' => 'spec', 'rsplus'=> 'splus', - 'bnf' => 'ebnf', 'gettext' => 'pot', // ML diff --git a/SyntaxHighlight_GeSHi.lexers.php b/SyntaxHighlight_GeSHi.lexers.php index 8960656..9f26c5b 100644 --- a/SyntaxHighlight_GeSHi.lexers.php +++ b/SyntaxHighlight_GeSHi.lexers.php @@ -4,12 +4,14 @@ return array( 'abap', 'abl', + 'abnf', 'aconf', 'actionscript', 'actionscript3', 'ada', 'ada2005', 'ada95', + 'adl', 'agda', 'ahk', 'alloy', @@ -31,6 +33,7 @@ 'apacheconf', 'apl', 'applescript', + 'arduino', 'arexx', 'as', 'as3', @@ -51,12 +54,15 @@ 'bat', 'batch', 'bbcode', + 'bc', 'befunge', 'bf', 'blitzbasic', 'blitzmax', 'bmax', + 'bnf', 'boo', + 'boogie', 'bplus', 'brainfuck', 'bro', @@ -68,6 +74,8 @@ 'c++-objdumb', 'c-objdump', 'ca65', + 'cadl', + 'camkes', 'cbmbas', 'ceylon', 'cf3', @@ -96,16 +104,26 @@ 'coffee-script', 'coffeescript', 'common-lisp', + 'componentpascal', 'console', 'control', 'coq', + 'cp', 'cpp', 'cpp-objdump', + 'cpsa', + 'crmsh', 'croc', 'cry', 'cryptol', 'csh', 'csharp', + 'csound', + 'csound-csd', + 'csound-document', + 'csound-orc', + 'csound-sco', + 'csound-score', 'css', 'css+django', 'css+erb', @@ -113,6 +131,7 @@ 'css+genshitext', 'css+jinja', 'css+lasso', + 'css+mako', 'css+mako', 'css+mozpreproc', 'css+myghty', @@ -137,6 +156,7 @@ 'docker', 'dockerfile', 'dosbatch', + 'doscon', 'dosini', 'dpatch', 'dtd', @@ -146,26 +166,34 @@ 'dylan-console', 'dylan-lid', 'dylan-repl', + 'earl-grey', + 'earlgrey', + 'easytrieve', 'ebnf', 'ec', 'ecl', + 'eg', 'eiffel', 'elisp', 'elixir', + 'elm', 'emacs', - 'emacs-lisp', 'erb', 'erl', 'erlang', 'evoque', 'ex', 'exs', + 'ezhil', 'factor', 'fan', 'fancy', 'felix', + 'fish', + 'fishshell', 'flx', 'fortran', + 'fortranfixed', 'foxpro', 'fsharp', 'fy', @@ -189,6 +217,7 @@ 'haskell', 'haxe', 'haxeml', + 'hexdump', 'hs', 'html', 'html+cheetah', @@ -200,6 +229,7 @@ 'html+jinja', 'html+kid', 'html+lasso', + 'html+mako', 'html+mako', 'html+myghty', 'html+php', @@ -221,6 +251,7 @@ 'i6t', 'i7', 'idl', + 'idl4', 'idr', 'idris', 'iex', @@ -239,6 +270,7 @@ 'irb', 'irc', 'isabelle', + 'j', 'jade', 'jags', 'jasmin', @@ -253,6 +285,7 @@ 'javascript+jinja', 'javascript+lasso', 'javascript+mako', + 'javascript+mako', 'javascript+mozpreproc', 'javascri
[MediaWiki-commits] [Gerrit] Add wikimedia/textcat to vendor repository - change (mediawiki/vendor)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/268028 Change subject: Add wikimedia/textcat to vendor repository .. Add wikimedia/textcat to vendor repository The library performs language detection against short strings and will be used as part of CirrusSearch. Bug: T124844 Change-Id: I25ad7bed820a07c2cc6f54d22815a32386df0916 --- M composer.json M composer.lock M composer/ClassLoader.php M composer/autoload_real.php M composer/installed.json A wikimedia/textcat/.gitignore A wikimedia/textcat/.gitreview A wikimedia/textcat/.travis.yml A wikimedia/textcat/LICENSE A wikimedia/textcat/LM-query/ar.lm A wikimedia/textcat/LM-query/bg.lm A wikimedia/textcat/LM-query/bn.lm A wikimedia/textcat/LM-query/de.lm A wikimedia/textcat/LM-query/el.lm A wikimedia/textcat/LM-query/en.lm A wikimedia/textcat/LM-query/es.lm A wikimedia/textcat/LM-query/fa.lm A wikimedia/textcat/LM-query/fr.lm A wikimedia/textcat/LM-query/he.lm A wikimedia/textcat/LM-query/hi.lm A wikimedia/textcat/LM-query/hy.lm A wikimedia/textcat/LM-query/ka.lm A wikimedia/textcat/LM-query/ko.lm A wikimedia/textcat/LM-query/ru.lm A wikimedia/textcat/LM-query/ta.lm A wikimedia/textcat/LM-query/te.lm A wikimedia/textcat/LM-query/th.lm A wikimedia/textcat/LM-query/zh.lm A wikimedia/textcat/LM/af.lm A wikimedia/textcat/LM/ar.lm A wikimedia/textcat/LM/be.lm A wikimedia/textcat/LM/bg.lm A wikimedia/textcat/LM/bn.lm A wikimedia/textcat/LM/br.lm A wikimedia/textcat/LM/bs.lm A wikimedia/textcat/LM/ca.lm A wikimedia/textcat/LM/cs.lm A wikimedia/textcat/LM/cy.lm A wikimedia/textcat/LM/da.lm A wikimedia/textcat/LM/de.lm A wikimedia/textcat/LM/el.lm A wikimedia/textcat/LM/en.lm A wikimedia/textcat/LM/eo.lm A wikimedia/textcat/LM/es.lm A wikimedia/textcat/LM/et.lm A wikimedia/textcat/LM/eu.lm A wikimedia/textcat/LM/fa.lm A wikimedia/textcat/LM/fi.lm A wikimedia/textcat/LM/fr.lm A wikimedia/textcat/LM/ga.lm A wikimedia/textcat/LM/gu.lm A wikimedia/textcat/LM/he.lm A wikimedia/textcat/LM/hi.lm A wikimedia/textcat/LM/hr.lm A wikimedia/textcat/LM/hu.lm A wikimedia/textcat/LM/hy.lm A wikimedia/textcat/LM/id.lm A wikimedia/textcat/LM/is.lm A wikimedia/textcat/LM/it.lm A wikimedia/textcat/LM/ja.lm A wikimedia/textcat/LM/jv.lm A wikimedia/textcat/LM/ka.lm A wikimedia/textcat/LM/kn.lm A wikimedia/textcat/LM/ko.lm A wikimedia/textcat/LM/la.lm A wikimedia/textcat/LM/lt.lm A wikimedia/textcat/LM/lv.lm A wikimedia/textcat/LM/ml.lm A wikimedia/textcat/LM/mr.lm A wikimedia/textcat/LM/ms.lm A wikimedia/textcat/LM/my.lm A wikimedia/textcat/LM/nl.lm A wikimedia/textcat/LM/no.lm A wikimedia/textcat/LM/or.lm A wikimedia/textcat/LM/pl.lm A wikimedia/textcat/LM/pnb.lm A wikimedia/textcat/LM/pt.lm A wikimedia/textcat/LM/ro.lm A wikimedia/textcat/LM/ru.lm A wikimedia/textcat/LM/sco.lm A wikimedia/textcat/LM/sh.lm A wikimedia/textcat/LM/sk.lm A wikimedia/textcat/LM/sl.lm A wikimedia/textcat/LM/sq.lm A wikimedia/textcat/LM/sr.lm A wikimedia/textcat/LM/su.lm A wikimedia/textcat/LM/sv.lm A wikimedia/textcat/LM/ta.lm A wikimedia/textcat/LM/te.lm A wikimedia/textcat/LM/th.lm A wikimedia/textcat/LM/tk.lm A wikimedia/textcat/LM/tl.lm A wikimedia/textcat/LM/tr.lm A wikimedia/textcat/LM/uk.lm A wikimedia/textcat/LM/ur.lm A wikimedia/textcat/LM/vi.lm A wikimedia/textcat/LM/zh-yue.lm A wikimedia/textcat/LM/zh.lm A wikimedia/textcat/README.md A wikimedia/textcat/TextCat.php A wikimedia/textcat/catus.php A wikimedia/textcat/composer.json A wikimedia/textcat/felis.php A wikimedia/textcat/lm2php.php A wikimedia/textcat/phpcs.xml A wikimedia/textcat/phpunit.xml.dist A wikimedia/textcat/tests/TextCatTest.php A wikimedia/textcat/tests/data/Models/afrikaans.lm A wikimedia/textcat/tests/data/Models/albanian.lm A wikimedia/textcat/tests/data/Models/amharic.lm A wikimedia/textcat/tests/data/Models/arabic.lm A wikimedia/textcat/tests/data/Models/basque.lm A wikimedia/textcat/tests/data/Models/belarussian.lm A wikimedia/textcat/tests/data/Models/bosnian.lm A wikimedia/textcat/tests/data/Models/breton.lm A wikimedia/textcat/tests/data/Models/catalan.lm A wikimedia/textcat/tests/data/Models/chinese.lm A wikimedia/textcat/tests/data/Models/croatian.lm A wikimedia/textcat/tests/data/Models/czech.lm A wikimedia/textcat/tests/data/Models/danish.lm A wikimedia/textcat/tests/data/Models/dutch.lm A wikimedia/textcat/tests/data/Models/english.lm A wikimedia/textcat/tests/data/Models/esperanto.lm A wikimedia/textcat/tests/data/Models/french.lm A wikimedia/textcat/tests/data/Models/german.lm A wikimedia/textcat/tests/data/Models/hebrew.lm A wikimedia/textcat/tests/data/Models/hungarian.lm A wikimedia/textcat/tests/data/Models/icelandic.lm A wikimedia/textcat/tests/data/Models/indonesian.lm A wikimedia/textcat/tests/data/Models/irish.lm A wikimedia/textcat/tests/data/Models/italian.lm A wikimedia/textcat/tests/data/Models/latin.lm A wikimedia/textcat/tests/data/Models/norwegian.lm A wikimedia/textcat/tests/data/Models/polish.
[MediaWiki-commits] [Gerrit] Enables sharing dash settings via URL - change (wikimedia...wetzel)
Bearloga has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268027
Change subject: Enables sharing dash settings via URL
..
Enables sharing dash settings via URL
This adds a requested feature of allowing users to link to the
dashboard and including settings (selections, choices) in the
URL. This uses Andrzej Oleś's shinyURL package to store params
in the URL and then restore the dashboard parameters from URL.
Change-Id: Ic5a768ffa62a01a2ded7e7ccdc83ec12b126
---
M server.R
M ui.R
M utils.R
3 files changed, 13 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wetzel
refs/changes/27/268027/1
diff --git a/server.R b/server.R
index 14edc05..f1e87db 100644
--- a/server.R
+++ b/server.R
@@ -3,7 +3,7 @@
existing_date <- Sys.Date() - 1
# Actual server code.
-shinyServer(function(input, output) {
+shinyServer(function(input, output, session) {
if(Sys.Date() != existing_date){
read_actions()
@@ -11,6 +11,8 @@
suppressWarnings(read_tiles())
existing_date <<- Sys.Date()
}
+
+ shinyURL.server(session)
# Wrap time_frame_range to provide global settings
time_frame_range <- function(input_local_timeframe, input_local_daterange) {
@@ -47,7 +49,7 @@
output$tiles_style_series <- renderDygraph({
polloi::data_select(input$tile_style_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
ddply(.(date, style), summarize, `total tiles` = sum(total)) %>%
- tidyr::spread(style, `total tiles`) %>%
+ tidyr::spread(style, `total tiles`, fill = 0) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_style_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_style_series_timeframe,
input$tiles_style_series_timeframe_daterange)) %>%
polloi::make_dygraph("Date", "Tiles", "Total tiles by style",
legend_name = "Style") %>%
@@ -60,7 +62,7 @@
output$tiles_users_series <- renderDygraph({
polloi::data_select(input$tile_users_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
ddply(.(date, style), summarize, `total users` = sum(users)) %>%
- tidyr::spread(style, `total users`) %>%
+ tidyr::spread(style, `total users`, fill = 0) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_users_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_users_series_timeframe,
input$tiles_users_series_timeframe_daterange)) %>%
polloi::make_dygraph("Date", "Users", "Total users by style") %>%
@@ -80,7 +82,7 @@
polloi::data_select(input$tile_zoom_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
subset(zoom %in% as.numeric(input$zoom_level_selector)) %>%
ddply(.(date, zoom), summarize, `total tiles` = sum(total)) %>%
- tidyr::spread(zoom, `total tiles`) %>%
+ tidyr::spread(zoom, `total tiles`, fill = 0) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_zoom_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_zoom_series_timeframe,
input$tiles_zoom_series_timeframe_daterange)) %>%
polloi::make_dygraph("Date", "Tiles", "Total tiles by zoom level") %>%
diff --git a/ui.R b/ui.R
index 1b19d10..adec0f2 100644
--- a/ui.R
+++ b/ui.R
@@ -1,6 +1,7 @@
library(shiny)
library(shinydashboard)
library(dygraphs)
+library(shinyURL)
header <- dashboardHeader(title = "Wikimedia Maps",
dropdownMenuOutput("message_menu"), disable = FALSE)
@@ -30,7 +31,11 @@
conditionalPanel("input.timeframe_global == 'custom'",
dateRangeInput("daterange_global", label =
"Custom Date Range",
start = Sys.Date()-11, end =
Sys.Date()-1, min = "2015-04-14")),
- icon = icon("cog", lib = "glyphicon"))
+ icon = icon("cog", lib = "glyphicon")),
+menuItem(text = "Sharing Options",
+ shinyURL.ui(tinyURL = FALSE),
+ p("Dashboard settings stored in URL.", style = "padding-bottom:
10px;"),
+ icon = icon("share-alt", lib = "glyphicon"))
)
)
diff --git a/utils.R b/utils.R
index 633806e..f15ecaa 100644
--- a/utils.R
+++ b/utils.R
@@ -5,6 +5,7 @@
library(reshape2)
library(polloi)
library(data.table)
+library(shinyURL) # devtools::install_github("aoles/shinyURL")
# Read in action data and write it into the global scope with sufficient
formatting to be trivially
# used in dygraphs.
--
To view, visit https://gerrit.wikimedia.org/r/268027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5a768ffa62a01a2ded7e7ccdc83ec12b126
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wetzel
Gerrit-Branch: mas
[MediaWiki-commits] [Gerrit] Add mw.user.sessionId() to TestSearchSatisfaction schema - change (mediawiki...WikimediaEvents)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268026
Change subject: Add mw.user.sessionId() to TestSearchSatisfaction schema
..
Add mw.user.sessionId() to TestSearchSatisfaction schema
This is used to correlate user satisfaction with responses to
QuickSurvey's.
Bug: T125236
Change-Id: I613b8f1bd3fbafd048c97bafff8cc6e226f4784b
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 5 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/26/268026/1
diff --git a/extension.json b/extension.json
index 4841f5c..4ed78e7 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,7 @@
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",
"schema": "TestSearchSatisfaction2",
- "revision": 14098806
+ "revision": 15306508
},
"schema.GeoFeatures": {
"class": "ResourceLoaderSchemaModule",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index a4b1b9f..b007f14 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -166,7 +166,10 @@
pageViewId: pageViewId,
// identifies if a user has
scrolled the page since the
// last event
- scroll: scrollTop !==
lastScrollTop
+ scroll: scrollTop !==
lastScrollTop,
+ // mediawiki session id for
correlating QuickSurvey results
+ // with search satisfaction
results
+ mwSessionId: mw.user.sessionId()
};
lastScrollTop = scrollTop;
if ( checkinTime !== undefined ) {
--
To view, visit https://gerrit.wikimedia.org/r/268026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I613b8f1bd3fbafd048c97bafff8cc6e226f4784b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't destroy message on capture error - change (wikimedia...SmashPig)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268025
Change subject: Don't destroy message on capture error
..
Don't destroy message on capture error
If the capture request throws an error such as those caused by
connectivity or credentials problems, don't get rid of the pending
queue message. Also, return false so the capture request job is
moved to the damaged job queue.
Bug: T117816
Change-Id: Id0cf6f75fc32c1ce20de943846af5a6e249dff72
---
M PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
1 file changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig
refs/changes/25/268025/1
diff --git a/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
b/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
index 6d375ab..a054d25 100644
--- a/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
+++ b/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
@@ -53,38 +53,40 @@
Logger::debug( 'Attempting to locate associated message in
pending queue' );
$pendingQueue = Configuration::getDefaultConfig()->obj(
'data-store/pending' );
$queueMessage = $pendingQueue->queueGetObject( null,
$this->correlationId );
+ $success = true;
if ( $this->shouldCapture( $queueMessage ) ) {
// Attempt to capture the payment
$api = new AdyenPaymentsAPI( $this->account );
$captureResult = $api->capture( $this->currency,
$this->amount, $this->pspReference );
- // Remove it from the pending queue
- $pendingQueue->queueAckObject();
- $pendingQueue->removeObjectsById( $this->correlationId
);
-
if ( $captureResult ) {
// Success!
Logger::info(
"Successfully captured payment!
Returned reference: '{$captureResult}'. " .
'Will requeue message as
processed.');
+ // Remove it from the pending queue
+ $pendingQueue->queueAckObject();
+ $pendingQueue->removeObjectsById(
$this->correlationId );
// Indicate that it has been captured and
re-queue it for use
// when the capture IPN message comes in.
$queueMessage->capture_requested = true;
$pendingQueue->addObj( $queueMessage );
} else {
- // Crap; couldn't capture it.
+ // Some kind of error in the request. We should
keep the pending
+ // message, complain loudly, and move this
capture job to the
+ // damaged queue.
Logger::error(
"Failed to capture payment on account
'{$this->account}' with reference " .
- "'{$this->pspReference}' and
correlation id '{$this->correlationId}'. This " .
- 'message has been removed from
the pending queue.',
+ "'{$this->pspReference}' and
correlation id '{$this->correlationId}'.",
$queueMessage
);
+ $success = false;
}
}
Logger::leaveContext();
- return true;
+ return $success;
}
protected function shouldCapture( $queueMessage ) {
--
To view, visit https://gerrit.wikimedia.org/r/268025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0cf6f75fc32c1ce20de943846af5a6e249dff72
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updates to nowiking code for dealing with extlink masqueraders - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Updates to nowiking code for dealing with extlink masqueraders
..
Updates to nowiking code for dealing with extlink masqueraders
* Followup to 9834cd6b5cb4805d2ab6beda5c4fa66eeef4a84c
* Templates can false lead the nowiking code to believe
that a wikitext string can parse to an extlink.
Ex: [{{echo|foo}}]
More generally, the problem how do we know if [{{Tpl}}]
will parse to an extlink or not. We won't know without
examining the expansion of {{Tpl}}. So, during serialization,
if we are trying to decide if the ']' needs to be nowiki
protected, we need to look at the HTML that serialized to
{{Tpl}} to see if the templated output was an A-tag.
* This patch handles the simplest scenarios like
[{{Tpl}} content-without-templates]
But, it will fail on [{{Tpl1}} {{Tpl2}}] since this patch
will look at expansion of {{Tpl2}} while making nowiking
decisions.
To be improved upon.
* Updated some existing tests.
Change-Id: Icc6ab3de4367d314702840d6b186df6b5944a9fa
---
M lib/html2wt/escapeWikitext.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 58 insertions(+), 34 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/html2wt/escapeWikitext.js b/lib/html2wt/escapeWikitext.js
index 99c229d..d9891e7 100644
--- a/lib/html2wt/escapeWikitext.js
+++ b/lib/html2wt/escapeWikitext.js
@@ -11,7 +11,6 @@
var Consts = wtConsts.WikitextConstants;
-
// Empty constructor
var WikitextEscapeHandlers = function(env, serializer) {
this.tokenizer = new PegTokenizer(env);
@@ -199,7 +198,7 @@
return tokens;
};
-WEHP.textCanParseAsLink = function(state, text) {
+WEHP.textCanParseAsLink = function(node, state, text) {
state.env.log("trace/wt-escape", "link-test-text=", function() { return
JSON.stringify(text); });
// Strip away extraneous characters after a ]] or a ]
@@ -237,15 +236,54 @@
buf = t + buf;
} else if (t.name === 'wikilink') {
if
(state.env.isValidLinkTarget(t.getAttribute('href'))) {
- break;
- } else {
- // Assumes 'src' will always be present which
it seems to be.
- // Tests will fail if anything changes in the
tokenizer.
- buf = t.dataAttribs.src + buf;
+ return true;
}
+
+ // Assumes 'src' will always be present which it seems
to be.
+ // Tests will fail if anything changes in the tokenizer.
+ buf = t.dataAttribs.src + buf;
+ } else if (t.name === 'extlink') {
+ // Check if the extlink came from a template which in
the end
+ // would not really parse as an extlink.
+
+ var href = t.getAttribute('href');
+ if (Array.isArray(href)) {
+ href = href[0];
+ }
+
+ if (!Util.isTemplateToken(href)) {
+ // Not a template and a real href => needs
nowiking
+ if (typeof href === 'string' &&
/https?:\/\//.test(href)) {
+ return true;
+ }
+ } else {
+ while (node) {
+ node = DU.previousNonSepSibling(node);
+ if
(DU.isFirstEncapsulationWrapperNode(node)) {
+ // FIXME: This is not entirely
correct.
+ // Assumes that extlink content
doesn't have templates.
+ // Solution: Count # of
non-nested templates encountered
+ // and skip over intermediate
templates.
+ // var content =
t.getAttribute('mw:content');
+ // var n =
intermediateNonNestedTemplates(content);
+ break;
+ }
+ }
+
+ if (node && node.nodeName === 'A' &&
+ node.textContent ===
node.getAttribute('href')) {
+ // The template expands to an url link
=> needs nowiking
+ return true;
+ }
+ }
+
+
[MediaWiki-commits] [Gerrit] Remove useProjectGroup() and references. - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove useProjectGroup() and references.
..
Remove useProjectGroup() and references.
This is some kind of legacy setting... we always use a project
group these days.
Change-Id: I545e94dc40968f3301a02b3042771e21195cf14d
---
M nova/OpenStackNovaProject.php
1 file changed, 17 insertions(+), 46 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 21670a0..ea8820f 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -478,41 +478,24 @@
$nochange = 0;
$synced = 1;
- // if we're not using project groups, just return $nochange.
- if ( !OpenStackNovaProject::useProjectGroup() ) {
+ // These both return a sorted array of Member DNs
+ $projectMemberDNs = $this->getMemberDNs();
+ $projectGroupMemberDNs = $this->projectGroup->getMemberDNs();
+
+ // These two arrays should be exactly the same,
+ // so comparing them using == should work.
+ // If they are not the same, then modify the
+ // project group member list so that it exactly
+ // matches the list from the project.
+ if ( $projectMemberDNs != $projectGroupMemberDNs ) {
+ $sync_success = $this->projectGroup->setMembers(
$projectMemberDNs );
+ $retval = $sync_success == true ? $synced : $failure;
+ }
+ else {
$retval = $nochange;
}
- else {
- // These both return a sorted array of Member DNs
- $projectMemberDNs = $this->getMemberDNs();
- $projectGroupMemberDNs =
$this->projectGroup->getMemberDNs();
-
- // These two arrays should be exactly the same,
- // so comparing them using == should work.
- // If they are not the same, then modify the
- // project group member list so that it exactly
- // matches the list from the project.
- if ( $projectMemberDNs != $projectGroupMemberDNs ) {
- $sync_success =
$this->projectGroup->setMembers( $projectMemberDNs );
- $retval = $sync_success == true ? $synced :
$failure;
- }
- else {
- $retval = $nochange;
- }
- }
-
return $retval;
- }
-
- static function useProjectGroup() {
- global $wgOpenStackManagerLDAPProjectBaseDN;
-
- if ( $wgOpenStackManagerLDAPProjectBaseDN ) {
- return true;
- } else {
- return false;
- }
}
/**
@@ -618,13 +601,6 @@
$project['member'] = $wgOpenStackManagerLDAPUser;
$projectdn = 'cn=' . $projectname . ',' .
$wgOpenStackManagerLDAPProjectBaseDN;
- // if we're not going to use project groups,
- // then create this project as a posixgroup
- if ( !OpenStackNovaProject::useProjectGroup() ) {
- $project['gidnumber'] =
OpenStackNovaUser::getNextIdNumber( $wgAuth, 'gidnumber' );
- $project['objectclass'][] = 'posixgroup';
- }
-
$success = LdapAuthenticationPlugin::ldap_add(
$wgAuth->ldapconn, $projectdn, $project );
$project = new OpenStackNovaProject( $projectname );
if ( $success ) {
@@ -645,10 +621,8 @@
// Now that we've created the Project, if we
// are supposed to use a corresponding Project Group
// to manage posix group permissions, do so now.
- if ( OpenStackNovaProject::useProjectGroup() ) {
- OpenStackNovaProjectGroup::createProjectGroup(
$projectname );
- # TODO: If project group creation fails we need
to be able to fail gracefully
- }
+ OpenStackNovaProjectGroup::createProjectGroup(
$projectname );
+ # TODO: If project group creation fails we need to be
able to fail gracefully
// Create two default, permissive sudo policies. First,
// allow sudo (as root) for all members...
@@ -746,10 +720,7 @@
}
}
- # Projects can have a separate group entry. If so, delete it
now.
-
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0acd416..a68330d - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/268024 Change subject: Syncronize VisualEditor: 0acd416..a68330d .. Syncronize VisualEditor: 0acd416..a68330d Change-Id: I7d039ef16450b4f2b2f7b2b301bee8ef8ddf9731 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/24/268024/1 diff --git a/VisualEditor b/VisualEditor index 0acd416..a68330d 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0acd4160f48f5ecc5c5371dd68a4de107759bf7b +Subproject commit a68330dda8ccd8829c9fff183223071edd2e7022 -- To view, visit https://gerrit.wikimedia.org/r/268024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d039ef16450b4f2b2f7b2b301bee8ef8ddf9731 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0acd416..a68330d - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0acd416..a68330d .. Syncronize VisualEditor: 0acd416..a68330d Change-Id: I7d039ef16450b4f2b2f7b2b301bee8ef8ddf9731 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 0acd416..a68330d 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0acd4160f48f5ecc5c5371dd68a4de107759bf7b +Subproject commit a68330dda8ccd8829c9fff183223071edd2e7022 -- To view, visit https://gerrit.wikimedia.org/r/268024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d039ef16450b4f2b2f7b2b301bee8ef8ddf9731 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (7c7aa59) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (7c7aa59) .. Update VE core submodule to master (7c7aa59) New changes: 635979b Localisation updates from https://translatewiki.net. cb724cf Update OOjs UI to v0.15.2 4218e04 Defer creation of cell slugs until end of cycle Change-Id: I21fd0935b4a68c87714f55f596416c8f3230288d --- M .jsduck/eg-iframe.html M lib/ve 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 7049e1f..7088d16 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -82,7 +82,10 @@ - + + + + diff --git a/lib/ve b/lib/ve index 53476f4..7c7aa59 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 53476f4d6b2b8760a266dab32b733ad9ee2faade +Subproject commit 7c7aa599eaa9e737df153377e46cc3b5c61ef793 -- To view, visit https://gerrit.wikimedia.org/r/268018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21fd0935b4a68c87714f55f596416c8f3230288d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Alex Monk Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove useProjectGroup() and references. - change (mediawiki...OpenStackManager)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268023
Change subject: Remove useProjectGroup() and references.
..
Remove useProjectGroup() and references.
This is some kind of legacy setting... we always use a project
group these days.
Change-Id: I545e94dc40968f3301a02b3042771e21195cf14d
---
M nova/OpenStackNovaProject.php
1 file changed, 17 insertions(+), 46 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/23/268023/1
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 21670a0..ea8820f 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -478,41 +478,24 @@
$nochange = 0;
$synced = 1;
- // if we're not using project groups, just return $nochange.
- if ( !OpenStackNovaProject::useProjectGroup() ) {
+ // These both return a sorted array of Member DNs
+ $projectMemberDNs = $this->getMemberDNs();
+ $projectGroupMemberDNs = $this->projectGroup->getMemberDNs();
+
+ // These two arrays should be exactly the same,
+ // so comparing them using == should work.
+ // If they are not the same, then modify the
+ // project group member list so that it exactly
+ // matches the list from the project.
+ if ( $projectMemberDNs != $projectGroupMemberDNs ) {
+ $sync_success = $this->projectGroup->setMembers(
$projectMemberDNs );
+ $retval = $sync_success == true ? $synced : $failure;
+ }
+ else {
$retval = $nochange;
}
- else {
- // These both return a sorted array of Member DNs
- $projectMemberDNs = $this->getMemberDNs();
- $projectGroupMemberDNs =
$this->projectGroup->getMemberDNs();
-
- // These two arrays should be exactly the same,
- // so comparing them using == should work.
- // If they are not the same, then modify the
- // project group member list so that it exactly
- // matches the list from the project.
- if ( $projectMemberDNs != $projectGroupMemberDNs ) {
- $sync_success =
$this->projectGroup->setMembers( $projectMemberDNs );
- $retval = $sync_success == true ? $synced :
$failure;
- }
- else {
- $retval = $nochange;
- }
- }
-
return $retval;
- }
-
- static function useProjectGroup() {
- global $wgOpenStackManagerLDAPProjectBaseDN;
-
- if ( $wgOpenStackManagerLDAPProjectBaseDN ) {
- return true;
- } else {
- return false;
- }
}
/**
@@ -618,13 +601,6 @@
$project['member'] = $wgOpenStackManagerLDAPUser;
$projectdn = 'cn=' . $projectname . ',' .
$wgOpenStackManagerLDAPProjectBaseDN;
- // if we're not going to use project groups,
- // then create this project as a posixgroup
- if ( !OpenStackNovaProject::useProjectGroup() ) {
- $project['gidnumber'] =
OpenStackNovaUser::getNextIdNumber( $wgAuth, 'gidnumber' );
- $project['objectclass'][] = 'posixgroup';
- }
-
$success = LdapAuthenticationPlugin::ldap_add(
$wgAuth->ldapconn, $projectdn, $project );
$project = new OpenStackNovaProject( $projectname );
if ( $success ) {
@@ -645,10 +621,8 @@
// Now that we've created the Project, if we
// are supposed to use a corresponding Project Group
// to manage posix group permissions, do so now.
- if ( OpenStackNovaProject::useProjectGroup() ) {
- OpenStackNovaProjectGroup::createProjectGroup(
$projectname );
- # TODO: If project group creation fails we need
to be able to fail gracefully
- }
+ OpenStackNovaProjectGroup::createProjectGroup(
$projectname );
+ # TODO: If project group creation fails we need to be
able to fail gracefully
// Create two default, permissive sudo policies. First,
// allow sudo (as root) for all members...
@@ -746,10 +720,7 @@
}
}
- # P
[MediaWiki-commits] [Gerrit] For all apache access logs, use the WMF cache log format - change (operations/puppet)
Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268022
Change subject: For all apache access logs, use the WMF cache log format
..
For all apache access logs, use the WMF cache log format
For all apache access logs, use a tab-separated log format similar to
https://wikitech.wikimedia.org/wiki/Cache_log_format
except that the first two fields (hostname and sequence number) are
omitted, and user (%u) is added for the purposes of logging of HTTP
authentication, as is used on the arbcom-l archive.
Apache's default log formats are annoying -- they don't even contain a
full URL for pasting into a web browser. vhost_combined might almost
allow you to put one together, except that it uses %v instead of the
actual host header, which might not have any relationship to the matched
ServerAlias. Execution time is essential information for performance
debugging and incident response, and you often don't know you need it
until it is too late. The date format is ridiculous, and putting
double quotes or square brackets around space-separated fields is
remarkably unhelpful if you need to analyse the logs using simple
tools like awk or regexes. I am replacing it with the "wmf" format
everywhere because I never want to see a stupid "combined" log again.
I haven't reviewed all these modules to make sure they are using the
apache module (which creates the log format in default.conf via
apache::init), I just checked a few randomly. I did copy the LogFormat
into the appserver apache2.conf, but I don't think it is used. If any
server is missing the LogFormat directive, the effect is to treat the
"wmf" format as a literal string, i.e. all log lines will just be "wmf".
Change-Id: I0435ef658f0e8bef1507cd57f5c316115531ce93
---
M modules/annualreport/files/15.wikipedia.org
M modules/annualreport/files/annual.wikimedia.org
M modules/apache/files/defaults.conf
M modules/bugzilla_static/templates/apache/static-bugzilla.wikimedia.org.erb
M modules/contint/templates/apache/doc.wikimedia.org.erb
M modules/contint/templates/apache/integration.mediawiki.org.erb
M modules/contint/templates/apache/integration.wikimedia.org.erb
M modules/contint/templates/apache/integration.wmflabs.org.erb
M modules/contint/templates/apache/localvhost.erb
M modules/ganglia/templates/ganglia.wikimedia.org.erb
M modules/gerrit/templates/gerrit.wikimedia.org.erb
M modules/gitblit/templates/git.wikimedia.org.erb
M modules/librenms/templates/apache.conf.erb
M modules/limn/templates/static.vhost.erb
M modules/limn/templates/vhost-limn-proxy-wp-zero-gone.conf.erb
M modules/limn/templates/vhost-limn-proxy.conf.erb
M modules/mailman/templates/lists.wikimedia.org.erb
M modules/mediawiki/templates/apache/apache2.conf.erb
M modules/mediawiki/templates/jobrunner/site.conf.erb
M modules/mediawiki_singlenode/templates/mediawiki_singlenode.erb
M modules/mw_rc_irc/templates/apache/irc.wikimedia.org.erb
M modules/noc/templates/dbtree.wikimedia.org.erb
M modules/noc/templates/noc.wikimedia.org.erb
M modules/otrs/templates/ticket.wikimedia.org.erb
M modules/phabricator/templates/phabricator-default.conf.erb
M modules/publichtml/templates/apacheconfig.erb
M modules/puppetmaster/templates/puppetmaster.erb
M modules/pybal/templates/config-vhost.conf.erb
M modules/racktables/templates/racktables.wikimedia.org.erb
M modules/releases/templates/apache.conf.erb
M modules/role/templates/deployment/apache-vhost.erb
M modules/smokeping/files/apache.conf
M modules/statistics/files/datasets.wikimedia.org
M modules/statistics/templates/metrics.wikimedia.org.erb
M modules/statistics/templates/stats.wikimedia.org.erb
M modules/toolserver_legacy/templates/www.toolserver.org.erb
M modules/torrus/files/apache.conf
M modules/wikistats/templates/apache/wikistats.erb
M templates/apache/sites/etherpad.wikimedia.org.erb
M templates/apache/sites/labtestwikitech.wikimedia.org.erb
M templates/apache/sites/servermon.wikimedia.org.erb
M templates/apache/sites/wikitech.wikimedia.org.erb
42 files changed, 57 insertions(+), 58 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/268022/1
diff --git a/modules/annualreport/files/15.wikipedia.org
b/modules/annualreport/files/15.wikipedia.org
index d7e837a..2857ff4 100644
--- a/modules/annualreport/files/15.wikipedia.org
+++ b/modules/annualreport/files/15.wikipedia.org
@@ -9,7 +9,7 @@
ErrorLog /var/log/apache2/error.log
LogLevel warn
-CustomLog /var/log/apache2/access.log combined
+CustomLog /var/log/apache2/access.log wmf
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
diff --git a/modules/annualreport/files/annual.wikimedia.org
b/modules/annualreport/files/annual.wikimedia.org
index 16c32cd..adcf1aa 100644
--- a/modules/annualreport/files/annual.wikimedia.org
+++ b/modules/annualreport/files/annual.wikimedia.org
@@ -9,7 +9,7 @@
ErrorLog /var/log/apache2/error.l
[MediaWiki-commits] [Gerrit] Quit double-staging Adyen data - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Quit double-staging Adyen data
..
Quit double-staging Adyen data
addRequestData already triggers staging, no need to call stageData
again a few lines down.
Change-Id: I55cff94a7fd9c4484d487f892b30f77af22d52e6
---
M adyen_gateway/adyen.adapter.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index f80cf67..6059e55 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -235,7 +235,10 @@
case 'donate':
$formaction = $this->url .
'/hpp/pay.shtml';
$this->runAntifraudHooks();
- $this->addRequestData( array (
'risk_score' => $this->risk_score ) ); //this will also fire off staging again.
+ // Add the risk score to our data. This
will also trigger
+ // staging, placing the risk score in
the constructed URL
+ // as 'offset' for use in
processor-side fraud filters.
+ $this->addRequestData( array (
'risk_score' => $this->risk_score ) );
if ( $this->getValidationAction() !=
'process' ) {
// copied from base class.
$this->logger->info( "Failed
pre-process checks for transaction type $transaction." );
@@ -251,7 +254,6 @@
) );
break;
}
- $this->stageData();
$requestParams =
$this->buildRequestParams();
$this->transaction_response->setData(
array(
--
To view, visit https://gerrit.wikimedia.org/r/266293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55cff94a7fd9c4484d487f892b30f77af22d52e6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg
Gerrit-Reviewer: AndyRussG
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: XenoRyet
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Centralise url handling for urls to static resources - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Centralise url handling for urls to static resources
..
Centralise url handling for urls to static resources
Keep in CSSMin as-is for back-compat and to ensure library remains
independent of MediaWiki.
Moved down a few lines as there is no need to compute the md5 hash when we're
returning a data URI. Previously md5_file was called twice during module builds
(once for the fallback url, and another time when producing the embedded data
uri).
Applied to logo in SkinModule as example. To be applied elsewhere as needed.
Without it, fallback is current behaviour (no cache invalidation).
Bug: T99096
Change-Id: I7f38bfc1bea5c241bc4f8ec4f4b640fd65f2c04f
---
M includes/OutputPage.php
M includes/libs/CSSMin.php
M includes/resourceloader/ResourceLoaderSkinModule.php
3 files changed, 70 insertions(+), 8 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 97165b4..e06fad9 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3810,6 +3810,58 @@
}
/**
+* Transform path to web-accessible static resource.
+*
+* This is used to add a validation hash as query string.
+* This aids various behaviors:
+*
+* - Put long Cache-Control max-age headers on responses for improved
+* cache performance.
+* - Get the correct version of a file as expected by the current page.
+* - Instantly get the updated version of a file after deployment.
+*
+* Avoid using this for urls included in HTML as otherwise clients may
get different
+* versions of a resource when navigating the site depending on when
the page was cached.
+* If changes to the url propagate, this is not a problem (e.g. if the
url is in
+* an external stylesheet).
+*
+* @since 1.27
+* @param Config $config
+* @param string $path Path-absolute URL to file (from document root,
must start with "/")
+* @return string URL
+*/
+ public static function transformResourcePath( Config $config, $path ) {
+ global $IP;
+ $remotePath = $config->get( 'ResourceBasePath' );
+ if ( strpos( $path, $remotePath ) !== 0 ) {
+ // Path is outside wgResourceBasePath, ignore.
+ return $path;
+ }
+ $path = RelPath\getRelativePath( $path, $remotePath );
+ return self::transformFilePath( $remotePath, $IP, $path );
+ }
+
+ /**
+* Utility method for transformResourceFilePath().
+*
+* Caller is responsible for ensuring the file exists. Emits a PHP
warning otherwise.
+*
+* @since 1.27
+* @param string $remotePath URL path that points to $localPath
+* @param string $localPath File directory exposed at $remotePath
+* @param string $file Path to target file relative to $localPath
+* @return string URL
+*/
+ public static function transformFilePath( $remotePath, $localPath,
$file ) {
+ $hash = md5_file( "$localPath/$file" );
+ if ( $hash === false ) {
+ wfLogWarning( __METHOD__ . ": Failed to hash
$localPath/$file" );
+ $hash = '';
+ }
+ return "$remotePath/$file?" . substr( $hash, 0, 5 );
+ }
+
+ /**
* Transform "media" attribute based on request parameters
*
* @param string $media Current value of the "media" attribute
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index 6ca0fed..246de75 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -451,15 +451,19 @@
// Path to the actual file on the filesystem
$localFile = "{$local}/{$file}";
if ( file_exists( $localFile ) ) {
- // Add version parameter as the first five hex
digits
- // of the MD5 hash of the file's contents.
- $url .= '?' . substr( md5_file( $localFile ),
0, 5 );
if ( $embed ) {
$data = self::encodeImageAsDataURI(
$localFile );
if ( $data !== false ) {
return $data;
}
}
+ if ( method_exists( 'OutputPage',
'transformFilePath' ) ) {
+ $url = OutputPage::transformFilePath(
$remote, $loca
[MediaWiki-commits] [Gerrit] Make new DI job live, set old one to non-voting - change (integration/config)
Cdentinger has uploaded a new change for review. https://gerrit.wikimedia.org/r/268021 Change subject: Make new DI job live, set old one to non-voting .. Make new DI job live, set old one to non-voting Bug: T124105 Change-Id: Icd349069ec53980ece2ce2d8df5ee481ff44d5d0 --- M zuul/layout.yaml 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/21/268021/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 84e6956..7db9fc2 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -743,6 +743,11 @@ # Nor on contrib - that branch doesn't have any of our patches. - name: mwext-DonationInterface-testextension-php53 branch: (?!^deployment$|^contrib$) +# Running DI against MW master is not a good test as payments wiki runs on +# old versions of core and vendor. However it is a good advisory build for +# scoping upgrades. +# The voting job is "mwext-donationinterfacecore125-testextension-php53" +voting: false - name: wikimedia-fundraising-civicrm branch: (?!.*deployment.*|^contrib$) @@ -3039,7 +3044,9 @@ check: - jsonlint - jshint -experimental: +test: + - mwext-donationinterfacecore125-testextension-php53 +gate-and-submit: - mwext-donationinterfacecore125-testextension-php53 - name: mediawiki/extensions/DoubleWiki -- To view, visit https://gerrit.wikimedia.org/r/268021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd349069ec53980ece2ce2d8df5ee481ff44d5d0 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Cdentinger ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "tin: disable l10nupdate until we figure out if it wo... - change (operations/puppet)
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/268020 Change subject: Revert "tin: disable l10nupdate until we figure out if it works with HHVM" .. Revert "tin: disable l10nupdate until we figure out if it works with HHVM" This reverts commit 444e8aa7b46014dd3097c83e3c7e279aa67703a6. Change-Id: Idb29ea99b0ed5ed2b56436279511d5e9d6e669fa --- M hieradata/hosts/tin.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/20/268020/1 diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml index 402d3cd..638589a 100644 --- a/hieradata/hosts/tin.yaml +++ b/hieradata/hosts/tin.yaml @@ -4,4 +4,4 @@ - esams.wikimedia.org - codfw.wmnet cluster: misc -scap::l10nupdate::run_l10nupdate: false +scap::l10nupdate::run_l10nupdate: true -- To view, visit https://gerrit.wikimedia.org/r/268020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb29ea99b0ed5ed2b56436279511d5e9d6e669fa Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't proxy nonglobal wikis as well - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't proxy nonglobal wikis as well
..
Don't proxy nonglobal wikis as well
* List them by dbname for now (only 2) but will switch to by property
when https://gerrit.wikimedia.org/r/#/c/231086/ merges.
* Can remove this special case from the deploy repo conf.
Change-Id: I08970ba20d92cf69219756bf2fc4faa0ba8b91f6
---
M lib/config/ParsoidConfig.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
index 3d29979..656a693 100644
--- a/lib/config/ParsoidConfig.js
+++ b/lib/config/ParsoidConfig.js
@@ -436,8 +436,13 @@
// private: Restricted read and write access.
// fishbowl: Restricted write access, full read
access.
// closed: No write access.
+ // nonglobal: Public but requires registration.
var prv = site.hasOwnProperty("private") ||
- site.hasOwnProperty("fishbowl");
+ site.hasOwnProperty("fishbowl") ||
+ // FIXME: "nonglobal" isn't exposed yet.
+ // Switch to
`site.hasOwnProperty("nonglobal")` when
+ //
https://gerrit.wikimedia.org/r/#/c/231086/ is deployed.
+ (site.dbname === 'labswiki' ||
site.dbname === 'labtestwiki');
insertInMaps.call(self, prv ? null : undefined,
site);
});
}
--
To view, visit https://gerrit.wikimedia.org/r/267943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08970ba20d92cf69219756bf2fc4faa0ba8b91f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (f7e440c) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268019 Change subject: Update VE core submodule to master (f7e440c) .. Update VE core submodule to master (f7e440c) New changes: f7e440c Defer creation of cell slugs until end of cycle Change-Id: I4bda82918cb54a3cc77523137fa297960b1b1ba0 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/19/268019/1 diff --git a/lib/ve b/lib/ve index 9a75f66..f7e440c 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 9a75f66b5bfc33be574062be5e72291fbe6b9906 +Subproject commit f7e440c27e08d0ff635eef999007f9474fe58e1f -- To view, visit https://gerrit.wikimedia.org/r/268019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4bda82918cb54a3cc77523137fa297960b1b1ba0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.27.0-wmf.12 Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (7c7aa59) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268018 Change subject: Update VE core submodule to master (7c7aa59) .. Update VE core submodule to master (7c7aa59) New changes: 635979b Localisation updates from https://translatewiki.net. cb724cf Update OOjs UI to v0.15.2 4218e04 Defer creation of cell slugs until end of cycle Change-Id: I21fd0935b4a68c87714f55f596416c8f3230288d --- M .jsduck/eg-iframe.html M lib/ve 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/18/268018/1 diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 7049e1f..7088d16 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -82,7 +82,10 @@ - + + + + diff --git a/lib/ve b/lib/ve index 53476f4..7c7aa59 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 53476f4d6b2b8760a266dab32b733ad9ee2faade +Subproject commit 7c7aa599eaa9e737df153377e46cc3b5c61ef793 -- To view, visit https://gerrit.wikimedia.org/r/268018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21fd0935b4a68c87714f55f596416c8f3230288d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defer creation of cell slugs until end of cycle - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Defer creation of cell slugs until end of cycle
..
Defer creation of cell slugs until end of cycle
Bug: T125436
Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
(cherry picked from commit 4218e0434c96f61fa1efea3cd6f1c4fd91f91ebd)
---
M src/ce/nodes/ve.ce.TableRowNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/nodes/ve.ce.TableRowNode.js
b/src/ce/nodes/ve.ce.TableRowNode.js
index 53d0b3b..cac9e07 100644
--- a/src/ce/nodes/ve.ce.TableRowNode.js
+++ b/src/ce/nodes/ve.ce.TableRowNode.js
@@ -50,7 +50,8 @@
ve.ce.TableRowNode.super.prototype.onSplice.apply( this, arguments );
if ( this.getRoot() ) {
- this.setupMissingCell();
+ // Defer call until after other changes in this cycle have been
made
+ setTimeout( this.setupMissingCell.bind( this ) );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/268017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defer creation of cell slugs until end of cycle - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Defer creation of cell slugs until end of cycle
..
Defer creation of cell slugs until end of cycle
Bug: T125436
Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
---
M src/ce/nodes/ve.ce.TableRowNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/nodes/ve.ce.TableRowNode.js
b/src/ce/nodes/ve.ce.TableRowNode.js
index 53d0b3b..cac9e07 100644
--- a/src/ce/nodes/ve.ce.TableRowNode.js
+++ b/src/ce/nodes/ve.ce.TableRowNode.js
@@ -50,7 +50,8 @@
ve.ce.TableRowNode.super.prototype.onSplice.apply( this, arguments );
if ( this.getRoot() ) {
- this.setupMissingCell();
+ // Defer call until after other changes in this cycle have been
made
+ setTimeout( this.setupMissingCell.bind( this ) );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/268015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defer creation of cell slugs until end of cycle - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268017
Change subject: Defer creation of cell slugs until end of cycle
..
Defer creation of cell slugs until end of cycle
Bug: T125436
Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
(cherry picked from commit 4218e0434c96f61fa1efea3cd6f1c4fd91f91ebd)
---
M src/ce/nodes/ve.ce.TableRowNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/17/268017/1
diff --git a/src/ce/nodes/ve.ce.TableRowNode.js
b/src/ce/nodes/ve.ce.TableRowNode.js
index 53d0b3b..cac9e07 100644
--- a/src/ce/nodes/ve.ce.TableRowNode.js
+++ b/src/ce/nodes/ve.ce.TableRowNode.js
@@ -50,7 +50,8 @@
ve.ce.TableRowNode.super.prototype.onSplice.apply( this, arguments );
if ( this.getRoot() ) {
- this.setupMissingCell();
+ // Defer call until after other changes in this cycle have been
made
+ setTimeout( this.setupMissingCell.bind( this ) );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/268017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove the gui for configuring roles during project creation - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove the gui for configuring roles during project creation
..
Remove the gui for configuring roles during project creation
We always want all the roles. This interface can only lead
to confusing, broken projects. Plus I don't want to maintain
this gui in the upcoming refactor.
Change-Id: I5eb4ead6f7dcf6d8a07e84f0d97a26cc2c296888
---
M special/SpecialNovaProject.php
1 file changed, 2 insertions(+), 15 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/special/SpecialNovaProject.php b/special/SpecialNovaProject.php
index f6532e8..95916dd 100644
--- a/special/SpecialNovaProject.php
+++ b/special/SpecialNovaProject.php
@@ -278,17 +278,6 @@
'section' => 'project',
'name' => 'member',
);
- $role_keys = array();
- foreach ( OpenStackNovaProject::$rolenames as $rolename ) {
- $role_keys[$rolename] = $rolename;
- }
- $projectInfo['roles'] = array(
- 'type' => 'multiselect',
- 'label-message' => 'openstackmanager-roles',
- 'section' => 'project',
- 'options' => $role_keys,
- 'name' => 'roles',
- );
$projectInfo['action'] = array(
'type' => 'hidden',
'default' => 'create',
@@ -361,10 +350,8 @@
}
$roles = $project->getRoles();
foreach ( $roles as $role ) {
- if ( in_array( $role->getRoleName(), $formData['roles']
) ) {
- foreach ( $members as $member ) {
- $role->addMember( $member );
- }
+ foreach ( $members as $member ) {
+ $role->addMember( $member );
}
// We also need to ensure the project creator is in all
roles
$role->addMember( $username );
--
To view, visit https://gerrit.wikimedia.org/r/268012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5eb4ead6f7dcf6d8a07e84f0d97a26cc2c296888
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Retry rest calls that return 401 after purging project token - change (mediawiki...OpenStackManager)
jenkins-bot has submitted this change and it was merged.
Change subject: Retry rest calls that return 401 after purging project token
..
Retry rest calls that return 401 after purging project token
Bug: T101199
Change-Id: Ic5789ffa05325a25a2787469447b8096f2c4ec8c
---
M nova/OpenStackNovaController.php
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index 1831dae..16a7f3e 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -810,9 +810,10 @@
return $headers;
}
- function restCall( $service, $path, $method, $data = array(),
$authHeaders='' ) {
+ function restCall( $service, $path, $method, $data = array(),
$authHeaders='', $retrying=false ) {
global $wgAuth;
global $wgOpenStackManagerNovaIdentityURI;
+ global $wgMemc;
if ( $authHeaders ) {
$headers = $authHeaders;
@@ -861,6 +862,14 @@
curl_setopt( $handle, CURLOPT_HEADER, 1 );
$response = curl_exec( $handle );
$code = curl_getinfo( $handle, CURLINFO_HTTP_CODE );
+
+ if ( $code === 401 && !$retrying ) {
+ $wgMemc->delete(
+ wfMemcKey( 'openstackmanager', "fulltoken-" .
$this->getProject(), $this->username )
+ );
+ return $this->restCall( $service, $path, $method,
$data, $authHeaders, true );
+ }
+
$header_size = curl_getinfo( $handle, CURLINFO_HEADER_SIZE );
$response_headers = substr( $response, 0, $header_size );
$body = substr( $response, $header_size );
--
To view, visit https://gerrit.wikimedia.org/r/267205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5789ffa05325a25a2787469447b8096f2c4ec8c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Alex Monk
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RESTBase and Labs DNS configuration for ady.wikipedia - change (operations/puppet)
Dereckson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268016
Change subject: RESTBase and Labs DNS configuration for ady.wikipedia
..
RESTBase and Labs DNS configuration for ady.wikipedia
Bug: T125501
Change-Id: I4cda48113ab4d34b978026f04a86ebf54240c690
---
M modules/restbase/templates/config.yaml.erb
M modules/role/manifests/labs/dnsrecursor.pp
2 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/268016/1
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index 87aad54..12ecf2d 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -82,6 +82,7 @@
# wikipedia
/{domain:ab.wikipedia.org}: *default_project
/{domain:ace.wikipedia.org}: *default_project
+/{domain:ady.wikipedia.org}: *default_project
/{domain:af.wikipedia.org}: *default_project
/{domain:ak.wikipedia.org}: *default_project
/{domain:als.wikipedia.org}: *default_project
diff --git a/modules/role/manifests/labs/dnsrecursor.pp
b/modules/role/manifests/labs/dnsrecursor.pp
index ac6a9b0..afd218f 100644
--- a/modules/role/manifests/labs/dnsrecursor.pp
+++ b/modules/role/manifests/labs/dnsrecursor.pp
@@ -84,11 +84,11 @@
'trwiki', 'wikidatawiki', 'zhwiki']
$c3_dbs = ['c3', 's3', 's6', 's7', 'aawiki', 'aawikibooks',
'aawiktionary', 'abwiki', 'abwiktionary', 'acewiki',
-'advisorywiki', 'afwiki', 'afwikibooks', 'afwikiquote',
-'afwiktionary', 'akwiki', 'akwikibooks', 'akwiktionary',
-'alswiki', 'alswikibooks', 'alswikiquote', 'alswiktionary',
-'amwiki', 'amwikiquote', 'amwiktionary', 'angwiki',
-'angwikibooks', 'angwikiquote', 'angwikisource',
+'advisorywiki', 'adywiki', 'afwiki', 'afwikibooks',
+'afwikiquote', 'afwiktionary', 'akwiki', 'akwikibooks',
+'akwiktionary', 'alswiki', 'alswikibooks', 'alswikiquote',
+'alswiktionary', 'amwiki', 'amwikiquote', 'amwiktionary',
+'angwiki', 'angwikibooks', 'angwikiquote', 'angwikisource',
'angwiktionary', 'anwiki', 'anwiktionary', 'arcwiki',
'arwiki', 'arwikibooks', 'arwikimedia', 'arwikinews',
'arwikiquote', 'arwikisource', 'arwikiversity',
--
To view, visit https://gerrit.wikimedia.org/r/268016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4cda48113ab4d34b978026f04a86ebf54240c690
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dereckson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Defer creation of cell slugs until end of cycle - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268015
Change subject: Defer creation of cell slugs until end of cycle
..
Defer creation of cell slugs until end of cycle
Bug: T125436
Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
---
M src/ce/nodes/ve.ce.TableRowNode.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/15/268015/1
diff --git a/src/ce/nodes/ve.ce.TableRowNode.js
b/src/ce/nodes/ve.ce.TableRowNode.js
index 53d0b3b..cac9e07 100644
--- a/src/ce/nodes/ve.ce.TableRowNode.js
+++ b/src/ce/nodes/ve.ce.TableRowNode.js
@@ -50,7 +50,8 @@
ve.ce.TableRowNode.super.prototype.onSplice.apply( this, arguments );
if ( this.getRoot() ) {
- this.setupMissingCell();
+ // Defer call until after other changes in this cycle have been
made
+ setTimeout( this.setupMissingCell.bind( this ) );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/268015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied4e38901e01d80e067efb4aac126b55165a4957
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Properly check for titlesuggest index presence in mw_cirrus_... - change (mediawiki...CirrusSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Properly check for titlesuggest index presence in
mw_cirrus_versions
..
Properly check for titlesuggest index presence in mw_cirrus_versions
Bug: T125424
Change-Id: I02f99e1411989ea9d3b34c10d895168d80a96cc8
---
M maintenance/updateSuggesterIndex.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Smalyshev: Looks good to me, but someone else must approve
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/updateSuggesterIndex.php
b/maintenance/updateSuggesterIndex.php
index f19033d..80f7699 100644
--- a/maintenance/updateSuggesterIndex.php
+++ b/maintenance/updateSuggesterIndex.php
@@ -280,8 +280,9 @@
list( $mMaj, $mMin ) = explode( '.',
\CirrusSearch\Maintenance\SuggesterMappingConfigBuilder::VERSION );
list( $aMaj, $aMin ) = explode( '.',
\CirrusSearch\Maintenance\SuggesterAnalysisConfigBuilder::VERSION );
- $versionDoc = $this->getConnection()->getIndex(
'mw_cirrus_versions' )->getType( 'version' )->getDocument(
$this->getIndexTypeName() );
- if ( $versionDoc == null ) {
+ try {
+ $versionDoc = $this->getConnection()->getIndex(
'mw_cirrus_versions' )->getType( 'version' )->getDocument(
$this->getIndexTypeName() );
+ } catch( \Elastica\Exception\NotFoundException $nfe ) {
$this->error( 'Index missing in mw_cirrus_versions,
cannot recycle.' );
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/267857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02f99e1411989ea9d3b34c10d895168d80a96cc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse
Gerrit-Reviewer: Cindy-the-browser-test-bot
Gerrit-Reviewer: DCausse
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Manybubbles
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix warning with duplicate route for / - change (mediawiki...mathoid)
Mobrovac has submitted this change and it was merged.
Change subject: Fix warning with duplicate route for /
..
Fix warning with duplicate route for /
Change-Id: I893c0fd7797cfc67b4ad76a58a7d5f0e0e87b7ed
---
M spec.yaml
1 file changed, 18 insertions(+), 19 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/spec.yaml b/spec.yaml
index 0c16f96..a69250d 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -33,6 +33,24 @@
spec: true
response:
status: 200
+post:
+ tags:
+- Render
+ description: Converts TeX to MathML, SVG, PNG and IMG
+ produces:
+- application/json
+ x-amples:
+- title: mass-energy equivalence (json)
+ request:
+body:
+ q: 'E=mc^2'
+ response:
+status: 200
+body:
+ log: success
+ success: true
+ svg: /.+/
+ mml: /.+/
# from routes/info.js
/_info:
get:
@@ -54,25 +72,6 @@
version: /.+/
home: /.+/
# from routes/mathoid.js
- /:
-post:
- tags:
-- Render
- description: Converts TeX to MathML, SVG, PNG and IMG
- produces:
-- application/json
- x-amples:
-- title: mass-energy equivalence (json)
- request:
-body:
- q: 'E=mc^2'
- response:
-status: 200
-body:
- log: success
- success: true
- svg: /.+/
- mml: /.+/
/{format}/:
post:
tags:
--
To view, visit https://gerrit.wikimedia.org/r/267543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I893c0fd7797cfc67b4ad76a58a7d5f0e0e87b7ed
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Physikerwelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable mhchem - change (mediawiki...mathoid)
Mobrovac has submitted this change and it was merged.
Change subject: Enable mhchem
..
Enable mhchem
* H20 test
* Remove svg style adjustment
Change-Id: Ia0f601c1d5392150f375eb7c2007f215864826df
---
M package.json
M routes/mathoid.js
M test/features/math/simple.js
3 files changed, 41 insertions(+), 24 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/package.json b/package.json
index 5c3fdea..3d2a5c1 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
"js-yaml": "^3.5.2",
"preq": "^0.4.8",
"service-runner": "^0.3.8",
-"mathoid-mathjax-node": "0.4.4",
-"texvcinfo": "^0.3.3"
+"mathoid-mathjax-node": "^0.5.0",
+"texvcinfo": "^0.4.1"
},
"devDependencies": {
"extend": "^3.0.0",
diff --git a/routes/mathoid.js b/routes/mathoid.js
index c09dbf7..9ce6359 100644
--- a/routes/mathoid.js
+++ b/routes/mathoid.js
@@ -51,15 +51,19 @@
}
function handleRequest(res, q, type, outFormat, features) {
-var sanitizedTex;
+var sanitizedTex, feedback;
var svg = app.conf.svg && /^svg|json|complete$/.test(outFormat);
var mml = (type !== "MathML") && /^mml|json|complete$/.test(outFormat);
var png = app.conf.png && /^png|json|complete$/.test(outFormat);
var img = app.conf.img && /^json|complete$/.test(outFormat);
var speech = (outFormat !== "png") && features.speech || outFormat ===
"speech";
+var chem = type === "chem";
+if (chem) {
+type = "inline-TeX";
+}
if (type === "TeX" || type === "inline-TeX") {
-var feedback = texvcInfo.feedback(q);
+feedback = texvcInfo.feedback(q,{usemhchem: chem});
// XXX properly handle errors here!
if (feedback.success) {
sanitizedTex = feedback.checked || '';
@@ -81,7 +85,7 @@
math: q,
format: type,
svg: svg,
-img: img,
+mathoidStyle: img,
mml: mml,
speakText: speech,
png: png
@@ -94,15 +98,6 @@
data.success = true;
// @deprecated
data.log = "success";
-}
-
-// Strip some styling returned by MathJax
-if (data.svg) {
-data.svg = data.svg.replace(/style="([^"]+)"/, function (match,
style) {
-return 'style="'
-+ style.replace(/(?:margin(?:-[a-z]+)?|position):[^;]+;
*/g, '')
-+ '"';
-});
}
// Return the sanitized TeX to the client
@@ -164,6 +159,9 @@
case "asciimath":
type = "AsciiMath";
break;
+case "chem":
+type = "chem";
+break;
default :
emitError("Input format \"" + type + "\" is not recognized!");
}
@@ -188,8 +186,8 @@
break;
case "texvcinfo":
setOutFormat('texvcinfo');
-if (!/tex$/i.test(type)) {
-emitError('texvcinfo accepts only tex or inline-tex as the
input type, "' + type + '" given!');
+if (!/(chem|tex$)/i.test(type)) {
+emitError('texvcinfo accepts only tex, inline-tex, or chem
as the input type, "' + type + '" given!');
}
break;
case "graph":
diff --git a/test/features/math/simple.js b/test/features/math/simple.js
index 5cf2765..ea0cf31 100644
--- a/test/features/math/simple.js
+++ b/test/features/math/simple.js
@@ -24,7 +24,7 @@
"mml": "http://www.w3.org/1998/Math/MathML\";
display=\"block\" alttext=\"upper E equals m c squared\">\n \n
\n E\n =\n m\n \n
c\n\n
2\n\n \n\nE=mc^{2}\n \n",
"speech": "upper E equals m c squared",
"svg": "\nhttp://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\";>\nhttp://www.w3.org/1999/xlink\"; width=\"9.025ex\"
height=\"2.676ex\" style=\"vertical-align: -0.338ex;\" viewBox=\"0 -1006.6
3885.6 1152.1\" xmlns=\"http://www.w3.org/2000/svg\"; role=\"math\"
aria-labelledby=\"MathJax-SVG-1-Title MathJax-SVG-1-Desc\">\nEquation\nupper E equals m c squared\n\n\n\n\n\n\n\n\n \n \n \n\n \n \n\n\n",
-"img": "",
+"mathoidStyle": "vertical-align: -0.338ex; width:9.025ex;
height:2.676ex;",
"success": true,
"log": "success",
"sanetex": "E=mc^{2}",
@@ -42,7 +42,7 @@
"mml": "http://www.w3.org/1998/Math/MathML\";
display=\"block\" alttext=\"double-struck upper R\">\n \n\n R\n
\n\\mathbb
{R}\n \n",
"speech": "double-struck upper R",
"svg": "\nhttp://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\";>\nhttp://www.w3.org/1999/xlink\"; width=\"1.689ex\"
height=\"2.176ex\" style=\"vertical-align: -0.338ex;\" view
[MediaWiki-commits] [Gerrit] Cleanup fixmes in tdHandler - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup fixmes in tdHandler
..
Cleanup fixmes in tdHandler
Change-Id: I142830e9dffb2ca7f95e140a228d529880db4971
---
M lib/html2wt/DOMHandlers.js
M lib/html2wt/escapeWikitext.js
2 files changed, 6 insertions(+), 13 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index 659c273..492fa46 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -750,7 +750,7 @@
handle: Promise.method(function(node, state, wrapperUnmodified)
{
var dp = DU.getDataParsoid(node);
var usableDP = stxInfoValidForTableCell(state, node);
- var startTagSrc = usableDP ? dp.startTagSrc : "";
+ var startTagSrc = usableDP ? dp.startTagSrc : '';
var attrSepSrc = usableDP ? dp.attrSepSrc : null;
var src = (usableDP && dp.stx_v === 'row') ? '||' : '|';
@@ -758,18 +758,11 @@
// we start a new line. If not, tr will have taken
care of it.
return serializeTableTag(startTagSrc || src, attrSepSrc
|| null,
state, node,
wrapperUnmodified).then(function(tableTag) {
- // FIXME: bad state hack!
- if (tableTag.length > 1) {
- state.inWideTD = true;
- }
+ var inWideTD = (tableTag.length > 1);
WTSUtils.emitStartTag(tableTag, node, state);
var tdHandler =
state.serializer.wteHandlers.tdHandler
-
.bind(state.serializer.wteHandlers, node);
- return state.serializeChildren(node, tdHandler)
- .then(function() {
- // FIXME: bad state hack!
- state.inWideTD = undefined;
- });
+
.bind(state.serializer.wteHandlers, node, inWideTD);
+ return state.serializeChildren(node, tdHandler);
});
}),
sepnls: {
diff --git a/lib/html2wt/escapeWikitext.js b/lib/html2wt/escapeWikitext.js
index 7f07771..99c229d 100644
--- a/lib/html2wt/escapeWikitext.js
+++ b/lib/html2wt/escapeWikitext.js
@@ -158,7 +158,7 @@
return text.match(/\]$/);
};
-WEHP.tdHandler = function(tdNode, state, text, opts) {
+WEHP.tdHandler = function(tdNode, inWideTD, state, text, opts) {
/*
* "|" anywhere in a text node of the subtree can be trouble!
* It is not sufficient to just look at immediate child of
@@ -182,7 +182,7 @@
// only zero-wt-emitting nodes on that path)
return (!opts.node || state.currLine.firstNode === tdNode) &&
(/\|/.test(text) || (
- !state.inWideTD &&
+ !inWideTD &&
state.currLine.text === '|' &&
text.match(/^[\-+]/) &&
opts.node && DU.pathToAncestor(opts.node,
tdNode).every(function(n) {
--
To view, visit https://gerrit.wikimedia.org/r/267938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I142830e9dffb2ca7f95e140a228d529880db4971
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create Wiki-Text-based language models for TextCat - change (wikimedia/textcat)
jenkins-bot has submitted this change and it was merged. Change subject: Create Wiki-Text-based language models for TextCat .. Create Wiki-Text-based language models for TextCat Moved existing query-based models to LM-query/. Created 70 new models based on random articles from the relevant Wikipedia. Minor updates to PHP code, including change output join text to "OR" so as not to conflict with language model "or.lm". Major updates to README.md. These models have not been evaluated (see T121539), but are made available as is. BUG: T121545 Change-Id: I772670f2fa97dfe3981fd139ea40c62f921ccda7 --- A LM-query/ar.lm A LM-query/bg.lm A LM-query/bn.lm A LM-query/de.lm A LM-query/el.lm A LM-query/en.lm A LM-query/es.lm A LM-query/fa.lm A LM-query/fr.lm A LM-query/he.lm A LM-query/hi.lm A LM-query/hy.lm A LM-query/ka.lm A LM-query/ko.lm A LM-query/ru.lm A LM-query/ta.lm A LM-query/te.lm A LM-query/th.lm A LM-query/zh.lm A LM/af.lm M LM/ar.lm A LM/be.lm M LM/bg.lm M LM/bn.lm A LM/br.lm A LM/bs.lm A LM/ca.lm A LM/cs.lm A LM/cy.lm A LM/da.lm M LM/de.lm M LM/el.lm M LM/en.lm A LM/eo.lm M LM/es.lm A LM/et.lm A LM/eu.lm M LM/fa.lm A LM/fi.lm M LM/fr.lm A LM/ga.lm A LM/gu.lm M LM/he.lm M LM/hi.lm A LM/hr.lm A LM/hu.lm M LM/hy.lm A LM/id.lm A LM/is.lm A LM/it.lm A LM/ja.lm A LM/jv.lm M LM/ka.lm A LM/kn.lm M LM/ko.lm A LM/la.lm A LM/lt.lm A LM/lv.lm A LM/ml.lm A LM/mr.lm A LM/ms.lm A LM/my.lm A LM/nl.lm A LM/no.lm A LM/or.lm A LM/pl.lm A LM/pnb.lm A LM/pt.lm A LM/ro.lm M LM/ru.lm A LM/sco.lm A LM/sh.lm A LM/sk.lm A LM/sl.lm A LM/sq.lm A LM/sr.lm A LM/su.lm A LM/sv.lm M LM/ta.lm M LM/te.lm M LM/th.lm A LM/tk.lm A LM/tl.lm A LM/tr.lm A LM/uk.lm A LM/ur.lm A LM/vi.lm A LM/zh-yue.lm M LM/zh.lm M README.md M TextCat.php M catus.php M felis.php 93 files changed, 750,122 insertions(+), 189,809 deletions(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/267779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I772670f2fa97dfe3981fd139ea40c62f921ccda7 Gerrit-PatchSet: 3 Gerrit-Project: wikimedia/textcat Gerrit-Branch: master Gerrit-Owner: Tjones Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.2 - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.15.2 .. Update OOjs UI to v0.15.2 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.2/History.md Change-Id: I8124a726660443ce514c48182871d46e6b086a10 --- M .jsduck/eg-iframe.html M build/modules.json M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/minimal-rtl.html M demos/ve/minimal.html M demos/ve/mobile-dist.html M demos/ve/mobile.html A lib/oojs-ui/i18n/cdo.json M lib/oojs-ui/i18n/hy.json M lib/oojs-ui/i18n/it.json M lib/oojs-ui/i18n/sh.json M lib/oojs-ui/i18n/xmf.json M lib/oojs-ui/i18n/zh-hans.json M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex-noimages.css M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css A lib/oojs-ui/oojs-ui-core-apex.css A lib/oojs-ui/oojs-ui-core-apex.rtl.css A lib/oojs-ui/oojs-ui-core-mediawiki.css A lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-core.js A lib/oojs-ui/oojs-ui-images-apex.css A lib/oojs-ui/oojs-ui-images-apex.rtl.css A lib/oojs-ui/oojs-ui-images-mediawiki.css A lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-noimages.css M lib/oojs-ui/oojs-ui-mediawiki-noimages.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-toolbars-apex.css A lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css A lib/oojs-ui/oojs-ui-toolbars-mediawiki.css A lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-toolbars.js A lib/oojs-ui/oojs-ui-widgets-apex.css A lib/oojs-ui/oojs-ui-widgets-apex.rtl.css A lib/oojs-ui/oojs-ui-widgets-mediawiki.css A lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-widgets.js A lib/oojs-ui/oojs-ui-windows-apex.css A lib/oojs-ui/oojs-ui-windows-apex.rtl.css A lib/oojs-ui/oojs-ui-windows-mediawiki.css A lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-windows.js D lib/oojs-ui/oojs-ui.js M lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg M lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg M lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg M lib/oojs-ui/themes/mediawiki/images/icons/alert-invert.svg M lib/oojs-ui/themes/mediawiki/images/icons/alert-warning.svg M lib/oojs-ui/themes/mediawiki/
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.2 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.15.2 .. Update OOjs UI to v0.15.2 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.2/History.md Change-Id: I8124a726660443ce514c48182871d46e6b086a10 --- M composer.json A resources/lib/oojs-ui/i18n/cdo.json M resources/lib/oojs-ui/i18n/hy.json M resources/lib/oojs-ui/i18n/it.json M resources/lib/oojs-ui/i18n/sh.json M resources/lib/oojs-ui/i18n/xmf.json M resources/lib/oojs-ui/i18n/zh-hans.json M resources/lib/oojs-ui/oojs-ui-apex-noimages.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/themes/mediawiki/icons-accessibility.json M resources/lib/oojs-ui/themes/mediawiki/icons-alerts.json M resources/lib/oojs-ui/themes/mediawiki/icons-content.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-core.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-list.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json M resources/lib/oojs-ui/themes/mediawiki/icons-layout.json M resources/lib/oojs-ui/themes/mediawiki/icons-location.json M resources/lib/oojs-ui/themes/mediawiki/icons-media.json M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json M resources/lib/oojs-ui/themes/mediawiki/icons-movement.json M resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json M resources/lib/oojs-ui/themes/mediawiki/icons.json M resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/alert-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/alert-warning.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/align-center-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/align-float-left-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/align-float-right-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arrow-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arrow-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/article-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/article-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleCheck-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleCheck-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleRedirect-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleRedirect-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleSearch-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleSearch-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bell-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bellOn-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bellOn-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/block-destructive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/block-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-a-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-b-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-te-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-f-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-geor-man-invert.svg M resources/l
[MediaWiki-commits] [Gerrit] Normalize database for PageAssessments - change (mediawiki...PageAssessments)
jenkins-bot has submitted this change and it was merged.
Change subject: Normalize database for PageAssessments
..
Normalize database for PageAssessments
Bug: T124798
Change-Id: I94af287b49a688ff399030cb1e90cdb926c73d46
---
M PageAssessmentsBody.php
M PageAssessmentsSaveJob.php
M db/addReviewsTable.sql
M tests/phpunit/PageAssessmentsTest.php
4 files changed, 21 insertions(+), 33 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php
index 0be546a..a67131b 100644
--- a/PageAssessmentsBody.php
+++ b/PageAssessmentsBody.php
@@ -27,8 +27,6 @@
* Driver function
*/
public static function execute ( $titleObj, $assessmentData ) {
- $pageTitle = $titleObj->getText();
- $pageNamespace = $titleObj->getNamespace();
$pageId = $titleObj->getArticleID();
$revisionId = $titleObj->getLatestRevID();
// Compile a list of projects to find out which ones to be
deleted afterwards
@@ -36,7 +34,7 @@
foreach ( $assessmentData as $parserData ) {
$projects[] = $parserData[0];
}
- $projectsInDb = PageAssessmentsBody::getAllProjects( $pageTitle
);
+ $projectsInDb = PageAssessmentsBody::getAllProjects( $pageId );
$toInsert = array_diff( $projects, $projectsInDb );
$toDelete = array_diff( $projectsInDb, $projects );
$toUpdate = array_intersect( $projects, $projectsInDb );
@@ -48,8 +46,6 @@
$importance = $parserData[2];
$values = array(
'pa_page_id' => $pageId,
- 'pa_page_name' => $pageTitle,
- 'pa_page_namespace' => $pageNamespace,
'pa_project' => $project,
'pa_class' => $class,
'pa_importance' => $importance,
@@ -65,7 +61,7 @@
// Add deletion jobs to job array
foreach ( $toDelete as $project ) {
$values = array(
- 'pa_page_name' => $pageTitle,
+ 'pa_page_id' => $pageId,
'pa_project' => $project,
'job_type' => 'delete'
);
@@ -85,13 +81,13 @@
public static function updateRecord ( $values ) {
$dbr = wfGetDB( DB_SLAVE );
$conds = array(
- 'pa_page_name' => $values['pa_page_name'],
+ 'pa_page_id' => $values['pa_page_id'],
'pa_project' => $values['pa_project']
);
// Check if there are no updates to be done
$record = $dbr->select(
'page_assessments',
- array( 'pa_class', 'pa_importance', 'pa_project',
'pa_page_name' ),
+ array( 'pa_class', 'pa_importance', 'pa_project',
'pa_page_id' ),
$conds
);
foreach ( $record as $row ) {
@@ -122,16 +118,16 @@
/**
* Get all records for give page
-* @param string $title Page title
+* @param int $id Page ID
* @param string $project Project
* @return array $results All projects associated with given page title
*/
- public static function getAllProjects ( $title ) {
+ public static function getAllProjects ( $pageId ) {
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
'page_assessments',
'pa_project',
- array( 'pa_page_name' => $title )
+ array( 'pa_page_id' => $pageId )
);
$results = array();
if ( $res ) {
@@ -151,7 +147,7 @@
public static function deleteRecord ( $values ) {
$dbw = wfGetDB( DB_MASTER );
$conds = array(
- 'pa_page_name' => $values['pa_page_name'],
+ 'pa_page_id' => $values['pa_page_id'],
'pa_project' => $values['pa_project']
);
$dbw->delete( 'page_assessments', $conds, __METHOD__ );
diff --git a/PageAssessmentsSaveJob.php b/PageAssessmentsSaveJob.php
index b11054d..378786a 100644
--- a/PageAssessmentsSaveJob.php
+++ b/PageAssessmentsSaveJob.php
@@ -24,8 +24,6 @@
// Compile the array to be inserted to the DB
$values = array(
'pa_page_id' => $this->params['pa_page_id'],
- 'pa_page_name' => $this->param
[MediaWiki-commits] [Gerrit] update-oojs-ui: Don't copy across oojs-ui.js, we don't use that - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268014 Change subject: update-oojs-ui: Don't copy across oojs-ui.js, we don't use that .. update-oojs-ui: Don't copy across oojs-ui.js, we don't use that Change-Id: Ief51aa4af116989f6f6730c42cd7db46972490cb --- M bin/update-oojs-ui.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/14/268014/1 diff --git a/bin/update-oojs-ui.sh b/bin/update-oojs-ui.sh index 0b0018c..9617512 100755 --- a/bin/update-oojs-ui.sh +++ b/bin/update-oojs-ui.sh @@ -38,7 +38,7 @@ # Copy files # - Exclude the minimised distribution files and PNG image assets (VE requires SVG support) -rsync --force --recursive --delete --exclude 'oojs-ui*.min.*' --exclude 'images/*/*.png' ./node_modules/oojs-ui/dist/ "$REPO_DIR/$TARGET_DIR" +rsync --force --recursive --delete --exclude 'oojs-ui*.min.*' --exclude 'oojs-ui.js' --exclude 'images/*/*.png' ./node_modules/oojs-ui/dist/ "$REPO_DIR/$TARGET_DIR" # Clean up temporary area rm -rf "$NPM_DIR" -- To view, visit https://gerrit.wikimedia.org/r/268014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief51aa4af116989f6f6730c42cd7db46972490cb Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DO NOT MERGE - breaking some tests - change (mediawiki...DonationInterface)
Cdentinger has uploaded a new change for review. https://gerrit.wikimedia.org/r/268013 Change subject: DO NOT MERGE - breaking some tests .. DO NOT MERGE - breaking some tests for the sake of testing the REL1_25 build Change-Id: I55d015a5d9ee41879a1ca6f62528752245f8c7ee --- M tests/DonationInterfaceTestCase.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/13/268013/1 diff --git a/tests/DonationInterfaceTestCase.php b/tests/DonationInterfaceTestCase.php index b5c1be6..1368f75 100644 --- a/tests/DonationInterfaceTestCase.php +++ b/tests/DonationInterfaceTestCase.php @@ -123,6 +123,7 @@ $this->setUpRequest( $options ); $expected = $this->getExpectedXmlRequestForGlobalCollect( $optionsForTestData, $options ); +$this->assertEquals( true, false ); $this->assertEquals( $expected, $request, 'The constructed XML for payment_method [' . $optionsForTestData['payment_method'] . '] and payment_submethod [' . $optionsForTestData['payment_submethod'] . '] does not match our expected request.' ); } -- To view, visit https://gerrit.wikimedia.org/r/268013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55d015a5d9ee41879a1ca6f62528752245f8c7ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Cdentinger ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove the gui for configuring roles during project creation. - change (mediawiki...OpenStackManager)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268012
Change subject: Remove the gui for configuring roles during project creation.
..
Remove the gui for configuring roles during project creation.
We always want all the roles. This interface can only lead
to confusing, broken projects. Plus I don't want to maintain
this gui in the upcoming refactor.
Change-Id: I5eb4ead6f7dcf6d8a07e84f0d97a26cc2c296888
---
M special/SpecialNovaProject.php
1 file changed, 2 insertions(+), 15 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/12/268012/1
diff --git a/special/SpecialNovaProject.php b/special/SpecialNovaProject.php
index f6532e8..95916dd 100644
--- a/special/SpecialNovaProject.php
+++ b/special/SpecialNovaProject.php
@@ -278,17 +278,6 @@
'section' => 'project',
'name' => 'member',
);
- $role_keys = array();
- foreach ( OpenStackNovaProject::$rolenames as $rolename ) {
- $role_keys[$rolename] = $rolename;
- }
- $projectInfo['roles'] = array(
- 'type' => 'multiselect',
- 'label-message' => 'openstackmanager-roles',
- 'section' => 'project',
- 'options' => $role_keys,
- 'name' => 'roles',
- );
$projectInfo['action'] = array(
'type' => 'hidden',
'default' => 'create',
@@ -361,10 +350,8 @@
}
$roles = $project->getRoles();
foreach ( $roles as $role ) {
- if ( in_array( $role->getRoleName(), $formData['roles']
) ) {
- foreach ( $members as $member ) {
- $role->addMember( $member );
- }
+ foreach ( $members as $member ) {
+ $role->addMember( $member );
}
// We also need to ensure the project creator is in all
roles
$role->addMember( $username );
--
To view, visit https://gerrit.wikimedia.org/r/268012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb4ead6f7dcf6d8a07e84f0d97a26cc2c296888
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.2 - change (mediawiki/vendor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.15.2
..
Update OOjs UI to v0.15.2
Release notes:
https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.2/History.md
Change-Id: I8124a726660443ce514c48182871d46e6b086a10
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/bin/docparser.rb
M oojs/oojs-ui/demos/demo.js
A oojs/oojs-ui/i18n/cdo.json
M oojs/oojs-ui/i18n/hy.json
M oojs/oojs-ui/i18n/it.json
M oojs/oojs-ui/i18n/sh.json
M oojs/oojs-ui/i18n/xmf.json
M oojs/oojs-ui/i18n/zh-hans.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/widgets/ComboBoxInputWidget.php
15 files changed, 107 insertions(+), 32 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 74b7bc3..2787cb4 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.17.2",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.15.1",
+ "oojs/oojs-ui": "0.15.2",
"oyejorge/less.php": "1.7.0.9",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.2.0",
diff --git a/composer.lock b/composer.lock
index 08edb3f..c00c463 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"hash": "1e11b7811354660159915303b915d65f",
-"content-hash": "aa78904fd3472b6a94b2dad4891ac274",
+"hash": "7720ca220d324a1d4faedabbaa4667bd",
+"content-hash": "270d312f323f4ad12254dca0c9cd3f72",
"packages": [
{
"name": "composer/semver",
@@ -363,16 +363,16 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.15.1",
+"version": "v0.15.2",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238"
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/488480477cb23b3eb922f24d57464a94d895b238";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/534bc1df51494f741f2df52e37253b8f074f91cd";,
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd",
"shasum": ""
},
"require": {
@@ -382,7 +382,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.1",
-"phpunit/phpunit": "~4.5"
+"phpunit/phpunit": "4.8.21"
},
"type": "library",
"autoload": {
@@ -438,7 +438,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2016-01-26 20:01:08"
+"time": "2016-02-02 21:52:29"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 0ef7acd..7a9098e 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1639,17 +1639,17 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.15.1",
-"version_normalized": "0.15.1.0",
+"version": "v0.15.2",
+"version_normalized": "0.15.2.0",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238"
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/488480477cb23b3eb922f24d57464a94d895b238";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/534bc1df51494f741f2df52e37253b8f074f91cd";,
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd",
"shasum": ""
},
"require": {
@@ -1659,9 +1659,9 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.1",
-"phpunit/phpunit": "~4.5"
+"phpunit/phpunit": "4.8.21"
},
-
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.2 - change (mediawiki/vendor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268011
Change subject: Update OOjs UI to v0.15.2
..
Update OOjs UI to v0.15.2
Release notes:
https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.2/History.md
Change-Id: I8124a726660443ce514c48182871d46e6b086a10
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
M oojs/oojs-ui/bin/docparser.rb
M oojs/oojs-ui/demos/demo.js
A oojs/oojs-ui/i18n/cdo.json
M oojs/oojs-ui/i18n/hy.json
M oojs/oojs-ui/i18n/it.json
M oojs/oojs-ui/i18n/sh.json
M oojs/oojs-ui/i18n/xmf.json
M oojs/oojs-ui/i18n/zh-hans.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/widgets/ComboBoxInputWidget.php
15 files changed, 107 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/11/268011/1
diff --git a/composer.json b/composer.json
index 74b7bc3..2787cb4 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.17.2",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.15.1",
+ "oojs/oojs-ui": "0.15.2",
"oyejorge/less.php": "1.7.0.9",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.2.0",
diff --git a/composer.lock b/composer.lock
index 08edb3f..c00c463 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"hash": "1e11b7811354660159915303b915d65f",
-"content-hash": "aa78904fd3472b6a94b2dad4891ac274",
+"hash": "7720ca220d324a1d4faedabbaa4667bd",
+"content-hash": "270d312f323f4ad12254dca0c9cd3f72",
"packages": [
{
"name": "composer/semver",
@@ -363,16 +363,16 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.15.1",
+"version": "v0.15.2",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238"
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/488480477cb23b3eb922f24d57464a94d895b238";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/534bc1df51494f741f2df52e37253b8f074f91cd";,
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd",
"shasum": ""
},
"require": {
@@ -382,7 +382,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.1",
-"phpunit/phpunit": "~4.5"
+"phpunit/phpunit": "4.8.21"
},
"type": "library",
"autoload": {
@@ -438,7 +438,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2016-01-26 20:01:08"
+"time": "2016-02-02 21:52:29"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 0ef7acd..7a9098e 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1639,17 +1639,17 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.15.1",
-"version_normalized": "0.15.1.0",
+"version": "v0.15.2",
+"version_normalized": "0.15.2.0",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238"
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/488480477cb23b3eb922f24d57464a94d895b238";,
-"reference": "488480477cb23b3eb922f24d57464a94d895b238",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/534bc1df51494f741f2df52e37253b8f074f91cd";,
+"reference": "534bc1df51494f741f2df52e37253b8f074f91cd",
"shasum": ""
},
"require": {
@@ -1659,9 +1659,9 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.1",
-"phpunit/phpunit": "~4.5"
+"phpunit/phpuni
[MediaWiki-commits] [Gerrit] Namespace localisation for Spanish (es) - change (mediawiki...EducationProgram)
MarcoAurelio has uploaded a new change for review. https://gerrit.wikimedia.org/r/268010 Change subject: Namespace localisation for Spanish (es) .. Namespace localisation for Spanish (es) Translates the English namespaces Education Program and Education Program talk into Spanish. Change-Id: Icfccab9147a07cbfb5f349b3e595a0465fce87b8 --- M EducationProgram.i18n.ns.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram refs/changes/10/268010/1 diff --git a/EducationProgram.i18n.ns.php b/EducationProgram.i18n.ns.php index cd893f9..bab4beb 100644 --- a/EducationProgram.i18n.ns.php +++ b/EducationProgram.i18n.ns.php @@ -33,6 +33,11 @@ EP_NS_TALK => 'Diskuse_ke_kurzu', ); +$namespaceNames['es'] = array( + EP_NS => 'Programa_educativo', + EP_NS_TALK => 'Programa_educativo_discusión', +); + $namespaceNames['fa'] = array( EP_NS => 'برنامه_آموزشی', EP_NS_TALK => 'بحث_برنامه_آموزشی', -- To view, visit https://gerrit.wikimedia.org/r/268010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfccab9147a07cbfb5f349b3e595a0465fce87b8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EducationProgram Gerrit-Branch: master Gerrit-Owner: MarcoAurelio ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove empty modules - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268009
Change subject: Hygiene: Remove empty modules
..
Hygiene: Remove empty modules
Depends-On: I55e4a2a305b75f0640609f7662c438a63a69f102
Change-Id: Ide3d8e5885af155750ddfce88743db9318a9d40c
---
M extension.json
1 file changed, 0 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/09/268009/1
diff --git a/extension.json b/extension.json
index 73fbf09..f2d688e 100644
--- a/extension.json
+++ b/extension.json
@@ -257,22 +257,10 @@
"arrow":
"resources/mobile.toggle.images/arrow.svg"
}
},
- "skins.minerva.icons.variants.js": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "dependencies": [
- "mobile.overlay.images"
- ]
- },
"skins.minerva.icons.images.scripts": {
"targets": [
"mobile",
"desktop"
- ],
- "dependencies": [
- "skins.minerva.icons.variants.js"
],
"class": "ResourceLoaderImageModule",
"prefix": "mw-ui",
@@ -1643,7 +1631,6 @@
"resources/skins.minerva.scripts.top/init.js"
]
},
- "skins.minerva.browse": [],
"skins.minerva.newusers": {
"targets": [
"mobile",
@@ -1794,12 +1781,6 @@
],
"scripts": [
"resources/skins.minerva.tablet.scripts/toc.js"
- ]
- },
- "skins.minerva.beta.images": {
- "targets": [
- "mobile",
- "desktop"
]
}
},
--
To view, visit https://gerrit.wikimedia.org/r/268009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide3d8e5885af155750ddfce88743db9318a9d40c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.2 - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268008 Change subject: Update OOjs UI to v0.15.2 .. Update OOjs UI to v0.15.2 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.2/History.md Change-Id: I8124a726660443ce514c48182871d46e6b086a10 --- M composer.json A resources/lib/oojs-ui/i18n/cdo.json M resources/lib/oojs-ui/i18n/hy.json M resources/lib/oojs-ui/i18n/it.json M resources/lib/oojs-ui/i18n/sh.json M resources/lib/oojs-ui/i18n/xmf.json M resources/lib/oojs-ui/i18n/zh-hans.json M resources/lib/oojs-ui/oojs-ui-apex-noimages.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/themes/mediawiki/icons-accessibility.json M resources/lib/oojs-ui/themes/mediawiki/icons-alerts.json M resources/lib/oojs-ui/themes/mediawiki/icons-content.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-core.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-list.json M resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json M resources/lib/oojs-ui/themes/mediawiki/icons-layout.json M resources/lib/oojs-ui/themes/mediawiki/icons-location.json M resources/lib/oojs-ui/themes/mediawiki/icons-media.json M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json M resources/lib/oojs-ui/themes/mediawiki/icons-movement.json M resources/lib/oojs-ui/themes/mediawiki/icons-wikimedia.json M resources/lib/oojs-ui/themes/mediawiki/icons.json M resources/lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/alert-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/alert-warning.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/align-center-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/align-float-left-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/align-float-right-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arrow-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/arrow-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/article-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/article-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleCheck-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleCheck-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleRedirect-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleRedirect-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleSearch-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/articleSearch-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bell-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bellOn-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bellOn-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/beta-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/betaLaunch-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bigger-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/block-destructive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/block-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-ltr-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/blockUndo-rtl-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-a-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-b-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-te-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-f-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g
[MediaWiki-commits] [Gerrit] Hygiene: Gather module should not depend on a skin module - change (mediawiki...Gather)
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/268007 Change subject: Hygiene: Gather module should not depend on a skin module .. Hygiene: Gather module should not depend on a skin module Change-Id: I55e4a2a305b75f0640609f7662c438a63a69f102 --- M extension.json 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather refs/changes/07/268007/1 diff --git a/extension.json b/extension.json index 3d97a63..5dd391b 100644 --- a/extension.json +++ b/extension.json @@ -289,7 +289,6 @@ "ext.gather.api", "ext.gather.collection.base", "mediawiki.storage", - "skins.minerva.icons.variants.js", "ext.gather.watchstar.icons", "ext.gather.buttonspinner" ], -- To view, visit https://gerrit.wikimedia.org/r/268007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55e4a2a305b75f0640609f7662c438a63a69f102 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gather Gerrit-Branch: master Gerrit-Owner: Jdlrobson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.15.2 - change (VisualEditor/VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/268006 Change subject: Update OOjs UI to v0.15.2 .. Update OOjs UI to v0.15.2 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.2/History.md Change-Id: I8124a726660443ce514c48182871d46e6b086a10 --- M .jsduck/eg-iframe.html M demos/ve/desktop-dist.html M demos/ve/desktop.html M demos/ve/mobile-dist.html M demos/ve/mobile.html A lib/oojs-ui/i18n/cdo.json M lib/oojs-ui/i18n/hy.json M lib/oojs-ui/i18n/it.json M lib/oojs-ui/i18n/sh.json M lib/oojs-ui/i18n/xmf.json M lib/oojs-ui/i18n/zh-hans.json M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex-noimages.css M lib/oojs-ui/oojs-ui-apex-noimages.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css A lib/oojs-ui/oojs-ui-core-apex.css A lib/oojs-ui/oojs-ui-core-apex.rtl.css A lib/oojs-ui/oojs-ui-core-mediawiki.css A lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-core.js A lib/oojs-ui/oojs-ui-images-apex.css A lib/oojs-ui/oojs-ui-images-apex.rtl.css A lib/oojs-ui/oojs-ui-images-mediawiki.css A lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-noimages.css M lib/oojs-ui/oojs-ui-mediawiki-noimages.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-toolbars-apex.css A lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css A lib/oojs-ui/oojs-ui-toolbars-mediawiki.css A lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-toolbars.js A lib/oojs-ui/oojs-ui-widgets-apex.css A lib/oojs-ui/oojs-ui-widgets-apex.rtl.css A lib/oojs-ui/oojs-ui-widgets-mediawiki.css A lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-widgets.js A lib/oojs-ui/oojs-ui-windows-apex.css A lib/oojs-ui/oojs-ui-windows-apex.rtl.css A lib/oojs-ui/oojs-ui-windows-mediawiki.css A lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css A lib/oojs-ui/oojs-ui-windows.js M lib/oojs-ui/oojs-ui.js M lib/oojs-ui/themes/mediawiki/images/icons/add-constructive.svg M lib/oojs-ui/themes/mediawiki/images/icons/add-invert.svg M lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg M lib/oojs-ui/themes/mediawiki/images/icons/alert-invert.svg M lib/oojs-ui/themes/mediawiki/images/icons/alert-warning.svg M lib/oojs-ui/themes/mediawiki/images/icons/align-center-invert.svg M li
[MediaWiki-commits] [Gerrit] Remove RandomRootPage extension from branching config - change (mediawiki...release)
jenkins-bot has submitted this change and it was merged. Change subject: Remove RandomRootPage extension from branching config .. Remove RandomRootPage extension from branching config The RandomRootPage extension has been archived. Change-Id: I627fcc27c44a2b7126186e8dd905118f86e34747 --- M make-wmf-branch/config.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Thcipriani: Looks good to me, approved jenkins-bot: Verified diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json index 2e5aa21..1087f68 100644 --- a/make-wmf-branch/config.json +++ b/make-wmf-branch/config.json @@ -104,7 +104,6 @@ "ProofreadPage", "QuickSurveys", "Quiz", - "RandomRootPage", "RelatedArticles", "RelatedSites", "Renameuser", -- To view, visit https://gerrit.wikimedia.org/r/267989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I627fcc27c44a2b7126186e8dd905118f86e34747 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Dduvall Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Chad Gerrit-Reviewer: Hashar Gerrit-Reviewer: Thcipriani Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tag v0.15.2 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Tag v0.15.2
..
Tag v0.15.2
Change-Id: Ie36ef99039dc18f052ede87747fe6b93c8537dc6
---
M History.md
M package.json
2 files changed, 29 insertions(+), 3 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/History.md b/History.md
index 44c2c61..0afc23b 100644
--- a/History.md
+++ b/History.md
@@ -1,7 +1,34 @@
# OOjs UI Release History
-## v0.15.1 / 2016-01-26
+## v0.15.2 / 2016-02-02
+### Features
+* DropdownWidget: Prevent label from overflowing the handle (Bartosz
Dziewoński)
+### Styles
+* Ensure gradient filter rendering on IE 8&9 (Bartosz Dziewoński)
+* Remove unused CSS classes .oo-ui-ltr and .oo-ui-rtl (Bartosz Dziewoński)
+* Update `.oo-ui-vertical-gradient` mixin to modern times (Volker E)
+
+### Code
+* Unify SVG icon color values to CSS/Less coding standards (Volker E)
+* ComboBoxInputWidget: Don't make the 'datalist' infusable (Bartosz Dziewoński)
+* Move OO.ui.alert and OO.ui.confirm methods to separate file (Bartosz
Dziewoński)
+* README: Add "Loading the library" wherein we apologise for the mess that is
the dist/ directory (Bartosz Dziewoński)
+* build: Actually check that all required files are not missing (Bartosz
Dziewoński)
+* build: Add intro.js.txt and outro.js.txt to all distribution JS files
(Bartosz Dziewoński)
+* build: De-duplicate per-theme modules lists (Bartosz Dziewoński)
+* build: Only define one 'less' task, not one per-distribution (Bartosz
Dziewoński)
+* build: Remove unused 'ieCompat' options from 'less' (Bartosz Dziewoński)
+* build: Remove unused 'report' options from 'less' (Bartosz Dziewoński)
+* build: Small modules.yaml tweaks (Bartosz Dziewoński)
+* build: Split the library into four parts (Bartosz Dziewoński)
+* build: Switch modules.json to YAML to document some of the weird stuff we've
put in there (Bartosz Dziewoński)
+* build: Unbreak `grunt build --graphics=vector` (Bartosz Dziewoński)
+* build: Update phpunit/phpunit to 4.8 (Paladox)
+* docparser: Parse '@class Foo' annotations, not just '@class' (Bartosz
Dziewoński)
+
+
+## v0.15.1 / 2016-01-26
### Features
* Really filter out unsafe URLs, but don't throw silly exceptions (Bartosz
Dziewoński)
* ClippableElement: Try to prevent unnecessary scrollbars (Bartosz Dziewoński)
@@ -41,7 +68,6 @@
* demo: Extend compounded form in widget.js demo (Volker E)
## v0.15.0 / 2016-01-12
-
### Breaking changes
* [BREAKING CHANGE] Drop Internet Explorer 8 support from JavaScript code
(Ricordisamoa)
* [BREAKING CHANGE] Delete deprecated aliases 'picture' and 'insert' (Ed
Sanders)
diff --git a/package.json b/package.json
index fd89e55..991e8b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.15.1",
+ "version": "0.15.2",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/268005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie36ef99039dc18f052ede87747fe6b93c8537dc6
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tag v0.15.2 - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268005
Change subject: Tag v0.15.2
..
Tag v0.15.2
Change-Id: Ie36ef99039dc18f052ede87747fe6b93c8537dc6
---
M History.md
M package.json
2 files changed, 29 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/05/268005/1
diff --git a/History.md b/History.md
index 44c2c61..0afc23b 100644
--- a/History.md
+++ b/History.md
@@ -1,7 +1,34 @@
# OOjs UI Release History
-## v0.15.1 / 2016-01-26
+## v0.15.2 / 2016-02-02
+### Features
+* DropdownWidget: Prevent label from overflowing the handle (Bartosz
Dziewoński)
+### Styles
+* Ensure gradient filter rendering on IE 8&9 (Bartosz Dziewoński)
+* Remove unused CSS classes .oo-ui-ltr and .oo-ui-rtl (Bartosz Dziewoński)
+* Update `.oo-ui-vertical-gradient` mixin to modern times (Volker E)
+
+### Code
+* Unify SVG icon color values to CSS/Less coding standards (Volker E)
+* ComboBoxInputWidget: Don't make the 'datalist' infusable (Bartosz Dziewoński)
+* Move OO.ui.alert and OO.ui.confirm methods to separate file (Bartosz
Dziewoński)
+* README: Add "Loading the library" wherein we apologise for the mess that is
the dist/ directory (Bartosz Dziewoński)
+* build: Actually check that all required files are not missing (Bartosz
Dziewoński)
+* build: Add intro.js.txt and outro.js.txt to all distribution JS files
(Bartosz Dziewoński)
+* build: De-duplicate per-theme modules lists (Bartosz Dziewoński)
+* build: Only define one 'less' task, not one per-distribution (Bartosz
Dziewoński)
+* build: Remove unused 'ieCompat' options from 'less' (Bartosz Dziewoński)
+* build: Remove unused 'report' options from 'less' (Bartosz Dziewoński)
+* build: Small modules.yaml tweaks (Bartosz Dziewoński)
+* build: Split the library into four parts (Bartosz Dziewoński)
+* build: Switch modules.json to YAML to document some of the weird stuff we've
put in there (Bartosz Dziewoński)
+* build: Unbreak `grunt build --graphics=vector` (Bartosz Dziewoński)
+* build: Update phpunit/phpunit to 4.8 (Paladox)
+* docparser: Parse '@class Foo' annotations, not just '@class' (Bartosz
Dziewoński)
+
+
+## v0.15.1 / 2016-01-26
### Features
* Really filter out unsafe URLs, but don't throw silly exceptions (Bartosz
Dziewoński)
* ClippableElement: Try to prevent unnecessary scrollbars (Bartosz Dziewoński)
@@ -41,7 +68,6 @@
* demo: Extend compounded form in widget.js demo (Volker E)
## v0.15.0 / 2016-01-12
-
### Breaking changes
* [BREAKING CHANGE] Drop Internet Explorer 8 support from JavaScript code
(Ricordisamoa)
* [BREAKING CHANGE] Delete deprecated aliases 'picture' and 'insert' (Ed
Sanders)
diff --git a/package.json b/package.json
index fd89e55..991e8b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.15.1",
+ "version": "0.15.2",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/268005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie36ef99039dc18f052ede87747fe6b93c8537dc6
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tin: disable l10nupdate until we figure out if it works with... - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: tin: disable l10nupdate until we figure out if it works with HHVM .. tin: disable l10nupdate until we figure out if it works with HHVM Given the amount of scap-related turmoil we had today, I want to disable this for today at least. Change-Id: I699abff721ef110f47c4b09163f50ca507a8060a --- M hieradata/hosts/tin.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml index 638589a..402d3cd 100644 --- a/hieradata/hosts/tin.yaml +++ b/hieradata/hosts/tin.yaml @@ -4,4 +4,4 @@ - esams.wikimedia.org - codfw.wmnet cluster: misc -scap::l10nupdate::run_l10nupdate: true +scap::l10nupdate::run_l10nupdate: false -- To view, visit https://gerrit.wikimedia.org/r/267927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I699abff721ef110f47c4b09163f50ca507a8060a Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial configuration for ady.wikipedia - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/268004
Change subject: Initial configuration for ady.wikipedia
..
Initial configuration for ady.wikipedia
Lang code ady
Shard s3
Site name Википедие
Meta namespace ... Википедие / Википедием и тегущыӀэн
Logo .
https://commons.wikimedia.org/wiki/File:Wikipedia-logo-v2-ady.png
Timezone . UTC
Uploads .. Through Commons
Bug: T125501
Change-Id: Ic2874dcd738e84e3abc202876352323594e13fef
---
M dblists/all.dblist
M dblists/commonsuploads.dblist
M dblists/s3.dblist
M dblists/small.dblist
M dblists/wikipedia.dblist
M langlist
A w/static/images/project-logos/adywiki.png
M wikiversions.json
M wmf-config/InitialiseSettings.php
9 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/04/268004/1
diff --git a/dblists/all.dblist b/dblists/all.dblist
index 5cb3e62..559dcbe 100644
--- a/dblists/all.dblist
+++ b/dblists/all.dblist
@@ -5,6 +5,7 @@
abwiktionary
acewiki
advisorywiki
+adywiki
afwiki
afwikibooks
afwikiquote
diff --git a/dblists/commonsuploads.dblist b/dblists/commonsuploads.dblist
index dc6b975..2c3ae10 100644
--- a/dblists/commonsuploads.dblist
+++ b/dblists/commonsuploads.dblist
@@ -1,5 +1,6 @@
abwiki
acewiki
+adywiki
afwikibooks
afwikiquote
afwiktionary
diff --git a/dblists/s3.dblist b/dblists/s3.dblist
index b07132b..d4a1c60 100644
--- a/dblists/s3.dblist
+++ b/dblists/s3.dblist
@@ -5,6 +5,7 @@
abwiktionary
acewiki
advisorywiki
+adywiki
afwiki
afwikibooks
afwikiquote
diff --git a/dblists/small.dblist b/dblists/small.dblist
index 9305527..5dcb392 100644
--- a/dblists/small.dblist
+++ b/dblists/small.dblist
@@ -5,6 +5,7 @@
abwiktionary
acewiki
advisorywiki
+adywiki
afwikibooks
afwikiquote
akwiki
diff --git a/dblists/wikipedia.dblist b/dblists/wikipedia.dblist
index 71e58ec..52ba32e 100644
--- a/dblists/wikipedia.dblist
+++ b/dblists/wikipedia.dblist
@@ -1,6 +1,7 @@
aawiki
abwiki
acewiki
+adywiki
afwiki
akwiki
alswiki
diff --git a/langlist b/langlist
index 3f505d2..c953c24 100644
--- a/langlist
+++ b/langlist
@@ -1,6 +1,7 @@
aa
ab
ace
+ady
af
ak
als
diff --git a/w/static/images/project-logos/adywiki.png
b/w/static/images/project-logos/adywiki.png
new file mode 100644
index 000..2d7ae60
--- /dev/null
+++ b/w/static/images/project-logos/adywiki.png
Binary files differ
diff --git a/wikiversions.json b/wikiversions.json
index 989e2b1..db5d652 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -6,6 +6,7 @@
"abwiktionary": "php-1.27.0-wmf.10",
"acewiki": "php-1.27.0-wmf.10",
"advisorywiki": "php-1.27.0-wmf.10",
+"adywiki": "php-1.27.0-wmf.10",
"afwiki": "php-1.27.0-wmf.10",
"afwikibooks": "php-1.27.0-wmf.10",
"afwikiquote": "php-1.27.0-wmf.10",
@@ -893,4 +894,4 @@
"zuwiki": "php-1.27.0-wmf.10",
"zuwikibooks": "php-1.27.0-wmf.10",
"zuwiktionary": "php-1.27.0-wmf.10"
-}
\ No newline at end of file
+}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cb4c687..225a090 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -234,6 +234,7 @@
# wgLocaltimezone @{
'wgLocaltimezone' => array(
+ 'adywiki' => 'UTC', // T125501
'alswiki' => 'Europe/Berlin',
'arbcom_dewiki' => 'Europe/Berlin',
'arbcom_fiwiki' => 'Europe/Helsinki',
@@ -460,6 +461,7 @@
// Wikipedia
'abwiki' => '/static/images/project-logos/abwiki.png', // T48589
'acewiki' => '/static/images/project-logos/acewiki.png',
+ 'adywiki' => '/static/images/project-logos/adywiki.png', // T125501
'afwiki' => '/static/images/project-logos/afwiki.png',
'akwiki' => '/static/images/project-logos/akwiki.png', // T48589
'alswiki' => '/static/images/project-logos/alswiki.png',
@@ -1513,6 +1515,7 @@
// Individual wikis, alphabetically by DB name
'abwiki' => 'Авикипедиа',
'advisorywiki' => 'Advisory Board',
+ 'adywiki' => 'Википедие', // T125501
'angwiki' => 'Wikipǣdia', // T58634
'angwikisource' => 'Wicifruma',
'angwiktionary' => 'Wikiwordbōc', // T58634
@@ -1996,6 +1999,7 @@
// Wikis (alphabetical by DB name)
'abwiki' => 'Авикипедиа',
'advisorywiki' => 'Project',
+ 'adywiki' => 'Википедие', // T125501
'amwiki' => 'ውክፔዲያ',
'angwiki' => 'Wikipǣdia', // T58634
'angwikisource' => 'Wicifruma',
@@ -2417,6 +2421,7 @@
# wgMetaNamespaceTalk @{
'wgMetaNamespaceTalk' => array(
+ 'adywiki' => 'Википедием_и_тегущыӀэн', // T125501
'angwiki' => 'Wikipǣdiamōtung', // T58634
'angwiktionary' => 'Wikiwordbōcmōtung', // T58634
'arwikiversity' => 'نقاش_ويكي_الجامعة',
--
To view, visit https://gerrit.wikimedia.org/r/26
[MediaWiki-commits] [Gerrit] [DO NOT MERGE] Update pygmentize to 7614bf7 - change (mediawiki...SyntaxHighlight_GeSHi)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/268003 Change subject: [DO NOT MERGE] Update pygmentize to 7614bf7 .. [DO NOT MERGE] Update pygmentize to 7614bf7 This updates pygmentize to the current tip, which is (at the time of writing) commit 7614bf7. I am posting this for Joergi123, who needs the current tip for TypoScript support. Bug: T125581 Change-Id: Ie44f9fa3f3251685286d842f8ec0093831745227 --- M pygments/VERSION M pygments/pygmentize 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/03/268003/1 diff --git a/pygments/VERSION b/pygments/VERSION index 879b416..252525f 100644 --- a/pygments/VERSION +++ b/pygments/VERSION @@ -1 +1 @@ -2.1 +7614bf7 diff --git a/pygments/pygmentize b/pygments/pygmentize index b767818..76232ea 100755 --- a/pygments/pygmentize +++ b/pygments/pygmentize Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/268003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie44f9fa3f3251685286d842f8ec0093831745227 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rework and improve sharing and saving media in gallery. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/268002 Change subject: Rework and improve sharing and saving media in gallery. .. Rework and improve sharing and saving media in gallery. Apologies for the size of this patch; it's larger than originally envisioned. However, as I started to work on fixing the initial crash, I saw an opportunity to improve the whole thing, in the following ways: - When sharing an image, we're now using the Fresco image pipeline (per their guidelines), and making a copy of the resulting bitmap for the purpose of sharing. It might look like the code asks Fresco to download the image again, but it's extremely likely that Fresco will pull the image from cache instead of going to the network, so this is OK. - When saving an item, we ask ourselves: "Is the user's intention to save the scaled-down image shown in our gallery, or the *original* full-resolution image from Commons?" It's highly likely to be the latter. And also, when saving videos or other types of media, it *must* be the latter. The app now handles all of this correctly. We now switch to using Android's aptly-named DownloadManager, which handles downloading of files automatically, and even gives us a Notification for free (with a progress bar)! We then intercept the download completion event, and notify the device's MediaStore to update its Gallery app, so that it shows the new media items. Bug: T125270 Change-Id: Ie5e742f6be911d591071dca1d801d7e47eee908f --- M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java M app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java A app/src/main/java/org/wikipedia/page/gallery/MediaDownloadHelper.java D app/src/main/java/org/wikipedia/page/gallery/SavedImageNotificationHelper.java M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java M app/src/main/java/org/wikipedia/util/FileUtil.java M app/src/main/java/org/wikipedia/util/ShareUtil.java M app/src/main/java/org/wikipedia/util/UriUtil.java M app/src/main/java/org/wikipedia/views/ViewUtil.java M app/src/main/res/values-ar/strings.xml M app/src/main/res/values-as/strings.xml M app/src/main/res/values-bn/strings.xml M app/src/main/res/values-br/strings.xml M app/src/main/res/values-ca/strings.xml M app/src/main/res/values-cs/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-de/strings.xml M app/src/main/res/values-el/strings.xml M app/src/main/res/values-es/strings.xml M app/src/main/res/values-eu/strings.xml M app/src/main/res/values-fa/strings.xml M app/src/main/res/values-fi/strings.xml M app/src/main/res/values-fr/strings.xml M app/src/main/res/values-gl/strings.xml M app/src/main/res/values-hu/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-it/strings.xml M app/src/main/res/values-iw/strings.xml M app/src/main/res/values-ja/strings.xml M app/src/main/res/values-ji/strings.xml M app/src/main/res/values-ka/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-lb/strings.xml M app/src/main/res/values-lt/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-mr/strings.xml M app/src/main/res/values-ms/strings.xml M app/src/main/res/values-nb/strings.xml M app/src/main/res/values-nl/strings.xml M app/src/main/res/values-pl/strings.xml M app/src/main/res/values-ps/strings.xml M app/src/main/res/values-pt-rBR/strings.xml M app/src/main/res/values-pt/strings.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values-ro/strings.xml M app/src/main/res/values-ru/strings.xml M app/src/main/res/values-sa/strings.xml M app/src/main/res/values-sd/strings.xml M app/src/main/res/values-sk/strings.xml M app/src/main/res/values-sr/strings.xml M app/src/main/res/values-sv/strings.xml M app/src/main/res/values-ta/strings.xml M app/src/main/res/values-te/strings.xml M app/src/main/res/values-tr/strings.xml M app/src/main/res/values-uk/strings.xml M app/src/main/res/values-vi/strings.xml M app/src/main/res/values-zh-rTW/strings.xml M app/src/main/res/values-zh/strings.xml M app/src/main/res/values/strings.xml 60 files changed, 214 insertions(+), 261 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/02/268002/1 diff --git a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java index 0f1e2e0..0544c62 100644 --- a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java +++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java @@ -19,7 +19,9 @@ import org.wikipedia.views.ViewUtil; import android.app.Activity; +import android.app.DownloadManager; import android.content.Intent; +import android.content.IntentFilter; import android.net.Uri; import
[MediaWiki-commits] [Gerrit] Hygiene: remove "never happens" comments from RTEs - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: remove "never happens" comments from RTEs
..
Hygiene: remove "never happens" comments from RTEs
Remove "this shouldn't happen" type comments where RuntimeExceptions are
thrown. RTE subclasses are used for unchecked Exceptions but generic
RTEs are not thrown casually and indicate in themselves that the program
is expected to crash. No functional change intended.
Change-Id: I27030102504f447947bd3c5d6797c136152f069a
---
M app/src/main/java/org/wikipedia/NightModeHandler.java
M app/src/main/java/org/wikipedia/RemoteConfig.java
M app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
M app/src/main/java/org/wikipedia/bridge/StyleBundle.java
M app/src/main/java/org/wikipedia/data/ContentPersister.java
M app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/page/Page.java
M app/src/main/java/org/wikipedia/page/PageTitle.java
M app/src/main/java/org/wikipedia/page/Section.java
M
app/src/main/java/org/wikipedia/page/bottomcontent/MainPageReadMoreTopicTask.java
M app/src/main/java/org/wikipedia/savedpages/ImageUrlMap.java
M app/src/main/java/org/wikipedia/savedpages/SavedPagePersistenceHelper.java
M app/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java
M app/src/main/java/org/wikipedia/util/StringUtil.java
16 files changed, 2 insertions(+), 25 deletions(-)
Approvals:
Mholloway: Looks good to me, but someone else must approve
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/NightModeHandler.java
b/app/src/main/java/org/wikipedia/NightModeHandler.java
index 0e39c99..c889ae8 100644
--- a/app/src/main/java/org/wikipedia/NightModeHandler.java
+++ b/app/src/main/java/org/wikipedia/NightModeHandler.java
@@ -30,7 +30,6 @@
payload.put("nightStyleBundle",
StyleBundle.getAvailableBundle(StyleBundle.BUNDLE_NIGHT_MODE).toJSON());
} catch (JSONException e) {
-// This shouldn't happen
throw new RuntimeException(e);
}
return payload;
diff --git a/app/src/main/java/org/wikipedia/RemoteConfig.java
b/app/src/main/java/org/wikipedia/RemoteConfig.java
index f88f0c9..33eb76f 100644
--- a/app/src/main/java/org/wikipedia/RemoteConfig.java
+++ b/app/src/main/java/org/wikipedia/RemoteConfig.java
@@ -22,7 +22,6 @@
// If there's no pref set, just give back the empty JSON Object
curConfig = new JSONObject(Prefs.getRemoteConfigJson());
} catch (JSONException e) {
-// This shouldn't be happening, and if it does I'd like a
crash report
throw new RuntimeException(e);
}
}
diff --git
a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
index 7456ef2..561281b 100644
--- a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
+++ b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
@@ -47,7 +47,6 @@
try {
meta = new JSONObject(responseJSON);
} catch (JSONException e) {
-// This never happens
throw new RuntimeException(e);
}
SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(context);
diff --git a/app/src/main/java/org/wikipedia/bridge/StyleBundle.java
b/app/src/main/java/org/wikipedia/bridge/StyleBundle.java
index 117d890..973613f 100644
--- a/app/src/main/java/org/wikipedia/bridge/StyleBundle.java
+++ b/app/src/main/java/org/wikipedia/bridge/StyleBundle.java
@@ -55,7 +55,6 @@
json.put("style_paths", stylesJSON);
return json;
} catch (JSONException e) {
-// This never happens
throw new RuntimeException(e);
}
}
diff --git a/app/src/main/java/org/wikipedia/data/ContentPersister.java
b/app/src/main/java/org/wikipedia/data/ContentPersister.java
index 0c3c44f..1ea8c35 100644
--- a/app/src/main/java/org/wikipedia/data/ContentPersister.java
+++ b/app/src/main/java/org/wikipedia/data/ContentPersister.java
@@ -19,7 +19,6 @@
try {
client.insert(uri, persistenceHelper.toContentValues(obj));
} catch (RemoteException e) {
-// This shouldn't happen
throw new RuntimeException(e);
}
}
@@ -30,7 +29,6 @@
try {
c = client.query(uri, null, selection, selectionArgs, sortOrder);
} catch (RemoteException e) {
-// This shouldn't happen
throw new RuntimeException(e);
}
return c;
@@ -45,7 +43,6 @@
try {
client.dele
[MediaWiki-commits] [Gerrit] Update pygments bundle to 2.1 - change (mediawiki...SyntaxHighlight_GeSHi)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/268001 Change subject: Update pygments bundle to 2.1 .. Update pygments bundle to 2.1 Changelog: https://bitbucket.org/birkenfeld/pygments-main/raw/7614bf7/CHANGES Lots of new lexers: Emacs Lisp, Arduino, Modula-2 with multi-dialect support, Fortran fixed format, Archetype Definition language, Terraform, Jcl, Easytrieve, ParaSail, Boogie, Turtle, Fish Shell, Roboconf, Test Anything Protocol, Shen, Component Pascal, SuperCollider, Shell consoles (Tcsh, PowerShell, MSDOS), Elm and J, Crmsh, Praat, CSound, Ezhil, Thrift, QVT Operational, Hexdump, and CAmkES Configuration. Bug: T125581 Change-Id: Ie881af3d1dff23f08ccc9cbcf5f94a084fa561e1 --- A pygments/VERSION M pygments/pygmentize 2 files changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi refs/changes/01/268001/1 diff --git a/pygments/VERSION b/pygments/VERSION new file mode 100644 index 000..879b416 --- /dev/null +++ b/pygments/VERSION @@ -0,0 +1 @@ +2.1 diff --git a/pygments/pygmentize b/pygments/pygmentize index 3cc23e4..b767818 100755 --- a/pygments/pygmentize +++ b/pygments/pygmentize Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/268001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie881af3d1dff23f08ccc9cbcf5f94a084fa561e1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rework and improve sharing and saving media in gallery. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/268000 Change subject: Rework and improve sharing and saving media in gallery. .. Rework and improve sharing and saving media in gallery. Apologies for the size of this patch; it's larger than originally envisioned. However, as I started to work on fixing the initial crash, I saw an opportunity to improve the whole thing, in the following ways: - When sharing an image, we're now using the Fresco image pipeline (per their guidelines), and making a copy of the resulting bitmap for the purpose of sharing. It might look like the code asks Fresco to download the image again, but it's extremely likely that Fresco will pull the image from cache instead of going to the network, so this is OK. - When saving an item, we ask ourselves: "Is the user's intention to save the scaled-down image shown in our gallery, or the *original* full-resolution image from Commons?" It's highly likely to be the latter. And also, when saving videos or other types of media, it *must* be the latter. The app now handles all of this correctly. We now switch to using Android's aptly-named DownloadManager, which handles downloading of files automatically, and even gives us a Notification for free (with a progress bar)! We then intercept the download completion event, and notify the device's MediaStore to update its Gallery app, so that it shows the new media items. Bug: T125270 Change-Id: Ib8c2c7e5de5ab411dacd9aeb2defb35f5cb7044e --- M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java M app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java A app/src/main/java/org/wikipedia/page/gallery/MediaDownloadHelper.java D app/src/main/java/org/wikipedia/page/gallery/SavedImageNotificationHelper.java M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java M app/src/main/java/org/wikipedia/util/FileUtil.java M app/src/main/java/org/wikipedia/util/ShareUtil.java M app/src/main/java/org/wikipedia/util/UriUtil.java M app/src/main/res/values-ar/strings.xml M app/src/main/res/values-as/strings.xml M app/src/main/res/values-bn/strings.xml M app/src/main/res/values-br/strings.xml M app/src/main/res/values-ca/strings.xml M app/src/main/res/values-cs/strings.xml M app/src/main/res/values-da/strings.xml M app/src/main/res/values-de/strings.xml M app/src/main/res/values-el/strings.xml M app/src/main/res/values-es/strings.xml M app/src/main/res/values-eu/strings.xml M app/src/main/res/values-fa/strings.xml M app/src/main/res/values-fi/strings.xml M app/src/main/res/values-fr/strings.xml M app/src/main/res/values-gl/strings.xml M app/src/main/res/values-hu/strings.xml M app/src/main/res/values-in/strings.xml M app/src/main/res/values-it/strings.xml M app/src/main/res/values-iw/strings.xml M app/src/main/res/values-ja/strings.xml M app/src/main/res/values-ji/strings.xml M app/src/main/res/values-ka/strings.xml M app/src/main/res/values-ko/strings.xml M app/src/main/res/values-lb/strings.xml M app/src/main/res/values-lt/strings.xml M app/src/main/res/values-mk/strings.xml M app/src/main/res/values-mr/strings.xml M app/src/main/res/values-ms/strings.xml M app/src/main/res/values-nb/strings.xml M app/src/main/res/values-nl/strings.xml M app/src/main/res/values-pl/strings.xml M app/src/main/res/values-ps/strings.xml M app/src/main/res/values-pt-rBR/strings.xml M app/src/main/res/values-pt/strings.xml M app/src/main/res/values-qq/strings.xml M app/src/main/res/values-ro/strings.xml M app/src/main/res/values-ru/strings.xml M app/src/main/res/values-sa/strings.xml M app/src/main/res/values-sd/strings.xml M app/src/main/res/values-sk/strings.xml M app/src/main/res/values-sr/strings.xml M app/src/main/res/values-sv/strings.xml M app/src/main/res/values-ta/strings.xml M app/src/main/res/values-te/strings.xml M app/src/main/res/values-tr/strings.xml M app/src/main/res/values-uk/strings.xml M app/src/main/res/values-vi/strings.xml M app/src/main/res/values-zh-rTW/strings.xml M app/src/main/res/values-zh/strings.xml M app/src/main/res/values/strings.xml 59 files changed, 203 insertions(+), 260 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/00/268000/1 diff --git a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java index 0f1e2e0..0544c62 100644 --- a/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java +++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java @@ -19,7 +19,9 @@ import org.wikipedia.views.ViewUtil; import android.app.Activity; +import android.app.DownloadManager; import android.content.Intent; +import android.content.IntentFilter; import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fra
[MediaWiki-commits] [Gerrit] Fix crash when sharing image from gallery. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267999
Change subject: Fix crash when sharing image from gallery.
..
Fix crash when sharing image from gallery.
Bug: T125270
Change-Id: Ib1fdb1cf7ca4c20efd23863f47a98460e7ef1212
---
M app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
M app/src/main/java/org/wikipedia/views/ViewUtil.java
3 files changed, 15 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/99/267999/1
diff --git
a/app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
b/app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
index abd62b6..578a53b 100644
--- a/app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
+++ b/app/src/main/java/org/wikipedia/page/gallery/GalleryItemFragment.java
@@ -8,6 +8,7 @@
import org.wikipedia.util.FileUtil;
import org.wikipedia.util.PermissionUtil;
import org.wikipedia.util.ShareUtil;
+import org.wikipedia.views.ViewUtil;
import android.Manifest;
import android.content.pm.PackageManager;
@@ -16,6 +17,7 @@
import android.graphics.Color;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.Bundle;
@@ -385,8 +387,10 @@
return;
}
parentActivity.getFunnel().logGalleryShare(pageTitle,
galleryItem.getName());
+
+
ShareUtil.shareImage(parentActivity,
-((BitmapDrawable) imageView.getDrawable()).getBitmap(),
+ViewUtil.getBitmapFromView(imageView),
new java.io.File(galleryItem.getUrl()).getName(),
pageTitle.getDisplayText(),
"",
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
index 370099a..4251d59 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -133,10 +133,7 @@
}
public Bitmap copyBitmap() {
-Bitmap returnedBitmap = Bitmap.createBitmap(image.getWidth(),
image.getHeight(), Bitmap.Config.ARGB_);
-Canvas canvas = new Canvas(returnedBitmap);
-image.draw(canvas);
-return returnedBitmap;
+return ViewUtil.getBitmapFromView(image);
}
public void setImageYScalar(float offset) {
diff --git a/app/src/main/java/org/wikipedia/views/ViewUtil.java
b/app/src/main/java/org/wikipedia/views/ViewUtil.java
index e8c9afb..3d9a023 100644
--- a/app/src/main/java/org/wikipedia/views/ViewUtil.java
+++ b/app/src/main/java/org/wikipedia/views/ViewUtil.java
@@ -1,6 +1,8 @@
package org.wikipedia.views;
import android.annotation.TargetApi;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
@@ -74,5 +76,12 @@
.build());
}
+public static Bitmap getBitmapFromView(View view) {
+Bitmap returnedBitmap = Bitmap.createBitmap(view.getWidth(),
view.getHeight(), Bitmap.Config.ARGB_);
+Canvas canvas = new Canvas(returnedBitmap);
+view.draw(canvas);
+return returnedBitmap;
+}
+
private ViewUtil() { }
}
--
To view, visit https://gerrit.wikimedia.org/r/267999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1fdb1cf7ca4c20efd23863f47a98460e7ef1212
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] create_pygmentize_bundle: add '--tip' option - change (mediawiki...SyntaxHighlight_GeSHi)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267998
Change subject: create_pygmentize_bundle: add '--tip' option
..
create_pygmentize_bundle: add '--tip' option
* Make it possible to build a pygmentize bundle of the current tip
by invoking create_pygmentize_bundle with the '--tip' option.
* In addition to the bundle itself, also generate a VERSION file
which contains the version of pygmentize (or the short commit SHA1)
that has been generated by create_pygmentize_bundle.
Bug: T125581
Change-Id: I3ea1e4ba5e7b069142e78cb411bc6e5ac7b379b1
---
M pygments/create_pygmentize_bundle
1 file changed, 34 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi
refs/changes/98/267998/1
diff --git a/pygments/create_pygmentize_bundle
b/pygments/create_pygmentize_bundle
index 9f638b9..8ad33ff 100755
--- a/pygments/create_pygmentize_bundle
+++ b/pygments/create_pygmentize_bundle
@@ -2,6 +2,10 @@
# -*- coding: utf-8 -*-
"""
Create a standalone, executable 'pygmentize' bundle.
+
+ By default, this script will fetch the latest official release from PyPI.
+ If you prefer the current tip, run this script with the '--tip' argument.
+
Author: Ori Livneh
"""
@@ -11,6 +15,7 @@
import hashlib
import io
+import json
import os
import stat
import textwrap
@@ -31,25 +36,36 @@
''')
-print('Querying PyPI for the latest Pygments release...')
-pypi = xmlrpclib.ServerProxy('https://pypi.python.org/pypi')
-latest_version = pypi.package_releases('Pygments')[0]
-for release in pypi.release_urls('Pygments', latest_version):
-if (release['packagetype'] == 'bdist_wheel' and
-release['python_version'].startswith('2')):
-url = release['url']
-md5_digest = release['md5_digest']
-break
-else:
-raise RuntimeError('No suitable package found.')
+if '--tip' in sys.argv:
+print('Querying BitBucket for current tip of Pygments...')
+req = urllib2.urlopen('https://api.bitbucket.org/2.0/repositories/'
+ 'birkenfeld/pygments-main/commit/tip')
+data = json.load(req)
+latest_version = data['hash'][:7]
+url = ('https://bitbucket.org/birkenfeld/pygments-main/'
+ 'get/%s.zip' % latest_version)
+md5_digest = None
+else:
+print('Querying PyPI for the latest Pygments release...')
+pypi = xmlrpclib.ServerProxy('https://pypi.python.org/pypi')
+latest_version = pypi.package_releases('Pygments')[0]
+for release in pypi.release_urls('Pygments', latest_version):
+if (release['packagetype'] == 'bdist_wheel' and
+release['python_version'].startswith('2')):
+url = release['url']
+md5_digest = release['md5_digest']
+break
+else:
+raise RuntimeError('No suitable package found.')
print('Retreiving version %s (%s)...' % (latest_version, url))
req = urllib2.urlopen(url)
buf = io.BytesIO(req.read())
-print('Verifying...')
-if hashlib.md5(buf.getvalue()).hexdigest() != md5_digest:
-raise RuntimeError('MD5 checksum mismatch.')
+if md5_digest is not None:
+print('Verifying...')
+if hashlib.md5(buf.getvalue()).hexdigest() != md5_digest:
+raise RuntimeError('MD5 checksum mismatch.')
print('Creating executable ZIP bundle...')
with zipfile.ZipFile(buf, 'a') as zf:
@@ -65,4 +81,8 @@
file_st = os.stat(file_path)
os.chmod(file_path, file_st.st_mode | stat.S_IEXEC)
+version_file_path = os.path.join(script_dir, 'VERSION')
+with open(version_file_path, 'w') as f:
+f.write(latest_version + '\n')
+
print('Done. Wrote %s bytes to %s' % (len(data), file_path))
--
To view, visit https://gerrit.wikimedia.org/r/267998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ea1e4ba5e7b069142e78cb411bc6e5ac7b379b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct app session metrics README and jar version - change (analytics/refinery)
Ottomata has submitted this change and it was merged.
Change subject: Correct app session metrics README and jar version
..
Correct app session metrics README and jar version
Bug: T117615
Change-Id: Idbf5b29cd01965e0da98e790d072b9f94f3345d0
---
M oozie/mobile_apps/session_metrics/README.md
M oozie/mobile_apps/session_metrics/bundle.properties
2 files changed, 17 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/oozie/mobile_apps/session_metrics/README.md
b/oozie/mobile_apps/session_metrics/README.md
index eb38b7d..47adf21 100644
--- a/oozie/mobile_apps/session_metrics/README.md
+++ b/oozie/mobile_apps/session_metrics/README.md
@@ -1,17 +1,28 @@
Oozie job to schedule app session metrics reports. The reports are
-set to be generated every 7 days for the last 30 days of data.
+set to be generated every 7 days. There are 2 kinds of reports:
+
+- Global: Considers all sessions for the last 30 days of data.
+- By OS: Considers the last 7 days of data and splits the sessions
+ by OS family (Android, iOS).
The oozie workflow launches a spark action that runs the
AppSessionMetrics scala job in analytics-refinery-source/refinery-job here -
https://phabricator.wikimedia.org/diffusion/ANRS/
-Example command for running the coordinator on command line:
+Example command for running the bundle on command line:
oozie job -run \
- -config coordinator.properties \
+ -config bundle.properties \
-D
refinery_directory=hdfs://analytics-hadoop/user/madhuvishy/refinery \
-D
spark_job_jar=hdfs://analytics-hadoop/user/madhuvishy/source/refinery-job-0.0.12-SNAPSHOT.jar
\
-D
output_directory=hdfs://analytics-hadoop/user/madhuvishy/session_metrics
-The results of this job is stored at output_directory/session_metrics.tsv.
It's also exposed as
-a hive external table - see
refinery/hive/mobile_apps/create_mobile_apps_session_metrics_table.hql
\ No newline at end of file
+The results of this job are stored at
+
+- {output_directory}/session_metrics/session_metrics.tsv (global)
+- {output_directory}/session_metrics_by_os/session_metrics.tsv (by OS)
+
+They're also exposed as hive external tables. See:
+
+- refinery/hive/mobile_apps/create_mobile_apps_session_metrics_table.hql
+- refinery/hive/mobile_apps/create_mobile_apps_session_metrics_by_os_table.hql
diff --git a/oozie/mobile_apps/session_metrics/bundle.properties
b/oozie/mobile_apps/session_metrics/bundle.properties
index 63b7da0..2c67ab4 100644
--- a/oozie/mobile_apps/session_metrics/bundle.properties
+++ b/oozie/mobile_apps/session_metrics/bundle.properties
@@ -49,7 +49,7 @@
spark_master = yarn
spark_deploy = cluster
spark_assembly_jar=
${name_node}/user/spark/share/lib/spark-assembly.jar
-spark_job_jar =
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.14.jar
+spark_job_jar =
${artifacts_directory}/org/wikimedia/analytics/refinery/refinery-job-0.0.26.jar
spark_job_class =
org.wikimedia.analytics.refinery.job.AppSessionMetrics
spark_job_name= app_session_metrics
spark_number_executors= 32
--
To view, visit https://gerrit.wikimedia.org/r/267996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idbf5b29cd01965e0da98e790d072b9f94f3345d0
Gerrit-PatchSet: 2
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Mforns
Gerrit-Reviewer: Ottomata
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable signature button for the Project namespace in ru.wiki - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/267997 Change subject: Enable signature button for the Project namespace in ru.wiki .. Enable signature button for the Project namespace in ru.wiki Bug: T125509 Change-Id: Ifaa36e1c36830209b7e90288ba7997bf3472f0a0 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/267997/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 468b55a..93b34c4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10755,6 +10755,7 @@ '+dewikivoyage' => array( 102 ), // T119420 '+itwiki' => array( 102 ), + '+ruwiki' => array( 104 ), // T125509 ), 'wmgExemptFromUserRobotsControlExtra' => array( -- To view, visit https://gerrit.wikimedia.org/r/267997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifaa36e1c36830209b7e90288ba7997bf3472f0a0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
