[MediaWiki-commits] [Gerrit] removes withAnyProjects method from getTasks - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: removes withAnyProjects method from getTasks
..
removes withAnyProjects method from getTasks
adds withEdgeLogicPHIDs instead
Bug: T97873
Change-Id: Icb550c9b033f5c8d1cee3132dd1095bb511f1663
---
M src/query/SprintQuery.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/query/SprintQuery.php b/src/query/SprintQuery.php
index 58da39c..74dddb5 100644
--- a/src/query/SprintQuery.php
+++ b/src/query/SprintQuery.php
@@ -72,7 +72,10 @@
public function getTasks() {
$tasks = id(new ManiphestTaskQuery())
-setViewer($this-viewer)
--withAnyProjects(array($this-project-getPHID()))
+-withEdgeLogicPHIDs(
+PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
+PhabricatorQueryConstraint::OPERATOR_OR,
+array($this-project-getPHID()))
-needProjectPHIDs(true)
-execute();
if (empty($tasks)) {
--
To view, visit https://gerrit.wikimedia.org/r/208941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb550c9b033f5c8d1cee3132dd1095bb511f1663
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
Gerrit-Reviewer: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
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 ext-wikimediacontactpagemessages to Extensions Used by W... - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Add ext-wikimediacontactpagemessages to Extensions Used by Wikimedia .. Add ext-wikimediacontactpagemessages to Extensions Used by Wikimedia Change-Id: I45f0cb0eb78d6fb1e96bc0f893f9d91f6829eb3e --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index a4c216f..23ad1e6 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -109,6 +109,7 @@ - ext-wikigrok # 2014-10-24, change id: I49a08c9f025a6258bd3a6d8f531d9b2a9c48968a - ext-wikilove - ext-wikihiero + - ext-wikimediacontactpagemessages - ext-wikimediaevents - ext-wikimediaincubator # r89556 - ext-wikimediaincubatorinfopage -- To view, visit https://gerrit.wikimedia.org/r/208511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45f0cb0eb78d6fb1e96bc0f893f9d91f6829eb3e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/quality. Extension can now be installed by composer.
Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
---
M composer.json
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index 628ad99..9769032 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality,
+ name: wikibase/quality,
type: mediawiki-extension,
- description: Extension for Wikibase to improve the data quality.,
+ description: Extension for Wikibase to improve the data quality and
trust.,
+ keywords: [quality, trust, violation, wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -14,8 +15,8 @@
},
require: {
php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~2.6,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
@@ -30,6 +31,9 @@
},
classmap: [
WikidataQualityHooks.php
+ ],
+ files: [
+ WikidataQuality.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed EnqueueJob::newFromLocalJobs docs - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fixed EnqueueJob::newFromLocalJobs docs
..
Fixed EnqueueJob::newFromLocalJobs docs
Change-Id: I02e6490fe801e02d7e8c50b2ddbec5cd4d36600f
---
M includes/jobqueue/jobs/EnqueueJob.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/jobs/EnqueueJob.php
b/includes/jobqueue/jobs/EnqueueJob.php
index 46fb2aa..fdef1f5 100755
--- a/includes/jobqueue/jobs/EnqueueJob.php
+++ b/includes/jobqueue/jobs/EnqueueJob.php
@@ -45,8 +45,8 @@
}
/**
-* @param Job|JobSpecification|array $jobs
-* @return JobRouteJob
+* @param JobSpecification|JobSpecification[] $jobs
+* @return EnqueueJob
*/
public static function newFromLocalJobs( $jobs ) {
$jobs = is_array( $jobs ) ? $jobs : array( $jobs );
--
To view, visit https://gerrit.wikimedia.org/r/208354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I02e6490fe801e02d7e8c50b2ddbec5cd4d36600f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Renamed field change patch file - change (mediawiki...ConfirmAccount)
jenkins-bot has submitted this change and it was merged. Change subject: Renamed field change patch file .. Renamed field change patch file Change-Id: I303f684f25d37e29b8734e86f32f090262f39fb6 --- M backend/schema/ConfirmAccountUpdater.hooks.php R backend/schema/mysql/patch-acr_email-varchar.sql 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Chad: Looks good to me, approved Gilles: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/backend/schema/ConfirmAccountUpdater.hooks.php b/backend/schema/ConfirmAccountUpdater.hooks.php old mode 100644 new mode 100755 index 07afc25..54e6d31 --- a/backend/schema/ConfirmAccountUpdater.hooks.php +++ b/backend/schema/ConfirmAccountUpdater.hooks.php @@ -17,7 +17,7 @@ $updater-addExtensionField( 'account_requests', 'acr_filename', $base/patch-acr_filename.sql ); $updater-addExtensionTable( 'account_credentials', $base/patch-account_credentials.sql ); $updater-addExtensionField( 'account_requests', 'acr_areas', $base/patch-acr_areas.sql ); - $updater-modifyExtensionField( 'account_requests', 'acr_email', $base/patch-alter-acr_email-index.sql ); + $updater-modifyExtensionField( 'account_requests', 'acr_email', $base/patch-acr_email-varchar.sql ); $updater-addExtensionIndex( 'account_requests', 'acr_email', $base/patch-email-index.sql ); $updater-addExtensionField( 'account_requests', 'acr_agent', $base/patch-acr_agent.sql ); $updater-dropExtensionIndex( 'account_requests', 'acr_deleted_reg', $base/patch-drop-acr_deleted_reg-index.sql ); diff --git a/backend/schema/mysql/patch-alter-acr_email-index.sql b/backend/schema/mysql/patch-acr_email-varchar.sql similarity index 70% rename from backend/schema/mysql/patch-alter-acr_email-index.sql rename to backend/schema/mysql/patch-acr_email-varchar.sql old mode 100644 new mode 100755 index 0b86a58..af39e4d --- a/backend/schema/mysql/patch-alter-acr_email-index.sql +++ b/backend/schema/mysql/patch-acr_email-varchar.sql @@ -1,3 +1,2 @@ --- (c) Aaron Schulz, 2015 - +-- Make this field easier to index ALTER TABLE /*_*/account_requests MODIFY /*i*/acr_email VARCHAR(255) binary NOT NULL; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/206860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I303f684f25d37e29b8734e86f32f090262f39fb6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ConfirmAccount Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct sample for beta optin - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Correct sample for beta optin
..
Correct sample for beta optin
Eek. This should be -1
We are currently showing this to pretty much everyone.
Change-Id: I9bd480f1b7ad8cea095cc69086fa951b622af377
---
M resources/mobile.betaoptin/init.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.betaoptin/init.js
b/resources/mobile.betaoptin/init.js
index ddc7b6e..c9c23ad 100644
--- a/resources/mobile.betaoptin/init.js
+++ b/resources/mobile.betaoptin/init.js
@@ -14,7 +14,7 @@
// a single character has 36 possibilities so this is 2/36 5.6%
chance (a-z and 0-9)
// 3% chance of this happening
inStable = !context.isBetaGroupMember();
- inSample = $.inArray( token.charAt( 0 ), [ '3', '2' ] ) !== 1;
+ inSample = $.inArray( token.charAt( 0 ), [ '3', '2' ] ) !== -1;
if ( inStable ( inSample || mw.util.getParamValue( 'debug' )
) ) {
new BetaOptinPanel()
.on( 'hide', function () {
--
To view, visit https://gerrit.wikimedia.org/r/208911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9bd480f1b7ad8cea095cc69086fa951b622af377
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Converted InfoAction to using the WAN cache - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Converted InfoAction to using the WAN cache
..
Converted InfoAction to using the WAN cache
Bug: T93141
Change-Id: I8988f77fa5a3504793d9b8e0eea6863888c9e226
---
M includes/actions/InfoAction.php
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index de4f977..203c687 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -64,12 +64,12 @@
* @param Title $title Title to clear cache for
*/
public static function invalidateCache( Title $title ) {
- global $wgMemc;
+ $cache = ObjectCache::getMainWANInstance();
$revision = Revision::newFromTitle( $title, 0,
Revision::READ_LATEST );
if ( $revision !== null ) {
$key = wfMemcKey( 'infoaction', sha1(
$title-getPrefixedText() ), $revision-getId() );
- $wgMemc-delete( $key );
+ $cache-delete( $key );
}
}
@@ -193,7 +193,7 @@
* @return array
*/
protected function pageInfo() {
- global $wgContLang, $wgMemc;
+ global $wgContLang;
$user = $this-getUser();
$lang = $this-getLanguage();
@@ -201,16 +201,17 @@
$id = $title-getArticleID();
$config = $this-context-getConfig();
+ $cache = ObjectCache::getMainWANInstance();
$memcKey = wfMemcKey( 'infoaction',
sha1( $title-getPrefixedText() ),
$this-page-getLatest() );
- $pageCounts = $wgMemc-get( $memcKey );
+ $pageCounts = $cache-get( $memcKey );
$version = isset( $pageCounts['cacheversion'] ) ?
$pageCounts['cacheversion'] : false;
if ( $pageCounts === false || $version !== self::CACHE_VERSION
) {
// Get page information that would be too expensive
to retrieve by normal means
$pageCounts = $this-pageCounts( $title );
$pageCounts['cacheversion'] = self::CACHE_VERSION;
- $wgMemc-set( $memcKey, $pageCounts );
+ $cache-set( $memcKey, $pageCounts );
}
// Get page properties
--
To view, visit https://gerrit.wikimedia.org/r/206989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8988f77fa5a3504793d9b8e0eea6863888c9e226
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ganglia_new::web. Increase the default memory limit - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208937
Change subject: ganglia_new::web. Increase the default memory limit
..
ganglia_new::web. Increase the default memory limit
Double the amount of memory a PHP script can allocate. This is expected
to solve a number of memory allocations errors ganglia frontend logs.
The machine has enough memory to survive the 100% increase and the
execution time limit is left untouched for now.
Bug: T97637
Change-Id: Iee759f73d58f36000ecde1634cbf3faf58503cf6
---
M modules/ganglia_new/manifests/web.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/208937/1
diff --git a/modules/ganglia_new/manifests/web.pp
b/modules/ganglia_new/manifests/web.pp
index 0c6d726..5c6c167 100644
--- a/modules/ganglia_new/manifests/web.pp
+++ b/modules/ganglia_new/manifests/web.pp
@@ -37,4 +37,12 @@
content = template('ganglia_new/conf_production.php.erb'),
require = Package['ganglia-webfrontend'],
}
+
+# Increase the default memory limit
+augeas { 'php.ini-memory':
+ context = '/files/etc/php5/apache2/php.ini/PHP',
+ changes = [
+'set memory_limit 256M',
+ ];
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/208937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee759f73d58f36000ecde1634cbf3faf58503cf6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mw.FormDataTransport: Make it possible to skip the 3000 ms t... - change (mediawiki...UploadWizard)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208938
Change subject: mw.FormDataTransport: Make it possible to skip the 3000 ms
timeout in tests
..
mw.FormDataTransport: Make it possible to skip the 3000 ms timeout in tests
Seems like the least bad solution?
Bug: T98130
Change-Id: I8f00ce8d3259254434d82b75ca44a7e1b88613d9
---
M resources/transports/mw.FormDataTransport.js
M tests/qunit/transports/mw.FormDataTransport.test.js
2 files changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/38/208938/1
diff --git a/resources/transports/mw.FormDataTransport.js
b/resources/transports/mw.FormDataTransport.js
index 57808b3..2f0fee3 100644
--- a/resources/transports/mw.FormDataTransport.js
+++ b/resources/transports/mw.FormDataTransport.js
@@ -10,6 +10,10 @@
* @param {string} postUrl URL to post to.
* @param {Object} formData Additional form fields required for upload
api call
* @param {Object} [config]
+* @param {Object} [config.chunkSize]
+* @param {Object} [config.maxPhpUploadSize]
+* @param {Object} [config.enableChunked]
+* @param {Object} [config.useRetryTimeout]
*/
mw.FormDataTransport = function ( postUrl, formData, config ) {
var profile = $.client.profile();
@@ -290,13 +294,18 @@
* @return {jQuery.Promise}
*/
FDTP.retryWithMethod = function ( methodName, file, offset ) {
- var retryDeferred,
- transport = this;
+ var
+ transport = this,
+ retryDeferred = $.Deferred(),
+ retry = function () {
+ transport[methodName]( file, offset ).then(
retryDeferred.resolve, retryDeferred.reject );
+ };
- retryDeferred = $.Deferred();
- setTimeout( function () {
- transport[methodName]( file, offset ).then(
retryDeferred.resolve, retryDeferred.reject );
- }, 3000 );
+ if ( this.config.useRetryTimeout !== false ) {
+ setTimeout( retry, 3000 );
+ } else {
+ retry();
+ }
return retryDeferred.promise();
};
diff --git a/tests/qunit/transports/mw.FormDataTransport.test.js
b/tests/qunit/transports/mw.FormDataTransport.test.js
index 9de3e28..3b0026f 100644
--- a/tests/qunit/transports/mw.FormDataTransport.test.js
+++ b/tests/qunit/transports/mw.FormDataTransport.test.js
@@ -25,6 +25,7 @@
chunkSize = chunkSize || 0;
config = {
+ useRetryTimeout: false,
chunkSize: chunkSize,
enableChunked: enableChunked,
maxPhpUploadSize: 0
--
To view, visit https://gerrit.wikimedia.org/r/208938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f00ce8d3259254434d82b75ca44a7e1b88613d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Assign weights to puppetmasters - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Assign weights to puppetmasters
..
Assign weights to puppetmasters
The puppetmaster class can accepts a loadfactor hash key. That is
mod_proxy's loadfactor parameter which is the normalized weighted load
applied to the worker. Use this to send twice the number of requests to
strontium than to palladium. palladium (the frontend) is anyway serving
more requests since it is:
- handling CA traffic
- handling reports
- handling file buckets
- handling volatile
It is also terminating client SSL traffic and reinitiating SSL
connections to the backends as well, so CPU usage is higher in
palladium. ganglia graphs prove the above as well:
http://ganglia.wikimedia.org/latest/?r=hourcs=ce=m=cpu_reporttab=chvn=hide-hf=falsehreg%5B%5D=palladium%7Cstrontium
Bug: T98128
Change-Id: Ic5faf01e2a0f9ff72c0f657e6b7421773974e1af
---
M manifests/role/puppetmaster.pp
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index 0c7f2ae..610b572 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -18,8 +18,14 @@
allow_from = $role::puppetmaster::config::allow_from,
server_type = 'frontend',
workers = [
-{ 'worker' = 'palladium.eqiad.wmnet', },
-{ 'worker' = 'strontium.eqiad.wmnet', },
+{
+'worker' = 'palladium.eqiad.wmnet',
+'loadfactor' = 10,
+},
+{
+'worker' = 'strontium.eqiad.wmnet',
+'loadfactor' = 20,
+},
],
config = {
'storeconfigs' = true, # Required by thin_storeconfigs on
puppet 3.x
--
To view, visit https://gerrit.wikimedia.org/r/208933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5faf01e2a0f9ff72c0f657e6b7421773974e1af
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
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 status for partial compliance. CompareResult has now a s... - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208943
Change subject: Add status for partial compliance. CompareResult has now a
status (returned by comparer) instead of a mismatch boolean.
..
Add status for partial compliance. CompareResult has now a status (returned by
comparer) instead of a mismatch boolean.
Change-Id: I29aada30641e6539a1306f7062537a2e3c75c812
---
M includes/CrossCheck/Comparer/EntityIdValueComparer.php
M includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/Comparer/StringValueComparer.php
M includes/CrossCheck/Comparer/TimeValueComparer.php
M includes/CrossCheck/Result/CompareResult.php
M includes/CrossCheck/Result/CrossCheckResult.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/Serializer/CompareResultSerializer.php
M tests/phpunit/CheckForCrossCheckViolationsJobTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/CrossCheck/Result/CompareResultTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
26 files changed, 180 insertions(+), 135 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/43/208943/1
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index fdff06a..0f5eda7 100755
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -46,6 +46,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -58,10 +59,10 @@
$terms = $this-getTerms( $entityId, $language );
if ( !empty( $terms ) ) {
-$match = $this-stringComparer-compareArrays( $terms,
$externalValues );
+$status = $this-stringComparer-compareArrays( $terms,
$externalValues );
$externalValues = $this-parseExternalValues( $externalValues,
$dumpMetaInformation );
-return new CompareResult( $localValue, $externalValues, !$match );
+return new CompareResult( $localValue, $externalValues, $status );
}
}
diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
old mode 100644
new mode 100755
index 952316a..d973fea
--- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
+++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
@@ -26,6 +26,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -38,16 +39,16 @@
$externalValues = $this-parseExternalValues( $externalValues,
$dumpMetaInformation );
-$dataMismatch = true;
+$status = CompareResult::STATUS_MISMATCH;
foreach ( $externalValues as $externalValue ) {
$formattedExternalValue = $globeFormatter-format( $externalValue
);
if ( $formattedLocalValue === $formattedExternalValue ) {
-$dataMismatch = false;
+$status = CompareResult::STATUS_COMPLIANCE;
break;
}
}
-return new CompareResult( $localValue, $externalValues, $dataMismatch
);
+return new CompareResult( $localValue, $externalValues, $status );
}
/**
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index b01990f..c39f0db
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/external-validation. Updated dependencies. Extension
can now be installed by composer.
Change-Id: I738aafbe4d898eb5b72efd77655df6ae174a7871
---
M composer.json
1 file changed, 13 insertions(+), 5 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index eaf2ea6..d134a95 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-external-validation,
+ name: wikibase/external-validation,
type: mediawiki-extension,
- description: Extension for WikidataQuality to perform cross checks
with external databases.,
+ description: Extension for WikibaseQuality to perform cross-checks
with external databases.,
+ keywords: [quality, trust, violation, external, database,
wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,12 +11,16 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1203/;
},
require: {
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
wikibase/data-model: ~2.6,
wikibase/data-model-serialization: ~1.3,
- serialization/serialization: 3.*,=3.2.1
+ serialization/serialization: 3.*,=3.2.1,
+ wikibase/quality: 1.x-dev
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -31,6 +36,9 @@
classmap: [
WikidataQualityExternalValidationHooks.php,
maintenance/UpdateTable.php
+ ],
+ files: [
+ WikidataQualityExternalValidation.php
]
}
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I738aafbe4d898eb5b72efd77655df6ae174a7871
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208950
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/quality. Extension can now be installed by composer.
Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
---
M composer.json
1 file changed, 7 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/50/208950/1
diff --git a/composer.json b/composer.json
index f7a7deb..e37fae5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality,
+ name: wikibase/quality,
type: mediawiki-extension,
- description: Extension for Wikibase to improve the data quality.,
+ description: Extension for Wikibase to improve the data quality and
trust.,
+ keywords: [quality, trust, violation, wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -14,8 +15,8 @@
},
require: {
php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~2.6,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
@@ -31,6 +32,9 @@
},
classmap: [
WikidataQualityHooks.php
+ ],
+ files: [
+ WikidataQuality.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/constraints. Updated dependencies. Extension can now
be installed by composer.
Change-Id: I5674d6c752dcb964b7a680704b414e6a00496df1
---
M composer.json
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index aeae88f..6966106 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-constraints,
+ name: wikibase/constraints,
type: mediawiki-extension,
- description: Extension for WikidataQuality to manage constraints in
Wikidata.,
+ description: Extension for WikibaseQuality to manage constraints in
Wikibase.,
+ keywords: [quality, trust, violation, constraint, wikibase,
wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,10 +11,14 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1202/;
},
require: {
- wikibase/data-model: ~2.6
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
+ wikibase/data-model: ~2.6,
+ wikibase/quality: 1.x-dev
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -27,6 +32,9 @@
},
classmap: [
WikidataQualityConstraintsHooks.php
+ ],
+ files: [
+ WikidataQualityConstraints.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5674d6c752dcb964b7a680704b414e6a00496df1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/constraints. Updated dependencies. Extension can now
be installed by composer.
Change-Id: Ib946d78d30bcb548a5b066c752a611b6fcf54592
---
M composer.json
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index aeae88f..8b5f4dc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-constraints,
+ name: wikibase/constraints,
type: mediawiki-extension,
- description: Extension for WikidataQuality to manage constraints in
Wikidata.,
+ description: Extension for WikibaseQuality to manage constraints in
Wikibase.,
+ keywords: [quality, trust, violation, constraint, wikibase,
wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,10 +11,14 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1202/;
},
require: {
- wikibase/data-model: ~2.6
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
+ wikibase/data-model: ~2.6,
+ wikibase/quality: dev-master
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -27,6 +32,9 @@
},
classmap: [
WikidataQualityConstraintsHooks.php
+ ],
+ files: [
+ WikidataQualityConstraints.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib946d78d30bcb548a5b066c752a611b6fcf54592
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent Alt+S being consumed by CX - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Prevent Alt+S being consumed by CX
..
Prevent Alt+S being consumed by CX
See
https://medium.com/medium-eng/the-curious-case-of-disappearing-polish-s-fa398313d4df
Also removed redundant e.preventDefault because
the handler is already returning false.
Change-Id: I5b5571f8a5c3e5101583cf56837f8f7c4f4722da
---
M modules/draft/ext.cx.draft.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/draft/ext.cx.draft.js b/modules/draft/ext.cx.draft.js
index bd23623..a3689b9 100644
--- a/modules/draft/ext.cx.draft.js
+++ b/modules/draft/ext.cx.draft.js
@@ -77,8 +77,8 @@
// Save when CTRL+S is pressed.
$( document ).on( 'keydown', function ( e ) {
- if ( e.ctrlKey e.which === 83 ) {
- e.preventDefault();
+ // See
https://medium.com/medium-eng/the-curious-case-of-disappearing-polish-s-fa398313d4df
+ if ( ( e.metaKey || e.ctrlKey !e.altKey ) e.which
=== 83 ) {
checkAndsave();
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/208936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b5571f8a5c3e5101583cf56837f8f7c4f4722da
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] removes withAnyProjects method from getTasks - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208941
Change subject: removes withAnyProjects method from getTasks
..
removes withAnyProjects method from getTasks
adds withEdgeLogicPHIDs instead
Bug: T97873
Change-Id: Icb550c9b033f5c8d1cee3132dd1095bb511f1663
---
M src/query/SprintQuery.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/41/208941/1
diff --git a/src/query/SprintQuery.php b/src/query/SprintQuery.php
index 58da39c..74dddb5 100644
--- a/src/query/SprintQuery.php
+++ b/src/query/SprintQuery.php
@@ -72,7 +72,10 @@
public function getTasks() {
$tasks = id(new ManiphestTaskQuery())
-setViewer($this-viewer)
--withAnyProjects(array($this-project-getPHID()))
+-withEdgeLogicPHIDs(
+PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
+PhabricatorQueryConstraint::OPERATOR_OR,
+array($this-project-getPHID()))
-needProjectPHIDs(true)
-execute();
if (empty($tasks)) {
--
To view, visit https://gerrit.wikimedia.org/r/208941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb550c9b033f5c8d1cee3132dd1095bb511f1663
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) christopher.john...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Notify apache on ganglia_new::web php.ini updates - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Notify apache on ganglia_new::web php.ini updates
..
Notify apache on ganglia_new::web php.ini updates
And some minor linting.
Change-Id: Id2b795b9b0b15443aab26131f54e0eb69fb8622c
---
M modules/ganglia_new/manifests/web.pp
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ganglia_new/manifests/web.pp
b/modules/ganglia_new/manifests/web.pp
index 5c6c167..8eb81dd 100644
--- a/modules/ganglia_new/manifests/web.pp
+++ b/modules/ganglia_new/manifests/web.pp
@@ -40,9 +40,10 @@
# Increase the default memory limit
augeas { 'php.ini-memory':
- context = '/files/etc/php5/apache2/php.ini/PHP',
- changes = [
-'set memory_limit 256M',
- ];
+context = '/files/etc/php5/apache2/php.ini/PHP',
+changes = [
+'set memory_limit 256M',
+],
+notify = Class['::apache']
}
}
--
To view, visit https://gerrit.wikimedia.org/r/208947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2b795b9b0b15443aab26131f54e0eb69fb8622c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Remove the 'options' argument from preRender and po... - change (mediawiki...WikiGrok)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Remove the 'options' argument from preRender and
postRender functions
..
Hygiene: Remove the 'options' argument from preRender and postRender functions
Depends on If8fc6b5223868ffd180b08ec931f6ca82e2223d5
Change-Id: I4598a5009ab3f189dd37603f7ed8021c07070dcf
---
M resources/dialog.c/WikiGrokDialogC.js
M resources/dialog/WikiGrokDialog.js
M resources/roulette/ErrorDrawer.js
3 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/dialog.c/WikiGrokDialogC.js
b/resources/dialog.c/WikiGrokDialogC.js
index 2518a91..6a4c5ce 100644
--- a/resources/dialog.c/WikiGrokDialogC.js
+++ b/resources/dialog.c/WikiGrokDialogC.js
@@ -91,16 +91,16 @@
/**
* @inheritdoc
*/
- postRender: function ( options ) {
+ postRender: function () {
var self = this;
- Drawer.prototype.postRender.apply( this, arguments );
+ Drawer.prototype.postRender.apply( this );
// Don't run this when rendering the Badge template
- if ( !options.beginQuestions ) {
- options.beginQuestions = true;
+ if ( !this.options.beginQuestions ) {
+ this.options.beginQuestions = true;
- self.askWikidataQuestion( options );
+ self.askWikidataQuestion( this.options );
// Silently fetch the next page
wikiGrokRoulette.getNextPage();
diff --git a/resources/dialog/WikiGrokDialog.js
b/resources/dialog/WikiGrokDialog.js
index 5c62d96..e1ba990 100644
--- a/resources/dialog/WikiGrokDialog.js
+++ b/resources/dialog/WikiGrokDialog.js
@@ -438,12 +438,10 @@
/**
* @inheritdoc
*/
- postRender: function ( options ) {
- if ( options.campaign !options.beginQuestions ) {
-
+ postRender: function () {
+ if ( this.options.campaign
!this.options.beginQuestions ) {
// Show the intro pane once.
- options.beginQuestions = true;
-
+ this.options.beginQuestions = true;
this._showIntroPane();
}
},
diff --git a/resources/roulette/ErrorDrawer.js
b/resources/roulette/ErrorDrawer.js
index 5721314..c513ea5 100644
--- a/resources/roulette/ErrorDrawer.js
+++ b/resources/roulette/ErrorDrawer.js
@@ -25,7 +25,7 @@
*/
postRender: function () {
var self = this;
- Drawer.prototype.postRender.apply( this, arguments );
+ Drawer.prototype.postRender.apply( this );
this.$el.find( '.close' ).on( 'click', function () {
self.detach();
} );
--
To view, visit https://gerrit.wikimedia.org/r/207011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4598a5009ab3f189dd37603f7ed8021c07070dcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
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 MoodBar from Extensions Used by Wikimedia - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Remove MoodBar from Extensions Used by Wikimedia .. Remove MoodBar from Extensions Used by Wikimedia MoodBar is only used in a very small number of wikis, its development is officially stopped and there are no plans to deploy it to more projects. Removing it from the used by Wikimedia group will reduce a bit of the load on the translators who want to focus on translation of Wikimedia projects' software. Change-Id: Idec321392f938fcb81c11a190c9360e75b44e594 --- M groups/MediaWiki/WikimediaAgg.yaml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index a4c216f..8281a18 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -66,7 +66,6 @@ - ext-mapsources # wikivoyage - ext-massmessage - ext-mobileapp - - ext-moodbar # r93131 - ext-multimediaviewer # Change id ecfa294d4b158aa5c44c166fa883d8ceef7d357d - ext-mwembedsupport - ext-navigationtiming # 2013-03-14: all wikis -- To view, visit https://gerrit.wikimedia.org/r/208917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idec321392f938fcb81c11a190c9360e75b44e594 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208944
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/external-validation. Updated dependencies. Extension
can now be installed by composer.
Change-Id: I738aafbe4d898eb5b72efd77655df6ae174a7871
---
M composer.json
1 file changed, 13 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/44/208944/1
diff --git a/composer.json b/composer.json
index eaf2ea6..d134a95 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-external-validation,
+ name: wikibase/external-validation,
type: mediawiki-extension,
- description: Extension for WikidataQuality to perform cross checks
with external databases.,
+ description: Extension for WikibaseQuality to perform cross-checks
with external databases.,
+ keywords: [quality, trust, violation, external, database,
wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,12 +11,16 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1203/;
},
require: {
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
wikibase/data-model: ~2.6,
wikibase/data-model-serialization: ~1.3,
- serialization/serialization: 3.*,=3.2.1
+ serialization/serialization: 3.*,=3.2.1,
+ wikibase/quality: 1.x-dev
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -31,6 +36,9 @@
classmap: [
WikidataQualityExternalValidationHooks.php,
maintenance/UpdateTable.php
+ ],
+ files: [
+ WikidataQualityExternalValidation.php
]
}
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I738aafbe4d898eb5b72efd77655df6ae174a7871
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace articles with pages - change (mediawiki...VisualEditor)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/208952 Change subject: Replace articles with pages .. Replace articles with pages This is the usual convention for consistency and portability. Change-Id: I2df05ee38d85aa42b79a189bebaa176c2b2c6c4b --- M modules/ve-mw/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/52/208952/1 diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json index 1fc483b..234b13a 100644 --- a/modules/ve-mw/i18n/en.json +++ b/modules/ve-mw/i18n/en.json @@ -242,7 +242,7 @@ visualeditor-formatdropdown-format-mw-heading6: Sub-heading 4, visualeditor-languages-tool: Languages, visualeditor-linkinspector-button-link-external: External link, - visualeditor-linkinspector-button-link-internal: Search articles, + visualeditor-linkinspector-button-link-internal: Search pages, visualeditor-linkinspector-description-new-page: page does not exist yet, visualeditor-linkinspector-description-redirect: redirect to $1, visualeditor-linkinspector-illegal-title: Invalid page title, -- To view, visit https://gerrit.wikimedia.org/r/208952 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2df05ee38d85aa42b79a189bebaa176c2b2c6c4b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Move mobile.editor.common to resources folder - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Move mobile.editor.common to resources folder .. Hygiene: Move mobile.editor.common to resources folder Changes: * Do not duplicate existing template * Make talk overlays dependent on common editor code Change-Id: Idfcb34f229fbd00b340ac6e623ddd125b96462d2 --- M includes/Resources.php R resources/mobile.editor.common/EditorOverlayAnonWarning.hogan R resources/mobile.editor.common/EditorOverlayBase.hogan R resources/mobile.editor.common/EditorOverlayBase.js R resources/mobile.editor.common/editHeader.hogan R resources/mobile.editor.common/editor.less R resources/mobile.editor.common/images/editSourceNormal.svg R resources/mobile.editor.common/images/editToggle.svg R resources/mobile.editor.common/images/editVeNormal.svg R resources/mobile.editor.common/previewHeader.hogan R resources/mobile.editor.common/saveHeader.hogan M resources/mobile.talk.overlays/TalkSectionAddOverlay.js 12 files changed, 10 insertions(+), 9 deletions(-) Approvals: Phuedx: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index b376a3b..c10fef2 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -511,17 +511,18 @@ 'mobile.drawers', ), 'scripts' = array( - 'javascripts/modules/editor/EditorOverlayBase.js', + 'resources/mobile.editor.common/EditorOverlayBase.js', ), 'styles' = array( - 'less/modules/editor/editor.less', + 'resources/mobile.editor.common/editor.less', ), 'templates' = array( - 'editHeader.hogan' = 'templates/modules/editor/editHeader.hogan', - 'previewHeader.hogan' = 'templates/modules/editor/previewHeader.hogan', - 'saveHeader.hogan' = 'templates/modules/editor/saveHeader.hogan', - 'EditorOverlayBase.hogan' = 'templates/modules/editor/EditorOverlayBase.hogan', - 'EditorOverlayAnonWarning.hogan' = 'templates/modules/editor/EditorOverlayAnonWarning.hogan', + 'editHeader.hogan' = 'resources/mobile.editor.common/editHeader.hogan', + 'previewHeader.hogan' = 'resources/mobile.editor.common/previewHeader.hogan', + 'saveHeader.hogan' = 'resources/mobile.editor.common/saveHeader.hogan', + 'EditorOverlayBase.hogan' = 'resources/mobile.editor.common/EditorOverlayBase.hogan', + 'EditorOverlayAnonWarning.hogan' = + 'resources/mobile.editor.common/EditorOverlayAnonWarning.hogan', ), 'messages' = array( // modules/editor/EditorOverlay.js @@ -701,6 +702,7 @@ 'dependencies' = array( 'mobile.talk', 'mediawiki.ui.anchor', + 'mobile.editor.common', ), 'scripts' = array( 'resources/mobile.talk.overlays/TalkSectionOverlay.js', @@ -712,7 +714,6 @@ 'content.hogan' = 'resources/mobile.talk.overlays/content.hogan', 'SectionAddOverlay/contentHeader.hogan' = 'resources/mobile.talk.overlays/talkSectionAddContentHeader.hogan', - 'SectionAddOverlay/saveHeader.hogan' = 'templates/modules/editor/saveHeader.hogan', 'SectionAddOverlay.hogan' = 'resources/mobile.talk.overlays/talkSectionAdd.hogan', 'Section/header.hogan' = 'resources/mobile.talk.overlays/talkSectionHeader.hogan', 'Section/content.hogan' = 'resources/mobile.talk.overlays/talkSection.hogan', diff --git a/templates/modules/editor/EditorOverlayAnonWarning.hogan b/resources/mobile.editor.common/EditorOverlayAnonWarning.hogan similarity index 100% rename from templates/modules/editor/EditorOverlayAnonWarning.hogan rename to resources/mobile.editor.common/EditorOverlayAnonWarning.hogan diff --git a/templates/modules/editor/EditorOverlayBase.hogan b/resources/mobile.editor.common/EditorOverlayBase.hogan similarity index 100% rename from templates/modules/editor/EditorOverlayBase.hogan rename to resources/mobile.editor.common/EditorOverlayBase.hogan diff --git a/javascripts/modules/editor/EditorOverlayBase.js b/resources/mobile.editor.common/EditorOverlayBase.js similarity index 100% rename from javascripts/modules/editor/EditorOverlayBase.js rename to resources/mobile.editor.common/EditorOverlayBase.js diff --git a/templates/modules/editor/editHeader.hogan b/resources/mobile.editor.common/editHeader.hogan similarity index 100%
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208940
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/quality. Extension can now be installed by composer.
Change-Id: I7e7d107a3d8c799e2c407a681e4b86f7bcbfb049
---
M composer.json
1 file changed, 7 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/40/208940/1
diff --git a/composer.json b/composer.json
index 628ad99..9769032 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality,
+ name: wikibase/quality,
type: mediawiki-extension,
- description: Extension for Wikibase to improve the data quality.,
+ description: Extension for Wikibase to improve the data quality and
trust.,
+ keywords: [quality, trust, violation, wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -14,8 +15,8 @@
},
require: {
php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~2.6,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
@@ -30,6 +31,9 @@
},
classmap: [
WikidataQualityHooks.php
+ ],
+ files: [
+ WikidataQuality.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e7d107a3d8c799e2c407a681e4b86f7bcbfb049
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change label text from 'Lookup' to 'Generate' - change (mediawiki...Citoid)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208951
Change subject: Change label text from 'Lookup' to 'Generate'
..
Change label text from 'Lookup' to 'Generate'
Bug: T97353
Change-Id: I35825b5f91d2f9b1e31c034d423458125059254f
---
M extension.json
M i18n/en.json
M i18n/qqq.json
3 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid
refs/changes/51/208951/1
diff --git a/extension.json b/extension.json
index f186afd..4ec00a2 100644
--- a/extension.json
+++ b/extension.json
@@ -2,7 +2,8 @@
name: Citoid,
version: 0.1.0,
author: [
- Marielle Volz
+ Marielle Volz,
+ Moriel Schottlender
],
url: https://www.mediawiki.org/wiki/Citoid;,
descriptionmsg: citoid-desc,
diff --git a/i18n/en.json b/i18n/en.json
index 147942c..2147e9d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,7 +5,7 @@
citoid-520-error: Unable to retrieve information from the provided
identifier.,
citoid-citation-widget-insert-button: Insert,
citoid-citeFromIDDialog-back: Back,
- citoid-citeFromIDDialog-lookup-button: Lookup,
+ citoid-citeFromIDDialog-lookup-button: Generate,
citoid-citeFromIDDialog-search: Search,
citoid-citeFromIDDialog-search-label: URL or DOI,
citoid-citeFromIDDialog-search-placeholder: e.g.
http://www.example.com;,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5120f4d..a76eacf 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,8 +9,8 @@
},
citoid-520-error: Error message for when citoid service returns a
520 error,
citoid-citation-widget-insert-button: Label for the button to insert
a chosen reference.\n{{Identical|Insert}},
- citoid-citeFromIDDialog-back: Label for the button to go back to the
lookup panel in the inspector.\n{{Identical|Back}},
- citoid-citeFromIDDialog-lookup-button: Label for the lookup button
for citation inputs. Unlike \search\, \lookup\ is a process in which there
is certainty that a particular result will be found, for example, matching a
valid ISBN to a book title.\n{{Identical|Lookup}},
+ citoid-citeFromIDDialog-back: Label for the button to go back to the
generate panel in the inspector.\n{{Identical|Back}},
+ citoid-citeFromIDDialog-lookup-button: Label for the generate button
for citation inputs. Unlike \search\, \generate\ is a process in which
there is certainty that a particular result will be found, for example,
matching a valid ISBN to a book title.\n{{Identical|Generate}},
citoid-citeFromIDDialog-search: Text for the search
button.\n{{Identical|Search}},
citoid-citeFromIDDialog-search-label: Label for the URL/DOI search
field.,
citoid-citeFromIDDialog-search-placeholder: Placeholder for the
URL/DOI search field.,
--
To view, visit https://gerrit.wikimedia.org/r/208951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35825b5f91d2f9b1e31c034d423458125059254f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Mvolz mv...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add empty span for indicators to the snakview - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Add empty span for indicators to the snakview .. Add empty span for indicators to the snakview Advantages of this solution: * It works everywhere, in main snaks, qualifiers and references. * It's independent from the skin and the planned redesign because it simply inlines smoothly with the value. Disadvantages: * It's the same class name for all indicator elements. You need a good CSS selector to target the correct element. Shouldn't be that hard: start with the statement GUID and then go deeper, possibly using in the selector. * The icons are not aligned. They are simply appended to the end of the values. * There is no default padding. Each icon added to the empty element should come with a good padding that works in both LTR and RTL contexts, e.g. padding: 0 0.5em. Bug: T95403 Change-Id: I8250979fd105f2b9a3eb1c4ab188e3df15bfcd1a --- M view/resources/templates.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/view/resources/templates.php b/view/resources/templates.php index 627acb5..0633a43 100644 --- a/view/resources/templates.php +++ b/view/resources/templates.php @@ -70,7 +70,7 @@ /div div class=wikibase-snakview-value-container dir=auto div class=wikibase-snakview-typeselector/div - div class=wikibase-snakview-value $2$3/div + div class=wikibase-snakview-value $2$3span class=wb-indicator/span/div /div /div HTML; -- To view, visit https://gerrit.wikimedia.org/r/207449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8250979fd105f2b9a3eb1c4ab188e3df15bfcd1a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: WMDE-Fisch christoph.fisc...@wikimedia.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQuality)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208942
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/quality. Extension can now be installed by composer.
Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
---
M composer.json
1 file changed, 7 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQuality
refs/changes/42/208942/1
diff --git a/composer.json b/composer.json
index 628ad99..9769032 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality,
+ name: wikibase/quality,
type: mediawiki-extension,
- description: Extension for Wikibase to improve the data quality.,
+ description: Extension for Wikibase to improve the data quality and
trust.,
+ keywords: [quality, trust, violation, wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -14,8 +15,8 @@
},
require: {
php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~2.6,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
@@ -30,6 +31,9 @@
},
classmap: [
WikidataQualityHooks.php
+ ],
+ files: [
+ WikidataQuality.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208949
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/constraints. Updated dependencies. Extension can now
be installed by composer.
Change-Id: Ib946d78d30bcb548a5b066c752a611b6fcf54592
---
M composer.json
1 file changed, 12 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/49/208949/1
diff --git a/composer.json b/composer.json
index aeae88f..8b5f4dc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-constraints,
+ name: wikibase/constraints,
type: mediawiki-extension,
- description: Extension for WikidataQuality to manage constraints in
Wikidata.,
+ description: Extension for WikibaseQuality to manage constraints in
Wikibase.,
+ keywords: [quality, trust, violation, constraint, wikibase,
wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,10 +11,14 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1202/;
},
require: {
- wikibase/data-model: ~2.6
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
+ wikibase/data-model: ~2.6,
+ wikibase/quality: dev-master
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -27,6 +32,9 @@
},
classmap: [
WikidataQualityConstraintsHooks.php
+ ],
+ files: [
+ WikidataQualityConstraints.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib946d78d30bcb548a5b066c752a611b6fcf54592
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add status for partial compliance. CompareResult has now a s... - change (mediawiki...WikidataQualityExternalValidation)
Dominic.sauer has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208948
Change subject: Add status for partial compliance. CompareResult has now a
status (returned by comparer) instead of a mismatch boolean.
..
Add status for partial compliance. CompareResult has now a status (returned by
comparer) instead of a mismatch boolean.
Change-Id: I29aada30641e6539a1306f7062537a2e3c75c812
---
M includes/CrossCheck/Comparer/EntityIdValueComparer.php
M includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
M includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
M includes/CrossCheck/Comparer/MultilingualTextValueComparer.php
M includes/CrossCheck/Comparer/QuantityValueComparer.php
M includes/CrossCheck/Comparer/StringComparer.php
M includes/CrossCheck/Comparer/StringValueComparer.php
M includes/CrossCheck/Comparer/TimeValueComparer.php
M includes/CrossCheck/Result/CompareResult.php
M includes/CrossCheck/Result/CrossCheckResult.php
M includes/CrossCheck/Result/CrossCheckResultList.php
M includes/Serializer/CompareResultSerializer.php
M tests/phpunit/CheckForCrossCheckViolationsJobTest.php
M tests/phpunit/CrossCheck/Comparer/EntityIdValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/GlobeCoordinateValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MonolingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/MultilingualTextValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/QuantityValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringComparerTest.php
M tests/phpunit/CrossCheck/Comparer/StringValueComparerTest.php
M tests/phpunit/CrossCheck/Comparer/TimeValueComparerTest.php
M tests/phpunit/CrossCheck/Result/CompareResultTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultListTest.php
M tests/phpunit/CrossCheck/Result/CrossCheckResultTest.php
M tests/phpunit/Serializer/CompareResultSerializerTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
26 files changed, 202 insertions(+), 135 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/48/208948/1
diff --git a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
index fdff06a..0f5eda7 100755
--- a/includes/CrossCheck/Comparer/EntityIdValueComparer.php
+++ b/includes/CrossCheck/Comparer/EntityIdValueComparer.php
@@ -46,6 +46,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -58,10 +59,10 @@
$terms = $this-getTerms( $entityId, $language );
if ( !empty( $terms ) ) {
-$match = $this-stringComparer-compareArrays( $terms,
$externalValues );
+$status = $this-stringComparer-compareArrays( $terms,
$externalValues );
$externalValues = $this-parseExternalValues( $externalValues,
$dumpMetaInformation );
-return new CompareResult( $localValue, $externalValues, !$match );
+return new CompareResult( $localValue, $externalValues, $status );
}
}
diff --git a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
old mode 100644
new mode 100755
index 952316a..d973fea
--- a/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
+++ b/includes/CrossCheck/Comparer/GlobeCoordinateValueComparer.php
@@ -26,6 +26,7 @@
* @param DataValue $localValue
* @param array $externalValues
* @param DumpMetaInformation $dumpMetaInformation
+ * @throws InvalidArgumentException
* @return CompareResult
*/
public function compare( DataValue $localValue, array $externalValues,
DumpMetaInformation $dumpMetaInformation ) {
@@ -38,16 +39,16 @@
$externalValues = $this-parseExternalValues( $externalValues,
$dumpMetaInformation );
-$dataMismatch = true;
+$status = CompareResult::STATUS_MISMATCH;
foreach ( $externalValues as $externalValue ) {
$formattedExternalValue = $globeFormatter-format( $externalValue
);
if ( $formattedLocalValue === $formattedExternalValue ) {
-$dataMismatch = false;
+$status = CompareResult::STATUS_COMPLIANCE;
break;
}
}
-return new CompareResult( $localValue, $externalValues, $dataMismatch
);
+return new CompareResult( $localValue, $externalValues, $status );
}
/**
diff --git a/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
b/includes/CrossCheck/Comparer/MonolingualTextValueComparer.php
index b01990f..c39f0db
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityConstraints)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208946
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/constraints. Updated dependencies. Extension can now
be installed by composer.
Change-Id: I5674d6c752dcb964b7a680704b414e6a00496df1
---
M composer.json
1 file changed, 12 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityConstraints
refs/changes/46/208946/1
diff --git a/composer.json b/composer.json
index aeae88f..6966106 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-constraints,
+ name: wikibase/constraints,
type: mediawiki-extension,
- description: Extension for WikidataQuality to manage constraints in
Wikidata.,
+ description: Extension for WikibaseQuality to manage constraints in
Wikibase.,
+ keywords: [quality, trust, violation, constraint, wikibase,
wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,10 +11,14 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1202/;
},
require: {
- wikibase/data-model: ~2.6
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
+ wikibase/data-model: ~2.6,
+ wikibase/quality: 1.x-dev
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -27,6 +32,9 @@
},
classmap: [
WikidataQualityConstraintsHooks.php
+ ],
+ files: [
+ WikidataQualityConstraints.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5674d6c752dcb964b7a680704b414e6a00496df1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityConstraints
Gerrit-Branch: v1
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Notify apache on ganglia_new::web php.ini updates - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208947
Change subject: Notify apache on ganglia_new::web php.ini updates
..
Notify apache on ganglia_new::web php.ini updates
And some minor linting.
Change-Id: Id2b795b9b0b15443aab26131f54e0eb69fb8622c
---
M modules/ganglia_new/manifests/web.pp
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/208947/1
diff --git a/modules/ganglia_new/manifests/web.pp
b/modules/ganglia_new/manifests/web.pp
index 5c6c167..57d77dd 100644
--- a/modules/ganglia_new/manifests/web.pp
+++ b/modules/ganglia_new/manifests/web.pp
@@ -40,9 +40,10 @@
# Increase the default memory limit
augeas { 'php.ini-memory':
- context = '/files/etc/php5/apache2/php.ini/PHP',
- changes = [
+context = '/files/etc/php5/apache2/php.ini/PHP',
+changes = [
'set memory_limit 256M',
- ];
+];
+notify = Class['::apache']
}
}
--
To view, visit https://gerrit.wikimedia.org/r/208947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2b795b9b0b15443aab26131f54e0eb69fb8622c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQuality)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/quality. Extension can now be installed by composer.
Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
---
M composer.json
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index f7a7deb..e37fae5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality,
+ name: wikibase/quality,
type: mediawiki-extension,
- description: Extension for Wikibase to improve the data quality.,
+ description: Extension for Wikibase to improve the data quality and
trust.,
+ keywords: [quality, trust, violation, wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -14,8 +15,8 @@
},
require: {
php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
wikibase/data-model: ~2.6,
- wikibase/data-model-serialization: ~1.3,
serialization/serialization: 3.*,=3.2.1
},
require-dev: {
@@ -31,6 +32,9 @@
},
classmap: [
WikidataQualityHooks.php
+ ],
+ files: [
+ WikidataQuality.php
]
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b9bb5c1ffe988488dfa0e4c73781dd8a995a002
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQuality
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move ContentTranslation to Main Extensions Used by Wikimedia - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Move ContentTranslation to Main Extensions Used by Wikimedia .. Move ContentTranslation to Main Extensions Used by Wikimedia It's being quickly deployed to more and more languages and becoming a major gateway to article creation, so its UI should be translated everywhere. Change-Id: I310af74dbc9f1444613d3c8f036233c5a4007dcd --- M groups/MediaWiki/WikimediaAgg.yaml M groups/MediaWiki/WikimediaMainAgg.yaml 2 files changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index a4c216f..82a414b 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -22,7 +22,6 @@ - ext-codereview # MediaWiki.org - ext-commonsmetadata # Change id ecfa294d4b158aa5c44c166fa883d8ceef7d357d - ext-contactpage # on nl.wp and wikimediafoundation.org - - ext-contenttranslation - ext-contributionreporting # wikimediafoundation.org - ext-contributiontracking # wikimediafoundation.org - ext-creditssource # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage diff --git a/groups/MediaWiki/WikimediaMainAgg.yaml b/groups/MediaWiki/WikimediaMainAgg.yaml index 5857077..f181395 100644 --- a/groups/MediaWiki/WikimediaMainAgg.yaml +++ b/groups/MediaWiki/WikimediaMainAgg.yaml @@ -21,6 +21,7 @@ - ext-collection - ext-confirmedit - ext-confirmeditfancycaptcha + - ext-contenttranslation - ext-disambiguator - ext-dismissablesitenotice - ext-echo -- To view, visit https://gerrit.wikimedia.org/r/208512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I310af74dbc9f1444613d3c8f036233c5a4007dcd Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208945
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/external-validation. Updated dependencies. Extension
can now be installed by composer.
Change-Id: I12d4461342a8b79bbafc002d87b1c8ad7bc98e57
---
M composer.json
1 file changed, 13 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataQualityExternalValidation
refs/changes/45/208945/1
diff --git a/composer.json b/composer.json
index eaf2ea6..4a3247e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-external-validation,
+ name: wikibase/external-validation,
type: mediawiki-extension,
- description: Extension for WikidataQuality to perform cross checks
with external databases.,
+ description: Extension for WikibaseQuality to perform cross-checks
with external databases.,
+ keywords: [quality, trust, violation, external, database,
wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,12 +11,16 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1203/;
},
require: {
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
wikibase/data-model: ~2.6,
wikibase/data-model-serialization: ~1.3,
- serialization/serialization: 3.*,=3.2.1
+ serialization/serialization: 3.*,=3.2.1,
+ wikibase/quality: dev-master
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -31,6 +36,9 @@
classmap: [
WikidataQualityExternalValidationHooks.php,
maintenance/UpdateTable.php
+ ],
+ files: [
+ WikidataQualityExternalValidation.php
]
}
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12d4461342a8b79bbafc002d87b1c8ad7bc98e57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adopted composer.json. - change (mediawiki...WikidataQualityExternalValidation)
Soeren.oldag has submitted this change and it was merged.
Change subject: Adopted composer.json.
..
Adopted composer.json.
Changed name to wikibase/external-validation. Updated dependencies. Extension
can now be installed by composer.
Change-Id: I12d4461342a8b79bbafc002d87b1c8ad7bc98e57
---
M composer.json
1 file changed, 13 insertions(+), 5 deletions(-)
Approvals:
Soeren.oldag: Verified; Looks good to me, approved
diff --git a/composer.json b/composer.json
index eaf2ea6..4a3247e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
{
- name: wikidataquality/wikidata-quality-external-validation,
+ name: wikibase/external-validation,
type: mediawiki-extension,
- description: Extension for WikidataQuality to perform cross checks
with external databases.,
+ description: Extension for WikibaseQuality to perform cross-checks
with external databases.,
+ keywords: [quality, trust, violation, external, database,
wikibase, wikidata],
homepage: https://www.mediawiki.org/wiki/WikidataQuality/;,
license: GPL-2.0+,
authors: [
@@ -10,12 +11,16 @@
}
],
support: {
- issues:
https://phabricator.wikimedia.org/project/profile/989/;
+ issues:
https://phabricator.wikimedia.org/project/profile/1203/;
},
require: {
+ php: =5.3.0,
+ composer/installers: 1.*,=1.0.1,
+ wikibase/wikibase: dev-master,
wikibase/data-model: ~2.6,
wikibase/data-model-serialization: ~1.3,
- serialization/serialization: 3.*,=3.2.1
+ serialization/serialization: 3.*,=3.2.1,
+ wikibase/quality: dev-master
},
require-dev: {
phpunit/phpunit: ~4.5,
@@ -31,6 +36,9 @@
classmap: [
WikidataQualityExternalValidationHooks.php,
maintenance/UpdateTable.php
+ ],
+ files: [
+ WikidataQualityExternalValidation.php
]
}
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/208945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12d4461342a8b79bbafc002d87b1c8ad7bc98e57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataQualityExternalValidation
Gerrit-Branch: master
Gerrit-Owner: Soeren.oldag soeren_ol...@freenet.de
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Soeren.oldag soeren_ol...@freenet.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Conversion to using WAN cache - change (mediawiki...PageTriage)
jenkins-bot has submitted this change and it was merged.
Change subject: Conversion to using WAN cache
..
Conversion to using WAN cache
Bug: T93141
Change-Id: I27392d59dae39953b1054e51620b329c6491721a
---
M includes/ArticleMetadata.php
M includes/PageTriage.php
M includes/PageTriageUtil.php
3 files changed, 11 insertions(+), 56 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ArticleMetadata.php b/includes/ArticleMetadata.php
old mode 100644
new mode 100755
index c6854e5..abb388f
--- a/includes/ArticleMetadata.php
+++ b/includes/ArticleMetadata.php
@@ -42,54 +42,20 @@
}
/**
-* Update the metadata in cache
-* @param $update array - key = value pair for update
-* @param $pageId int
-*/
- public function updateMetadataInCache( $update, $pageId = null ) {
- global $wgMemc;
-
- $keyPrefix = $this-memcKeyPrefix();
-
- if ( $pageId ) {
- $pageId = array( $pageId );
- } else {
- $pageId = $this-mPageId;
- }
-
- foreach ( $pageId as $val ) {
- $wgMemc-merge(
- $keyPrefix . '-' . $val,
- function( BagOStuff $cache, $key, $data ) use(
$update ) {
- // data exists in cache, update the data
- if ( $data !== false ) {
- return array_merge( $data,
$update );
- // data doesn't exist in cache, don't
do anything
- // with the partial update
- } else {
- return false;
- }
- },
- 86400
- );
- }
- }
-
- /**
* Flush the metadata in cache
* @param $pageId - page id to be flushed, if null is provided, all
* page id in $this-mPageId will be flushed
*/
public function flushMetadataFromCache( $pageId = null ) {
- global $wgMemc;
+ $cache = ObjectCache::getMainWANInstance();
$keyPrefix = $this-memcKeyPrefix();
if ( is_null( $pageId ) ) {
foreach ( $this-mPageId as $pageId ) {
- $wgMemc-delete( $keyPrefix . '-' . $pageId );
+ $cache-delete( $keyPrefix . '-' . $pageId );
}
} else {
- $wgMemc-delete( $keyPrefix . '-' . $pageId );
+ $cache-delete( $keyPrefix . '-' . $pageId );
}
}
@@ -99,10 +65,9 @@
* @param $singleData mixed - data to be saved
*/
public function setMetadataToCache( $pageId, $singleData ) {
- global $wgMemc;
-
+ $cache = ObjectCache::getMainWANInstance();
$this-flushMetadataFromCache( $pageId );
- $wgMemc-set( $this-memcKeyPrefix() . '-' . $pageId,
$singleData, 86400 ); // 24 hours
+ $cache-set( $this-memcKeyPrefix() . '-' . $pageId,
$singleData, 86400 ); // 24 hours
}
/**
@@ -112,21 +77,21 @@
* @return array
*/
public function getMetadataFromCache( $pageId = null ) {
- global $wgMemc;
+ $cache = ObjectCache::getMainWANInstance();
$keyPrefix = $this-memcKeyPrefix();
if ( is_null( $pageId ) ) {
$metaData = array();
foreach ( $this-mPageId as $pageId ) {
- $metaDataCache = $wgMemc-get( $keyPrefix . '-'
. $pageId );
+ $metaDataCache = $cache-get( $keyPrefix . '-'
. $pageId );
if ( $metaDataCache !== false ) {
$metaData[$pageId] = $metaDataCache;
}
}
return $metaData;
} else {
- return $wgMemc-get( $keyPrefix . '-' . $pageId );
+ return $cache-get( $keyPrefix . '-' . $pageId );
}
}
@@ -243,8 +208,8 @@
*/
public static function getValidTags() {
global $wgPageTriageCacheVersion, $wgMemc;
- $key = wfMemcKey( 'pagetriage', 'valid', 'tags',
$wgPageTriageCacheVersion );
+ $key = wfMemcKey( 'pagetriage', 'valid', 'tags',
$wgPageTriageCacheVersion );
$tags = $wgMemc-get( $key
[MediaWiki-commits] [Gerrit] Revert Append drawers to body so they can work in other skins - change (mediawiki...MobileFrontend)
Phuedx has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208953
Change subject: Revert Append drawers to body so they can work in other skins
..
Revert Append drawers to body so they can work in other skins
This reverts commit c3553073c1440ac2c27613a5481b40815c7f5ca9.
Bug: T97621
Change-Id: If2c2e90ec780998bd2185d9648469c60d2494073
---
M resources/mobile.drawers/Drawer.js
M resources/mobile.startup/init.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/53/208953/1
diff --git a/resources/mobile.drawers/Drawer.js
b/resources/mobile.drawers/Drawer.js
index 3ee2e37..d4e627c 100644
--- a/resources/mobile.drawers/Drawer.js
+++ b/resources/mobile.drawers/Drawer.js
@@ -14,7 +14,7 @@
* Defines an element that the Drawer should automatically be
appended to.
* @property {String}
*/
- appendToElement: 'body',
+ appendToElement: '#mw-mf-viewport',
closeOnScroll: true,
events: $.extend( {}, Panel.prototype.events, {
click: 'stopPropagation'
diff --git a/resources/mobile.startup/init.js b/resources/mobile.startup/init.js
index 814dca6..92d7ea1 100644
--- a/resources/mobile.startup/init.js
+++ b/resources/mobile.startup/init.js
@@ -15,7 +15,7 @@
Skin = M.require( 'Skin' );
skin = new Skin( {
- el: 'body',
+ el: '#mw-mf-viewport',
tabletModules: mw.config.get( 'skin' ) === 'minerva' ? [
'tablet.scripts' ] : [],
page: getCurrentPage(),
mainMenu: new MainMenu()
--
To view, visit https://gerrit.wikimedia.org/r/208953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2c2e90ec780998bd2185d9648469c60d2494073
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP fold parseResponseXX calls into processResponse - change (mediawiki...DonationInterface)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209154
Change subject: WIP fold parseResponseXX calls into processResponse
..
WIP fold parseResponseXX calls into processResponse
FIXME: this is not the win I was hoping for. Turns our there's
not a ton of parallel switch structure in many gateways.
Change-Id: I7dd03e4a37d9e7e3938c2c5747d19d448e319d5b
---
M adyen_gateway/adyen.adapter.php
M amazon_gateway/amazon.adapter.php
M astropay_gateway/astropay.adapter.php
M gateway_common/GatewayPage.php
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M paypal_gateway/paypal.adapter.php
M tests/Adapter/Astropay/AstropayTest.php
M worldpay_gateway/worldpay.adapter.php
9 files changed, 140 insertions(+), 128 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/54/209154/1
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index dbffef8..d811270 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -462,20 +462,24 @@
return $queryvals;
}
- function processResponse( $response ) {
+ /**
+* For Adyen, we only call this on the donor's return to the
ResultSwitcher
+* @param array $response GET/POST params from request
+* @throws ResponseProcessingException
+*/
+ public function processResponse( $response ) {
// Always called outside do_transaction, so just make a new
response object
$this-transaction_result = new PaymentTransactionResponse();
- if ( empty( $response ) || empty( $response['data'] ) ) {
+ if ( empty( $response ) ) {
$this-logger-info( No response from gateway );
throw new ResponseProcessingException(
'No response from gateway',
ResponseCodes::NO_RESPONSE
);
}
- $request_vars = $response['data'];
- $this-logger-info( Processing user return data: . print_r(
$request_vars, TRUE ) );
+ $this-logger-info( Processing user return data: . print_r(
$response , TRUE ) );
- if ( !$this-checkResponseSignature( $request_vars ) ) {
+ if ( !$this-checkResponseSignature( $response ) ) {
$this-logger-info( Bad signature in response );
throw new ResponseProcessingException(
'Bad signature in response',
@@ -484,9 +488,9 @@
}
$this-logger-debug( 'Good signature' );
- $gateway_txn_id = isset( $request_vars[ 'pspReference' ] ) ?
$request_vars[ 'pspReference' ] : '';
+ $gateway_txn_id = isset( $response [ 'pspReference' ] ) ?
$response [ 'pspReference' ] : '';
- $result_code = isset( $request_vars[ 'authResult' ] ) ?
$request_vars[ 'authResult' ] : '';
+ $result_code = isset( $response [ 'authResult' ] ) ? $response
[ 'authResult' ] : '';
if ( $result_code == 'PENDING' || $result_code == 'AUTHORISED'
) {
// Both of these are listed as pending because we have
to submit a capture
// request on 'AUTHORIZATION' ipn message receipt.
@@ -495,9 +499,9 @@
}
else {
$this-finalizeInternalStatus( FinalStatus::FAILED );
- $this-logger-info( Negative response from gateway.
Full response: . print_r( $request_vars, TRUE ) );
+ $this-logger-info( Negative response from gateway.
Full response: . print_r( $response , TRUE ) );
throw new ResponseProcessingException(
- Negative response from gateway. Full response:
. print_r( $request_vars, TRUE ),
+ Negative response from gateway. Full response:
. print_r( $response , TRUE ),
ResponseCodes::UNKNOWN
);
}
diff --git a/amazon_gateway/amazon.adapter.php
b/amazon_gateway/amazon.adapter.php
index 68ca6f8..f723b93 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -50,7 +50,7 @@
status = gateway_status,
buyerEmail = email,
transactionDate = date_collect,
- buyerName = fname, // This is dealt with in
processResponse()
+ buyerName = fname, // This is dealt with in
addDataFromURI()
errorMessage = error_message,
paymentMethod = payment_submethod,
referenceId =
[MediaWiki-commits] [Gerrit] Quote params passed into regular expressions - change (mediawiki...Quiz)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209153
Change subject: Quote params passed into regular expressions
..
Quote params passed into regular expressions
Bug: T89104
Change-Id: Ie1f13f83fd41aa8a205e7ae867cd58b0f37436a2
---
M Quiz.class.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz
refs/changes/53/209153/1
diff --git a/Quiz.class.php b/Quiz.class.php
index e0dcb23..a655d43 100644
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -762,8 +762,8 @@
if( $this-mBeingCorrected
!empty( $value ) ) {
if(
$value ==
$possibility ||
- ( preg_match(
'`^' . $value . ' \(i\)$`i', $possibility ) ) ||
- (
!$this-mCaseSensitive preg_match( '`^' . $value . '$`i', $possibility ) )
+ ( preg_match(
'`^' . preg_quote( $value, '`' ) . ' \(i\)$`i', $possibility ) ) ||
+ (
!$this-mCaseSensitive preg_match( '`^' . preg_quote( $value, '`' ) . '$`i',
$possibility ) )
) {
$state =
'right';
$title =
'title=' . wfMessage( 'quiz_colorRight' )-escaped() . '';
--
To view, visit https://gerrit.wikimedia.org/r/209153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1f13f83fd41aa8a205e7ae867cd58b0f37436a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update CirrusSearch - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update CirrusSearch .. Update CirrusSearch Change-Id: Ie5178b79ef14d2508685c2e68f2eabbcaf0f4b4e --- M extensions/CirrusSearch 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/CirrusSearch b/extensions/CirrusSearch index 86ce60f..01e95f2 16 --- a/extensions/CirrusSearch +++ b/extensions/CirrusSearch -Subproject commit 86ce60f10122168c35a7917819d5429de8bfa602 +Subproject commit 01e95f23e143416f83c87624b00f5a92ca158579 -- To view, visit https://gerrit.wikimedia.org/r/209136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5178b79ef14d2508685c2e68f2eabbcaf0f4b4e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logstash: fix heap size setting - change (operations/puppet)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/209158 Change subject: logstash: fix heap size setting .. logstash: fix heap size setting Change-Id: I3d40f246294f6dce8d1b7bda39816550d3d28536 --- M hieradata/role/common/logstash.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/209158/1 diff --git a/hieradata/role/common/logstash.yaml b/hieradata/role/common/logstash.yaml index 99fdab0..a23ab5a 100644 --- a/hieradata/role/common/logstash.yaml +++ b/hieradata/role/common/logstash.yaml @@ -28,4 +28,4 @@ # current configuration isn't thread safe and can cause crashes or # garbled output when used with more than one thread worker. logstash::filter_workers: 1 -logstash::heap_memory_mb: '1G' +logstash::heap_memory_mb: 1024 -- To view, visit https://gerrit.wikimedia.org/r/209158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d40f246294f6dce8d1b7bda39816550d3d28536 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis bda...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata - Fix api error output - change (mediawiki/core)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/209165 Change subject: Update Wikidata - Fix api error output .. Update Wikidata - Fix api error output which is visible via the ui when entering values. the error is not localized. Change-Id: If5d7260f3304aae785e75cc509dd4aba387fd083 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/209165/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index daa1a42..ea6647a 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit daa1a429dc8e65f7998a167572e8db4741dfe065 +Subproject commit ea6647ade430afeca8e1a8775060fb4ba8f1e564 -- To view, visit https://gerrit.wikimedia.org/r/209165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5d7260f3304aae785e75cc509dd4aba387fd083 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] MWWikiversions::readDbListFile: allow single-line ('#' or '/... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: MWWikiversions::readDbListFile: allow single-line ('#' or '//')
comments
..
MWWikiversions::readDbListFile: allow single-line ('#' or '//') comments
Change-Id: Ib08e369014a059e6ec9defdb29e8afbba578e353
---
M multiversion/MWWikiversions.php
1 file changed, 21 insertions(+), 10 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index 8030436..132b60c 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -73,17 +73,28 @@
* @return Array
*/
public static function readDbListFile( $srcPath ) {
- $data = file_get_contents( $srcPath );
- if ( $data === false ) {
+ $lines = @file( $srcPath, FILE_IGNORE_NEW_LINES |
FILE_SKIP_EMPTY_LINES );
+ if ( !$lines ) {
throw new Exception( Unable to read $srcPath.\n );
- } else if ( substr( $data, 0, 2 ) === '%%' ) {
- $dir = getcwd();
- chdir( dirname( $srcPath ) );
- $dbs = self::evalDbListExpression( $data );
- chdir( $dir );
- return $dbs;
- } else {
- return array_filter( explode( \n, $data ) );
}
+
+ $dbs = array();
+ foreach ( $lines as $line ) {
+ // Strip comments ('//' or '#' to end-of-line) and trim
whitespace.
+ $line = trim( preg_replace( '/(#|\/\/).*/', '', $line )
);
+ if ( substr( $line, 0, 2 ) === '%%' ) {
+ if ( !empty( $dbs ) ) {
+ throw new Exception( {$srcPath}:
Encountered dblist expression inside a dblist list file.\n );
+ }
+ $dir = getcwd();
+ chdir( dirname( $srcPath ) );
+ $dbs = self::evalDbListExpression( $line );
+ chdir( $dir );
+ break;
+ } else if ( $line !== '' ) {
+ $dbs[] = $line;
+ }
+ }
+ return $dbs;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/209150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib08e369014a059e6ec9defdb29e8afbba578e353
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
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 wmgUseBits setting, now that the migration is complete - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove wmgUseBits setting, now that the migration is complete
..
Remove wmgUseBits setting, now that the migration is complete
Change-Id: I83ad6d060eaac895a72e2e642baaa66f75a868e1
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 5 insertions(+), 21 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8eb48dd..0acadfa 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -196,19 +196,11 @@
unset( $wgStylePath );
unset( $wgStyleSheetPath );
-if ( $wmgUseBits ) {
- $wmgAssetsHost = $wmfHostnames['bits'];
- $wgLoadScript = //{$wmgAssetsHost}/{$_SERVER['SERVER_NAME']}/load.php;
- $wgExtensionAssetsPath =
//{$wmgAssetsHost}/static/$wmfVersionNumber/extensions;
- $wgStyleSheetPath = //{$wmgAssetsHost}/static/$wmfVersionNumber/skins;
- $wgResourceBasePath = //{$wmgAssetsHost}/static/$wmfVersionNumber;
-} else {
- $wmgAssetsHost = $_SERVER['SERVER_NAME'];
- $wgLoadScript = //{$wmgAssetsHost}/w/load.php;
- $wgExtensionAssetsPath =
//{$wmgAssetsHost}/w/static/$wmfVersionNumber/extensions;
- $wgStyleSheetPath =
//{$wmgAssetsHost}/w/static/$wmfVersionNumber/skins;
- $wgResourceBasePath = //{$wmgAssetsHost}/w/static/$wmfVersionNumber;
-}
+$wmgAssetsHost = $_SERVER['SERVER_NAME'];
+$wgLoadScript = //{$wmgAssetsHost}/w/load.php;
+$wgExtensionAssetsPath =
//{$wmgAssetsHost}/static/$wmfVersionNumber/extensions;
+$wgStyleSheetPath = //{$wmgAssetsHost}/static/$wmfVersionNumber/skins;
+$wgResourceBasePath = //{$wmgAssetsHost}/static/$wmfVersionNumber;
$wgStylePath = $wgStyleSheetPath;
$wgArticlePath = /wiki/$1;
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index e19e1e6..4e85f21 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -587,8 +587,5 @@
'default' = true,
),
- 'wmgUseBits' = array(
- 'default' = false,
- ),
);
} # wmflLabsSettings()
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index dc3d613..7602aae 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15402,11 +15402,6 @@
'default' = '//bits.wikimedia.org/beacon/media',
),
-// Whether or not to use bits.wikimedia.org for static assets. -- T95448
-'wmgUseBits' = array(
- 'default' = false,
-),
-
);
--
To view, visit https://gerrit.wikimedia.org/r/209130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83ad6d060eaac895a72e2e642baaa66f75a868e1
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send group0 + group1 MediaWiki events to logstash - change (operations/mediawiki-config)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209170
Change subject: Send group0 + group1 MediaWiki events to logstash
..
Send group0 + group1 MediaWiki events to logstash
Configure Monolog to send MediaWiki debug log events from all group0 and
group1 wikis to the Logstash cluster.
Bug: T88732
Change-Id: Ie84e24acbc5d832ae45d1333e1d82d02fbab58fc
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/70/209170/1
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 7602aae..bc191a8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4284,12 +4284,12 @@
// Use false to disable all Logstash logging
// FIXME: someday this will need to be datacenter aware
'wmgLogstashServers' = array(
- 'default' = false,
- 'group0' = array(
+ 'default' = array(
'10.64.32.138', // logstash1001.eqiad.wmnet
'10.64.32.137', // logstash1002.eqiad.wmnet
'10.64.32.136', // logstash1003.eqiad.wmnet
),
+ 'wikipedia' = false,
),
# wmgMonologChannels @{
--
To view, visit https://gerrit.wikimedia.org/r/209170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie84e24acbc5d832ae45d1333e1d82d02fbab58fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send MediaWiki events for all wikis to Logstash - change (operations/mediawiki-config)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209172
Change subject: Send MediaWiki events for all wikis to Logstash
..
Send MediaWiki events for all wikis to Logstash
Configure Monolog to send MediaWiki debug log events from all wikis to
the Logstash cluster.
Bug: T88732
Change-Id: Ifa844c793a7587b7c13951834844fd7b53b3596f
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/72/209172/1
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index bc191a8..78928e8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4289,7 +4289,6 @@
'10.64.32.137', // logstash1002.eqiad.wmnet
'10.64.32.136', // logstash1003.eqiad.wmnet
),
- 'wikipedia' = false,
),
# wmgMonologChannels @{
--
To view, visit https://gerrit.wikimedia.org/r/209172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa844c793a7587b7c13951834844fd7b53b3596f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Get rid of convoluted getContent failsafe - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Get rid of convoluted getContent failsafe
..
Get rid of convoluted getContent failsafe
1/ we no longer want to use this, it's what
flow_post_moderation_state.partial.handlebars is for
2/ the places that do still use it are mostly the formatters
(via RevisionFormatter::processParam) that failsafe
message doesn't make as much sense there: deleted-post
for example includes a link to history, which can't
always be rendered (and it doesn't make sense to link
to history from history...)
We should either show no excerpt at all if we're not
allowed to see it, or think about a different message
(to follow up)
Bug: T97872
Change-Id: Ic519084164e1f6cf43f35656aceb1e1be7139594
---
M includes/Formatter/AbstractFormatter.php
M includes/Formatter/RevisionFormatter.php
M includes/Formatter/TocTopicListFormatter.php
M includes/Templating.php
4 files changed, 48 insertions(+), 63 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Formatter/AbstractFormatter.php
b/includes/Formatter/AbstractFormatter.php
index 390c1a5..4c9e1f4 100644
--- a/includes/Formatter/AbstractFormatter.php
+++ b/includes/Formatter/AbstractFormatter.php
@@ -304,7 +304,7 @@
// generated link has generic link text, should be actual topic
title
$root = $row-revision-getRootPost();
- if ( $root ) {
+ if ( $root $this-permissions-isAllowed( $root, 'view' ) ) {
$topic-setMessage( Container::get( 'templating'
)-getContent( $root, 'wikitext' ) );
}
diff --git a/includes/Formatter/RevisionFormatter.php
b/includes/Formatter/RevisionFormatter.php
index f33871d..10d5ea2 100644
--- a/includes/Formatter/RevisionFormatter.php
+++ b/includes/Formatter/RevisionFormatter.php
@@ -857,6 +857,10 @@
return Message::rawParam(
$this-templating-getUserLinks( $revision ) );
case 'summary':
+ if ( !$this-permissions-isAllowed( $revision, 'view'
) ) {
+ return '';
+ }
+
/*
* Fetch in HTML; unparsed wikitext in summary is
pointless.
* Larger-scale wikis will likely also store content in
html, so no
@@ -869,6 +873,10 @@
return Message::plaintextParam( $content );
case 'wikitext':
+ if ( !$this-permissions-isAllowed( $revision, 'view'
) ) {
+ return '';
+ }
+
$content = $this-templating-getContent( $revision,
'wikitext' );
// This must be escaped and marked raw to prevent
special chars in
// content, like $1, from changing the i18n result
@@ -916,7 +924,12 @@
if ( !$revision instanceof PostRevision ) {
throw new FlowException( 'Expected PostRevision
but received ' . get_class( $revision ) );
}
+
$root = $revision-getRootPost();
+ if ( !$this-permissions-isAllowed( $root, 'view' ) ) {
+ return '';
+ }
+
$content = $this-templating-getContent( $root,
'wikitext' );
return Message::plaintextParam( $content );
@@ -925,8 +938,13 @@
if ( !$revision instanceof PostSummary ) {
throw new FlowException( 'Expected PostSummary
but received ' . get_class( $revision ) );
}
+
/** @var PostRevision $post */
$post =
$revision-getCollection()-getPost()-getLastRevision();
+ if ( !$this-permissions-isAllowed( $post, 'view' ) ) {
+ return '';
+ }
+
if ( $post-isTopicTitle() ) {
return Message::plaintextParam(
$this-templating-getContent( $post, 'wikitext' ) );
} else {
diff --git a/includes/Formatter/TocTopicListFormatter.php
b/includes/Formatter/TocTopicListFormatter.php
index 65aa0ce..de4e183 100644
--- a/includes/Formatter/TocTopicListFormatter.php
+++ b/includes/Formatter/TocTopicListFormatter.php
@@ -50,6 +50,8 @@
// topic titles.
'content' = array(
+ // no need to check permissions before
fetching content; that should've
+ // been done by whatever caller
supplies $topicRootRevisionsByWorkflowId,
[MediaWiki-commits] [Gerrit] Enable NewUserMessage on bh.wikipedia - change (operations/mediawiki-config)
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/209146 Change subject: Enable NewUserMessage on bh.wikipedia .. Enable NewUserMessage on bh.wikipedia Bug: T97920 Change-Id: If516a158bd0c77944e5e79d49a80136bb434707e --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/46/209146/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7d9797e..49cf949 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -11044,6 +11044,7 @@ 'default' = false, 'arwiki' = true, 'arwikisource' = true, + 'bhwiki' = true, // T97920 'ckbwiki' = true, // Bug T54678 'commonswiki' = true, 'dewikiversity' = true, // Bug T51449 -- To view, visit https://gerrit.wikimedia.org/r/209146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If516a158bd0c77944e5e79d49a80136bb434707e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Dereckson dereck...@espace-win.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Generate menu HTML via JavaScript. - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Generate menu HTML via JavaScript.
..
Generate menu HTML via JavaScript.
Shrink our HTML size dramatically BOOM
Bug: T95332
Change-Id: I073fb300d2948f10b47e6fa37f6fd036f6034461
---
M includes/Resources.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M javascripts/modules/mainMenu/init.js
M javascripts/modules/uploads/init.js
M less/mainmenu.less
M less/specials/mobilemenu.less
M resources/mobile.mainMenu/MainMenu.js
M tests/browser/features/support/pages/article_page.rb
9 files changed, 71 insertions(+), 42 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 54e48c7..9e19c33 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -211,6 +211,9 @@
'dependencies' = array(
'mobile.view',
),
+ 'templates' = array(
+ 'menu.hogan' =
'resources/mobile.mainMenu/menu.mustache',
+ ),
'scripts' = array(
'resources/mobile.mainMenu/MainMenu.js',
),
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 7c6d038..2dfa139 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -55,6 +55,7 @@
/**
* Get elements for personal toolbar
+* @deprecated
* @return array
*/
public function getPersonalTools() {
@@ -92,6 +93,7 @@
/**
* Returns main sidebar menu elements
+* @deprecated
* @return array
*/
public function getDiscoveryTools() {
@@ -100,6 +102,7 @@
/**
* Returns sidebar footer links
+* @deprecated
* @return array
*/
public function getSiteLinks() {
@@ -354,33 +357,16 @@
}
/**
-* temporary function that flattens old style menu definitions to
template compatible definition.
-* This can be safely removed once we have fully transitioned to menus
that use templates.
-*/
- private function flattenLinkArray( $array ) {
- $menu = array();
- foreach ( $array as $name = $info ) {
- $base = isset( $info['links'][0] ) ? $info['links'][0]
: $info;
- $menu[] = array_merge( $base, array( 'name' = $name )
);
- }
- return $menu;
- }
-
- /**
* Renders the main menu.
* @param array [$data] Data used to build the page
*/
- protected function renderMainMenu( $data = array() ) {
- $templateParser = new TemplateParser(
- __DIR__ . '/../../resources/mobile.mainMenu/' );
+ protected function renderMainMenu( $data ) {
+ if ( $this-isSpecialMobileMenuPage ) {
+ $templateParser = new TemplateParser(
+ __DIR__ . '/../../resources/mobile.mainMenu/' );
- $templateData = array(
- 'id' = 'mw-mf-page-left',
- 'discovery' = $this-flattenLinkArray(
$this-getDiscoveryTools() ),
- 'personal' =
$this-flattenLinkArray($this-getPersonalTools() ),
- 'sitelinks' = $this-flattenLinkArray(
$this-getSiteLinks() ),
- );
- echo $templateParser-processTemplate( 'menu', $templateData );
+ echo $templateParser-processTemplate( 'menu',
$data['menu_data'] );
+ }
}
/**
@@ -404,7 +390,7 @@
echo $data[ 'headelement' ];
?
div id=mw-mf-viewport
- ?php $this-renderMainMenu(); ?
+ ?php $this-renderMainMenu( $data ); ?
div id=mw-mf-page-center
?php
foreach ( $this-data['banners'] as
$banner ){
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 84032d0..eb3c4b0 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -32,6 +32,19 @@
}
/**
+* temporary function that flattens old style menu definitions to
template compatible definition.
+* This can be safely removed once we have fully transitioned to menus
that use templates.
+*/
+ private function flattenLinkArray( $array ) {
+ $menu = array();
+ foreach ( $array as $name = $info ) {
+ $base = isset( $info['links'][0] ) ? $info['links'][0]
: $info;
+ $menu[] = array_merge( $base, array( 'name' = $name )
);
+
[MediaWiki-commits] [Gerrit] Render main menu via a server side template - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Render main menu via a server side template
..
Render main menu via a server side template
Bug: T97431
Change-Id: Iba0b2a76d063e35d0d9490d3bec407d92fad83f1
---
M includes/skins/MinervaTemplate.php
M includes/skins/MinervaTemplateAlpha.php
A resources/mobile.mainMenu/menu.mustache
3 files changed, 86 insertions(+), 44 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 94c2f11..7c6d038 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -354,47 +354,33 @@
}
/**
-* Renders the main menu.
-*
-* @param array $data Data used to build the page
+* temporary function that flattens old style menu definitions to
template compatible definition.
+* This can be safely removed once we have fully transitioned to menus
that use templates.
*/
- protected function renderMainMenu( $data ) {
- ?
- nav id=mw-mf-page-left class=navigation-drawer
- ?php
- $this-renderMainMenuItems();
- ?
- /nav
- ?php
+ private function flattenLinkArray( $array ) {
+ $menu = array();
+ foreach ( $array as $name = $info ) {
+ $base = isset( $info['links'][0] ) ? $info['links'][0]
: $info;
+ $menu[] = array_merge( $base, array( 'name' = $name )
);
+ }
+ return $menu;
}
/**
-* Renders the contents of the main menu.
+* Renders the main menu.
+* @param array [$data] Data used to build the page
*/
- protected function renderMainMenuItems() {
- ?
- ul
- ?php
- foreach ( $this-getDiscoveryTools() as $key =
$val ) {
- echo $this-makeListItem( $key, $val );
- }
- ?
- /ul
- ul
- ?php
- foreach ( $this-getPersonalTools() as $key =
$val ){
- echo $this-makeListItem( $key, $val );
- }
- ?
- /ul
- ul class=hlist
- ?php
- foreach ( $this-getSiteLinks() as $key = $val
) {
- echo $this-makeListItem( $key, $val );
- }
- ?
- /ul
- ?php
+ protected function renderMainMenu( $data = array() ) {
+ $templateParser = new TemplateParser(
+ __DIR__ . '/../../resources/mobile.mainMenu/' );
+
+ $templateData = array(
+ 'id' = 'mw-mf-page-left',
+ 'discovery' = $this-flattenLinkArray(
$this-getDiscoveryTools() ),
+ 'personal' =
$this-flattenLinkArray($this-getPersonalTools() ),
+ 'sitelinks' = $this-flattenLinkArray(
$this-getSiteLinks() ),
+ );
+ echo $templateParser-processTemplate( 'menu', $templateData );
}
/**
@@ -418,7 +404,7 @@
echo $data[ 'headelement' ];
?
div id=mw-mf-viewport
- ?php $this-renderMainMenu( $data ); ?
+ ?php $this-renderMainMenu(); ?
div id=mw-mf-page-center
?php
foreach ( $this-data['banners'] as
$banner ){
diff --git a/includes/skins/MinervaTemplateAlpha.php
b/includes/skins/MinervaTemplateAlpha.php
index 655533b..dce45f4 100644
--- a/includes/skins/MinervaTemplateAlpha.php
+++ b/includes/skins/MinervaTemplateAlpha.php
@@ -146,16 +146,49 @@
echo $data['secondaryButton'];
}
+ /**
+* Renders the main menu.
+*
+* @param array $data Data used to build the page
+*/
protected function renderMainMenu( $data ) {
- $class = $this-isSpecialMobileMenuPage ? '' : ' hidden';
-
+ $className = $this-isSpecialMobileMenuPage ? '' : ' hidden';
?
- nav class=?php echo $class; ?
- ?php
- $this-renderMainMenuItems();
- ?
+ nav class=?php echo $className; ?
+ ?php
+ $this-renderMainMenuItems();
+ ?
/nav
- ?php
+
[MediaWiki-commits] [Gerrit] Update Wikidata - fix api error output when parsing values - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata - fix api error output when parsing values
..
Update Wikidata - fix api error output when parsing values
and elsewhere this is used by the Wikibase api
Change-Id: Ibf054807644f42b425b9bc7bba043f61a5fba990
---
M composer.lock
M extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
M vendor/composer/installed.json
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 975015b..1b7223d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1213,7 +1213,7 @@
source: {
type: git,
url:
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: eedce83fe41a299f242c2933e23bbbc8ce2dc944
+reference: b83449d82ca0a5f2fb890e37ef76bb3d0075d463
},
require: {
data-values/common: ~0.2.0,
@@ -1283,7 +1283,7 @@
issues: https://bugzilla.wikimedia.org/;,
irc: irc://irc.freenode.net/wikidata
},
-time: 2015-05-05 19:13:08
+time: 2015-05-06 01:04:37
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
b/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
index 9ad77b5..002503e 100644
--- a/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
+++ b/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
@@ -440,7 +440,7 @@
ApiResult::setIndexedTagName( $row['parameters'], 'parameter' );
$html = $this-forceMessageLanguage( $message, $this-language
)-useDatabase( true )-parse();
- ApiResult::setContentValue( $row, 'html', $html );
+ ApiResult::setValue( $row, 'html', $html );
$row[ApiResult::META_BC_SUBELEMENTS][] = 'html';
return $row;
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6de4ea1..7d9ed3e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1303,7 +1303,7 @@
source: {
type: git,
url:
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: eedce83fe41a299f242c2933e23bbbc8ce2dc944
+reference: b83449d82ca0a5f2fb890e37ef76bb3d0075d463
},
require: {
data-values/common: ~0.2.0,
@@ -1329,7 +1329,7 @@
conflict: {
mediawiki/mediawiki: 1.23
},
-time: 2015-05-05 18:50:37,
+time: 2015-05-05 20:16:30,
type: mediawiki-extension,
installation-source: source,
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/209160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf054807644f42b425b9bc7bba043f61a5fba990
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf4
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
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 mod_expires config for static/ - change (operations/puppet)
Ori.livneh has submitted this change and it was merged. Change subject: update mod_expires config for static/ .. update mod_expires config for static/ * Increase max-age to 31536000 (1 year), because static assets are versioned by branch directory (except static/current -- but for those resources, URLs are versioned via a query string). * Add caching headers for favicon.ico * Apply to /srv/mediawiki/(static|images|docroot|static). Change-Id: If96a762c23cd81145efd1e1825b58baa6f10ae79 --- M modules/mediawiki/files/apache/modules/expires.conf 1 file changed, 16 insertions(+), 14 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mediawiki/files/apache/modules/expires.conf b/modules/mediawiki/files/apache/modules/expires.conf index 800e68d..e912917 100644 --- a/modules/mediawiki/files/apache/modules/expires.conf +++ b/modules/mediawiki/files/apache/modules/expires.conf @@ -2,20 +2,22 @@ # sends max-age and Expires header, time in seconds IfModule mod_expires.c ExpiresActive On -Directory /srv/mediawiki/docroot -FilesMatch \.(gif|jpe?g|png|css|js|json|woff|woff2|svg|eot|ttf)$ -ExpiresByType image/gif A2592000 -ExpiresByType image/png A2592000 -ExpiresByType image/jpeg A2592000 -ExpiresByType text/css A2592000 -ExpiresByType text/javascript A2592000 -ExpiresByType application/x-javascript A2592000 -ExpiresByType application/json A2592000 -ExpiresByType application/font-woff A2592000 -ExpiresByType application/font-woff2 A2592000 -ExpiresByType image/svg+xml A2592000 -ExpiresByType application/vnd.ms-fontobject A2592000 -ExpiresByType application/x-font-ttf A2592000 + Directory ~ ^/srv/mediawiki/(images|docroot|static) +FilesMatch \.(gif|jpe?g|png|css|js|json|woff|woff2|svg|eot|ttf|ico)$ +ExpiresByType image/gif A31536000 +ExpiresByType image/png A31536000 +ExpiresByType image/jpeg A31536000 +ExpiresByType text/css A31536000 +ExpiresByType text/javascript A31536000 +ExpiresByType application/x-javascript A31536000 +ExpiresByType application/json A31536000 +ExpiresByType application/font-woff A31536000 +ExpiresByType application/font-woff2 A31536000 +ExpiresByType image/svg+xml A31536000 +ExpiresByType image/x-icon A31536000 +ExpiresByType image/vnd.microsoft.icon A31536000 +ExpiresByType application/vnd.ms-fontobject A31536000 +ExpiresByType application/x-font-ttf A31536000 Header add Access-Control-Allow-Origin * /FilesMatch /Directory -- To view, visit https://gerrit.wikimedia.org/r/209145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If96a762c23cd81145efd1e1825b58baa6f10ae79 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use both setContentValue() and META_BC_SUBELEMENTS on ... - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/209157 Change subject: Don't use both setContentValue() and META_BC_SUBELEMENTS on the same key .. Don't use both setContentValue() and META_BC_SUBELEMENTS on the same key When converting setContent( $row, $html, 'html' ), I847a4a5a should have used only META_BC_SUBELEMENTS. Bug: T98185 Change-Id: If9b232c9c51c881da82d6f87ab39f5f83cc57e4d --- M repo/includes/api/ApiErrorReporter.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/57/209157/1 diff --git a/repo/includes/api/ApiErrorReporter.php b/repo/includes/api/ApiErrorReporter.php index 9ad77b5..002503e 100644 --- a/repo/includes/api/ApiErrorReporter.php +++ b/repo/includes/api/ApiErrorReporter.php @@ -440,7 +440,7 @@ ApiResult::setIndexedTagName( $row['parameters'], 'parameter' ); $html = $this-forceMessageLanguage( $message, $this-language )-useDatabase( true )-parse(); - ApiResult::setContentValue( $row, 'html', $html ); + ApiResult::setValue( $row, 'html', $html ); $row[ApiResult::META_BC_SUBELEMENTS][] = 'html'; return $row; -- To view, visit https://gerrit.wikimedia.org/r/209157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9b232c9c51c881da82d6f87ab39f5f83cc57e4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Anomie bjor...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix a typo in DispatchingValueParser error - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Fix a typo in DispatchingValueParser error .. Fix a typo in DispatchingValueParser error Change-Id: I6ba38f0f82af1f97b79f1965280ee9bc8f0e88a9 --- M lib/includes/parsers/DispatchingValueParser.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/includes/parsers/DispatchingValueParser.php b/lib/includes/parsers/DispatchingValueParser.php index 10c3ca0..abf0faa 100644 --- a/lib/includes/parsers/DispatchingValueParser.php +++ b/lib/includes/parsers/DispatchingValueParser.php @@ -64,7 +64,7 @@ } throw new ParseException( - 'The value is not recognitzed by the configured parsers', + 'The value is not recognized by the configured parsers', $value, $this-format ); -- To view, visit https://gerrit.wikimedia.org/r/209156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ba38f0f82af1f97b79f1965280ee9bc8f0e88a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drop the withoutTermSearchKey setting - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Drop the withoutTermSearchKey setting
..
Drop the withoutTermSearchKey setting
This has been used for the initial production deployment,
but isn't of much use since.
Running update.php will fix existing installations, even if
the setting was set.
Change-Id: Ia9d9ba8bdf7e88273ca0321c8223884028a000d9
---
M docs/options.wiki
M lib/includes/store/sql/TermSqlIndex.php
M lib/tests/phpunit/store/TermIndexTest.php
M repo/config/Wikibase.default.php
M repo/includes/store/sql/SqlStore.php
M repo/tests/phpunit/includes/store/sql/TermSearchKeyBuilderTest.php
M repo/tests/phpunit/includes/store/sql/TermSqlIndexTest.php
7 files changed, 11 insertions(+), 45 deletions(-)
Approvals:
Aude: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/docs/options.wiki b/docs/options.wiki
index c849409..731a8dc 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -53,7 +53,6 @@
=== Expert Settings ===
;idBlacklist: A list of IDs to reserve and skip for new entities. IDs are
given as integers, the blacklist applies to all types of entities. '''Note:'''
this may change in the future to allow separate blacklists for different kinds
of entities.
-;withoutTermSearchKey: Allow the terms table to work without the
term_search_key field, for sites that can not easily roll out schema changes on
large tables. This means that all searches will use exact matching (depending
on the database's collation). Default: codefalse/code. This is only needed
for compatibility with old database layouts.
;withoutTermWeight: Allow the terms table to work without the term_weight
field, for sites that can not easily roll out schema changes on large tables.
This means that all searches will return the results in an undefined order
(depending on how the database works). Default: codefalse/code. This is
only needed for compatibility with old database layouts.
;multilang-limits: Limits to impose on multilanguage strings like labels,
descriptions and such. Supported limits:
:;length: the maximum length of the string, in characters.
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index 0d54f05..62c3c34 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -331,11 +331,8 @@
'term_language' = $term-getLanguage(),
'term_type' = $term-getType(),
'term_text' = $term-getText(),
+ 'term_search_key' = $this-getSearchKey(
$term-getText(), $term-getLanguage() )
);
-
- if ( $this-supportsSearchKeys() ) {
- $fields['term_search_key'] = $this-getSearchKey(
$term-getText(), $term-getLanguage() );
- }
return $fields;
}
@@ -722,7 +719,7 @@
// used in the database.
$textField = 'term_text';
- if ( !$options['caseSensitive']
$this-supportsSearchKeys() ) {
+ if ( !$options['caseSensitive'] ) {
$textField = 'term_search_key';
$text = $this-getSearchKey( $term-getText(),
$term-getLanguage() );
}
@@ -998,13 +995,6 @@
}
return $normalized;
- }
-
- /**
-* @return bool
-*/
- public function supportsSearchKeys() {
- return !Settings::get( 'withoutTermSearchKey' );
}
/**
diff --git a/lib/tests/phpunit/store/TermIndexTest.php
b/lib/tests/phpunit/store/TermIndexTest.php
index 4090b3b..ce31541 100644
--- a/lib/tests/phpunit/store/TermIndexTest.php
+++ b/lib/tests/phpunit/store/TermIndexTest.php
@@ -146,23 +146,18 @@
);
/** @var Term[] $expectedTerms */
- $expectedTerms = array();
-
- if ( ! Settings::get( 'withoutTermSearchKey' ) ) {
- // case insensitive match is (probably) only found if
SearchKey can be used.
- // See comment in TermSqlIndex::termsToConditions
- $expectedTerms[$id0] = new Term( array(
+ $expectedTerms = array(
+ $id0 = new Term( array(
'termLanguage' = 'en',
'termText' = 'prefix',
- ) );
- }
-
- $expectedTerms[$id1] = new Term( array(
- 'termText' = 'postfix',
- ) );
+ ) ),
+ $id1 = new Term( array(
+ 'termText' = 'postfix',
+ ) )
+ );
[MediaWiki-commits] [Gerrit] logstash: change heap size to 256m - change (operations/puppet)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/209161 Change subject: logstash: change heap size to 256m .. logstash: change heap size to 256m For currently unknown reasons heap sizes 256m aren't working on logstash1001. Change-Id: Ied4b79bcd43d229e8895f2bc49632f80c704e291 --- M hieradata/role/common/logstash.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/209161/1 diff --git a/hieradata/role/common/logstash.yaml b/hieradata/role/common/logstash.yaml index a23ab5a..33ecff8 100644 --- a/hieradata/role/common/logstash.yaml +++ b/hieradata/role/common/logstash.yaml @@ -28,4 +28,4 @@ # current configuration isn't thread safe and can cause crashes or # garbled output when used with more than one thread worker. logstash::filter_workers: 1 -logstash::heap_memory_mb: 1024 +logstash::heap_memory_mb: 256 -- To view, visit https://gerrit.wikimedia.org/r/209161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied4b79bcd43d229e8895f2bc49632f80c704e291 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis bda...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added PeriodicScriptParamsIterator class to avoid OOMs - change (mediawiki...jobrunner)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208852
Change subject: Added PeriodicScriptParamsIterator class to avoid OOMs
..
Added PeriodicScriptParamsIterator class to avoid OOMs
* Lowered the batch size for better pipeline interlacing.
Large pipeline batches still seem to easily hog CPU.
Forcing more round trips throttles the chron script.
* Avoid parsing the LUA script for each batch. This saves
I/O, though not much CPU, from testing.
* Short-circuit the script for the common (99%) case sooner.
The script examines every queue that could have anything
in it, which is a lot of queues (no. wikis X no. types).
The vast majority are empty at any given time.
* Updated some comments.
Bug: T97939
Change-Id: Icab05090ba93f9c22ba4f98b5e0ba008cb1a19fe
---
M redisJobChronService
M src/RedisJobService.php
2 files changed, 133 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner
refs/changes/52/208852/2
diff --git a/redisJobChronService b/redisJobChronService
index 022ed7e..1ebbce5 100755
--- a/redisJobChronService
+++ b/redisJobChronService
@@ -114,7 +114,6 @@
* and prune out jobs that failed too many times. This updates the
* aggregator server as necessary.
*
-* @note: similar to JobQueueRedis.php periodic tasks method
* @return int|bool Number of jobs recycled/deleted/undelayed/abandoned
(false if not run)
*/
private function executePeriodicTasks() {
@@ -139,46 +138,31 @@
return $jobs;
}
+ // Job queue partition servers
+ $qServers = $this-queueSrvs;
// Randomize to scale the liveliness with the # of
runners
shuffle( $types );
shuffle( $wikiIds );
+ shuffle( $qServers );
- $now = time();
-
- // Build up the script arguments for each queue...
- $paramsByQueue = array();
+ // Build up the script arguments for each queue
+ // using an Iterator to avoid client OOMs...
+ $paramsByQueue = new AppendIterator();
foreach ( $types as $type ) {
- $ttl = $this-getTTLForType( $type );
- $attempts = $this-getAttemptsForType( $type );
- foreach ( $wikiIds as $wikiId ) {
- $paramsByQueue[] = array(
- 'queue' = array( $type,
$wikiId ),
- 'params' = array(
-
{$wikiId}:jobqueue:{$type}:z-claimed, # KEYS[1]
-
{$wikiId}:jobqueue:{$type}:h-attempts, # KEYS[2]
-
{$wikiId}:jobqueue:{$type}:l-unclaimed, # KEYS[3]
-
{$wikiId}:jobqueue:{$type}:h-data, # KEYS[4]
-
{$wikiId}:jobqueue:{$type}:z-abandoned, # KEYS[5]
-
{$wikiId}:jobqueue:{$type}:z-delayed, # KEYS[6]
- $now - $ttl, # ARGV[1]
- $now - 7 * 86400, #
ARGV[2]
- $attempts, # ARGV[3]
- $now # ARGV[4]
- ),
- 'keys' = 6 # number of first
argument(s) that are keys
- );
- }
+ $paramsByQueue-append( new
PeriodicScriptParamsIterator(
+ $type,
+ $wikiIds,
+ $this-getTTLForType( $type ),
+ $this-getAttemptsForType( $type )
+ ) );
}
- // Batch the Lua queries to avoid client OOMs
- $paramsByQueueBatches = array_chunk( $paramsByQueue,
500 );
- $mapSet = array(); // ready map of (queue name =
timestamp)
+ // Track queues that become ready
+ $mapSet = array(); // map of (queue name = timestamp)
// Run the script on all job queue partitions...
- foreach ( $this-queueSrvs as $qServer ) {
-
[MediaWiki-commits] [Gerrit] access: Remove Erik Moeller's Production Shell Access - change (operations/puppet)
coren has submitted this change and it was merged. Change subject: access: Remove Erik Moeller's Production Shell Access .. access: Remove Erik Moeller's Production Shell Access bug: T97864 Change-Id: Ifcca65b14fa3ada2af22e0649c9117b00ea9ee49 --- M modules/admin/data/data.yaml 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: coren: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 7dac22a..1141195 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -1,7 +1,8 @@ groups: absent: description: meta group for absented users -members: [bsitu , cmcmahon, csalvia, edenhill, jgonera, mah, mwalker, nimishg, rainman, ssmith, swalling] +members: [bsitu , cmcmahon, csalvia, edenhill, jgonera, mah, mwalker, +nimishg, rainman, ssmith, swalling, erik] wikidev: gid: 500 description: container group for primary user groups. @@ -55,7 +56,7 @@ description: access to terbium, fluorine (private data) and bastion hosts restricted folks use sudo to access apache / www-data resources members: [avar, daniel, dartar, diederik, - erik, ezachte, hoo, jamesur, jdlrobson, khorn, qchris, + ezachte, hoo, jamesur, jdlrobson, khorn, qchris, tparscal, tnegrin, ssastry, ironholds, nuria, leila, santhosh, amire80, legoktm, jsahleen] privileges: ['ALL = (www-data,apache) NOPASSWD: ALL'] @@ -102,7 +103,7 @@ ironholds, jforrester, jkatz, jmorgan, jzerebecki, kaldari, kleduc, leila, maryana, mattflaschen, milimetric, nettrom, nuria, ori, otto, qchris, springle, tnegrin, yurik, yuvipanda, - mforns, erik, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal, + mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal, daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson] ldap-admins: gid: 715 @@ -157,7 +158,7 @@ members: [handrade, haithams, ezachte, milimetric, dartar, yurik, halfak, howief, awight, dr0ptp4kt, qchris, tnegrin, nuria, leila, manybubbles, ironholds, kleduc, ellery, nettrom, mforns, - spage, erik, bmansurov, rmoen, tbayer, joal, ashwinpp, madhuvishy] + spage, bmansurov, rmoen, tbayer, joal, ashwinpp, madhuvishy] statistics-users: gid: 726 description: Access hosts with a mysql client for research. NO PRIVS. @@ -204,7 +205,7 @@ This will grant shell access on Hadoop client nodes (stat1002) and on Hadoop NameNodes. Some files in HDFS have sensitive data in them. Those files are group readable by the analytics-privatedata-users group. -members: [dartar, erik, milimetric, yurik, maryana, +members: [dartar, milimetric, yurik, maryana, halfak, dr0ptp4kt, qchris, tnegrin, ironholds, kleduc, nuria, haithams, otto, deskana, bsitzmann, dbrant, declerambaul, ellery, nettrom, leila, @@ -853,12 +854,11 @@ diederik@Diederik-Van-Lieres-MacBook-Pro.local] uid: 1293 erik: -ensure: present +ensure: absent gid: 500 name: erik realname: Erik Moeller -ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQDYiVifze8jetMrDIeZd8NRMKYofzT8fval1kdjAE2/3lAPpewZw8UxCM8Voz7jlJ2/NnGntNt99uGEp+6Z6VmUu15NUyeWSTdfe6BEQtLqtWaZ2qqdhoIS1bwdOEwZhSPGrP2Hp5LE0WRhAaCtVXQsCsKEFLwBjyXHQi3d1tR+qxFouKm2Yhq4atFksGfaJGCcUZ9k3qHJPheOM/0lIaOMm8cBkfacDFb7cZPHoNx8JrUcmKTHeqV8mYeIQQ4lfbwFSYnVy6F43psXWLIOYoHXmneu1840Of8Nxqd02ExEqZKBpwTZa/qPiLnVbexuPYzD3RcUE3g0NtL1smYZo6pr -erik@deep_thought] +ssh_keys: [] uid: 503 ezachte: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/208566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifcca65b14fa3ada2af22e0649c9117b00ea9ee49 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Matanya mata...@foss.co.il Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: Eloquence e...@wikimedia.org Gerrit-Reviewer: coren mpellet...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Move logging schemas into resources - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: Move logging schemas into resources .. Hygiene: Move logging schemas into resources Change-Id: I4f47108402e7bfb6438d7485f45c7e33af26f5e4 --- M includes/MobileFrontend.hooks.php R resources/mobile.loggingSchemas/SchemaMobileWeb.js R resources/mobile.loggingSchemas/SchemaMobileWebClickTracking.js R resources/mobile.loggingSchemas/SchemaMobileWebEditing.js R resources/mobile.loggingSchemas/SchemaMobileWebSearch.js R resources/mobile.loggingSchemas/SchemaMobileWebUploads.js R resources/mobile.loggingSchemas/SchemaMobileWebWatching.js R resources/mobile.loggingSchemas/init.js 8 files changed, 8 insertions(+), 7 deletions(-) Approvals: Bmansurov: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/MobileFrontend.hooks.php b/includes/MobileFrontend.hooks.php index 7526df2..ef89508 100644 --- a/includes/MobileFrontend.hooks.php +++ b/includes/MobileFrontend.hooks.php @@ -963,12 +963,12 @@ } $scripts = array( - 'javascripts/loggingSchemas/SchemaMobileWeb.js', - 'javascripts/loggingSchemas/SchemaMobileWebUploads.js', - 'javascripts/loggingSchemas/SchemaMobileWebClickTracking.js', - 'javascripts/loggingSchemas/SchemaMobileWebEditing.js', - 'javascripts/loggingSchemas/SchemaMobileWebWatching.js', - 'javascripts/loggingSchemas/SchemaMobileWebSearch.js', + 'resources/mobile.loggingSchemas/SchemaMobileWeb.js', + 'resources/mobile.loggingSchemas/SchemaMobileWebUploads.js', + 'resources/mobile.loggingSchemas/SchemaMobileWebClickTracking.js', + 'resources/mobile.loggingSchemas/SchemaMobileWebEditing.js', + 'resources/mobile.loggingSchemas/SchemaMobileWebWatching.js', + 'resources/mobile.loggingSchemas/SchemaMobileWebSearch.js', ); $wgResourceModules['mobile.loggingSchemas'] = $wgMFResourceFileModuleBoilerplate + array( @@ -979,7 +979,8 @@ 'scripts' = $scripts, ); - $wgResourceModules['skins.minerva.scripts']['scripts'][] = 'javascripts/loggingSchemas/init.js'; + $wgResourceModules['skins.minerva.scripts'] + ['scripts'][] = 'resources/mobile.loggingSchemas/init.js'; } /** diff --git a/javascripts/loggingSchemas/SchemaMobileWeb.js b/resources/mobile.loggingSchemas/SchemaMobileWeb.js similarity index 100% rename from javascripts/loggingSchemas/SchemaMobileWeb.js rename to resources/mobile.loggingSchemas/SchemaMobileWeb.js diff --git a/javascripts/loggingSchemas/SchemaMobileWebClickTracking.js b/resources/mobile.loggingSchemas/SchemaMobileWebClickTracking.js similarity index 100% rename from javascripts/loggingSchemas/SchemaMobileWebClickTracking.js rename to resources/mobile.loggingSchemas/SchemaMobileWebClickTracking.js diff --git a/javascripts/loggingSchemas/SchemaMobileWebEditing.js b/resources/mobile.loggingSchemas/SchemaMobileWebEditing.js similarity index 100% rename from javascripts/loggingSchemas/SchemaMobileWebEditing.js rename to resources/mobile.loggingSchemas/SchemaMobileWebEditing.js diff --git a/javascripts/loggingSchemas/SchemaMobileWebSearch.js b/resources/mobile.loggingSchemas/SchemaMobileWebSearch.js similarity index 100% rename from javascripts/loggingSchemas/SchemaMobileWebSearch.js rename to resources/mobile.loggingSchemas/SchemaMobileWebSearch.js diff --git a/javascripts/loggingSchemas/SchemaMobileWebUploads.js b/resources/mobile.loggingSchemas/SchemaMobileWebUploads.js similarity index 100% rename from javascripts/loggingSchemas/SchemaMobileWebUploads.js rename to resources/mobile.loggingSchemas/SchemaMobileWebUploads.js diff --git a/javascripts/loggingSchemas/SchemaMobileWebWatching.js b/resources/mobile.loggingSchemas/SchemaMobileWebWatching.js similarity index 100% rename from javascripts/loggingSchemas/SchemaMobileWebWatching.js rename to resources/mobile.loggingSchemas/SchemaMobileWebWatching.js diff --git a/javascripts/loggingSchemas/init.js b/resources/mobile.loggingSchemas/init.js similarity index 100% rename from javascripts/loggingSchemas/init.js rename to resources/mobile.loggingSchemas/init.js -- To view, visit https://gerrit.wikimedia.org/r/208910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f47108402e7bfb6438d7485f45c7e33af26f5e4 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___
[MediaWiki-commits] [Gerrit] Fix typo in UsageTableUpdater - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Fix typo in UsageTableUpdater .. Fix typo in UsageTableUpdater Change-Id: I887e7938fe9ee734a009b2d88e231a3dd354be99 --- M client/includes/Usage/Sql/UsageTableUpdater.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/client/includes/Usage/Sql/UsageTableUpdater.php b/client/includes/Usage/Sql/UsageTableUpdater.php index 7325491..fab22b2 100644 --- a/client/includes/Usage/Sql/UsageTableUpdater.php +++ b/client/includes/Usage/Sql/UsageTableUpdater.php @@ -52,7 +52,7 @@ } /** -* Re-indexes the given list of EntityUsagess so that each EntityUsage can be found by using its +* Re-indexes the given list of EntityUsages so that each EntityUsage can be found by using its * string representation as a key. * * @param EntityUsage[] $usages -- To view, visit https://gerrit.wikimedia.org/r/207366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I887e7938fe9ee734a009b2d88e231a3dd354be99 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Hoo man h...@online.de 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 a typo in DispatchingValueParser error - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/209156 Change subject: Fix a typo in DispatchingValueParser error .. Fix a typo in DispatchingValueParser error Change-Id: I6ba38f0f82af1f97b79f1965280ee9bc8f0e88a9 --- M lib/includes/parsers/DispatchingValueParser.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/56/209156/1 diff --git a/lib/includes/parsers/DispatchingValueParser.php b/lib/includes/parsers/DispatchingValueParser.php index 10c3ca0..abf0faa 100644 --- a/lib/includes/parsers/DispatchingValueParser.php +++ b/lib/includes/parsers/DispatchingValueParser.php @@ -64,7 +64,7 @@ } throw new ParseException( - 'The value is not recognitzed by the configured parsers', + 'The value is not recognized by the configured parsers', $value, $this-format ); -- To view, visit https://gerrit.wikimedia.org/r/209156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ba38f0f82af1f97b79f1965280ee9bc8f0e88a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Wiki.svg for wikimania2015wiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Use Wiki.svg for wikimania2015wiki .. Use Wiki.svg for wikimania2015wiki Requested by Ellie Young and James Alexander. Change-Id: I831a28265293c92f8f8ab21c7c16c019e73b0df4 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Catrope: Looks good to me, approved Jalexander: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7d9797e..dc3d613 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -1067,7 +1067,7 @@ 'wikimania2012wiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Wikimania_2012_logo.svg/135px-Wikimania_2012_logo.svg.png', // Bug T50382 'wikimania2013wiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/5/52/Wikimania_2013_logo.svg/135px-Wikimania_2013_logo.svg.png', // Bug T50382 'wikimania2014wiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/0/06/Wikimania_2014_Shard_logo_v3_with_logotype_and_date_%28small%29.svg/135px-Wikimania_2014_Shard_logo_v3_with_logotype_and_date_%28small%29.svg.png', // Bug T58398 - 'wikimania2015wiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Wikimania_2015_logo.svg/135px-Wikimania_2015_logo.svg.png', // Bug T50382 + 'wikimania2015wiki' = '//upload.wikimedia.org/wikipedia/wikimania2015/f/f0/Wiki.svg', // Bug T50382 'wikimania2016wiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Wikimania_2016_logo.svg/135px-Wikimania_2016_logo.svg.png', // T85374 'wikimaniateamwiki' = '//upload.wikimedia.org/wikipedia/commons/thumb/0/07/Wikimania_team_logo.svg/135px-Wikimania_team_logo.svg.png', // Bug T50376 ), -- To view, visit https://gerrit.wikimedia.org/r/209126 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I831a28265293c92f8f8ab21c7c16c019e73b0df4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: John F. Lewis johnflewi...@gmail.com Gerrit-Reviewer: Alex Monk kren...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Jalexander jalexan...@wikimedia.org 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 for soon-to-be-deprecated query continue parameter warni... - change (apps...wikipedia)
Fjalapeno has submitted this change and it was merged. Change subject: Fix for soon-to-be-deprecated query continue parameter warnings. .. Fix for soon-to-be-deprecated query continue parameter warnings. T98244 Change-Id: I0fe1c2f42d24e77ef7d33601a9e6526407120cb1 --- M Wikipedia/Networking/Fetchers/PageHistoryFetcher.m M Wikipedia/Networking/Fetchers/WikiTextSectionFetcher.m 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Fjalapeno: Looks good to me, approved jenkins-bot: Verified diff --git a/Wikipedia/Networking/Fetchers/PageHistoryFetcher.m b/Wikipedia/Networking/Fetchers/PageHistoryFetcher.m index 0ea6b90..f7a8422 100644 --- a/Wikipedia/Networking/Fetchers/PageHistoryFetcher.m +++ b/Wikipedia/Networking/Fetchers/PageHistoryFetcher.m @@ -75,6 +75,7 @@ @rvlimit: @50, @rvdir: @older, @titles: title.prefixedText, +@continue: @, @format: @json //,@rvdiffto: @(-1) // Add this to fake out error api response. }.mutableCopy; diff --git a/Wikipedia/Networking/Fetchers/WikiTextSectionFetcher.m b/Wikipedia/Networking/Fetchers/WikiTextSectionFetcher.m index ceb09e1..74df9bf 100644 --- a/Wikipedia/Networking/Fetchers/WikiTextSectionFetcher.m +++ b/Wikipedia/Networking/Fetchers/WikiTextSectionFetcher.m @@ -89,6 +89,7 @@ @rvsection: self.section.index ? self.section.index : @0, @titles: [self.section sourceTitle].prefixedText, @meta: @userinfo, // we need the local user ID for event logging + @continue: @, @format: @json }; } -- To view, visit https://gerrit.wikimedia.org/r/209149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0fe1c2f42d24e77ef7d33601a9e6526407120cb1 Gerrit-PatchSet: 2 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Mhurd mh...@wikimedia.org Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org Gerrit-Reviewer: Fjalapeno cfl...@wikimedia.org 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 can not misspelling - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209152
Change subject: Fix can not misspelling
..
Fix can not misspelling
see
http://english.stackexchange.com/questions/4510/why-is-cannot-spelled-as-one-word
:)
it's normally and imho correctly spelled cannot as one word, with no space.
Change-Id: I5a3d1016a3c0f46512e1d59ec4f3d5cfc9f981fc
---
M lib/config/WikibaseLib.default.php
M lib/includes/LanguageFallbackChain.php
M lib/includes/formatters/MwTimeIsoFormatter.php
M repo/config/Wikibase.default.php
M repo/i18n/en.json
M repo/includes/ChangeOp/ChangeOpClaim.php
M repo/includes/actions/EditEntityAction.php
M repo/includes/api/ApiWikibase.php
M repo/includes/api/EditEntity.php
M repo/includes/api/LinkTitles.php
M repo/includes/content/EntityHandler.php
M repo/includes/rdf/DateTimeValueCleaner.php
M repo/includes/rdf/JulianDateTimeValueCleaner.php
M repo/includes/specials/SpecialSetLabelDescriptionAliases.php
M repo/tests/phpunit/includes/EditEntityTest.php
15 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/52/209152/1
diff --git a/lib/config/WikibaseLib.default.php
b/lib/config/WikibaseLib.default.php
index 7195a87..177eaad 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -45,7 +45,7 @@
'dispatchBatchCacheFactor' = 3,
// Allow the TermIndex table to work without weights,
- // for sites that can not easily roll out schema changes on large
tables.
+ // for sites that cannot easily roll out schema changes on large tables.
// This means that all searches will return an undefined order
// (depending on the database's inner working).
'withoutTermWeight' = false,
diff --git a/lib/includes/LanguageFallbackChain.php
b/lib/includes/LanguageFallbackChain.php
index f6d2090..17e54a1 100644
--- a/lib/includes/LanguageFallbackChain.php
+++ b/lib/includes/LanguageFallbackChain.php
@@ -115,7 +115,7 @@
foreach ( $data as $languageCode = $value ) {
if ( Language::isValidCode( $languageCode ) ) {
- // We can not translate here, we do not have a
LanguageWithConversion object
+ // We cannot translate here, we do not have a
LanguageWithConversion object
return $this-getValueArray( $value,
$languageCode );
}
}
diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php
b/lib/includes/formatters/MwTimeIsoFormatter.php
index 8b85767..7fa9792 100644
--- a/lib/includes/formatters/MwTimeIsoFormatter.php
+++ b/lib/includes/formatters/MwTimeIsoFormatter.php
@@ -96,10 +96,10 @@
$localizedDate = $this-language-sprintfDate( $dateFormat,
$mwTimestamp );
if ( $mwYear !== $localizedYear ) {
- // If we can not reliably fix the year, return the full
time stamp. This should
+ // If we cannot reliably fix the year, return the full
time stamp. This should
// never happen as Language::sprintfDate should always
return a 4 digit year.
if ( substr_count( $localizedDate, $mwYear ) !== 1 ) {
- throw new InvalidArgumentException( 'Can not
identify year in formatted date.' );
+ throw new InvalidArgumentException( 'Cannot
identify year in formatted date.' );
}
$localizedDate = str_replace( $mwYear, $localizedYear,
$localizedDate );
@@ -307,7 +307,7 @@
*/
private function getMessage( $key, $param ) {
$message = new Message( $key );
- // FIXME: As the frontend can not parse the translated
precisions we only want to
+ // FIXME: As the frontend cannot parse the translated
precisions we only want to
// present the English for now. Once the frontend is using
backend parsers we can
// turn the translation on. See the FIXME in
MwTimeIsoParser::reconvertOutputString.
// $message-inLanguage( $this-language );
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 5722fd3..eecc97a 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -28,7 +28,7 @@
),
// Allow the TermIndex table to work without the
term_search_key field,
- // for sites that can not easily roll out schema changes on
large tables.
+ // for sites that cannot easily roll out schema changes on
large tables.
// This means that all searches will use exact matching
// (depending on the database's collation).
[MediaWiki-commits] [Gerrit] visualeditor-default.dblist: Add comments explaining order - change (operations/mediawiki-config)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/209151 Change subject: visualeditor-default.dblist: Add comments explaining order .. visualeditor-default.dblist: Add comments explaining order Change-Id: I55cdf0ed6143ad8b7ee0690303fcf784c6dc42d3 --- M visualeditor-default.dblist 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/51/209151/1 diff --git a/visualeditor-default.dblist b/visualeditor-default.dblist index 6b6876e..b2e8454 100644 --- a/visualeditor-default.dblist +++ b/visualeditor-default.dblist @@ -1,5 +1,7 @@ +# Group 0 wikis test2wiki mediawikiwiki +# Wikipedias aawiki abwiki acewiki @@ -214,15 +216,25 @@ yowiki zeawiki zuwiki -cawikiquote +# Wiktionaries frwiktionary +# Wikiquotes +cawikiquote +# Wikibookses frwikibooks ptwikibooks +# Wikisources +# Wikinewses +# Wikiversities frwikiversity ptwikiversity +# Wikivoyages +# Wikimanias wikimania2014wiki wikimania2015wiki wikimania2016wiki +# Other wikis (e.g. Commons, Meta, Wikimedias) +# Private wikis boardwiki collabwiki legalteamwiki -- To view, visit https://gerrit.wikimedia.org/r/209151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55cdf0ed6143ad8b7ee0690303fcf784c6dc42d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admin: add group for traceback-roots - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/209159 Change subject: admin: add group for traceback-roots .. admin: add group for traceback-roots Bug:T98148 Change-Id: I254bc53e9e57ed671b2c8a1afcc6694081b0eaa9 --- A hieradata/hosts/rhenium.yaml M modules/admin/data/data.yaml 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/59/209159/1 diff --git a/hieradata/hosts/rhenium.yaml b/hieradata/hosts/rhenium.yaml new file mode 100644 index 000..74b4c57 --- /dev/null +++ b/hieradata/hosts/rhenium.yaml @@ -0,0 +1,2 @@ +admin::groups: + - traceback-roots diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 4e2f2b6..6f6f75d 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -305,6 +305,11 @@ members: [yurik] privileges: ['ALL = NOPASSWD: /usr/sbin/service graphoid *', 'ALL = (graphoid) NOPASSWD: ALL'] + traceback-roots: +gid: 751 +description: people who have full root on traceback hosts +members: [dkg] +privileges: ['ALL = (ALL) NOPASSWD: ALL'] users: rush: ensure: present -- To view, visit https://gerrit.wikimedia.org/r/209159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I254bc53e9e57ed671b2c8a1afcc6694081b0eaa9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logstash: change heap size to 256m - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: logstash: change heap size to 256m .. logstash: change heap size to 256m For currently unknown reasons heap sizes 256m aren't working on logstash1001. Change-Id: Ied4b79bcd43d229e8895f2bc49632f80c704e291 --- M hieradata/role/common/logstash.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/hieradata/role/common/logstash.yaml b/hieradata/role/common/logstash.yaml index a23ab5a..33ecff8 100644 --- a/hieradata/role/common/logstash.yaml +++ b/hieradata/role/common/logstash.yaml @@ -28,4 +28,4 @@ # current configuration isn't thread safe and can cause crashes or # garbled output when used with more than one thread worker. logstash::filter_workers: 1 -logstash::heap_memory_mb: 1024 +logstash::heap_memory_mb: 256 -- To view, visit https://gerrit.wikimedia.org/r/209161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied4b79bcd43d229e8895f2bc49632f80c704e291 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Explicitly define module position - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged. Change subject: Explicitly define module position .. Explicitly define module position Style modules currently added through addModuleStyles default to being in the head (top position). This is an unhealthy default, since only critical styles that are needed at pageload should be in the head. In order to be able to switch the default to bottom, existing module positions have to be defined explicitly. Bug: T97410 Change-Id: I7d9e793b4b36a9ca3f5da75480ad89cddf7d5bf8 --- M client/resources/Resources.php M repo/resources/Resources.php M view/resources/jquery/wikibase/resources.php M view/resources/jquery/wikibase/toolbar/resources.php M view/resources/wikibase/resources.php 5 files changed, 5 insertions(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/client/resources/Resources.php b/client/resources/Resources.php index 2f695e2..6930b12 100644 --- a/client/resources/Resources.php +++ b/client/resources/Resources.php @@ -38,6 +38,7 @@ 'styles' = 'wikibase.client.page-move.css' ), 'wikibase.client.changeslist.css' = $moduleTemplate + array( + 'position' = 'top', 'styles' = 'wikibase.client.changeslist.css' ), 'wikibase.client.linkitem.init' = $moduleTemplate + array( diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php index 8408ee0..205a3ca 100644 --- a/repo/resources/Resources.php +++ b/repo/resources/Resources.php @@ -140,6 +140,7 @@ /* Wikibase special pages */ 'wikibase.special' = $moduleTemplate + array( + 'position' = 'top', 'styles' = array( 'wikibase.special/wikibase.special.css' ), diff --git a/view/resources/jquery/wikibase/resources.php b/view/resources/jquery/wikibase/resources.php index a2785c0..4b39988 100644 --- a/view/resources/jquery/wikibase/resources.php +++ b/view/resources/jquery/wikibase/resources.php @@ -431,6 +431,7 @@ ), 'jquery.wikibase.statementview' = $moduleTemplate + array( + 'position' = 'top', 'scripts' = array( 'jquery.wikibase.statementview.js', 'jquery.wikibase.statementview.RankSelector.js', diff --git a/view/resources/jquery/wikibase/toolbar/resources.php b/view/resources/jquery/wikibase/toolbar/resources.php index 9be1c67..2dce035 100644 --- a/view/resources/jquery/wikibase/toolbar/resources.php +++ b/view/resources/jquery/wikibase/toolbar/resources.php @@ -91,6 +91,7 @@ ), 'jquery.wikibase.toolbar' = $moduleTemplate + array( + 'position' = 'top', 'scripts' = array( 'jquery.wikibase.toolbar.js', ), diff --git a/view/resources/wikibase/resources.php b/view/resources/wikibase/resources.php index fd389f6..3359133 100644 --- a/view/resources/wikibase/resources.php +++ b/view/resources/wikibase/resources.php @@ -18,6 +18,7 @@ // common styles independent from JavaScript being enabled or disabled 'wikibase.common' = $moduleTemplate + array( + 'position' = 'top', 'styles' = array( // Order must be hierarchical, do not order alphabetically 'wikibase.css', -- To view, visit https://gerrit.wikimedia.org/r/208982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d9e793b4b36a9ca3f5da75480ad89cddf7d5bf8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed duplicated jobs in triggerOpportunisticLinksUpdate() - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209171
Change subject: Removed duplicated jobs in triggerOpportunisticLinksUpdate()
..
Removed duplicated jobs in triggerOpportunisticLinksUpdate()
* They get deduplicated on final insertion, but de-duplication them
on initial insertion (EnqueueJob) to avoid any build-up there.
Change-Id: Ia06f2bdf59a7e57fddb22890aa0b39420c0bfa7d
---
M includes/jobqueue/JobSpecification.php
M includes/page/WikiPage.php
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/209171/1
diff --git a/includes/jobqueue/JobSpecification.php
b/includes/jobqueue/JobSpecification.php
index 327a18f..9ace1ba 100644
--- a/includes/jobqueue/JobSpecification.php
+++ b/includes/jobqueue/JobSpecification.php
@@ -97,7 +97,7 @@
/**
* @param string $type
* @param array $params Map of key/values
-* @param array $opts Map of key/values
+* @param array $opts Map of key/values; includes 'removeDuplicates'
* @param Title $title Optional descriptive title
*/
public function __construct(
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index e938ca8..cc182a4 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -3412,7 +3412,8 @@
// Check if the last link refresh was before page_touched
if ( $this-getLinksTimestamp() $this-getTouched() ) {
JobQueueGroup::singleton()-push(
EnqueueJob::newFromLocalJobs(
- new JobSpecification( 'refreshLinks', $params,
array(), $this-mTitle )
+ new JobSpecification( 'refreshLinks', $params,
+ array( 'removeDuplicates' = true ),
$this-mTitle )
) );
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/209171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia06f2bdf59a7e57fddb22890aa0b39420c0bfa7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Populate abort.type in Schema:Edit logging - change (mediawiki...WikiEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Populate abort.type in Schema:Edit logging
..
Populate abort.type in Schema:Edit logging
Using document.activeElement at the time of the unload
event as a proxy for whether the user is switching to VE.
Switching to VE is weighed more heavily than whether or not
the user made changes: switching to VE causes abort.type to be
'switchwithout' regardless of whether changes were made; only
if the user isn't switching to VE do we look at whether changes
were made and use 'abort' or 'nochange' as appropriate.
When wgAction === 'submit' (i.e. we're on a preview / show changes
view), it is assumed that the user has made changes.
Bug: T95938
Change-Id: Ic91b87c4fc5b601e1fd98b237100d808e97400bd
(cherry picked from commit d1270ed4b65e6bef4c9f899a22835699dbdc4c57)
---
M modules/ext.wikiEditor.js
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikiEditor.js b/modules/ext.wikiEditor.js
index fc33fc9..0663c2b 100644
--- a/modules/ext.wikiEditor.js
+++ b/modules/ext.wikiEditor.js
@@ -54,6 +54,7 @@
$( function () {
var $textarea = $( '#wpTextbox1' ),
$editingSessionIdInput = $( '#editingStatsId' ),
+ origText = $textarea.val(),
submitting, onUnloadFallback;
// Initialize wikiEditor
@@ -69,7 +70,12 @@
} );
onUnloadFallback = window.onunload;
window.onunload = function () {
- var fallbackResult;
+ var fallbackResult,
+ caVeEdit = $( '#ca-ve-edit' )[0],
+ switchingToVE = caVeEdit (
+ document.activeElement ===
caVeEdit ||
+ $.contains( caVeEdit,
document.activeElement )
+ );
if ( onUnloadFallback ) {
fallbackResult = onUnloadFallback();
@@ -77,8 +83,12 @@
if ( !submitting ) {
logEditEvent( 'abort', {
- editingSessionId:
editingSessionId
- // TODO: abort.type
+ editingSessionId:
editingSessionId,
+ type: switchingToVE ?
'switchwithout' :
+ ( mw.config.get(
'wgAction' ) !== 'submit' origText === $textarea.val() ?
+ 'nochange' :
+ 'abandon'
+ )
} );
}
@@ -95,4 +105,4 @@
};
}
} );
-}( jQuery, mediaWiki ) );
\ No newline at end of file
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/208871
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic91b87c4fc5b601e1fd98b237100d808e97400bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: wmf/1.26wmf3
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
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 mod_expires config for static/ - change (operations/puppet)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/209145 Change subject: update mod_expires config for static/ .. update mod_expires config for static/ * Increase max-age to 31536000 (1 year), because static assets are versioned by branch directory (except static/current -- but for those resources, URLs are versioned via a query string). * Add caching headers for favicon.ico * Apply to /srv/mediawiki/(static|images|docroot|w/static). Change-Id: If96a762c23cd81145efd1e1825b58baa6f10ae79 --- M modules/mediawiki/files/apache/modules/expires.conf 1 file changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/45/209145/1 diff --git a/modules/mediawiki/files/apache/modules/expires.conf b/modules/mediawiki/files/apache/modules/expires.conf index 800e68d..e912917 100644 --- a/modules/mediawiki/files/apache/modules/expires.conf +++ b/modules/mediawiki/files/apache/modules/expires.conf @@ -2,20 +2,22 @@ # sends max-age and Expires header, time in seconds IfModule mod_expires.c ExpiresActive On -Directory /srv/mediawiki/docroot -FilesMatch \.(gif|jpe?g|png|css|js|json|woff|woff2|svg|eot|ttf)$ -ExpiresByType image/gif A2592000 -ExpiresByType image/png A2592000 -ExpiresByType image/jpeg A2592000 -ExpiresByType text/css A2592000 -ExpiresByType text/javascript A2592000 -ExpiresByType application/x-javascript A2592000 -ExpiresByType application/json A2592000 -ExpiresByType application/font-woff A2592000 -ExpiresByType application/font-woff2 A2592000 -ExpiresByType image/svg+xml A2592000 -ExpiresByType application/vnd.ms-fontobject A2592000 -ExpiresByType application/x-font-ttf A2592000 + Directory ~ ^/srv/mediawiki/(images|docroot|static) +FilesMatch \.(gif|jpe?g|png|css|js|json|woff|woff2|svg|eot|ttf|ico)$ +ExpiresByType image/gif A31536000 +ExpiresByType image/png A31536000 +ExpiresByType image/jpeg A31536000 +ExpiresByType text/css A31536000 +ExpiresByType text/javascript A31536000 +ExpiresByType application/x-javascript A31536000 +ExpiresByType application/json A31536000 +ExpiresByType application/font-woff A31536000 +ExpiresByType application/font-woff2 A31536000 +ExpiresByType image/svg+xml A31536000 +ExpiresByType image/x-icon A31536000 +ExpiresByType image/vnd.microsoft.icon A31536000 +ExpiresByType application/vnd.ms-fontobject A31536000 +ExpiresByType application/x-font-ttf A31536000 Header add Access-Control-Allow-Origin * /FilesMatch /Directory -- To view, visit https://gerrit.wikimedia.org/r/209145 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If96a762c23cd81145efd1e1825b58baa6f10ae79 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump WikiEditor for Ic91b87c4f - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Bump WikiEditor for Ic91b87c4f .. Bump WikiEditor for Ic91b87c4f Change-Id: I3e271df6719ececfdbca001089354f0a5eb1baf2 --- M extensions/WikiEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/WikiEditor b/extensions/WikiEditor index da3dec3..814f567 16 --- a/extensions/WikiEditor +++ b/extensions/WikiEditor -Subproject commit da3dec37649e939d41542f98b094d54d68c2814b +Subproject commit 814f5678b624c92b0ca3b1d22d9b4129d14717df -- To view, visit https://gerrit.wikimedia.org/r/209147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e271df6719ececfdbca001089354f0a5eb1baf2 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf3 Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com 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 Flow to 1.26wmf4 HEAD - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Flow to 1.26wmf4 HEAD .. Update Flow to 1.26wmf4 HEAD Change-Id: I51d2931aff820d767bcdfa8aa5ebff247907a521 --- M extensions/Flow 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Flow b/extensions/Flow index 1562904..f15796f 16 --- a/extensions/Flow +++ b/extensions/Flow -Subproject commit 15629041862280dc051704e1d3b828a8bbed667e +Subproject commit f15796f641bcedb53eb38169c6fb565c7f0a34b1 -- To view, visit https://gerrit.wikimedia.org/r/209142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51d2931aff820d767bcdfa8aa5ebff247907a521 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admin: add user for dkg - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/209155 Change subject: admin: add user for dkg .. admin: add user for dkg Bug:T98148 Change-Id: Icba23492f180edd5276142a04341c78910707dde --- M modules/admin/data/data.yaml 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/55/209155/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index 7dac22a..4e2f2b6 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -1401,3 +1401,10 @@ realname: Guillaume Paumier ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQCxE/ZWep1KH3AEenFtT+8+RJIzbbQfMoTxFPpGhvXZcBijxj+SajDzzgF5lyv+j+pjFsty524R3rEK+Dxu8zpORsVLODuAHMcFDoPeC6IgQKCxnJlWMcNfhUX0VXcm+sjPPTlSKkPsvXypiErB/LWlMT5splo7debfRXRgr4Kh1fZAcrkaoZCW66Ipn7g6Mw2efS1WbJLtpwQDrhzHlL7XuoDJZWwpch1ZcKbBW8TSh3haPFpMhNow2Qtb7V0ZCk+f3dzT6D1vEL1aKQQwskR/GM9nrBgLIGB0ucgue3GcDnpI6W+nLRmamKMc1JX4HfP0J3RrkZgaK661XxHmHOq/ gpaum...@wikimedia.org] uid: 2047 + dkg: +ensure: present +gid: 500 +name: dkg +realname: Daniel Kahn Gillmor +ssh_keys: [ssh-rsa B3NzaC1yc2EDAQABAAABAQC8NY6C8j5WYDAeXbs3C0L9Prr+cAuOgvkoeYwLpV3l+WuYTC6m0LpnaZ53d9o/r5zqKaIDC4F2FgP4cU52qikFqNorqvsZ3sFHAy5XWFtvSzsaRTGUKhs+Y14TKKpQ2Y+oynsuZFN8wm4N6U8ZepeFT+fDtPBPT9lrzooxGydnyw2246LRhx7jtrYwnAMi78+dPTBTNXVQm5oHHAwDpLnEgNe35ii78qZxSlS1qnfwXKfNrdRafCwHDetR8VEiZgsVkZ15GaKZ441rvXYsLkuzBqC1BseRfaPAYZ5hFq3ikP2zW6JNJ5IS8k8JfR9wMmuSB8J+U2op/qoCJQQ3HMAb dkg] +uid: 12138 -- To view, visit https://gerrit.wikimedia.org/r/209155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icba23492f180edd5276142a04341c78910707dde Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata - fix api error output when parsing values - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209160
Change subject: Update Wikidata - fix api error output when parsing values
..
Update Wikidata - fix api error output when parsing values
and elsewhere this is used by the Wikibase api
Change-Id: Ibf054807644f42b425b9bc7bba043f61a5fba990
---
M composer.lock
M extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
M vendor/composer/installed.json
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/60/209160/1
diff --git a/composer.lock b/composer.lock
index 975015b..1b7223d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1213,7 +1213,7 @@
source: {
type: git,
url:
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: eedce83fe41a299f242c2933e23bbbc8ce2dc944
+reference: b83449d82ca0a5f2fb890e37ef76bb3d0075d463
},
require: {
data-values/common: ~0.2.0,
@@ -1283,7 +1283,7 @@
issues: https://bugzilla.wikimedia.org/;,
irc: irc://irc.freenode.net/wikidata
},
-time: 2015-05-05 19:13:08
+time: 2015-05-06 01:04:37
},
{
name: wikibase/wikimedia-badges,
diff --git a/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
b/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
index 9ad77b5..002503e 100644
--- a/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
+++ b/extensions/Wikibase/repo/includes/api/ApiErrorReporter.php
@@ -440,7 +440,7 @@
ApiResult::setIndexedTagName( $row['parameters'], 'parameter' );
$html = $this-forceMessageLanguage( $message, $this-language
)-useDatabase( true )-parse();
- ApiResult::setContentValue( $row, 'html', $html );
+ ApiResult::setValue( $row, 'html', $html );
$row[ApiResult::META_BC_SUBELEMENTS][] = 'html';
return $row;
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6de4ea1..7d9ed3e 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1303,7 +1303,7 @@
source: {
type: git,
url:
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: eedce83fe41a299f242c2933e23bbbc8ce2dc944
+reference: b83449d82ca0a5f2fb890e37ef76bb3d0075d463
},
require: {
data-values/common: ~0.2.0,
@@ -1329,7 +1329,7 @@
conflict: {
mediawiki/mediawiki: 1.23
},
-time: 2015-05-05 18:50:37,
+time: 2015-05-05 20:16:30,
type: mediawiki-extension,
installation-source: source,
autoload: {
--
To view, visit https://gerrit.wikimedia.org/r/209160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf054807644f42b425b9bc7bba043f61a5fba990
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.26wmf4
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add user name suggestions from the API in the mention inspector - change (mediawiki...Flow)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209167
Change subject: Add user name suggestions from the API in the mention inspector
..
Add user name suggestions from the API in the mention inspector
Keep the suggestions from the topic: we're able to do more useful
search on them (substring match rather than prefix match) and
float them to the top.
Bug: T93421
Change-Id: I1aa5cfc1e2d645ba977f265fd9f3b13bc2589e46
---
M
modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
1 file changed, 54 insertions(+), 78 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/67/209167/1
diff --git
a/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
b/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
index 2ea6aab..57fd243 100644
---
a/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
+++
b/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
@@ -25,8 +25,6 @@
return !mw.util.isIPAddress( poster, false );
} );
this.username = null;
- // Username to validity promise (promise resolves with
true/false for existent/non-existent
- this.isUsernameValidCache = {};
this.$element.addClass( 'flow-ve-ui-mentionTargetInputWidget' );
this.lookupMenu.$element.addClass(
'flow-ve-ui-mentionTargetInputWidget-menu' );
@@ -37,81 +35,63 @@
OO.mixinClass( mw.flow.ve.ui.MentionTargetInputWidget,
OO.ui.LookupElement );
mw.flow.ve.ui.MentionTargetInputWidget.prototype.isValid = function () {
- var api = new mw.Api(),
- dfd = $.Deferred(),
- promise = dfd.promise(),
- username = this.getValue(),
- widget = this,
- isValid;
-
- if ( $.trim( username ) === '' ) {
- dfd.resolve( false );
- return promise;
- }
-
- username = username[0].toUpperCase() + username.slice( 1 );
- if ( this.isUsernameValidCache[username] !== undefined ) {
- return this.isUsernameValidCache[username];
- }
-
- // Note that we delete this below if it turns out to get an
error.
- this.isUsernameValidCache[username] = promise;
-
- api.get( {
- action: 'query',
- list: 'users',
- ususers: username
- } ).done( function ( resp ) {
- if (
- resp
- resp.query
- resp.query.users
- resp.query.users.length 0
- ) {
- // This is the normal path for either existent
or non-existent users.
- isValid = resp.query.users[0].missing ===
undefined;
- dfd.resolve( isValid );
- } else {
- // This means part of the response is missing,
which again shouldn't
- // happen (it could for empty string user, but
we're not supposed to
- // send the request at all then). See
explanation under fail.
- dfd.resolve( true );
- delete widget.isUsernameValidCache[username];
- }
- } ).fail( function () {
- // This should only happen on error cases. Even if the
user doesn't exist,
- // we should still enter done. Since this is an
unforseen error, return true
- // so we don't block submission, and evict cache.
- dfd.resolve( true );
- delete widget.isUsernameValidCache[username];
- } );
-
- return promise;
+ return $.Deferred().resolve( !!mw.Title.newFromText(
this.value, 2 ) );
};
/**
* Gets a promise representing the auto-complete.
-* Right now, the auto-complete is based on the users who have already
posted to the topic.
+* The auto-complete is based on the users who have already posted to
the topic
+* and on an API call.
*
-* It does a case-insensitive search for a string (anywhere in the
poster's username)
-* matching what the user has typed in so far.
-*
+* For users who have posted to the topic, we do a case-insensitive
search for a string
+
[MediaWiki-commits] [Gerrit] [WIP] MentionTargetInputWidget: Segment the suggestions list - change (mediawiki...Flow)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209168
Change subject: [WIP] MentionTargetInputWidget: Segment the suggestions list
..
[WIP] MentionTargetInputWidget: Segment the suggestions list
We already float users that posted on the topic to the top,
this adds explicit labeling to that.
Bug: T93421
Change-Id: I5be2be6cc94a2b97cce18f43efc9b9c56f017c7c
---
M Resources.php
M i18n/en.json
M i18n/qqq.json
M
modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
4 files changed, 22 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/68/209168/1
diff --git a/Resources.php b/Resources.php
index 6b8aa95..b4ac34b 100644
--- a/Resources.php
+++ b/Resources.php
@@ -477,6 +477,8 @@
'flow-ve-mention-inspector-title',
'flow-ve-mention-inspector-remove-label',
'flow-ve-mention-inspector-invalid-user',
+ 'flow-ve-mention-inspector-suggestions-topic',
+ 'flow-ve-mention-inspector-suggestions-other',
'flow-ve-mention-tool-title',
'flow-ve-switch-editor-tool-title',
),
diff --git a/i18n/en.json b/i18n/en.json
index 1a8891c..add5ca0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -535,6 +535,8 @@
flow-ve-mention-tool-title: Mention a user,
flow-ve-mention-template: ping,
flow-ve-mention-inspector-invalid-user: The username \$1\ is not
registered.,
+ flow-ve-mention-inspector-suggestions-topic: Participants in this
conversation,
+ flow-ve-mention-inspector-suggestions-other: Other users,
flow-wikitext-editor-help: Wikitext $1.,
flow-wikitext-editor-help-and-preview: Wikitext $1 and you can $2
anytime.,
flow-wikitext-editor-help-uses-wikitext: [[mw:Help:Formatting|uses
markup]],
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c3a07cb..8bea72d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -540,6 +540,8 @@
flow-ve-mention-tool-title: Title text for the user mention tool on
Flow's VisualEditor toolbar.,
flow-ve-mention-template: Name of on-wiki template used for user
mentions. The template should accept a call in the form
nowiki{{templatename|Username}}/nowiki, to mention Username. It uses the
content language.,
flow-ve-mention-inspector-invalid-user: Error shown when the poster
attempts to mention a user that does not exist. Parameters:\n$1: Username.
The username is not registered; thus, gender is unknown.,
+ flow-ve-mention-inspector-suggestions-topic: Label for user name
suggestions based on users that posted to the current topic.,
+ flow-ve-mention-inspector-suggestions-other: Label for user name
suggestions based on users that did not post to the current topic (in contrast
with {{msg-mw|flow-ve-mention-inspector-suggestions-topic}}).,
flow-wikitext-editor-help: Text shown at the bottom of a wikitext
editing box when visualeditor is not available to switch to.\n\n$1 is
{{msg-mw|Flow-wikitext-editor-help-uses-wikitext}}.,
flow-wikitext-editor-help-and-preview: Text shown at the bottom of a
wikitext editing box when visualeditor is available to switch to.\n* $1 is
{{msg-mw|flow-wikitext-editor-help-uses-wikitext}}\n* $2 is
{{msg-mw|flow-wikitext-editor-help-preview-the-result}},
flow-wikitext-editor-help-uses-wikitext: Link to wikitext help. Used
in the following messages:\n* {{msg-mw|flow-wikitext-editor-help}}\n*
{{msg-mw|flow-wikitext-editor-help-and-preview}},
diff --git
a/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
b/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
index 57fd243..25289fe 100644
---
a/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
+++
b/modules/editor/editors/visualeditor/ui/widgets/mw.flow.ve.ui.MentionTargetInputWidget.js
@@ -107,12 +107,26 @@
* @return {OO.ui.MenuOptionWidget[]} Menu items
*/
mw.flow.ve.ui.MentionTargetInputWidget.prototype.getLookupMenuOptionsFromData =
function ( data ) {
- return $.map( data.localMatches.concat( data.apiMatches ),
function ( username ) {
+ function makeOption( username ) {
return new OO.ui.MenuOptionWidget( {
data: username,
label: username
} );
- } );
+ }
+
+ var items = [];
+
+ if ( data.localMatches.length 0 ) {
+ items.push( new OO.ui.MenuSectionOptionWidget( { label:
mw.msg( 'flow-ve-mention-inspector-suggestions-topic' ) } ) );
+ items =
[MediaWiki-commits] [Gerrit] Fix paths and add set handler - change (search/extra)
Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209169
Change subject: Fix paths and add set handler
..
Fix paths and add set handler
There were errors with paths that we hadn't caught due to test errors.
The set handler adds set operations (add and remove) to elasticsearch's lists.
This is usually done with dynamic scripting.
Change-Id: I3e032ca3a838b3a7f315a6f9b501f673b6d17859
---
M docs/super_detect_noop.md
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
A src/main/java/org/wikimedia/search/extra/superdetectnoop/ChangeHandler.java
D
src/main/java/org/wikimedia/search/extra/superdetectnoop/CloseEnoughDetector.java
A src/main/java/org/wikimedia/search/extra/superdetectnoop/SetHandler.java
M
src/main/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScript.java
D
src/main/java/org/wikimedia/search/extra/superdetectnoop/WithinAbsoluteDetector.java
A
src/main/java/org/wikimedia/search/extra/superdetectnoop/WithinAbsoluteHandler.java
D
src/main/java/org/wikimedia/search/extra/superdetectnoop/WithinPercentageDetector.java
A
src/main/java/org/wikimedia/search/extra/superdetectnoop/WithinPercentageHandler.java
A
src/test/java/org/wikimedia/search/extra/superdetectnoop/SetDetectorMonteCarlo.java
M
src/test/java/org/wikimedia/search/extra/superdetectnoop/SuperDetectNoopScriptTest.java
12 files changed, 685 insertions(+), 282 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/extra
refs/changes/69/209169/1
diff --git a/docs/super_detect_noop.md b/docs/super_detect_noop.md
index af4b7b0..3f511c0 100644
--- a/docs/super_detect_noop.md
+++ b/docs/super_detect_noop.md
@@ -2,24 +2,32 @@
=
The ```super_detect_noop``` native script is just like Elasticsearch's
-```detect_noop``` but it allows configurable sloppiness.
+```detect_noop``` but it allows configurable sloppiness and set operations.
Options
---
```super_detect_noop``` supports only the following options:
* ```source``` The source to merge into the existing source. Required.
-* ```detectors``` Configures sloppiness detectors. Optional, defaults to
+* ```handlers``` Object mapping path to change handler. Optional, defaults to
behaving exactly as Elasticsearch's ```detect_noop```. Possible field values:
* ```equals``` If the new value isn't equal to the old value then the new
value is written to the source. This is the default if no value is
-specified in the ```detectors``` object.
+specified in the ```handlers``` object.
* ```within nnn%``` If the new value isn't within nnn percent of the old
value then its written to the source. nnn is parsed as a double and all
math is performed with doubles.
* ```within nnn``` If the new value isn't within nnn of the old value then
its written to the source. nnn is parsed as a double and all math is
performed with doubles.
+* ```set``` Treats the new value as set operations to perform on the old
+value. See examples below for how to use it. Note that adding values to a
+field that doesn't exist will create it and removing values from a
+non-existant field won't. Setting the field to null will remove it. The
+only supported set operations are add and remove. They can be specified
+either as lists or as values. If they are values they thought of as a
+singleton list.
+
Examples
---
@@ -37,7 +45,7 @@
source: {
foo: 5
},
-detectors: {
+handlers: {
foo: within 20%
}
}
@@ -60,14 +68,57 @@
source: {
foo: {
bar: 5
-},
+}
},
-detectors: {
+handlers: {
foo.bar: within 20%
}
}
}'
```
+
+Set operations:
+curl -XDELETE localhost:9200/test?pretty
+curl -XPUT localhost:9200/test?pretty
+curl -XGET
'http://localhost:9200/_cluster/health?wait_for_status=yellowtimeout=50spretty'
+curl -XPUT localhost:9200/test/test/1 -d'{
+foo: [cat, dog, fish]
+}'
+curl localhost:9200/test/test/1?pretty
+curl -XPOST localhost:9200/test/test/1/_update -d'{
+script: super_detect_noop,
+lang: native,
+params: {
+source: {
+foo: {
+add: cow,
+remove: cat
+}
+},
+handlers: {
+foo: set
+}
+}
+}'
+curl localhost:9200/test/test/1?pretty
+curl -XPOST localhost:9200/test/test/1/_update -d'{
+script: super_detect_noop,
+lang: native,
+params: {
+source: {
+foo: {
+add: [cow],
+remove: [cat, fish]
+}
+},
+handlers: {
+foo: set
+}
+}
+}'
+curl localhost:9200/test/test/1?pretty
+```
+
Integrating
---
@@ -87,9 +138,9 @@
@Override
[MediaWiki-commits] [Gerrit] BUmp WikiEditor for Ic91b87c4f - change (mediawiki/core)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/209147 Change subject: BUmp WikiEditor for Ic91b87c4f .. BUmp WikiEditor for Ic91b87c4f Change-Id: I3e271df6719ececfdbca001089354f0a5eb1baf2 --- M extensions/WikiEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/47/209147/1 diff --git a/extensions/WikiEditor b/extensions/WikiEditor index da3dec3..814f567 16 --- a/extensions/WikiEditor +++ b/extensions/WikiEditor -Subproject commit da3dec37649e939d41542f98b094d54d68c2814b +Subproject commit 814f5678b624c92b0ca3b1d22d9b4129d14717df -- To view, visit https://gerrit.wikimedia.org/r/209147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e271df6719ececfdbca001089354f0a5eb1baf2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf3 Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gridengine: Puppetize gridengine-mailer - change (operations/puppet)
Yuvipanda has submitted this change and it was merged.
Change subject: gridengine: Puppetize gridengine-mailer
..
gridengine: Puppetize gridengine-mailer
Bug: T63160
Change-Id: Ia0fb28010ad05996e71c1e057e4185b40bfcb532
---
A modules/gridengine/files/gridengine-mailer
M modules/gridengine/manifests/init.pp
2 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/gridengine/files/gridengine-mailer
b/modules/gridengine/files/gridengine-mailer
new file mode 100755
index 000..0193f00
--- /dev/null
+++ b/modules/gridengine/files/gridengine-mailer
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# The grid engine outputs infinity numbers as 0^HINFINITY. On
+# consoles, this will properly display INFINITY, in mails however it
+# causes them to be encoded as application/octet-stream, so we replace
+# 0^HINFINITY with INFINITY here.
+
+sed s/0$'\b'INFINITY/INFINITY/g | mail $@
diff --git a/modules/gridengine/manifests/init.pp
b/modules/gridengine/manifests/init.pp
index e4a809f..e9f888d 100644
--- a/modules/gridengine/manifests/init.pp
+++ b/modules/gridengine/manifests/init.pp
@@ -62,5 +62,11 @@
mode= '0755',
}
+file { '/usr/local/bin/gridengine-mailer':
+ensure = file,
+owner = 'root',
+group = 'root',
+mode = '0555',
+source = 'puppet:///modules/gridengine/gridengine-mailer',
+}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/203656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0fb28010ad05996e71c1e057e4185b40bfcb532
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Tim Landscheidt t...@tim-landscheidt.de
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow View to enhance existing a server side rendered view - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow View to enhance existing a server side rendered view
..
Allow View to enhance existing a server side rendered view
Do not render the template when the enhance option is given.
Bug: T97648
Change-Id: I3455df3d7c0e66183ef01abe819eeac7f949cc41
---
M resources/mobile.pagelist/PageList.js
M resources/mobile.view/View.js
2 files changed, 7 insertions(+), 18 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.pagelist/PageList.js
b/resources/mobile.pagelist/PageList.js
index 7a1b2c7..ed54b39 100644
--- a/resources/mobile.pagelist/PageList.js
+++ b/resources/mobile.pagelist/PageList.js
@@ -28,14 +28,9 @@
* }
* }
* ]
-* @cfg {Boolean} defaults.enhance Whether to enhance views
already in DOM.
-* When enabled, the template is disabled so that it is not
rendered in the DOM.
-* Use in conjunction with View::defaults.$el to associate the
PageList with an existing
-* already rendered element in the DOM.
*/
defaults: {
- pages: [],
- enhance: false
+ pages: []
},
/**
* Render page images for the existing page list. Assumes no
page images have been loaded.
@@ -76,17 +71,6 @@
} );
}, delay );
}
- },
- /**
-* @inheritdoc
-*/
- initialize: function ( options ) {
- // FIXME: Find more elegant standard way to allow
enhancement of views already in DOM
- if ( options.enhance ) {
- this.template = false;
- }
-
- View.prototype.initialize.apply( this, arguments );
},
/**
* @inheritdoc
diff --git a/resources/mobile.view/View.js b/resources/mobile.view/View.js
index 41e2979..34aa7a4 100644
--- a/resources/mobile.view/View.js
+++ b/resources/mobile.view/View.js
@@ -127,6 +127,10 @@
*
* @cfg {Object} defaults Default options hash.
* @cfg {jQuery.Object|String} [defaults.el] jQuery selector to
use for rendering.
+* @cfg {Boolean} [defaults.enhance] Whether to enhance views
already in DOM.
+* When enabled, the template is disabled so that it is not
rendered in the DOM.
+* Use in conjunction with View::defaults.$el to associate the
View with an existing
+* already rendered element in the DOM.
*/
defaults: {},
@@ -208,7 +212,8 @@
}
// FIXME: don't pass optionsClone in the next version
(see mobile.startup.init.js)
this.preRender( optionsClone );
- if ( this.template ) {
+
+ if ( this.template !this.options.enhance ) {
this.$el.html( this.template.render(
this.options, this.templatePartials ) );
}
// FIXME: don't pass optionsClone in the next version
(see mobile.startup.init.js)
--
To view, visit https://gerrit.wikimedia.org/r/208166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3455df3d7c0e66183ef01abe819eeac7f949cc41
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Jhernandez jhernan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logstash: Convert Elasticsearch on logstash100[1-3] to client - change (operations/puppet)
Yuvipanda has submitted this change and it was merged. Change subject: logstash: Convert Elasticsearch on logstash100[1-3] to client .. logstash: Convert Elasticsearch on logstash100[1-3] to client Change the configuration of the Elasticsearch instances run on logstash100[1-3] to disallow data storage or master election. These instances are only used as clients to make accessing the backing Elasticsearch cluster easier. The heap size for these Elasticsearch client nodes is also reduced and additional heap is granted to Logstash. Bug: T96814 Change-Id: Ib89ca508876affec01e99c1a103a3014bc50dee4 --- M hieradata/role/common/logstash.yaml M hieradata/role/common/logstash/elasticsearch.yaml 2 files changed, 10 insertions(+), 2 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/logstash.yaml b/hieradata/role/common/logstash.yaml index f5254a2..99fdab0 100644 --- a/hieradata/role/common/logstash.yaml +++ b/hieradata/role/common/logstash.yaml @@ -3,10 +3,16 @@ - logstash-roots # ES-specific +# NOTE: multicast_group and cluster_name must be kept in sync with the backend +# node config in hieradata/role/common/logstash/elasticsearch.yaml elasticsearch::auto_create_index: true elasticsearch::cluster_name: production-logstash-eqiad elasticsearch::expected_nodes: 3 -elasticsearch::heap_memory: '5G' +elasticsearch::heap_memory: '2G' +# The ES nodes that are run on the same box as Logstash+Kibana are only used +# as client nodes to communicate with the backing cluster. +elasticsearch::holds_data: false +elasticsearch::master_eligible: false elasticsearch::minimum_master_nodes: 2 elasticsearch::multicast_group: 224.2.2.6 elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins @@ -22,4 +28,4 @@ # current configuration isn't thread safe and can cause crashes or # garbled output when used with more than one thread worker. logstash::filter_workers: 1 -logstash::heap_memory_mb: 128 +logstash::heap_memory_mb: '1G' diff --git a/hieradata/role/common/logstash/elasticsearch.yaml b/hieradata/role/common/logstash/elasticsearch.yaml index d52376f..72849a7 100644 --- a/hieradata/role/common/logstash/elasticsearch.yaml +++ b/hieradata/role/common/logstash/elasticsearch.yaml @@ -4,6 +4,8 @@ - logstash-roots # ES-specific +# NOTE: multicast_group and cluster_name must be kept in sync with the backend +# node config in hieradata/role/common/logstash.yaml elasticsearch::auto_create_index: true elasticsearch::cluster_name: production-logstash-eqiad elasticsearch::expected_nodes: 3 -- To view, visit https://gerrit.wikimedia.org/r/205971 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib89ca508876affec01e99c1a103a3014bc50dee4 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Gage jger...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] do text sanitation on selected text before sharing - change (apps...wikipedia)
Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209163
Change subject: do text sanitation on selected text before sharing
..
do text sanitation on selected text before sharing
We weren't doing sanitation on selected text before sharing, which was
allowing things like citations to slip through. See added test case for
wmf_shareSnippetFromText and its usage (as opposed to
wmf_shareSnippetFromHTML).
One drawback to this approach is that if a user *partially* selects a
citation like this.[1 it will still be passed through. IMO we need a
more comprehensive solution for how we select text for sharing (perhaps
using selectors on HTML w/ Parsoid markup?).
Bug: T95476
Change-Id: Id3e0d26c697d409baf6668118a8e695ff96ab4e9
---
M Wikipedia/Categories/NSString+WMFHTMLParsing.h
M Wikipedia/Categories/NSString+WMFHTMLParsing.m
M Wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M Wikipedia/View Controllers/ShareCard/WMFShareOptionsViewController.m
M Wikipedia/View Controllers/WebView/WebViewController.h
M Wikipedia/View Controllers/WebView/WebViewController.m
M WikipediaUnitTests/NSString+WMFHTMLParsingTests.m
7 files changed, 67 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/63/209163/1
diff --git a/Wikipedia/Categories/NSString+WMFHTMLParsing.h
b/Wikipedia/Categories/NSString+WMFHTMLParsing.h
index 94169f0..82062a8 100644
--- a/Wikipedia/Categories/NSString+WMFHTMLParsing.h
+++ b/Wikipedia/Categories/NSString+WMFHTMLParsing.h
@@ -25,11 +25,12 @@
/**
* Parse the receiver as HTML and return a heuristically defined snippet.
*/
-- (NSString*)wmf_getStringSnippetWithoutHTML;
+- (NSString*)wmf_shareSnippetFromHTML;
+
+/// @return A new string which has been sanitized to remove unnecesary
characters and wiki markup.
+- (NSString*)wmf_shareSnippetFromText;
/**
- *
- *
* @return Return string with internal whitespace segments reduced to single
space. Accounts for end of sentence punctuation like commas, semicolons and
periods. Trims leading and trailing whitespace as well.
*/
- (NSString*)wmf_getCollapsedWhitespaceStringAdjustedForTerminalPunctuation;
diff --git a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
index a89ad8f..63edc71 100644
--- a/Wikipedia/Categories/NSString+WMFHTMLParsing.m
+++ b/Wikipedia/Categories/NSString+WMFHTMLParsing.m
@@ -1,6 +1,7 @@
#import NSString+WMFHTMLParsing.h
#import WikipediaAppUtils.h
#import hpple/TFHpple.h
+#import NSString+Extras.h
static int const kMinimumLengthForPreTransformedHTMLForSnippet = 40;
static int const kHighestIndexForSubstringAfterHTMLRemoved = 350;
@@ -30,46 +31,43 @@
return [[self wmf_htmlTextNodes] componentsJoinedByString:delimiter];
}
-- (NSString*)wmf_getStringSnippetWithoutHTML {
+- (NSString*)wmf_shareSnippetFromHTML {
if (self.length kMinimumLengthForPreTransformedHTMLForSnippet) {
return nil;
}
-NSData* stringData = [self dataUsingEncoding:NSUTF8StringEncoding];
-TFHpple* parser = [TFHpple hppleWithHTMLData:stringData];
-NSArray* textNodes = [parser searchWithXPathQuery:@//p[1]//text()];
-NSMutableArray* results = @[].mutableCopy;
-for (TFHppleElement* node in textNodes) {
-[results addObject:node.raw];
-}
-NSString* result = [results componentsJoinedByString:@];
-result = [result substringToIndex:
- MIN(kHighestIndexForSubstringAfterHTMLRemoved, result.length)];
-result = [NSString wmf_stringSnippetSimplifiedInString:result];
-return result.length = kMinimumLengthForPreTransformedHTMLForSnippet ?
- result : nil;
+NSString* result =
+[[TFHpple hppleWithHTMLData:[self
dataUsingEncoding:NSUTF8StringEncoding]]
+ searchWithXPathQuery:@//p[1]//text()]
+valueForKey:WMF_SAFE_KEYPATH([TFHppleElement new], raw)]
+ componentsJoinedByString:@]
+ wmf_safeSubstringToIndex:kHighestIndexForSubstringAfterHTMLRemoved]
+ wmf_shareSnippetFromText];
+return result.length = kMinimumLengthForPreTransformedHTMLForSnippet ?
result : nil;
}
#pragma mark - String simplification and cleanup
-+ (NSString*)wmf_stringSnippetSimplifiedInString:(NSString*)string {
-NSString* result = [string stringByReplacingOccurrencesOfString:@amp;
withString:@];
-result = [string stringByReplacingOccurrencesOfString:@gt;
withString:@];
-result = [string stringByReplacingOccurrencesOfString:@lt;
withString:@];
-result = [result wmf_stringByCollapsingConsecutiveNewlines];
-result = [result wmf_stringByRecursivelyRemovingParenthesizedContent];
-result = [result wmf_stringByRemovingBracketedContent];
-result = [result wmf_stringByRemovingWhiteSpaceBeforeCommasAndSemicolons];
-result = [result
[MediaWiki-commits] [Gerrit] move db1021 to s2 and db1054 to sideline - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209164
Change subject: move db1021 to s2 and db1054 to sideline
..
move db1021 to s2 and db1054 to sideline
Bug: T89801
Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0
---
M manifests/site.pp
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/209164/1
diff --git a/manifests/site.pp b/manifests/site.pp
index ce2ee2f..3e7027a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -527,7 +527,7 @@
}
}
-node /^db10(21|26|45|58)\.eqiad\.wmnet/ {
+node /^db10(26|45|58)\.eqiad\.wmnet/ {
$cluster = 'mysql'
class { 'role::coredb::s5':
@@ -572,7 +572,7 @@
}
}
-node /^db10(36|54|60|63|67)\.eqiad\.wmnet/ {
+node /^db10(21|36|60|63|67)\.eqiad\.wmnet/ {
$cluster = 'mysql'
class { 'role::mariadb::core':
@@ -783,6 +783,14 @@
include role::mariadb::tendril
}
+# eqiad db hardware issues
+# db1054 T89801
+node /^db10(54)\.eqiad\.wmnet$/ {
+
+$cluster = 'mysql'
+include standard
+}
+
# codfw db
node /^db20(5[5-9]|6[0-9]|70)\.codfw\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/209164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add config to run jobchron service - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Add config to run jobchron service
..
Add config to run jobchron service
Adds an init config, based on the production jobchron.conf, to run the
jobchron service which is required for delayed jobs used in CirrusSearch
and other places.
Additionaly, as suggested in the ticket, changes the jobrunner and jobchron
to use php5 instead of hhvm. This results in a memory usage of ~15M per
service rather than the 65M-70M used by hhvm.
Bug: T92278
Change-Id: I1dab95c58d002191671e99ee2b9c80aeff22096b
---
A puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobchron
M puppet/modules/mediawiki/manifests/jobrunner.pp
A puppet/modules/mediawiki/templates/jobchron.conf.erb
M puppet/modules/mediawiki/templates/jobrunner.conf.erb
4 files changed, 66 insertions(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobchron
b/puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobchron
new file mode 100644
index 000..404663c
--- /dev/null
+++ b/puppet/modules/mediawiki/files/logrotate.d_mediawiki_jobchron
@@ -0,0 +1,13 @@
+# logrotate config for MediaWiki Jobrunner logs
+# This file is managed by Puppet
+/var/log/mediawiki/jobchron.log {
+daily
+missingok
+rotate 7
+compress
+notifempty
+nocreate
+postrotate
+/sbin/restart jobchron /dev/null 21
+endscript
+}
diff --git a/puppet/modules/mediawiki/manifests/jobrunner.pp
b/puppet/modules/mediawiki/manifests/jobrunner.pp
index 36918a8..0d68443 100644
--- a/puppet/modules/mediawiki/manifests/jobrunner.pp
+++ b/puppet/modules/mediawiki/manifests/jobrunner.pp
@@ -34,6 +34,14 @@
notify = Service['jobrunner'],
}
+file { '/etc/init/jobchron.conf':
+content = template('mediawiki/jobchron.conf.erb'),
+owner = 'root',
+group = 'root',
+mode= '0444',
+notify = Service['jobchron'],
+}
+
file { '/etc/jobrunner.ini':
ensure = absent,
}
@@ -53,10 +61,24 @@
mode = '0444',
}
+file { '/etc/logrotate.d/mediawiki_jobchron':
+source = 'puppet:///modules/mediawiki/logrotate.d_mediawiki_jobchron',
+owner = 'root',
+group = 'root',
+mode = '0444',
+}
+
service { 'jobrunner':
enable = true,
ensure = 'running',
provider = 'upstart',
require = Mediawiki::Wiki[$::mediawiki::wiki_name],
}
+
+service { 'jobchron':
+enable = true,
+ensure = 'running',
+provider = 'upstart',
+require = Mediawiki::Wiki[$::mediawiki::wiki_name],
+}
}
diff --git a/puppet/modules/mediawiki/templates/jobchron.conf.erb
b/puppet/modules/mediawiki/templates/jobchron.conf.erb
new file mode 100644
index 000..5727a45
--- /dev/null
+++ b/puppet/modules/mediawiki/templates/jobchron.conf.erb
@@ -0,0 +1,29 @@
+# jobchron -- Continuously maintain MediaWiki job queue
+description MediaWiki job queue chron loop
+
+start on (runlevel [2345] and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+pre-start script
+ mkdir -p -m0755 /var/run/jobchron
+ [ ! -r /etc/default/jobrunner ] { stop; exit 0; }
+ . /etc/default/jobrunner
+ mkdir -p -m0755 $(dirname
${JOBCHRON_LOGFILE:=/var/log/mediawiki/jobchron.log})
+ [ ! -r ${JOBRUNNER_CONFIG:=/etc/jobrunner.json} ] { stop; exit 1; }
+ php5 -r exit( !@is_array( json_decode( file_get_contents(
'$JOBRUNNER_CONFIG' ) ) ) ); /dev/null 21
+ [ $? -eq 0 ] || { stop; exit 1; }
+end script
+
+script
+ . /etc/default/jobrunner
+ exec start-stop-daemon --quiet --start --pidfile
${JOBCHRON_PID:-/var/run/jobchron/pid} \
+--chuid ${JOBRUNNER_USER:-nobody}:${JOBRUNNER_GROUP:-nogroup}
--make-pidfile \
+--exec /usr/bin/php5 -- %= @dir %/redisJobChronService \
+--config-file=${JOBRUNNER_CONFIG:-/etc/jobrunner.json} $DAEMON_OPTS \
+ ${JOBCHRON_LOGFILE:-/var/log/mediawiki/jobchron.log} 21
+end script
+
+respawn
+
+# vim: set ft=upstart:
+
diff --git a/puppet/modules/mediawiki/templates/jobrunner.conf.erb
b/puppet/modules/mediawiki/templates/jobrunner.conf.erb
index a205110..c5eb6e6 100644
--- a/puppet/modules/mediawiki/templates/jobrunner.conf.erb
+++ b/puppet/modules/mediawiki/templates/jobrunner.conf.erb
@@ -12,7 +12,7 @@
. /etc/default/jobrunner
mkdir -p -m0755 $(dirname
${JOBRUNNER_LOGFILE:=/var/log/mediawiki/jobrunner.log})
[ ! -r ${JOBRUNNER_CONFIG:=/etc/jobrunner.json} ] { stop; exit 1; }
- sudo -u ${JOBRUNNER_USER:-nobody} php -r exit( !@is_array( json_decode(
file_get_contents( '$JOBRUNNER_CONFIG' ), true ) ) ); /dev/null 21
+ php5 -r exit( !@is_array( json_decode( file_get_contents(
'$JOBRUNNER_CONFIG' ), true ) ) ); /dev/null 21
[ $? -eq 0 ] || { stop; exit 1; }
end script
@@ -20,7 +20,7 @@
.
[MediaWiki-commits] [Gerrit] move geoiplookup to text-addrs-v4 - change (operations/dns)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209174
Change subject: move geoiplookup to text-addrs-v4
..
move geoiplookup to text-addrs-v4
Also eliminates bits-addrs-v4, as this was the only consumer of
it, and removes bits-related examples from admin_state commentary
Do not merge before cache support for this move is fully deployed!
Change-Id: Ia95d1b550206297b3f78f736230b308d9b71d5a0
---
M admin_state
M config-geo
M templates/wikimedia.org
3 files changed, 13 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/74/209174/1
diff --git a/admin_state b/admin_state
index 6ce67fb..7295eeb 100644
--- a/admin_state
+++ b/admin_state
@@ -53,19 +53,19 @@
# geoip/text*/esams = DOWN
# geoip/mobile-addrs/esams = DOWN
#
-# # Disable all services except bits-addrs + bits-addrs-v4 in ulsfo,
+# # Disable all services except text-addrs + text-addrs-v4 in ulsfo,
# # regardless of the order of these lines:
# geoip/generic-map/ulsfo = DOWN
-# geoip/bits-*/ulsfo = UP
+# geoip/text-*/ulsfo = UP
#
-# # Disable all services except bits-addrs in ulsfo:
+# # Disable all services except text-addrs in ulsfo:
# geoip/generic-map/ulsfo = DOWN
-# geoip/bits-*/ulsfo = UP # marks both bits UP as prev example, but...
-# geoip/bits-addrs-v4/ulsfo = DOWN # this overrides the above for -v4
+# geoip/text-*/ulsfo = UP # marks both text UP as prev example, but...
+# geoip/text-addrs-v4/ulsfo = DOWN # this overrides the above for -v4
#
-# # Disables all services except bits-addrs + bits-addrs-v4 in ulsfo:
+# # Disables all services except text-addrs + text-addrs-v4 in ulsfo:
# geoip/generic-map/ulsfo = DOWN
-# geoip/bits-addrs-v4/ulsfo = DOWN # this does nothing because...
-# geoip/bits-*/ulsfo = UP # ... this overrides the line above completely
+# geoip/text-addrs-v4/ulsfo = DOWN # this does nothing because...
+# geoip/text-*/ulsfo = UP # ... this overrides the line above completely
#
##
diff --git a/config-geo b/config-geo
index 2e3ced9..63a89dc 100644
--- a/config-geo
+++ b/config-geo
@@ -240,7 +240,7 @@
ulsfo = { addrs_v4 = 198.35.26.96, addrs_v6 =
2620:0:863:ed1a::1 }
}
}
-text-addrs-v4 = { # v4 from above, for e.g. donate
+text-addrs-v4 = { # v4 from above, for e.g. donate and geoiplookup
map = generic-map
service_types = up
dcmap = {
@@ -258,16 +258,6 @@
codfw = { addrs_v4 = 208.80.153.234, addrs_v6 =
2620:0:860:ed1a::1:a }
esams = { addrs_v4 = 91.198.174.202, addrs_v6 =
2620:0:862:ed1a::1:a }
ulsfo = { addrs_v4 = 198.35.26.106, addrs_v6 =
2620:0:863:ed1a::1:a }
-}
-}
-bits-addrs-v4 = { # v4 from above, for e.g. geoiplookup
-map = generic-map
-service_types = up
-dcmap = {
-eqiad = 208.80.154.234
-codfw = 208.80.153.234
-esams = 91.198.174.202
-ulsfo = 198.35.26.106
}
}
upload-addrs = {
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 936ad62..a30b620 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -80,7 +80,7 @@
bits600 DYNA geoip!bits-addrs
upload 600 DYNA geoip!upload-addrs
m 600 DYNA geoip!mobile-addrs
-geoiplookup 600 DYNA geoip!bits-addrs-v4
+geoiplookup 600 DYNA geoip!text-addrs-v4
donate 600 DYNA geoip!text-addrs-v4
; Legacy geo-lb hostnames - no longer referenced
@@ -230,7 +230,7 @@
misc-web-lb.eqiad 1H IN A208.80.154.241
1H IN 2620:0:861:ed1a::11
-geoiplookup-lb.eqiad600 IN DYNA geoip!bits-addrs-v4/eqiad
+geoiplookup-lb.eqiad600 IN DYNA geoip!text-addrs-v4/eqiad
parsoid-lb.eqiad1H IN A208.80.154.248
1H IN 2620:0:861:ed1a::3:14
@@ -256,7 +256,7 @@
bits-lb.ulsfo 600 IN DYNA geoip!bits-addrs/ulsfo
upload-lb.ulsfo 600 IN DYNA geoip!upload-addrs/ulsfo
mobile-lb.ulsfo 600 IN DYNA geoip!mobile-addrs/ulsfo
-geoiplookup-lb.ulsfo600 IN DYNA geoip!bits-addrs-v4/ulsfo
+geoiplookup-lb.ulsfo600 IN DYNA geoip!text-addrs-v4/ulsfo
donate-lb.ulsfo 600 IN DYNA geoip!text-addrs-v4/ulsfo
1H IN MX 10polonium.wikimedia.org.
1H IN MX 50lead.wikimedia.org.
@@ -750,7 +750,7 @@
bits-lb 600 IN DYNA geoip!bits-addrs/esams
upload-lb 600 IN DYNA geoip!upload-addrs/esams
mobile-lb 600 IN DYNA geoip!mobile-addrs/esams
-geoiplookup-lb600 IN DYNA geoip!bits-addrs-v4/esams
+geoiplookup-lb600 IN DYNA geoip!text-addrs-v4/esams
donate-lb 600 IN DYNA geoip!text-addrs-v4/esams
1H
[MediaWiki-commits] [Gerrit] EventLogging varnish log tailers: make '.gif' suffix optional - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209175
Change subject: EventLogging varnish log tailers: make '.gif' suffix optional
..
EventLogging varnish log tailers: make '.gif' suffix optional
Since we're migrating the EventLogging end-point off of bits and nesting it
under /beacon, we may as well perform the other outstanding clean-up task,
which is to drop the '.gif' suffix, which was never really needed.
Change-Id: Ie482863e00e3245cffec2c44c0be6a5b1848f759
---
M modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/logging/eventlistener.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/209175/1
diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp
b/modules/role/manifests/cache/kafka/eventlogging.pp
index 849a445..7959365 100644
--- a/modules/role/manifests/cache/kafka/eventlogging.pp
+++ b/modules/role/manifests/cache/kafka/eventlogging.pp
@@ -11,7 +11,7 @@
topic = 'eventlogging-client-side',
varnish_name = $varnish_name,
varnish_svc_name = $varnish_svc_name,
-varnish_opts = { 'm' = 'RxURL:^/beacon/event\.gif\?.' },
+varnish_opts = { 'm' = 'RxURL:^/beacon/event(\.gif)?\?.' },
topic_request_required_acks = '-1',
}
}
diff --git a/modules/role/manifests/cache/logging/eventlistener.pp
b/modules/role/manifests/cache/logging/eventlistener.pp
index decf642..98136d7 100644
--- a/modules/role/manifests/cache/logging/eventlistener.pp
+++ b/modules/role/manifests/cache/logging/eventlistener.pp
@@ -8,7 +8,7 @@
listener_address = $event_listener,
port = '8422',
instance_name= $instance_name,
-cli_args = '-m RxURL:^/(beacon/)?event\.gif\?. -D',
+cli_args = '-m RxURL:^/(beacon/)?event(\.gif)?\?. -D',
log_fmt = '%q\t%l\t%n\t%t\t%h\t%{User-agent}i',
monitor = false,
}
--
To view, visit https://gerrit.wikimedia.org/r/209175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie482863e00e3245cffec2c44c0be6a5b1848f759
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Populate abort.type in Schema:Edit logging - change (mediawiki...WikiEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Populate abort.type in Schema:Edit logging
..
Populate abort.type in Schema:Edit logging
Using document.activeElement at the time of the unload
event as a proxy for whether the user is switching to VE.
Switching to VE is weighed more heavily than whether or not
the user made changes: switching to VE causes abort.type to be
'switchwithout' regardless of whether changes were made; only
if the user isn't switching to VE do we look at whether changes
were made and use 'abort' or 'nochange' as appropriate.
When wgAction === 'submit' (i.e. we're on a preview / show changes
view), it is assumed that the user has made changes.
Bug: T95938
Change-Id: Ic91b87c4fc5b601e1fd98b237100d808e97400bd
(cherry picked from commit d1270ed4b65e6bef4c9f899a22835699dbdc4c57)
---
M modules/ext.wikiEditor.js
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikiEditor.js b/modules/ext.wikiEditor.js
index fc33fc9..0663c2b 100644
--- a/modules/ext.wikiEditor.js
+++ b/modules/ext.wikiEditor.js
@@ -54,6 +54,7 @@
$( function () {
var $textarea = $( '#wpTextbox1' ),
$editingSessionIdInput = $( '#editingStatsId' ),
+ origText = $textarea.val(),
submitting, onUnloadFallback;
// Initialize wikiEditor
@@ -69,7 +70,12 @@
} );
onUnloadFallback = window.onunload;
window.onunload = function () {
- var fallbackResult;
+ var fallbackResult,
+ caVeEdit = $( '#ca-ve-edit' )[0],
+ switchingToVE = caVeEdit (
+ document.activeElement ===
caVeEdit ||
+ $.contains( caVeEdit,
document.activeElement )
+ );
if ( onUnloadFallback ) {
fallbackResult = onUnloadFallback();
@@ -77,8 +83,12 @@
if ( !submitting ) {
logEditEvent( 'abort', {
- editingSessionId:
editingSessionId
- // TODO: abort.type
+ editingSessionId:
editingSessionId,
+ type: switchingToVE ?
'switchwithout' :
+ ( mw.config.get(
'wgAction' ) !== 'submit' origText === $textarea.val() ?
+ 'nochange' :
+ 'abandon'
+ )
} );
}
@@ -95,4 +105,4 @@
};
}
} );
-}( jQuery, mediaWiki ) );
\ No newline at end of file
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/208870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic91b87c4fc5b601e1fd98b237100d808e97400bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: wmf/1.26wmf4
Gerrit-Owner: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump WikiEditor for Ic91b87c4f - change (mediawiki/core)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/209148 Change subject: Bump WikiEditor for Ic91b87c4f .. Bump WikiEditor for Ic91b87c4f Change-Id: I0eeb6372e4b297c13c44c1c1cd03ea925fc8d350 --- M extensions/WikiEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/48/209148/1 diff --git a/extensions/WikiEditor b/extensions/WikiEditor index 6224478..006e9d6 16 --- a/extensions/WikiEditor +++ b/extensions/WikiEditor -Subproject commit 622447881ae566af4ae027afe6ed490c0e8f6c40 +Subproject commit 006e9d64e4d0f30be0ce8d784eb6c41d1a4cefd3 -- To view, visit https://gerrit.wikimedia.org/r/209148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0eeb6372e4b297c13c44c1c1cd03ea925fc8d350 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Catrope roan.katt...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move Final Status out of transaction_results, use consts - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Move Final Status out of transaction_results, use consts
..
Move Final Status out of transaction_results, use consts
Final status is not inherent to the transaction result, so let's move it out.
Also define consts for each of the valid values
Bug: T98063
Change-Id: I97024487c4559dd18fd697c321660952c1ce51db
---
M DonationInterface.php
M adyen_gateway/adyen.adapter.php
M amazon_gateway/amazon.adapter.php
M amazon_gateway/amazon_gateway.body.php
M astropay_gateway/astropay.adapter.php
A gateway_common/FinalStatus.php
M gateway_common/GatewayPage.php
M gateway_common/PaymentResult.php
M gateway_common/gateway.adapter.php
M globalcollect_gateway/globalcollect.adapter.php
M globalcollect_gateway/globalcollect_resultswitcher.body.php
M globalcollect_gateway/scripts/orphan_adapter.php
M paypal_gateway/paypal.adapter.php
M tests/Adapter/Astropay/AstropayTest.php
M worldpay_gateway/worldpay.adapter.php
15 files changed, 124 insertions(+), 129 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DonationInterface.php b/DonationInterface.php
index 38c8a42..a40a791 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -107,6 +107,7 @@
$wgAutoloadClasses['DonationLogProcessor'] = $donationinterface_dir .
'gateway_common/DonationLogProcessor.php';
$wgAutoloadClasses['DonationQueue'] = $donationinterface_dir .
'gateway_common/DonationQueue.php';
$wgAutoloadClasses['EncodingMangler'] = $donationinterface_dir .
'gateway_common/EncodingMangler.php';
+$wgAutoloadClasses['FinalStatus'] = $donationinterface_dir .
'gateway_common/FinalStatus.php';
$wgAutoloadClasses['GatewayAdapter'] = $donationinterface_dir .
'gateway_common/gateway.adapter.php';
$wgAutoloadClasses['GatewayPage'] = $donationinterface_dir .
'gateway_common/GatewayPage.php';
$wgAutoloadClasses['GatewayType'] = $donationinterface_dir .
'gateway_common/gateway.adapter.php';
diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 5fbaf5e..27f0c4f 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -493,11 +493,11 @@
// Both of these are listed as pending because we have
to submit a capture
// request on 'AUTHORIZATION' ipn message receipt.
$this-logger-info( User came back as pending or
authorised, placing in pending queue );
- $this-finalizeInternalStatus( 'pending' );
+ $this-finalizeInternalStatus( FinalStatus::PENDING );
}
else {
$this-logger-info( Negative response from gateway.
Full response: . print_r( $request_vars, TRUE ) );
- $this-finalizeInternalStatus( 'failed' );
+ $this-finalizeInternalStatus( FinalStatus::FAILED );
return ResponseCodes::UNKNOWN;
}
$this-setTransactionResult( $gateway_txn_id, 'gateway_txn_id'
);
diff --git a/amazon_gateway/amazon.adapter.php
b/amazon_gateway/amazon.adapter.php
index 6c60e14..2a33e13 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -272,7 +272,7 @@
parent::do_transaction( $transaction );
- if ( $this-getFinalStatus() == 'complete' ) {
+ if ( $this-getFinalStatus() ===
FinalStatus::COMPLETE ) {
$this-unstaged_data =
$this-dataObj-getDataEscaped(); // XXX not cool.
$this-runPostProcessHooks();
$this-doLimboStompTransaction( true );
@@ -288,7 +288,7 @@
default:
$this-logger-critical( At $transaction; THIS
IS NOT DEFINED! );
- $this-finalizeInternalStatus( 'failed' );
+ $this-finalizeInternalStatus(
FinalStatus::FAILED );
}
return $this-getTransactionAllResults();
@@ -322,11 +322,11 @@
$ctid =
$this-getData_Unstaged_Escaped( 'contribution_tracking_id' );
$this-logger-alert( $ctid failed
orderid verification but has txnid '$txnid'. Investigation required. );
if ( $this-getGlobal(
'UseOrderIdValidation' ) ) {
- $this-finalizeInternalStatus(
'failed' );
+ $this-finalizeInternalStatus(
FinalStatus::FAILED );
return;
}
} else {
-
[MediaWiki-commits] [Gerrit] Add Apache Commons Lang, WikipediaApp clean up - change (apps...wikipedia)
Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/209162 Change subject: Add Apache Commons Lang, WikipediaApp clean up .. Add Apache Commons Lang, WikipediaApp clean up - Add Apache Commons Lang. Not used heavily in this patch but subsequent patches may leverage it. - Miscellaneous minor clean up changes in WikipediaApp, mostly around languages. Change-Id: I1352eaa40b4c759921c556335da7648e3474fe38 --- A wikipedia/assets/licenses/ApacheCommonsLang M wikipedia/build.gradle M wikipedia/res/values/credits.xml M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java 4 files changed, 242 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/62/209162/1 diff --git a/wikipedia/assets/licenses/ApacheCommonsLang b/wikipedia/assets/licenses/ApacheCommonsLang new file mode 100644 index 000..d645695 --- /dev/null +++ b/wikipedia/assets/licenses/ApacheCommonsLang @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in
[MediaWiki-commits] [Gerrit] move db1021 to s2 and db1054 to sideline - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: move db1021 to s2 and db1054 to sideline
..
move db1021 to s2 and db1054 to sideline
Bug: T89801
Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0
---
M manifests/site.pp
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index ce2ee2f..3e7027a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -527,7 +527,7 @@
}
}
-node /^db10(21|26|45|58)\.eqiad\.wmnet/ {
+node /^db10(26|45|58)\.eqiad\.wmnet/ {
$cluster = 'mysql'
class { 'role::coredb::s5':
@@ -572,7 +572,7 @@
}
}
-node /^db10(36|54|60|63|67)\.eqiad\.wmnet/ {
+node /^db10(21|36|60|63|67)\.eqiad\.wmnet/ {
$cluster = 'mysql'
class { 'role::mariadb::core':
@@ -783,6 +783,14 @@
include role::mariadb::tendril
}
+# eqiad db hardware issues
+# db1054 T89801
+node /^db10(54)\.eqiad\.wmnet$/ {
+
+$cluster = 'mysql'
+include standard
+}
+
# codfw db
node /^db20(5[5-9]|6[0-9]|70)\.codfw\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/209164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle sprin...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org
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 Wikidata - Fix api error output - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata - Fix api error output .. Update Wikidata - Fix api error output which is visible via the ui when entering values. the error is not localized. Change-Id: If5d7260f3304aae785e75cc509dd4aba387fd083 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Wikidata b/extensions/Wikidata index daa1a42..ea6647a 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit daa1a429dc8e65f7998a167572e8db4741dfe065 +Subproject commit ea6647ade430afeca8e1a8775060fb4ba8f1e564 -- To view, visit https://gerrit.wikimedia.org/r/209165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5d7260f3304aae785e75cc509dd4aba387fd083 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.26wmf4 Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] visualeditor-default.dblist: Add comments explaining order - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: visualeditor-default.dblist: Add comments explaining order .. visualeditor-default.dblist: Add comments explaining order Change-Id: I55cdf0ed6143ad8b7ee0690303fcf784c6dc42d3 --- M visualeditor-default.dblist 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/visualeditor-default.dblist b/visualeditor-default.dblist index 6b6876e..b2e8454 100644 --- a/visualeditor-default.dblist +++ b/visualeditor-default.dblist @@ -1,5 +1,7 @@ +# Group 0 wikis test2wiki mediawikiwiki +# Wikipedias aawiki abwiki acewiki @@ -214,15 +216,25 @@ yowiki zeawiki zuwiki -cawikiquote +# Wiktionaries frwiktionary +# Wikiquotes +cawikiquote +# Wikibookses frwikibooks ptwikibooks +# Wikisources +# Wikinewses +# Wikiversities frwikiversity ptwikiversity +# Wikivoyages +# Wikimanias wikimania2014wiki wikimania2015wiki wikimania2016wiki +# Other wikis (e.g. Commons, Meta, Wikimedias) +# Private wikis boardwiki collabwiki legalteamwiki -- To view, visit https://gerrit.wikimedia.org/r/209151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I55cdf0ed6143ad8b7ee0690303fcf784c6dc42d3 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org 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^n] Create a basic data model layer for Flow JS - change (mediawiki...Flow)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209166
Change subject: [wip^n] Create a basic data model layer for Flow JS
..
[wip^n] Create a basic data model layer for Flow JS
Create a dm for Flow; start with a flow Board and Topic models with
basic fetching from the API.
Change-Id: Iba245037078f548edd2dc10519e8f2c0c650cb00
---
M .jshintrc
M Hooks.php
M Resources.php
M modules/flow-initialize.js
A modules/flow/dm/api/mw.flow.dm.APIResultsProvider.js
A modules/flow/dm/api/mw.flow.dm.APIResultsQueue.js
A modules/flow/dm/api/mw.flow.dm.APITopicsProvider.js
A modules/flow/dm/mixins/mw.flow.dm.List.js
A modules/flow/dm/mw.flow.dm.Board.js
A modules/flow/dm/mw.flow.dm.Item.js
A modules/flow/dm/mw.flow.dm.Topic.js
A modules/flow/dm/mw.flow.dm.js
A modules/flow/mw.flow.js
13 files changed, 1,164 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/66/209166/1
diff --git a/.jshintrc b/.jshintrc
index 85b889e..dc3cc52 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -27,6 +27,7 @@
supernew: true, // suppress warnings about weird object
constructions
trailing: true, // disallow trailing whitespace
undef : true, // prohibits the use of undefined variables
- unused: vars // complain about unused variables but not arguments
+ unused: vars, // complain about unused variables but not
arguments
+ jquery: true
// white:true // enforce Crockford rules
}
diff --git a/Hooks.php b/Hooks.php
index 695c5e5..c2ac9f3 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -999,7 +999,6 @@
}
}
}
-
return true;
}
diff --git a/Resources.php b/Resources.php
index 6b8aa95..b49423d 100644
--- a/Resources.php
+++ b/Resources.php
@@ -349,6 +349,22 @@
'mediawiki.Uri',
),
) + $mobile,
+ 'ext.flow.dm' = $flowResourceTemplate + array(
+ 'scripts' = array( // Component order is important
+ 'flow/mw.flow.js',
+ 'flow/dm/mw.flow.dm.js',
+ 'flow/dm/mw.flow.dm.Item.js',
+ 'flow/dm/mixins/mw.flow.dm.List.js',
+ 'flow/dm/api/mw.flow.dm.APIResultsProvider.js',
+ 'flow/dm/api/mw.flow.dm.APIResultsQueue.js',
+ 'flow/dm/api/mw.flow.dm.APITopicsProvider.js',
+ 'flow/dm/mw.flow.dm.Topic.js',
+ 'flow/dm/mw.flow.dm.Board.js',
+ ),
+ 'dependencies' = array(
+ 'oojs'
+ )
+ ) + $mobile,
'ext.flow' = $flowResourceTemplate + array(
'scripts' = array( // Component order is important
// MW UI
@@ -385,6 +401,7 @@
'jquery.throttle-debounce',
'mediawiki.jqueryMsg',
'ext.flow.jquery.conditionalScroll',
+ 'ext.flow.dm',
'mediawiki.api',
'mediawiki.util',
'mediawiki.api.options', // required by switch-editor
feature
diff --git a/modules/flow-initialize.js b/modules/flow-initialize.js
index 279a1e3..dafca71 100644
--- a/modules/flow-initialize.js
+++ b/modules/flow-initialize.js
@@ -10,5 +10,8 @@
*/
$( document ).ready( function () {
mw.flow.initComponent( $( '.flow-component' ) );
+
+ // Load data model
+ mw.flow.Initialize( $( '.flow-component' ) );
} );
}( jQuery ) );
diff --git a/modules/flow/dm/api/mw.flow.dm.APIResultsProvider.js
b/modules/flow/dm/api/mw.flow.dm.APIResultsProvider.js
new file mode 100644
index 000..b6729e2
--- /dev/null
+++ b/modules/flow/dm/api/mw.flow.dm.APIResultsProvider.js
@@ -0,0 +1,234 @@
+/**
+ * Resource Provider object.
+ *
+ * @class
+ * @mixins OO.EventEmitter
+ *
+ * @constructor
+ * @abstract
+ * @param {string} apiurl The URL to the api
+ * @param {Object} [config] Configuration options
+ * @cfg {number} fetchLimit The default number of results to fetch
+ * @cfg {string} lang The language of the API
+ * @cfg {number} offset Initial offset, if relevant, to call results from
+ * @cfg {Object} ajaxSettings The settings for the ajax call
+ * @cfg {Object} staticParams The data parameters that are static and should
+ * always be sent to the API request, as opposed to user parameters.
+ * @cfg {Object} userParams Initial user parameters to be sent as data to
+ * the API request. These can change per request, like the search query term
+ * or sizing parameters for images, etc.
+ */
+mw.flow.dm.APIResultsProvider = function VeDmResourceProvider( apiurl, config
) {
+ config = config || {};
+
+
[MediaWiki-commits] [Gerrit] Fix typo in upstart script - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged. Change subject: Fix typo in upstart script .. Fix typo in upstart script Need to give the start command to the active script. Change-Id: Ica975a28dca34f7f5dcbdcda89a72483576c9e7e --- M puppet/modules/activemq/templates/activemq-upstart.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/activemq/templates/activemq-upstart.conf.erb b/puppet/modules/activemq/templates/activemq-upstart.conf.erb index d92783a..7aa71a0 100755 --- a/puppet/modules/activemq/templates/activemq-upstart.conf.erb +++ b/puppet/modules/activemq/templates/activemq-upstart.conf.erb @@ -5,4 +5,4 @@ setuid activemq setgid activemq -exec %= @pkgdir %/bin/activemq-admin +exec %= @pkgdir %/bin/activemq-admin start -- To view, visit https://gerrit.wikimedia.org/r/208854 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica975a28dca34f7f5dcbdcda89a72483576c9e7e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Awight awi...@wikimedia.org Gerrit-Reviewer: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: AndyRussG andrew.green...@gmail.com Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Katie Horn kh...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] support geoiplookup target on all enabled clusters - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209173
Change subject: support geoiplookup target on all enabled clusters
..
support geoiplookup target on all enabled clusters
This enables support for both the /geoiplookup path and the geoiplookup.wm.o
hostname on all clusters with the enable_geoiplookup attribute. Previously
this only existed on bits.wm.o, but this brings it to the text/mobile
endpoints as well.
Change-Id: I8c90977e4937838451c6b09bacb5667cafe44ae9
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/209173/1
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 5512c91..da555eb 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -306,6 +306,12 @@
error 204;
}
+% if @cluster_options.fetch(enable_geoiplookup, false) -%
+ if (req.url == /geoiplookup || req.http.host ==
geoiplookup.wikimedia.org) {
+ error 666 geoiplookup;
+ }
+% end -%
+
/* Function vcl_recv in %= @vcl %.inc.vcl will be appended here */
}
@@ -399,6 +405,17 @@
if (obj.status == 204 req.request == PURGE) {
set obj.http.Connection = keep-alive;
}
+
+% if @cluster_options.fetch(enable_geoiplookup, false) -%
+ // Support geoiplookup
+ if (obj.status == 666) {
+ call geoip_lookup;
+ set obj.status = 200;
+ set obj.http.Connection = keep-alive;
+ return (deliver);
+ }
+% end -%
+
/* Function vcl_error in %= @vcl %.inc.vcl will be appended here */
}
--
To view, visit https://gerrit.wikimedia.org/r/209173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c90977e4937838451c6b09bacb5667cafe44ae9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed duplicated jobs in triggerOpportunisticLinksUpdate() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Removed duplicated jobs in triggerOpportunisticLinksUpdate()
..
Removed duplicated jobs in triggerOpportunisticLinksUpdate()
* They get deduplicated on final insertion, but de-duplication them
on initial insertion (EnqueueJob) to avoid any build-up there.
Change-Id: Ia06f2bdf59a7e57fddb22890aa0b39420c0bfa7d
---
M includes/jobqueue/JobSpecification.php
M includes/page/WikiPage.php
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/JobSpecification.php
b/includes/jobqueue/JobSpecification.php
index 327a18f..9ace1ba 100644
--- a/includes/jobqueue/JobSpecification.php
+++ b/includes/jobqueue/JobSpecification.php
@@ -97,7 +97,7 @@
/**
* @param string $type
* @param array $params Map of key/values
-* @param array $opts Map of key/values
+* @param array $opts Map of key/values; includes 'removeDuplicates'
* @param Title $title Optional descriptive title
*/
public function __construct(
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index e938ca8..cc182a4 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -3412,7 +3412,8 @@
// Check if the last link refresh was before page_touched
if ( $this-getLinksTimestamp() $this-getTouched() ) {
JobQueueGroup::singleton()-push(
EnqueueJob::newFromLocalJobs(
- new JobSpecification( 'refreshLinks', $params,
array(), $this-mTitle )
+ new JobSpecification( 'refreshLinks', $params,
+ array( 'removeDuplicates' = true ),
$this-mTitle )
) );
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/209171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia06f2bdf59a7e57fddb22890aa0b39420c0bfa7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
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 workflow_page_id when board is restored - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix workflow_page_id when board is restored
..
Fix workflow_page_id when board is restored
Re-use most of board-move code. It does pretty much
exactly what is needed to update page_id after restore,
but just can't use Title objects for old page ID (because,
for deleted entries, getArticleId() is unreliable, as it
would return 0).
Bug: T95280
Change-Id: I5078611fb9fe9a59de128b06db397f604fe26fee
---
M Flow.php
M Hooks.php
M includes/BoardMover.php
M includes/Model/Workflow.php
4 files changed, 53 insertions(+), 29 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.php b/Flow.php
index 8281d2b..caff681 100644
--- a/Flow.php
+++ b/Flow.php
@@ -145,6 +145,7 @@
$wgHooks['CategoryViewer::generateLink'][] =
'FlowHooks::onCategoryViewerGenerateLink';
$wgHooks['ArticleConfirmDelete'][] = 'FlowHooks::onArticleConfirmDelete';
$wgHooks['ArticleDelete'][] = 'FlowHooks::onArticleDelete';
+$wgHooks['ArticleUndelete'][] = 'FlowHooks::onArticleUndelete';
// Extension:UserMerge support
$wgHooks['UserMergeAccountFields'][] = 'FlowHooks::onUserMergeAccountFields';
diff --git a/Hooks.php b/Hooks.php
index 695c5e5..f8c7000 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1351,17 +1351,46 @@
}
/**
+* @param Title $title Title corresponding to the article restored
+* @param bool $create Whether or not the restoration caused the page
to be created (i.e. it didn't exist before).
+* @param string $comment The comment associated with the undeletion.
+* @param int $oldPageId ID of page previously deleted (from archive
table)
+* @return bool
+*/
+ public static function onArticleUndelete( Title $title, $created,
$comment, $oldPageId ) {
+ if ( $title-getContentModel() === CONTENT_MODEL_FLOW_BOARD ) {
+ // complete hack to make sure that when the page is
saved to new
+ // location and rendered it doesn't throw an error
about the wrong title
+ Container::get( 'factory.loader.workflow'
)-pageMoveInProgress();
+ // open a database transaction and prepare everything
for the move commit
+ $boardMover = Container::get( 'board_mover' );
+ $boardMover-prepareMove( $oldPageId, $title );
+ $boardMover-commit();
+ }
+
+ return true;
+ }
+
+ /**
* Occurs at the begining of the MovePage process. Perhaps ContentModel
should be
* extended to be notified about moves explicitly.
*/
public static function onTitleMove( Title $oldTitle, Title $newTitle,
User $user ) {
+ // $newTitle doesn't yet exist, but after the move it'll still
have
+ // the same ID $oldTitle used to have
+ // Since we don't want to wait until after the page has been
moved
+ // to start preparing relevant Flow moves, I'll make it reflect
the
+ // correct ID already
+ $bogusTitle = clone $newTitle;
+ $bogusTitle-resetArticleID( $oldTitle-getArticleID() );
+
if ( $oldTitle-getContentModel() === CONTENT_MODEL_FLOW_BOARD
) {
// complete hack to make sure that when the page is
saved to new
// location and rendered it doesn't throw an error
about the wrong title
Container::get( 'factory.loader.workflow'
)-pageMoveInProgress();
// open a database transaction and prepare everything
for the move, but
// don't commit yet. That is done below in
self::onTitleMoveComplete
- Container::get( 'board_mover' )-prepareMove(
$oldTitle, $newTitle );
+ Container::get( 'board_mover' )-prepareMove(
$oldTitle-getArticleID(), $bogusTitle );
}
return true;
diff --git a/includes/BoardMover.php b/includes/BoardMover.php
index 58552d1..6c1ee9d 100644
--- a/includes/BoardMover.php
+++ b/includes/BoardMover.php
@@ -45,20 +45,15 @@
/**
* Collects the workflow and header (if it exists) and puts them into
the database. Does
* not commit yet. It is intended for prepareMove to be called from the
TitleMove hook,
-* and commited from TitleMoveComplete hook. This ensures that if some
error prevents the
-* core transaction from commiting this transaction is also not
commited.
+* and committed from TitleMoveComplete hook. This ensures that if some
error prevents the
+* core transaction from committing this transaction is also not
committed.
+*
+* @param int $oldPageId Page ID before move/change
+*
[MediaWiki-commits] [Gerrit] Set up gitreview default username - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Set up gitreview default username
..
Set up gitreview default username
Bug: T85237
Change-Id: I2ba974b53142cab2c65995c5c367d0f00677080a
---
M Vagrantfile
M puppet/modules/git/manifests/gerrit.pp
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Vagrantfile b/Vagrantfile
index c7851d2..3840fec 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -211,6 +211,7 @@
puppet.facter = $FACTER = {
'fqdn' = config.vm.hostname,
+'git_user' = settings[:git_user],
'forwarded_port' = settings[:http_port],
'shared_apt_cache' = '/vagrant/cache/apt/',
'environment'= 'vagrant',
diff --git a/puppet/modules/git/manifests/gerrit.pp
b/puppet/modules/git/manifests/gerrit.pp
index 19e7fe9..1c0c549 100644
--- a/puppet/modules/git/manifests/gerrit.pp
+++ b/puppet/modules/git/manifests/gerrit.pp
@@ -18,5 +18,14 @@
mode = '0644',
}
+if $::git_user {
+exec { 'gitreview.username':
+command = git config --global --add gitreview.username
'${::git_user}',
+user= 'vagrant',
+unless = 'git config --global gitreview.username',
+require = Package['git'],
+}
+}
+
Sshkey | | - File['/etc/ssh/ssh_known_hosts']
}
--
To view, visit https://gerrit.wikimedia.org/r/208629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ba974b53142cab2c65995c5c367d0f00677080a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
