[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Don't recommend a specific MySQL server implementation

[Legoktm (Code Review)]

Legoktm has submitted this change and it was merged.

Change subject: Don't recommend a specific MySQL server implementation
..


Don't recommend a specific MySQL server implementation

Per 

Change-Id: Id29005aaf9d0a73eeb78db4b159e600e19ff9ec6
---
M debian/changelog
M debian/control
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 63a1c6d..6faf863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@
   * Add NEWS for major version upgrade (Closes: #838965)
   * Add README for mediawiki-classes
   * Add RELEASE-NOTES-* as documentation for mediawiki
+  * Recommend default-mysql-server | virtual-mysql-server instead of
+just mysql-server
 
  -- Kunal Mehta   Tue, 13 Sep 2016 04:17:42 -0700
 
diff --git a/debian/control b/debian/control
index 475c3af..5daadde 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php, php-mysql | php-pgsql | php-sqlite3 | 
php-mysqlnd, php-common (>= 5.5.0+dfsg-10~), php-mbstring, php-xml, 
mime-support, libjs-jquery, mediawiki-classes (= ${binary:Version}), 
${misc:Depends}
-Recommends: mysql-server | postgresql-contrib, php-cli, php-intl, php-curl, 
php-wikidiff2, python
+Recommends: default-mysql-server | virtual-mysql-server | postgresql-contrib, 
php-cli, php-intl, php-curl, php-wikidiff2, python
 Suggests: imagemagick | php-gd, memcached, clamav, php-apcu, hhvm
 Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1+1~),
  mediawiki-extensions-ldapauth (<< 2.8~),

-- 
To view, visit https://gerrit.wikimedia.org/r/314473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id29005aaf9d0a73eeb78db4b159e600e19ff9ec6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve deprecation comment for MW_DIFF_VERSION

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315466

Change subject: Improve deprecation comment for MW_DIFF_VERSION
..

Improve deprecation comment for MW_DIFF_VERSION

IDEs will now recognize it as deprecated.

Change-Id: Iac96449fb204a1e4b1e707138b3f0b5697bdfab4
---
M includes/diff/DifferenceEngine.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/315466/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index cd644cb..16e9a44 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -21,7 +21,7 @@
  * @ingroup DifferenceEngine
  */
 
-// Deprecated, use class constant instead
+/** @deprecated use class constant instead */
 define( 'MW_DIFF_VERSION', '1.11a' );
 
 /**
@@ -176,7 +176,7 @@
 *
 * @param int $id Revision ID
 *
-* @return mixed URL or false
+* @return string|bool Link HTML or false
 */
public function deletedLink( $id ) {
if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/315466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac96449fb204a1e4b1e707138b3f0b5697bdfab4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use namespaced ScopedCallback

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315465

Change subject: Use namespaced ScopedCallback
..

Use namespaced ScopedCallback

The un-namespaced \ScopedCallback is deprecated.

Change-Id: Ie014d5a775ead66335a24acac9d339915884d1a4
---
M includes/EditPage.php
M includes/api/ApiStashEdit.php
M includes/auth/AuthManager.php
M includes/cache/MessageCache.php
M includes/context/RequestContext.php
M includes/deferred/LinksDeletionUpdate.php
M includes/deferred/LinksUpdate.php
M includes/jobqueue/JobQueueDB.php
M includes/jobqueue/JobRunner.php
M includes/jobqueue/jobs/AssembleUploadChunksJob.php
M includes/jobqueue/jobs/PublishStashedFileJob.php
M includes/libs/filebackend/FileBackend.php
M includes/libs/objectcache/BagOStuff.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/IDatabase.php
M includes/libs/rdbms/lbfactory/LBFactory.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/libs/rdbms/loadmonitor/LoadMonitor.php
M includes/libs/xmp/XMP.php
M includes/media/SVG.php
M includes/parser/Parser.php
M includes/parser/ParserOptions.php
M includes/profiler/Profiler.php
M includes/resourceloader/ResourceLoaderModule.php
M includes/session/Session.php
M includes/session/SessionBackend.php
M includes/session/SessionManager.php
M includes/specials/SpecialTrackingCategories.php
M includes/user/User.php
M tests/parser/ParserTestRunner.php
M tests/parser/fuzzTest.php
M tests/phpunit/includes/WatchedItemStoreUnitTest.php
M tests/phpunit/includes/auth/AuthManagerTest.php
M tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php
M 
tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
M tests/phpunit/includes/changes/RecentChangeTest.php
M tests/phpunit/includes/page/WikiCategoryPageTest.php
M tests/phpunit/includes/parser/ParserIntegrationTest.php
M tests/phpunit/includes/session/PHPSessionHandlerTest.php
M tests/phpunit/includes/session/SessionBackendTest.php
M tests/phpunit/includes/session/SessionManagerTest.php
M tests/phpunit/includes/session/TestUtils.php
M tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php
M tests/phpunit/includes/user/BotPasswordTest.php
M tests/phpunit/suites/ParserTestTopLevelSuite.php
45 files changed, 79 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/315465/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8226da5..1884fba 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -22,6 +22,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\ScopedCallback;
 
 /**
  * The edit page/HTML interface (split from Article)
diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index 5a2492d..92cbe90 100644
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -21,6 +21,7 @@
 
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\ScopedCallback;
 
 /**
  * Prepare an edit in shared cache so that it can be reused on edit
diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index e223e16..4fc874a 100644
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -2382,7 +2382,7 @@
$session->set( 'AuthManager:lastAuthTimestamp', time() );
$session->persist();
 
-   \ScopedCallback::consume( $delay );
+   \Wikimedia\ScopedCallback::consume( $delay );
 
\Hooks::run( 'UserLoggedIn', [ $user ] );
}
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index f393acd..d5411f9 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -21,6 +21,7 @@
  * @ingroup Cache
  */
 use MediaWiki\MediaWikiServices;
+use Wikimedia\ScopedCallback;
 
 /**
  * MediaWiki message cache structure version.
diff --git a/includes/context/RequestContext.php 
b/includes/context/RequestContext.php
index a8cad9f..ebedb7e 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -25,6 +25,7 @@
 use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\ScopedCallback;
 
 /**
  * Group all the pieces relevant to the context of a request into one instance
diff --git a/includes/deferred/LinksDeletionUpdate.php 
b/includes/deferred/LinksDeletionUpdate.php
index 93b3ef6..6aa3831 100644
--- a/includes/deferred/LinksDeletionUpdate.php
+++ b/includes/deferred/LinksDeletionUpdate.php
@@ -20,6 +20,7 @@
  * @file
  */
 use MediaWiki\MediaWikiServices;
+use Wikimedia\ScopedCallback;
 
 /**
  * Update object handling the cleanup of links tables after a page was deleted.
diff --git a/includes/deferred/LinksUpdate.php 
b/includes/deferred/LinksUpdate.php
index 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Don't use deprecated MW_DIFF_VERSION

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315464

Change subject: Don't use deprecated MW_DIFF_VERSION
..

Don't use deprecated MW_DIFF_VERSION

Change-Id: I60e13d81b35465d99eb8e0a656d5135b240a6744
---
M includes/diff/InlineDifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/64/315464/1

diff --git a/includes/diff/InlineDifferenceEngine.php 
b/includes/diff/InlineDifferenceEngine.php
index 8a43451..f8eb104 100644
--- a/includes/diff/InlineDifferenceEngine.php
+++ b/includes/diff/InlineDifferenceEngine.php
@@ -147,7 +147,7 @@
throw new Exception( 'mOldid and mNewid must be set to 
get diff cache key.' );
}
 
-   return wfMemcKey( 'diff', 'inline', MW_DIFF_VERSION,
+   return wfMemcKey( 'diff', 'inline', self::DIFF_VERSION,
'oldid', $this->mOldid, 'newid', $this->mNewid );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60e13d81b35465d99eb8e0a656d5135b240a6744
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: jquery.morphCrossfade: Remove 'overflow' fiddling

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: jquery.morphCrossfade: Remove 'overflow' fiddling
..


jquery.morphCrossfade: Remove 'overflow' fiddling

When we cross-fade back-and-forth quickly, the second time we would
read the "old" overflow value while the first animation was still
ongoing and it was set to 'hidden', preventing us from restoring the
real original value.

But it turns out that none of this code is needed, because jQuery
already does this when animating 'height', and it does it correctly.
So just remove it!

This fixes the "Remove" buttons for each upload disappearing after a
failed submit on the "Details" step (e.g. blocked by AbuseFilter).

Change-Id: Ib57c0222f729c8bfcacb610e35e8473791a8f75c
---
M resources/jquery/jquery.morphCrossfade.js
1 file changed, 0 insertions(+), 3 deletions(-)

Approvals:
  Prtksxna: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/jquery/jquery.morphCrossfade.js 
b/resources/jquery/jquery.morphCrossfade.js
index 0705a25..ddc6e2e 100644
--- a/resources/jquery/jquery.morphCrossfade.js
+++ b/resources/jquery/jquery.morphCrossfade.js
@@ -79,7 +79,6 @@
 
$.each( this, function ( i, container ) {
var $container = $( container ),
-   oldOverflow = $container.css( 'overflow' ),
$oldPanel = $( $container.data( 
'crossfadeDisplay' ) ),
$newPanel = ( typeof newPanelSelector === 
'string' ) ?
$container.find( newPanelSelector ) : 
$( newPanelSelector );
@@ -90,13 +89,11 @@
// make doubly sure that the container 
height is equal to oldPanel,
// and prevent now-oversized panels 
from sticking out
$container.css( { height: 
$oldPanel.outerHeight() } );
-   $container.css( { overflow: 'hidden' } 
);
// take it out of the flow
$oldPanel.css( { position: 'absolute' } 
);
// fade WITHOUT hiding when opacity = 0
$oldPanel.stop().animate( { opacity: 0 
}, speed, 'linear', function () {
$oldPanel.css( { visibility: 
'hidden' } );
-   $container.css( { overflow: 
oldOverflow } );
} );
}
$container.data( 'crossfadeDisplay', $newPanel 
);

-- 
To view, visit https://gerrit.wikimedia.org/r/314598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib57c0222f729c8bfcacb610e35e8473791a8f75c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Matthias Mullie 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Don't use deprecated MW_DIFF_VERSION

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315463

Change subject: Don't use deprecated MW_DIFF_VERSION
..

Don't use deprecated MW_DIFF_VERSION

Change-Id: I5d0412cba40cfe23d79330130eb4f89581059719
---
M repo/includes/Diff/EntityContentDiffView.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/63/315463/1

diff --git a/repo/includes/Diff/EntityContentDiffView.php 
b/repo/includes/Diff/EntityContentDiffView.php
index fdaf676..272be7a 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -227,7 +227,7 @@
protected function getDiffBodyCacheKey() {
return wfMemcKey(
'diff',
-   'version', MW_DIFF_VERSION,
+   'version', self::DIFF_VERSION,
'oldid', $this->getOldid(),
'newid', $this->getNewid(),
'lang', $this->getLanguage()->getCode()

-- 
To view, visit https://gerrit.wikimedia.org/r/315463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d0412cba40cfe23d79330130eb4f89581059719
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Set gallery dialog to larger size when search panel is focused

[Tchanders (Code Review)]

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315462

Change subject: Set gallery dialog to larger size when search panel is focused
..

Set gallery dialog to larger size when search panel is focused

Bug: T145246
Change-Id: I49b218f704d31b4f699fe39f414a84abbfffc093
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/62/315462/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index bfd54f1..c9d6219 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -578,8 +578,10 @@
// If the edit panel is visible, focus the caption input
if ( !visible ) {
this.highlightedCaptionInput.focus();
+   this.setSize( 'large' );
} else {
this.searchWidget.getQuery().focus().select();
+   this.setSize( 'larger' );
}
 };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49b218f704d31b4f699fe39f414a84abbfffc093
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Simplify en:TFA retrieval

[BearND (Code Review)]

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315461

Change subject: Simplify en:TFA retrieval
..

Simplify en:TFA retrieval

RB only uses the title. So there's no need to request
summary data in MCS for this.

The etag is now in a different format. But I don't think it
matters much since the TFA endpoint is not exposed yet.

Change-Id: I9cb4f2a4837678fef2c4b24522860ccde4999d1e
---
M lib/feed/featured.js
1 file changed, 3 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/61/315461/1

diff --git a/lib/feed/featured.js b/lib/feed/featured.js
index 12ddf0b..11c05c4 100644
--- a/lib/feed/featured.js
+++ b/lib/feed/featured.js
@@ -101,21 +101,13 @@
 mwapi.checkForQueryPagesInResponse(req, response);
 tfaPageObj = getPageObject(response);
 pageTitle = removeEllipsis(tfaPageObj.extract);
-req.params.title = pageTitle;
-return mwapi.requestExtractAndDescription(app, req);
-}).then(function (extractResponse) {
-mwapi.checkForQueryPagesInResponse(req, extractResponse);
-var extractPageObj = getPageObject(extractResponse, true);
 return BBPromise.props({
-page: extractPageObj,
-dbTitle: mwapi.getDbTitle(app, req, extractPageObj.title)
+dbTitle: mwapi.getDbTitle(app, req, pageTitle)
 });
 }).then(function (res) {
 return {
-payload: mwapi.buildSummaryResponse(res.page, res.dbTitle),
-meta: {
-etag: tfaPageObj.pageid + '/' + 
mwapi.getRevisionFromExtract(res.page)
-}
+payload: { title: res.dbTitle },
+meta: { etag: tfaPageObj.pageid }
 };
 });
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cb4f2a4837678fef2c4b24522860ccde4999d1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable MessageCache debugging on the beta cluster

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Enable MessageCache debugging on the beta cluster
..


Enable MessageCache debugging on the beta cluster

This is to help figure out the CentralNotice bug mentioned below.

Bug: T144952
Change-Id: I4b379d95f4bfb26b31d47fb3231b34620ca8667b
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  AndyRussG: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 0b71439..c121878 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -149,6 +149,7 @@
'EventBus' => 'debug',
'runJobs' => [ 'logstash' => 'info' ],
'squid' => 'debug',
+   'MessageCache' => 'debug',
],
],
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b379d95f4bfb26b31d47fb3231b34620ca8667b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: WIP Enable MessageCache debugging on the beta cluster

[Awight (Code Review)]

Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315460

Change subject: WIP Enable MessageCache debugging on the beta cluster
..

WIP Enable MessageCache debugging on the beta cluster

Change-Id: I4b379d95f4bfb26b31d47fb3231b34620ca8667b
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/60/315460/1

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 0b71439..c121878 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -149,6 +149,7 @@
'EventBus' => 'debug',
'runJobs' => [ 'logstash' => 'info' ],
'squid' => 'debug',
+   'MessageCache' => 'debug',
],
],
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b379d95f4bfb26b31d47fb3231b34620ca8667b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Awight 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Only update assessment data when talk pages are saved

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Only update assessment data when talk pages are saved
..


Only update assessment data when talk pages are saved

Bug: T147906
Change-Id: Iacd4c46429fdfda344c968af9bd306454f1bb878
---
M PageAssessments.hooks.php
1 file changed, 17 insertions(+), 13 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PageAssessments.hooks.php b/PageAssessments.hooks.php
index 5c6dd5c..b9aec25 100644
--- a/PageAssessments.hooks.php
+++ b/PageAssessments.hooks.php
@@ -31,24 +31,28 @@
}
 
/**
-* Insert assessment records after page is saved
+* Update assessment records after talk page is saved
 * @param LinksUpdate $linksUpdate
 * @param mixed $ticket
 */
public static function onLinksUpdateComplete( &$linksUpdate, $ticket = 
null ) {
-   $pOut = $linksUpdate->getParserOutput();
-   if ( $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' ) !== null ) {
-   $assessmentData = $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' );
-   } else {
-   // Even if there is no assessment data, we still need 
to run doUpdates
-   // in case any assessment data was deleted from the 
page.
-   $assessmentData = [];
-   }
$title = $linksUpdate->getTitle();
-   // In most cases $title will be a talk page, but we want to 
associate the
-   // assessment data with the subject page.
-   $subjectTitle = $title->getSubjectPage();
-   PageAssessmentsBody::doUpdates( $subjectTitle, $assessmentData, 
$ticket );
+   // This assumes that the assessment parser function is only 
used on talk pages.
+   // See T147906 for why assessments are not supported in either 
namespace.
+   if ( $title->getNamespace() === NS_TALK ) {
+   $pOut = $linksUpdate->getParserOutput();
+   if ( $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' ) !== null ) {
+   $assessmentData = $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' );
+   } else {
+   // Even if there is no assessment data, we 
still need to run doUpdates
+   // in case any assessment data was deleted from 
the page.
+   $assessmentData = [];
+   }
+   // The title is a talk page, but we want to associate 
the assessment data
+   // with the subject page.
+   $subjectTitle = $title->getSubjectPage();
+   PageAssessmentsBody::doUpdates( $subjectTitle, 
$assessmentData, $ticket );
+   }
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/315458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iacd4c46429fdfda344c968af9bd306454f1bb878
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: update WikiSite comments

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315459

Change subject: Hygiene: update WikiSite comments
..

Hygiene: update WikiSite comments

Change-Id: Ib15b80ea0257ff854fc7346862e91f3b23d3bc7c
---
M app/src/main/java/org/wikipedia/dataclient/WikiSite.java
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/59/315459/1

diff --git a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java 
b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
index e31e6ed..867d1ad 100644
--- a/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
+++ b/app/src/main/java/org/wikipedia/dataclient/WikiSite.java
@@ -62,7 +62,8 @@
 languageCode);
 }
 
-/** This method cannot resolve multi-dialect wikis like Simplified and 
Traditional Chinese. */
+/** This method cannot resolve multi-dialect wikis like Simplified and 
Traditional Chinese as
+the variant is unavailable. */
 public WikiSite(@NonNull String authority) {
 this(authority, authorityToLanguageCode(authority));
 }
@@ -84,6 +85,10 @@
 }
 
 public WikiSite(@NonNull Uri uri, @NonNull String languageCode) {
+// todo: uncomment
+// if (!supportedAuthority(uri.getAuthority())) {
+// throw new IllegalArgumentException("Unsupported authority=" + 
uri.getAuthority());
+// }
 this.uri = uri;
 this.languageCode = languageCode;
 }
@@ -174,7 +179,8 @@
 }
 
 /**
- * @return The wiki language code which may differ from the language 
subdomain.
+ * @return The wiki language code which may differ from the language 
subdomain. Empty if
+ * language code is unknown. Ex: "en", "zh-hans", ""
  *
  * @see AppLanguageLookUpTable
  */

-- 
To view, visit https://gerrit.wikimedia.org/r/315459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib15b80ea0257ff854fc7346862e91f3b23d3bc7c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Only update assessment data when talk pages are saved

[Kaldari (Code Review)]

Kaldari has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315458

Change subject: Only update assessment data when talk pages are saved
..

Only update assessment data when talk pages are saved

Bug: T147906
Change-Id: Iacd4c46429fdfda344c968af9bd306454f1bb878
---
M PageAssessments.hooks.php
1 file changed, 17 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments 
refs/changes/58/315458/1

diff --git a/PageAssessments.hooks.php b/PageAssessments.hooks.php
index 5c6dd5c..b9aec25 100644
--- a/PageAssessments.hooks.php
+++ b/PageAssessments.hooks.php
@@ -31,24 +31,28 @@
}
 
/**
-* Insert assessment records after page is saved
+* Update assessment records after talk page is saved
 * @param LinksUpdate $linksUpdate
 * @param mixed $ticket
 */
public static function onLinksUpdateComplete( &$linksUpdate, $ticket = 
null ) {
-   $pOut = $linksUpdate->getParserOutput();
-   if ( $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' ) !== null ) {
-   $assessmentData = $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' );
-   } else {
-   // Even if there is no assessment data, we still need 
to run doUpdates
-   // in case any assessment data was deleted from the 
page.
-   $assessmentData = [];
-   }
$title = $linksUpdate->getTitle();
-   // In most cases $title will be a talk page, but we want to 
associate the
-   // assessment data with the subject page.
-   $subjectTitle = $title->getSubjectPage();
-   PageAssessmentsBody::doUpdates( $subjectTitle, $assessmentData, 
$ticket );
+   // This assumes that the assessment parser function is only 
used on talk pages.
+   // See T147906 for why assessments are not supported in either 
namespace.
+   if ( $title->getNamespace() === NS_TALK ) {
+   $pOut = $linksUpdate->getParserOutput();
+   if ( $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' ) !== null ) {
+   $assessmentData = $pOut->getExtensionData( 
'ext-pageassessment-assessmentdata' );
+   } else {
+   // Even if there is no assessment data, we 
still need to run doUpdates
+   // in case any assessment data was deleted from 
the page.
+   $assessmentData = [];
+   }
+   // The title is a talk page, but we want to associate 
the assessment data
+   // with the subject page.
+   $subjectTitle = $title->getSubjectPage();
+   PageAssessmentsBody::doUpdates( $subjectTitle, 
$assessmentData, $ticket );
+   }
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/315458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacd4c46429fdfda344c968af9bd306454f1bb878
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: rename Site to WikiSite

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315457

Change subject: Hygiene: rename Site to WikiSite
..

Hygiene: rename Site to WikiSite

Move org.wikipedia.Site to org.wikipedia.dataclient.WikiSite. No user
visible change intended.

Site appears to have originally been intended as a generic wiki URL. If
not, that's what is expected now as class assumptions around URL
structure are wiki specific, especially language. This patch renames
Site to WikiSite and moves it under the dataclient package to help
alleviate confusion over its purpose.

Site is misused to accept unsupported URLs in some cases. A future
refactor should find and fix these instances. There are also some wiki
corner cases that aren't fully handled around language including: meta,
upload, deployment, and test. Maybe a more generic Site super class
would help.

Additional changes:

• Use "wiki" terminology instead of "site". Retaining site nomenclature
  would be keeping some confusion. Where models are thought to be kept
  as JSON, @SerializedName is used. For volatile storage,
  @SerializedName is not used

• Use WikiSite.forLanguageCode instead of hardcoding *.wikipedia.org

• Removed always null Site member from GalleryCollection

• In tests, replace a couple instances of:

  (WikipediaApp) 
getInstrumentation().getTargetContext().getApplicationContext()`

  With: `WikipediaApp.getInstance()`

My apologies for the unhappily large diff. I recommend viewing through a
few programs including icdiff and grep.

Change-Id: Ic967146a77b1301c87a0e6fa552c2f70663ca2fe
---
A app/src/androidTest/java/org/wikipedia/dataclient/WikiSiteTest.java
M app/src/androidTest/java/org/wikipedia/editing/EditPreviewTaskTest.java
M app/src/androidTest/java/org/wikipedia/page/BasePageLoadTest.java
M app/src/androidTest/java/org/wikipedia/page/PageLoadTest.java
M app/src/androidTest/java/org/wikipedia/test/CreateAccountTaskTest.java
M app/src/androidTest/java/org/wikipedia/test/EditTaskTest.java
M app/src/androidTest/java/org/wikipedia/test/FetchSectionWikitextTaskTests.java
M app/src/androidTest/java/org/wikipedia/test/FullSearchTaskTests.java
M app/src/androidTest/java/org/wikipedia/test/GetDescriptionsTaskTests.java
M app/src/androidTest/java/org/wikipedia/test/LanguageVariantTests.java
M app/src/androidTest/java/org/wikipedia/test/LoginClientTest.java
M app/src/androidTest/java/org/wikipedia/test/PageTests.java
M app/src/androidTest/java/org/wikipedia/test/ParcelableTest.java
D app/src/androidTest/java/org/wikipedia/test/SiteTests.java
M app/src/androidTest/java/org/wikipedia/test/SuggestionsTaskTests.java
M app/src/main/java/org/wikipedia/LongPressHandler.java
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/AppearanceChangeFunnel.java
M app/src/main/java/org/wikipedia/analytics/EditFunnel.java
M app/src/main/java/org/wikipedia/analytics/FindInPageFunnel.java
M app/src/main/java/org/wikipedia/analytics/Funnel.java
M app/src/main/java/org/wikipedia/analytics/GalleryFunnel.java
M app/src/main/java/org/wikipedia/analytics/ProtectedEditAttemptFunnel.java
M app/src/main/java/org/wikipedia/analytics/ReadingListsFunnel.java
M app/src/main/java/org/wikipedia/analytics/ShareAFactFunnel.java
M app/src/main/java/org/wikipedia/analytics/SuggestedPagesFunnel.java
M app/src/main/java/org/wikipedia/analytics/TimedFunnel.java
M app/src/main/java/org/wikipedia/analytics/ToCInteractionFunnel.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
R app/src/main/java/org/wikipedia/dataclient/WikiSite.java
M app/src/main/java/org/wikipedia/dataclient/retrofit/MwCachedService.java
M app/src/main/java/org/wikipedia/dataclient/retrofit/RbCachedService.java
M app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
D app/src/main/java/org/wikipedia/dataclient/retrofit/SiteCachedService.java
A app/src/main/java/org/wikipedia/dataclient/retrofit/WikiCachedService.java
M app/src/main/java/org/wikipedia/editing/CaptchaHandler.java
M app/src/main/java/org/wikipedia/editing/CaptchaResult.java
M app/src/main/java/org/wikipedia/editing/EditHandler.java
M app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/editing/EditPreviewTask.java
M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
M app/src/main/java/org/wikipedia/editing/EditTask.java
M app/src/main/java/org/wikipedia/editing/EditTokenStorage.java
M app/src/main/java/org/wikipedia/editing/FetchEditTokenTask.java
M app/src/main/java/org/wikipedia/editing/FetchSectionWikitextTask.java
M app/src/main/java/org/wikipedia/editing/RefreshCaptchaTask.java
M app/src/main/java/org/wikipedia/editing/summaries/EditSummaryHandler.java
M app/src/main/java/org/wikipedia/feed/FeedCoordinatorBase.java
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Address subpixel rendering errors in Number...

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315456

Change subject: MediaWiki theme: Address subpixel rendering errors in 
NumberInputWidget
..

MediaWiki theme: Address subpixel rendering errors in NumberInputWidget

Adressing subpixel rendering errors in browsers due to `em` to pixel
translation of relative CSS units by specify values that are translating
to full pixels at base `font-size`.
Introducing several Less variables for DRY purposes.

Bug: T102127
Change-Id: I1ecbf767a598704c3913d8853a458f0fe526f5d1
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
3 files changed, 14 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/315456/1

diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index e620458..6c683cd 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -58,6 +58,7 @@
 @max-width-default: 50em;
 @max-width-input: @max-width-default;
 
+@size-button-default: 2.5em; // equals `32px` at base `font-size: 12.8px`
 @size-icon-min: 24px;
 @size-indicator-min: 12px;
 @size-icon: unit( 24 / 16 / 0.8, em );
@@ -87,6 +88,9 @@
 @border-width-default: 1px;
 @border-width-medium: 2px;
 
+@padding-widget-default: 0.547em; // equals `6px` at base `font-size: 12.8px`
+@padding-top-input-text: 0.625em; // equals `7px` at base `font-size: 12.8px`
+
 @box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 );
 @box-shadow-menu: @box-shadow-dialog;
 @box-shadow-focus-default: inset 0 0 0 1px @color-progressive;
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 52c4b3e..fbf46a9 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -164,8 +164,8 @@
}
 
> .oo-ui-buttonElement-button {
-   padding: 0.5em 1em;
-   min-height: 1.2em;
+   padding: @padding-widget-default 1em;
+   min-height: 1.25em;
min-width: 1em;
border-radius: @border-radius-default;
position: relative;
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 1ac7c08..1db4f31 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -701,7 +701,6 @@
 
input,
textarea {
-   padding: 0.5em;
margin: 0;
font-size: inherit;
font-family: inherit;
@@ -709,6 +708,11 @@
color: @color-emphasized;
border: @border-default;
border-radius: @border-radius-default;
+   padding: @padding-top-input-text @padding-widget-default 
@padding-widget-default;
+   }
+
+   input {
+   line-height: 1.172em; // Firefox needs a value, Chrome the 
unit; equals `15px` at base `font-size: 12.8px`
}
 
textarea {
@@ -868,7 +872,7 @@
}
 
&-dropdownButton {
-   width: 2.5em;
+   width: @size-button-default;
 
.oo-ui-buttonElement-button {
padding: 0.5em;
@@ -1449,11 +1453,12 @@
 
&-buttoned {
.oo-ui-buttonWidget {
-   width: 2.5em;
+   width: @size-button-default;
}
 
.oo-ui-buttonElement-button {
display: block;
+   min-height: @size-button-default;
padding-left: 0;
padding-right: 0;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/315456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ecbf767a598704c3913d8853a458f0fe526f5d1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "gerrit: workaround a CSS bug with Microsoft Edge"

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Revert "gerrit: workaround a CSS bug with Microsoft Edge"
..


Revert "gerrit: workaround a CSS bug with Microsoft Edge"

This is not needed any more, this was fixed in windows 10 build 14942, and 
never impacted the anniversary update.

This reverts commit 2bbe80c0ed9ded5338039bd246c45c218e2b2ffb.

Change-Id: I693a5cac698a29810136354721689b35b57000db
---
M modules/gerrit/files/etc/GerritSite.css
1 file changed, 0 insertions(+), 12 deletions(-)

Approvals:
  Dzahn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/gerrit/files/etc/GerritSite.css 
b/modules/gerrit/files/etc/GerritSite.css
index 0347bd6..9f8de49 100644
--- a/modules/gerrit/files/etc/GerritSite.css
+++ b/modules/gerrit/files/etc/GerritSite.css
@@ -51,18 +51,6 @@
color: #222 !important;
 }
 
-/*
- * Workaround Microsoft Edge bug in gerrit
- *
- * https://bugs.chromium.org/p/gerrit/issues/detail?id=4526
- *
- * https://phabricator.wikimedia.org/T145130
- *
- */
-.downloadBoxScheme {
-   display: block !important;
-}
-
 /**
  * Header
  */

-- 
To view, visit https://gerrit.wikimedia.org/r/314835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I693a5cac698a29810136354721689b35b57000db
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: TitleWidget: Take 'known' status into account when deciding ...

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315455

Change subject: TitleWidget: Take 'known' status into account when deciding 
page existence
..

TitleWidget: Take 'known' status into account when deciding page existence

Bug: T72123
Change-Id: Id00215946a9a1927967e8af7f321862e89261c51
---
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
1 file changed, 23 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/315455/1

diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index b25b2d4..936d321 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -146,7 +146,17 @@
}
req = new mw.Api().get( params );
promiseAbortObject.abort = 
req.abort.bind( req ); // TODO ew
-   return req;
+   return req.then( function ( ret ) {
+   if ( ret.query === undefined ) {
+   ret = new mw.Api().get( 
{
+   action: 'query',
+   titles: query,
+   continue: ''
+   } );
+   
promiseAbortObject.abort = ret.abort.bind( ret );
+   }
+   return ret;
+   } );
}
} ).promise( promiseAbortObject );
} else {
@@ -186,6 +196,7 @@
continue;
}
pageData[ suggestionPage.title ] = {
+   known: suggestionPage.known !== undefined,
missing: suggestionPage.missing !== undefined,
redirect: suggestionPage.redirect !== undefined,
disambiguation: OO.getProp( suggestionPage, 
'pageprops', 'disambiguation' ) !== undefined,
@@ -205,6 +216,7 @@
for ( i = 0, len = redirects.length; i < len; i++ ) {
pageData[ redirects[ i ] ] = {
missing: false,
+   known: true,
redirect: true,
disambiguation: false,
description: mw.msg( 
'mw-widgets-titleinput-description-redirect', suggestionPage.title ),
@@ -222,14 +234,21 @@
// If not found, run value through mw.Title to avoid treating a 
match as a
// mismatch where normalisation would make them matching (bug 
48476)
 
-   pageExistsExact = titles.indexOf( this.getQueryValue() ) !== -1;
+   pageExistsExact = (
+   Object.prototype.hasOwnProperty.call( pageData, 
this.getQueryValue() ) &&
+   pageData[ this.getQueryValue() ].missing &&
+   pageData[ this.getQueryValue() ].known
+   );
pageExists = pageExistsExact || (
-   titleObj && titles.indexOf( titleObj.getPrefixedText() 
) !== -1
+   titleObj &&
+   Object.prototype.hasOwnProperty.call( pageData, 
titleObj.getPrefixedText() ) &&
+   pageData[ titleObj.getPrefixedText() ].missing &&
+   pageData[ titleObj.getPrefixedText() ].known
);
 
if ( !pageExists ) {
pageData[ this.getQueryValue() ] = {
-   missing: true, redirect: false, disambiguation: 
false,
+   missing: true, known: false, redirect: false, 
disambiguation: false,
description: mw.msg( 
'mw-widgets-titleinput-description-new-page' )
};
}

-- 
To view, visit https://gerrit.wikimedia.org/r/315455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id00215946a9a1927967e8af7f321862e89261c51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Use ParserOutput instead of DB to check for categories

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315454

Change subject: Use ParserOutput instead of DB to check for categories
..

Use ParserOutput instead of DB to check for categories

Using the DB is unreliable because LinksUpdate tends to happen
so late that we end up looking at the previous revision's categories,
making the category information always lag behind by one edit.

Bug: T147721
Change-Id: Ibfb42fed1b2d27d4dddc15845356b95c5f3e0dd2
---
M includes/ArticleMetadata.php
1 file changed, 32 insertions(+), 38 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage 
refs/changes/54/315454/1

diff --git a/includes/ArticleMetadata.php b/includes/ArticleMetadata.php
index a009a66..7e7bdab 100755
--- a/includes/ArticleMetadata.php
+++ b/includes/ArticleMetadata.php
@@ -576,6 +576,22 @@
}
}
}
+
+   protected function getArticleByPageId( $pageId ) {
+   // Try if there is an up-to-date wikipage object from article 
save
+   // else try to create a new one, this is important for 
replication deley
+   if ( isset( $this->articles[$pageId] ) ) {
+   $article = $this->articles[$pageId];
+   } else {
+   if ( $this->componentDb === DB_MASTER ) {
+   $from = 'fromdbmaster';
+   } else {
+   $from = 'fromdb';
+   }
+   $article = WikiPage::newFromID( $pageId, $from );
+   }
+   return $article;
+   }
 }
 
 /**
@@ -687,13 +703,13 @@
 
public function compile() {
foreach ( $this->mPageId as $pageId ) {
-   $this->processEstimatedCount(
-   $pageId,
-   [ 'page', 'categorylinks' ],
-   [ 'page_id' => $pageId, 'page_id = 
cl_from' ],
-   $maxNumToProcess = 50,
-   'category_count'
-   );
+   $article = $this->getArticleByPageId( $pageId );
+   if ( $article ) {
+   $parserOutput = 
$article->getContent()->getParserOutput( $article->getTitle() );
+   $content = $article->getContent();
+   $title = $article->getTitle();
+   $this->metadata[$pageId]['category_count'] = 
count( $parserOutput->getCategories() );
+   }
}
$this->fillInZeroCount( 'category_count' );
return true;
@@ -712,18 +728,7 @@
 
public function compile() {
foreach ( $this->mPageId as $pageId ) {
-   // Article snippet, try if there is an up-to-date 
wikipage object from article save
-   // else try to create a new one, this is important for 
replication deley
-   if ( isset( $this->articles[$pageId] ) ) {
-   $article = $this->articles[$pageId];
-   } else {
-   if ( $this->componentDb === DB_MASTER ) {
-   $from = 'fromdbmaster';
-   } else {
-   $from = 'fromdb';
-   }
-   $article = WikiPage::newFromID( $pageId, $from 
);
-   }
+   $article = $this->getArticleByPageId( $pageId );
if ( $article ) {
$content = $article->getContent();
$text = ContentHandler::getContentText( 
$content );
@@ -883,7 +888,6 @@
 
public function __construct( $pageId, $componentDb = DB_MASTER, 
$articles = null ) {
parent::__construct( $pageId, $componentDb, $articles );
-   $this->metadata = array_fill_keys( $this->mPageId, [ 'deleted' 
=> '0' ] );
}
 
public static function getDeletionTags() {
@@ -897,28 +901,18 @@
 
public function compile() {
$deletionTags = self::getDeletionTags();
-   $res = $this->db->select(
-   [ 'categorylinks' ],
-   [ 'cl_from AS page_id', 'cl_to' ],
-   [ 'cl_from' => $this->mPageId, 'cl_to' => 
array_keys( $deletionTags ) ],
-   __METHOD__
-   );
-
-   foreach ( $res as $row ) {
-   
$this->metadata[$row->page_id][$deletionTags[$row->cl_to]] = '1';
-   // This won't be saved to 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tcpircbot: adjust IPv6 addresses of maintenance servers

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: tcpircbot: adjust IPv6 addresses of maintenance servers
..


tcpircbot: adjust IPv6 addresses of maintenance servers

Since https://gerrit.wikimedia.org/r/#/c/302649/ has been merged
the maintenance servers now have properly mapped IPv6 addresses.

As a follow-up to https://gerrit.wikimedia.org/r/#/c/302647/ we
have to update them here now.

Bug: T141619
Change-Id: Id6f4f45cd14040cdbb86c65d92c935ce08b0a00d
---
M manifests/role/tcpircbot.pp
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Dzahn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index 83ea50b..fbc6a1e 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -21,10 +21,10 @@
 '2620:0:861:101:10:64:0:196/128',   # deployment eqiad v6: tin
 ':::10.192.16.132/128', # deployment codfw v4: mira
 '2620:0:860:102:10:192:16:132/128', # deployment codfw v6: mira
-':::10.64.32.13/128', # maintenance eqiad v4: 
terbium
-'2620:0:861:103:92b1:1cff:fe25:9d72/128', # maintenance eqiad v6: 
terbium
-':::10.192.48.45/128',# maintenance codfw v4: 
wasat
-'2620:0:860:104:1602:ecff:fe3f:478c/128', # maintenance codfw v6: 
wasat
+':::10.64.32.13/128',   # maintenance eqiad v4: terbium
+'2620:0:861:103:10:64:32:13/64',# maintenance eqiad v6: terbium
+':::10.192.48.45/128',  # maintenance codfw v4: wasat
+'2620:0:860:104:10:192:48:45/64',   # maintenance codfw v6: wasat
 ':::10.64.16.73/128',   # puppetmaster1001.eqiad.wmnet
 '2620:0:861:102:10:64:16:73/128',   # puppetmaster1001.eqiad.wmnet
 ':::10.192.0.27/128',   # puppetmaster2001.codfw.wmnet

-- 
To view, visit https://gerrit.wikimedia.org/r/315453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6f4f45cd14040cdbb86c65d92c935ce08b0a00d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tcpircbot: adjust IPv6 addresses of maintenance servers

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315453

Change subject: tcpircbot: adjust IPv6 addresses of maintenance servers
..

tcpircbot: adjust IPv6 addresses of maintenance servers

Since https://gerrit.wikimedia.org/r/#/c/302649/ has been merged
the maintenance servers now have properly mapped IPv6 addresses.

As a follow-up to https://gerrit.wikimedia.org/r/#/c/302647/ we
have to update them here now.

Bug: T141619
Change-Id: Id6f4f45cd14040cdbb86c65d92c935ce08b0a00d
---
M manifests/role/tcpircbot.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/315453/1

diff --git a/manifests/role/tcpircbot.pp b/manifests/role/tcpircbot.pp
index 83ea50b..fbc6a1e 100644
--- a/manifests/role/tcpircbot.pp
+++ b/manifests/role/tcpircbot.pp
@@ -21,10 +21,10 @@
 '2620:0:861:101:10:64:0:196/128',   # deployment eqiad v6: tin
 ':::10.192.16.132/128', # deployment codfw v4: mira
 '2620:0:860:102:10:192:16:132/128', # deployment codfw v6: mira
-':::10.64.32.13/128', # maintenance eqiad v4: 
terbium
-'2620:0:861:103:92b1:1cff:fe25:9d72/128', # maintenance eqiad v6: 
terbium
-':::10.192.48.45/128',# maintenance codfw v4: 
wasat
-'2620:0:860:104:1602:ecff:fe3f:478c/128', # maintenance codfw v6: 
wasat
+':::10.64.32.13/128',   # maintenance eqiad v4: terbium
+'2620:0:861:103:10:64:32:13/64',# maintenance eqiad v6: terbium
+':::10.192.48.45/128',  # maintenance codfw v4: wasat
+'2620:0:860:104:10:192:48:45/64',   # maintenance codfw v6: wasat
 ':::10.64.16.73/128',   # puppetmaster1001.eqiad.wmnet
 '2620:0:861:102:10:64:16:73/128',   # puppetmaster1001.eqiad.wmnet
 ':::10.192.0.27/128',   # puppetmaster2001.codfw.wmnet

-- 
To view, visit https://gerrit.wikimedia.org/r/315453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6f4f45cd14040cdbb86c65d92c935ce08b0a00d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add mapped v6 IPs for terbium and wasat

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: add mapped v6 IPs for terbium and wasat
..


add mapped v6 IPs for terbium and wasat

They have v6 addresses already but not the "mapped" nice ones.

After this also adjust I94169ff5efb3a0a6ba74249

Change-Id: I84b34ea447e8136c25b6acf7be1e088a97303055
---
M manifests/site.pp
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Eevans: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  Dzahn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 79952d2..79059e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2784,6 +2784,10 @@
 
 include ldap::role::client::labs
 include base::firewall
+
+interface::add_ip6_mapped { 'main':
+interface => 'eth0',
+}
 }
 
 # Thumbor servers for MediaWiki image scaling
@@ -2851,6 +2855,10 @@
 
 include ldap::role::client::labs
 include base::firewall
+
+interface::add_ip6_mapped { 'main':
+interface => 'eth0',
+}
 }
 
 # Wikidata query service

-- 
To view, visit https://gerrit.wikimedia.org/r/302649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I84b34ea447e8136c25b6acf7be1e088a97303055
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...OATHAuth[master]: Apply rate limits to all token verifications

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Apply rate limits to all token verifications
..


Apply rate limits to all token verifications

Extend the token validation failure checks introduced in I4884f6e to the
other interactions where OATHAuthKey::verifyToken is used.

Depends-On: Ia3add8bbbab0307f036e9b77e752c382da3a0d04
Change-Id: Icbe5cdf561c683dc971a099d61cedff311b26b43
---
M OATHAuth.hooks.legacy.php
M OATHAuthKey.php
M api/ApiOATHValidate.php
M auth/TOTPSecondaryAuthenticationProvider.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M special/SpecialOATHDisable.php
M special/SpecialOATHLogin.php
9 files changed, 40 insertions(+), 23 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/OATHAuth.hooks.legacy.php b/OATHAuth.hooks.legacy.php
index d62b3ec..739f256 100644
--- a/OATHAuth.hooks.legacy.php
+++ b/OATHAuth.hooks.legacy.php
@@ -35,14 +35,18 @@
$result = true;
 
if ( $oathuser->getKey() !== null ) {
-   $result = $oathuser->getKey()->verifyToken( $token, 
$oathuser );
+   // Don't increase pingLimiter, just check for limit 
exceeded.
+   if ( $user->pingLimiter( 'badoath', 0 ) ) {
+   $result = 'oathauth-abortlogin-throttled';
+   } elseif ( !$oathuser->getKey()->verifyToken( $token, 
$oathuser ) ) {
+   $result = 'oathauth-abortlogin';
+   }
}
 
-   if ( $result ) {
+   if ( $result === true ) {
return true;
} else {
-   $errorMsg = 'oathauth-abortlogin';
-
+   $errorMsg = $result;
return false;
}
}
diff --git a/OATHAuthKey.php b/OATHAuthKey.php
index c119da3..63225d3 100644
--- a/OATHAuthKey.php
+++ b/OATHAuthKey.php
@@ -80,7 +80,7 @@
 * @return int|false Returns a constant represent what type of token 
was matched,
 *  or false for no match
 */
-   public function verifyToken( $token, $user ) {
+   public function verifyToken( $token, OATHUser $user ) {
global $wgOATHAuthWindowRadius;
 
if ( $this->secret['mode'] !== 'hotp' ) {
@@ -136,6 +136,9 @@
$lastWindow,
$this->secret['period'] * ( 1 + 2 * 
$wgOATHAuthWindowRadius )
);
+   } else {
+   // Increase rate limit counter for failed request
+   $user->getUser()->pingLimiter( 'badoath' );
}
 
return $retval;
diff --git a/api/ApiOATHValidate.php b/api/ApiOATHValidate.php
index 2ce162e..5413e27 100644
--- a/api/ApiOATHValidate.php
+++ b/api/ApiOATHValidate.php
@@ -44,7 +44,7 @@
$this->dieUsageMsg( [ 'noname', $params['user'] ] );
}
 
-   // Don't increase pingLimiter, just check for limit exceeded
+   // Don't increase pingLimiter, just check for limit exceeded.
if ( $user->pingLimiter( 'badoath', 0 ) ) {
$this->dieUsageMsg( 'actionthrottledtext' );
}
@@ -66,11 +66,6 @@
$params['totp'], $oathUser ) 
!== false;
}
}
-   }
-
-   if ( !$result['valid'] ) {
-   // Increase rate limit counter for failed request
-   $user->pingLimiter( 'badoath' );
}
 
$this->getResult()->addValue( null, $this->getModuleName(), 
$result );
diff --git a/auth/TOTPSecondaryAuthenticationProvider.php 
b/auth/TOTPSecondaryAuthenticationProvider.php
index 23a83f8..d0b5c10 100644
--- a/auth/TOTPSecondaryAuthenticationProvider.php
+++ b/auth/TOTPSecondaryAuthenticationProvider.php
@@ -4,7 +4,6 @@
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\Auth\AuthenticationResponse;
 use MediaWiki\Auth\AuthManager;
-use MediaWiki\Auth\Throttler;
 use MediaWiki\Session\SessionManager;
 
 /**
@@ -55,16 +54,6 @@
wfMessage( 'oathauth-login-failed' ), 'error' );
}
 
-   $throttler = new Throttler( null, [ 'type' => 'TOTP' ] );
-   $result = $throttler->increase( $user->getName(), null, 
__METHOD__ );
-   if ( $result ) {
-   return AuthenticationResponse::newUI( [ new 
TOTPAuthenticationRequest() ],
-   new Message(
-   'oathauth-throttled',
-   [ Message::durationParam( 
$result['wait'] ) ]
-   ), 

[MediaWiki-commits] [Gerrit] mediawiki...OATHAuth[master]: Add an api action to validate an OATH token

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add an api action to validate an OATH token
..


Add an api action to validate an OATH token

Add a new internal action=oathvalidate Action API module that can be
used to validate an OATH token collected from a user. Using the module
requires the 'oathauth-api-all' permission introduced in I4884f6e.

Attempts to call the action for a given user are rate limited to only
allow 10 failures per minute using the new 'badoath' key.

The check is primarily useful as an internal network service in an
environment where MediaWiki and other applications are sharing the same
backing authentication store (e.g. LDAP) and the non-MediaWiki
applications would like to respect the OATH protections enabled on the
MediaWiki install.

Complete usage in an LDAP shared auth environment would look something
like:
* Authenticate a user with the LDAP server via auth-bind
* Call action=query=oath as a privileged user to check for OATH
  protection.
* If OATH is active for the account, prompt the user for their current
  OATH token.
* Call action=oathvalidate as a privileged user to validate the token.
* If validation succeeds, complete authentication.
* If validation fails, do not authenticate the user.

Bug: T144712
Change-Id: I1b18d9f3b99364fc47c760bdfc2047c1cbb5c04a
---
A api/ApiOATHValidate.php
M api/ApiQueryOATH.php
M extension.json
M i18n/en.json
M i18n/qqq.json
5 files changed, 136 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/api/ApiOATHValidate.php b/api/ApiOATHValidate.php
new file mode 100644
index 000..2ce162e
--- /dev/null
+++ b/api/ApiOATHValidate.php
@@ -0,0 +1,111 @@
+http://www.gnu.org/copyleft/gpl.html
+ */
+
+/**
+ * Validate an OATH token.
+ *
+ * @ingroup API
+ * @ingroup Extensions
+ */
+class ApiOATHValidate extends ApiBase {
+   public function execute() {
+   // Be extra paranoid about the data that is sent
+   $this->requirePostedParameters( [ 'totp', 'token' ] );
+
+   $params = $this->extractRequestParams();
+   if ( $params['user'] === null ) {
+   $params['user'] = $this->getUser()->getName();
+   }
+
+   if ( !$this->getUser()->isAllowed( 'oathauth-api-all' ) ) {
+   $this->dieUsage(
+   'You do not have permission to validate an OATH 
token',
+   'permissiondenied'
+   );
+   }
+
+   $user = User::newFromName( $params['user'] );
+   if ( $user === false ) {
+   $this->dieUsageMsg( [ 'noname', $params['user'] ] );
+   }
+
+   // Don't increase pingLimiter, just check for limit exceeded
+   if ( $user->pingLimiter( 'badoath', 0 ) ) {
+   $this->dieUsageMsg( 'actionthrottledtext' );
+   }
+
+   $result = [
+   ApiResult::META_BC_BOOLS => [ 'enabled', 'valid' ],
+   'enabled' => false,
+   'valid' => false,
+   ];
+
+   if ( !$user->isAnon() ) {
+   $oathUser = OATHAuthHooks::getOATHUserRepository()
+   ->findByUser( $user );
+   if ( $oathUser ) {
+   $key = $oathUser->getKey();
+   if ( $key !== null ) {
+   $result['enabled'] = true;
+   $result['valid'] = $key->verifyToken(
+   $params['totp'], $oathUser ) 
!== false;
+   }
+   }
+   }
+
+   if ( !$result['valid'] ) {
+   // Increase rate limit counter for failed request
+   $user->pingLimiter( 'badoath' );
+   }
+
+   $this->getResult()->addValue( null, $this->getModuleName(), 
$result );
+   }
+
+   public function getCacheMode( $params ) {
+   return 'private';
+   }
+
+   public function isInternal() {
+   return true;
+   }
+
+   public function needsToken() {
+   return 'csrf';
+   }
+
+   public function getAllowedParams() {
+   return [
+   'user' => [
+   ApiBase::PARAM_TYPE => 'user',
+   ],
+   'totp' => [
+   ApiBase::PARAM_TYPE => 'string',
+   ApiBase::PARAM_REQUIRED => true,
+   ],
+   ];
+   }
+
+   protected function getExamplesMessages() {
+   return [
+ 

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.28.0-wmf.22]: Remove position_increment_gap on source_text.trigram

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove position_increment_gap on source_text.trigram
..


Remove position_increment_gap on source_text.trigram

This one that was missed when I cleaned up position_increment_gap
on field where position are not stored.

Change-Id: I58788b940b98fcdc04c4421d697d311ccc57247a
---
M includes/Search/SourceTextIndexField.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Search/SourceTextIndexField.php 
b/includes/Search/SourceTextIndexField.php
index 142efe6..cce4219 100644
--- a/includes/Search/SourceTextIndexField.php
+++ b/includes/Search/SourceTextIndexField.php
@@ -56,7 +56,6 @@
'type' => 'string',
'analyzer' => 'trigram',
'index_options' => 'docs',
-   'position_increment_gap' => 
self::POSITION_INCREMENT_GAP,
];
}
$this->configureHighlighting( $field, ['plain'], false );

-- 
To view, visit https://gerrit.wikimedia.org/r/315440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I58788b940b98fcdc04c4421d697d311ccc57247a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.28.0-wmf.22]: Add completion support to ClusterOverride

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add completion support to ClusterOverride
..


Add completion support to ClusterOverride

It can be useful when we want to switch everything except completion
queries.

Change-Id: Ib32d0478309b6b482c6c5cf497e721545247e7e7
(cherry picked from commit defd26b9f0e8ea7b6f177eeae0bcf0eb53c1235e)
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/Searcher.php
3 files changed, 14 insertions(+), 9 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CirrusSearch.php b/CirrusSearch.php
index 122f79c..c7fa0ec 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -526,15 +526,16 @@
 // be retrieved by elasticsearch.
 $wgCirrusSearchMoreLikeThisUseFields = false;
 
-// This allows redirecting full text queries to a separate cluster configured
+// This allows redirecting queries to a separate cluster configured
 // in $wgCirrusSearchClusters. Note that queries can use multiple features, in
 // the case multiple features have overrides the first match wins.
 //
-// Example sending more_like queries to codfw:
-//   $wgCirrusSearchFullTextClusterOverrides = array(
+// Example sending more_like queries to codfw and completion to eqiad:
+//   $wgCirrusSearchClusterOverrides = [
 // 'more_like' => 'codfw',
-//   );
-$wgCirrusSearchFullTextClusterOverrides = array();
+// 'completion' => 'eqiad',
+//   ];
+$wgCirrusSearchClusterOverrides = [];
 
 // More like this queries can be quite expensive. Set this to > 0 to cache the
 // results for the specified # of seconds into ObjectCache (memcache, redis, or
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index ce43cd0..04c6ad0 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -491,9 +491,13 @@
if ( isset( 
$this->features[SearchEngine::COMPLETION_PROFILE_TYPE] ) ) {
$profile = 
$this->features[SearchEngine::COMPLETION_PROFILE_TYPE];
}
-   // offset is omitted, searchSuggestion does not support
-   // scrolling results
-   $suggester = new CompletionSuggester( $this->connection, 
$this->limit,
+   $clusterOverride = $config->getElement( 
'CirrusSearchClusterOverrides', 'completion' );
+   if ( $clusterOverride !== null ) {
+   $connection = Connection::getPool( $config, 
$clusterOverride );
+   } else {
+   $connection = $this->connection;
+   }
+   $suggester = new CompletionSuggester( $connection, $this->limit,
$this->offset, $config, $this->namespaces, null,
$this->indexBaseName, $profile );
 
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 48c3414..2c7034e 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -837,7 +837,7 @@
 * features to specific clusters.
 */
private function overrideConnectionIfNeeded() {
-   $overrides = $this->config->get( 
'CirrusSearchFullTextClusterOverrides' );
+   $overrides = $this->config->get( 'CirrusSearchClusterOverrides' 
);
foreach ( $overrides as $feature => $cluster ) {
if ( $this->searchContext->isSyntaxUsed( $feature ) ) {
$this->connection = Connection::getPool( 
$this->config, $cluster );

-- 
To view, visit https://gerrit.wikimedia.org/r/315441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib32d0478309b6b482c6c5cf497e721545247e7e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.22]: Call destroy method that actually exists instead of one that...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Call destroy method that actually exists instead of one that 
doesn't anymore.
..


Call destroy method that actually exists instead of one that doesn't anymore.

Bug: T147881
Change-Id: Idac48d3c022af60409df37f2b1fcf82af814bdfa
---
M includes/ForkController.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ForkController.php b/includes/ForkController.php
index 2725753..da4cd17 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -150,7 +150,7 @@
protected function prepareEnvironment() {
global $wgMemc;
// Don't share DB, storage, or memcached connections
-   wfGetLBFactory()->destroyInstance();
+   wfGetLBFactory()->destroy();
FileBackendGroup::destroySingleton();
LockManagerGroup::destroySingletons();
JobQueueGroup::destroySingletons();

-- 
To view, visit https://gerrit.wikimedia.org/r/315332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idac48d3c022af60409df37f2b1fcf82af814bdfa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...OATHAuth[master]: Remove pre authmanager MW support

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315452

Change subject: Remove pre authmanager MW support
..

Remove pre authmanager MW support

Change-Id: I46712392e48c263bd30b849777caea8e22650d40
---
D OATHAuth.hooks.legacy.php
M OATHAuth.hooks.php
M extension.json
3 files changed, 13 insertions(+), 98 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth 
refs/changes/52/315452/1

diff --git a/OATHAuth.hooks.legacy.php b/OATHAuth.hooks.legacy.php
deleted file mode 100644
index d62b3ec..000
--- a/OATHAuth.hooks.legacy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-getText( 'wpOATHToken' );
-   $oathrepo = OATHAuthHooks::getOATHUserRepository();
-   $oathuser = $oathrepo->findByUser( $user );
-   # Though it's weird to default to true, we only want to deny
-   # users who have two-factor enabled and have validated their
-   # token.
-   $result = true;
-
-   if ( $oathuser->getKey() !== null ) {
-   $result = $oathuser->getKey()->verifyToken( $token, 
$oathuser );
-   }
-
-   if ( $result ) {
-   return true;
-   } else {
-   $errorMsg = 'oathauth-abortlogin';
-
-   return false;
-   }
-   }
-
-   /**
-* @param $user User
-* @param $password string
-* @param &$abort int
-* @param &$errorMsg string
-* @return bool
-*/
-   static function AbortLogin( $user, $password, &$abort, &$errorMsg ) {
-   $context = RequestContext::getMain();
-   $request = $context->getRequest();
-   $output = $context->getOutput();
-
-   $oathrepo = OATHAuthHooks::getOATHUserRepository();
-   $oathuser = $oathrepo->findByUser( $user );
-   $uid = CentralIdLookup::factory()->centralIdFromLocalUser( 
$user );
-
-   if ( $oathuser->getKey() !== null && !$request->getCheck( 
'token' ) ) {
-   $encData = OATHAuthUtils::encryptSessionData(
-   $request->getValues(),
-   $uid
-   );
-   $request->setSessionData( 'oath_login', $encData );
-   $request->setSessionData( 'oath_uid', $uid );
-   $output->redirect( SpecialPage::getTitleFor( 'OATH' 
)->getFullURL( '', false, PROTO_CURRENT ) );
-   return false;
-   } else {
-   return true;
-   }
-   }
-}
diff --git a/OATHAuth.hooks.php b/OATHAuth.hooks.php
index 39f269b..f57e015 100644
--- a/OATHAuth.hooks.php
+++ b/OATHAuth.hooks.php
@@ -32,23 +32,15 @@
 * Register hooks which depend on MediaWiki core version
 */
public static function onRegistration() {
-   global $wgDisableAuthManager, $wgAuthManagerAutoConfig;
-
-   if ( !$wgDisableAuthManager && class_exists( AuthManager::class 
) ) {
-   $wgAuthManagerAutoConfig['secondaryauth'] += [
-   TOTPSecondaryAuthenticationProvider::class => [
-   'class' => 
TOTPSecondaryAuthenticationProvider::class,
-   // after non-interactive providers but 
before the ones
-   // that run after a successful 
authentication
-   'sort' => 50,
-   ]
-   ];
-   Hooks::register( 'AuthChangeFormFields', 
'OATHAuthHooks::onAuthChangeFormFields' );
-   } else {
-   Hooks::register( 'AbortChangePassword', 
'OATHAuthLegacyHooks::AbortChangePassword' );
-   Hooks::register( 'AbortLogin', 
'OATHAuthLegacyHooks::AbortLogin' );
-   Hooks::register( 'ChangePasswordForm', 
'OATHAuthLegacyHooks::ChangePasswordForm' );
-   }
+   global $wgAuthManagerAutoConfig;
+   $wgAuthManagerAutoConfig['secondaryauth'] += [
+   TOTPSecondaryAuthenticationProvider::class => [
+   'class' => 
TOTPSecondaryAuthenticationProvider::class,
+   // after non-interactive providers but before 
the ones
+   // that run after a successful authentication
+   'sort' => 50,
+   ]
+   ];
}
 
/**
diff --git a/extension.json b/extension.json
index ed21abf..91ec9cc 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "OATHAuth",
-   "version": "0.2.1",
+   "version": "0.2.2",

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.28.0-wmf.22]: Follow-up I9547dfd: Only enable VE tabs if VE is available

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up I9547dfd: Only enable VE tabs if VE is available
..


Follow-up I9547dfd: Only enable VE tabs if VE is available

Otherwise VE is launched on namespaces where it is disabled
(but NWE is enabled).

Bug: T147890
Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
(cherry picked from commit 4fc2904a87d7e4fa5f7bf1d61b37de1c6ddc850d)
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index bcd39b4..41cfd7b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -970,7 +970,7 @@
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
init.setupSkin();
-   } else if ( pageCanLoadVE && onlyTabIsVE ) {
+   } else if ( init.isVisualAvailable && 
pageCanLoadVE && onlyTabIsVE ) {
// … on single-edit-tab wikis, where VE 
is the user's preferred editor
// Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', 
function ( e ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/315424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Add more languages to news feed

[BearND (Code Review)]

BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315451

Change subject: Add more languages to news feed
..

Add more languages to news feed

da, el, fi, fr, ko, no, pl, sv, vi

For some languages the code needed to be changed to be more
flexible in terms of selectors used to find the correct list of
news items. (fr, da, pl)

To test I added the following paths to my local RB instance config.yaml

/{domain:ca.wikipedia.org}: *default_project
/{domain:el.wikipedia.org}: *default_project
/{domain:fi.wikipedia.org}: *default_project
/{domain:ko.wikipedia.org}: *default_project
/{domain:no.wikipedia.org}: *default_project
/{domain:pl.wikipedia.org}: *default_project
/{domain:vi.wikipedia.org}: *default_project

and in the Android app pointed to that local RB instance. After switching to
a new language in the app I ended up having to refresh the feed a couple of
times before the news items showed up.

Bug: T143808
Change-Id: Iac6c156a242b1cb545ed671338bf525a07e105b4
---
M lib/feed/news.js
M test/features/news/news.js
2 files changed, 20 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps 
refs/changes/51/315451/1

diff --git a/lib/feed/news.js b/lib/feed/news.js
index 4932193..55e9c5d 100644
--- a/lib/feed/news.js
+++ b/lib/feed/news.js
@@ -9,13 +9,23 @@
 var HTTPError = require('../util').HTTPError;
 
 var newsTemplates = {
-en: 'Template:In_the_news',
-de: 'Wikipedia:Hauptseite/Aktuelles',
-es: 'Portal:Actualidad',
-he: 'תבנית:חדשות_ואקטואליה',
-pt: 'Portal:Eventos_atuais',
-ru: 'Шаблон:Актуальные_события',
-zh: 'Portal:新聞動態'
+en: {title: 'Template:In_the_news', selector: 'ul[id^=mw]'},
+
+da: {title: 'Skabelon:Forside_aktuelle_begivenheder', selector: 'div'},
+de: {title: 'Wikipedia:Hauptseite/Aktuelles', selector: 'ul'},
+el: {title: 'Πύλη:Τρέχοντα_γεγονότα/Επικεφαλίδες', selector: 'ul'},
+es: {title: 'Portal:Actualidad', selector: 'ul'},
+fi: {title: 'Malline:Uutisissa', selector: 'ul'},
+fr: {title: 'Modèle:Accueil_actualité', selector: 'ul[id^=mw]'},
+he: {title: 'תבנית:חדשות_ואקטואליה', selector: 'ul'},
+ko: {title: '틀:새로_들어온_소식', selector: 'ul'},
+no: {title: 'Mal:Aktuelt', selector: 'ul'},
+pl: {title: 'Szablon:Aktualności', selector: 'ul:last-of-type'},
+pt: {title: 'Portal:Eventos_atuais', selector: 'ul'},
+ru: {title: 'Шаблон:Актуальные_события', selector: 'ul'},
+sv: {title: 'Portal:Huvudsida/Aktuella händelser', selector: 'ul'},
+vi: {title: 'Bản_mẫu:Tin_tức', selector: 'ul'},
+zh: {title: 'Portal:新聞動態', selector: 'ul'}
 };
 
 function removeFragment(href) {
@@ -55,14 +65,14 @@
 payload: [],
 meta: {}
 };
-req.params.title = newsTemplates[lang];
+req.params.title = newsTemplates[lang].title;
 return parsoid.getParsoidHtml(app, req)
 .then(function (response) {
 result.meta.etag = parsoid.getRevisionFromEtag(response.headers);
 
 var linkTitles = [];
 var doc = domino.createDocument(response.body);
-var newsList = doc.getElementsByTagName('ul')[0];
+var newsList = doc.querySelector(newsTemplates[lang].selector);
 var stories = newsList.getElementsByTagName('li');
 
 for (var j = 0, m = stories.length; j < m; j++) {
diff --git a/test/features/news/news.js b/test/features/news/news.js
index a5eb076..f2478fc 100644
--- a/test/features/news/news.js
+++ b/test/features/news/news.js
@@ -40,8 +40,7 @@
 this.timeout(2);
 
 before(function () { return server.start(); });
-
-[ 'de', 'en', 'es', 'he', 'pt', 'ru', 'zh' ].forEach(function(lang) {
+[ 'da', 'de', 'el', 'en', 'es', 'fi', 'fr', 'he', 'ko', 'no', 'pl', 'pt', 
'ru', 'sv', 'vi', 'zh' ].forEach(function(lang) {
 it(lang + ': should respond to GET request with expected headers, 
incl. CORS and CSP headers', function () {
 return headers.checkHeaders(server.config.uri + lang + 
'.wikipedia.org/v1/page/news',
 'application/json');

-- 
To view, visit https://gerrit.wikimedia.org/r/315451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac6c156a242b1cb545ed671338bf525a07e105b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[wmf/1.28.0-wmf.21]: Add ignorestatus option for fixing stuck renames

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add ignorestatus option for fixing stuck renames
..


Add ignorestatus option for fixing stuck renames

Also fix log channel name.

Bug: T147029
Change-Id: I4f6f60a2525cfa50f951d40b8990eb43d2bf1b16
(cherry picked from commit a84a66c714f657417f9bb3c590e1ad98dffbe8e7)
---
M includes/LocalRenameJob/LocalRenameJob.php
M includes/LocalRenameJob/LocalRenameUserJob.php
M maintenance/fixStuckGlobalRename.php
3 files changed, 31 insertions(+), 7 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/LocalRenameJob/LocalRenameJob.php 
b/includes/LocalRenameJob/LocalRenameJob.php
index 5042f0f..26ea044 100644
--- a/includes/LocalRenameJob/LocalRenameJob.php
+++ b/includes/LocalRenameJob/LocalRenameJob.php
@@ -36,13 +36,16 @@
$factory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
$factory->commitMasterChanges( $fnameTrxOwner );
 
-   if ( $status !== 'queued' && $status !== 'failed' ) {
-   LoggerFactory::getInstance( 'rename' )->info( 'skipping 
duplicate rename from {user}', [
-   'user' => $this->params['from'],
-   'to' => $this->params['to'],
-   'status' => $status,
-   ] );
-   return true;
+   if ( empty( $this->params['ignorestatus'] ) ) {
+   if ( $status !== 'queued' && $status !== 'failed' ) {
+   LoggerFactory::getInstance( 'CentralAuthRename' 
)
+   ->info( 'skipping duplicate rename from 
{user}', [
+   'user' => $this->params['from'],
+   'to' => $this->params['to'],
+   'status' => $status,
+   ] );
+   return true;
+   }
}
 
if ( isset( $this->params['session'] ) ) {
diff --git a/includes/LocalRenameJob/LocalRenameUserJob.php 
b/includes/LocalRenameJob/LocalRenameUserJob.php
index e6eb991..19365e6 100644
--- a/includes/LocalRenameJob/LocalRenameUserJob.php
+++ b/includes/LocalRenameJob/LocalRenameUserJob.php
@@ -7,6 +7,24 @@
  * This is intended to be run on each wiki individually
  */
 class LocalRenameUserJob extends LocalRenameJob {
+   /**
+* @param Title $title
+* @param array $params An associative array of options:
+*   from - old username
+*   to - new username
+*   force - try to do the rename even if the old username is invalid
+*   renamer - whom the renaming should be attributed in logs
+*   reason - reason to use in the rename log
+*   movepages - move user / user talk pages and their subpages
+*   suppressredirects - when moving pages, suppress redirects
+*   reattach - after rename, attach the local account. When used, 
should be set to
+* [ wiki ID => [ 'attachedMethod' => method, 'attachedTimestamp' 
=> timestamp ].
+* See CentralAuthUser::queryAttached. (default: false)
+*   promotetoglobal - globalize the new user account (default: false)
+*   session - session data from RequestContext::exportSession, for 
checkuser data
+*   ignorestatus - ignore update status, run the job even if it seems 
like another job
+* is already working on it
+*/
public function __construct( $title, $params ) {
$this->command = 'LocalRenameUserJob';
 
diff --git a/maintenance/fixStuckGlobalRename.php 
b/maintenance/fixStuckGlobalRename.php
index b4ddeb6..ccd34d3 100644
--- a/maintenance/fixStuckGlobalRename.php
+++ b/maintenance/fixStuckGlobalRename.php
@@ -16,6 +16,8 @@
$this->addArg( 'oldname', 'Old name' );
$this->addArg( 'newname', 'New name' );
$this->addOption( 'logwiki', 'Wiki where the log entry exists', 
true, true );
+   $this->addOption( 'ignorestatus', 'Ignore rename status. Don\'t 
do this when the rename '
+   . 'jobs might still be running.' );
$this->addDescription( 'Unstuck global rename on a single wiki' 
);
}
 
@@ -75,6 +77,7 @@
'movepages' => $movepages,
'suppressredirects' => $suppressredirects,
'reason' => $comment,
+   'ignorestatus' => $this->getOption( 'ignorestatus', 
false ),
// no way to recover localuser attachment details, 
faking it
'reattach' => [ wfWikiID() => [
'attachedMethod' => 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: robots.php: Use WikiPage instead of Article class

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: robots.php: Use WikiPage instead of Article class
..


robots.php: Use WikiPage instead of Article class

Less-deprecated methods.

Resubmission of I345a02b442bf1 - with the undefined $title variable fixed.

Change-Id: I9982af8fea6d50b4e0baf925906ff5baffed4b6b
---
M w/robots.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/w/robots.php b/w/robots.php
index 937206f..ee90531 100644
--- a/w/robots.php
+++ b/w/robots.php
@@ -3,10 +3,10 @@
 require getMediaWiki( 'includes/WebStart.php' );
 
 $wgTitle = Title::newFromText( 'Mediawiki:robots.txt' );
-$wgArticle = new Article( $wgTitle, 0 );
+$page = WikiPage::factory( $wgTitle );
 
 header( 'Content-Type: text/plain; charset=utf-8' );
-header( 'X-Article-ID: ' . $wgArticle->getID() );
+header( 'X-Article-ID: ' . $page->getId() );
 header( 'X-Language: ' . $lang );
 header( 'X-Site: ' . $site );
 header( 'Vary: X-Subdomain' );
@@ -25,10 +25,10 @@
 
 if ( $zeroRated ) {
echo $dontIndex;
-} elseif ( $wgArticle->getID() != 0 ) {
-   $extratext = $wgArticle->getContent( false ) ;
+} elseif ( $page->exists() ) {
+   $extratext = $page->getText() ?: '';
// Take last modified timestamp of page into account
-   $mtime = max( $mtime, wfTimestamp( TS_UNIX,  $wgArticle->getTouched() ) 
);
+   $mtime = max( $mtime, wfTimestamp( TS_UNIX, $page->getTouched() ) );
 } elseif( $wmfRealm == 'labs' ) {
echo $dontIndex;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/314790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9982af8fea6d50b4e0baf925906ff5baffed4b6b
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Greg Grossmeier 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Always remember your wg prefix

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Always remember your wg prefix
..


Always remember your wg prefix

If not things won't work how you want them to...

Change-Id: Ie9dafeb327f85d4681001a441428e30b7d2c1f74
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c0001a9..be2b646 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14524,7 +14524,7 @@
 'wgMinervaEnableSiteNotice' => [
'default' => false,
 ],
-'MinervaBottomLanguageButton' => [
+'wgMinervaBottomLanguageButton' => [
'default' => false,
 ],
 'wmgMFAppPackageId' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/315450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9dafeb327f85d4681001a441428e30b7d2c1f74
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Always remember your wg prefix

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315450

Change subject: Always remember your wg prefix
..

Always remember your wg prefix

If not things won't work how you want them to...

Change-Id: Ie9dafeb327f85d4681001a441428e30b7d2c1f74
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/50/315450/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c0001a9..be2b646 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14524,7 +14524,7 @@
 'wgMinervaEnableSiteNotice' => [
'default' => false,
 ],
-'MinervaBottomLanguageButton' => [
+'wgMinervaBottomLanguageButton' => [
'default' => false,
 ],
 'wmgMFAppPackageId' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/315450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9dafeb327f85d4681001a441428e30b7d2c1f74
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: WIP Update gallery dialog actions to reflect presence of cha...

[Tchanders (Code Review)]

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315449

Change subject: WIP Update gallery dialog actions to reflect presence of changes
..

WIP Update gallery dialog actions to reflect presence of changes

Every time a change is made in the gallery dialog, disable
or enable the Done button according to whether the dialog
has changed since it was opened.

Changes have been made upstream, so they also apply to
inspectors and dialogs that inherit from
MWLiveExtensionInspector or MWExtensionWindow.

Bug: T62311

Change-Id: I2295d77114fe024921b6e2bbcf76e04faefa47f1
---
M modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
M modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js
M modules/ve-mw/ui/ve.ui.MWExtensionWindow.js
3 files changed, 96 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/49/315449/1

diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
index bfd54f1..18a87d5 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWGalleryDialog.js
@@ -322,7 +322,6 @@
this.toggleEmptyGalleryMessage( true );
this.showSearchPanelButton.toggle( false );
this.toggleSearchPanel( true );
-   this.updateActions();
}
 
// Options card
@@ -348,11 +347,20 @@
this.stylesInput.setValue( styles );
 
// Add event handlers
+   this.highlightedCaptionInput.connect( this, { change: 
'updateActions' } );
this.searchWidget.getResults().connect( this, { choose: 
'onSearchResultsChoose' } );
this.showSearchPanelButton.connect( this, { click: 
'onShowSearchPanelButtonClick' } );
this.galleryGroup.connect( this, { editItem: 
'onHighlightItem' } );
+   this.galleryGroup.connect( this, { itemDragEnd: 
'updateActions' } );
this.removeButton.connect( this, { click: 
'onRemoveItem' } );
this.modeDropdown.getMenu().connect( this, { choose: 
'onModeDropdownChange' } );
+   this.captionInput.connect( this, { change: 
'updateActions' } );
+   this.widthsInput.connect( this, { change: 
'updateActions' } );
+   this.heightsInput.connect( this, { change: 
'updateActions' } );
+   this.perrowInput.connect( this, { change: 
'updateActions' } );
+   this.showFilenameCheckbox.connect( this, { change: 
'updateActions' } );
+   this.classesInput.connect( this, { change: 
'updateActions' } );
+   this.stylesInput.connect( this, { change: 
'updateActions' } );
 
// Hack: Give the input a value so that 
this.insertOrUpdateNode gets called
this.input.setValue( 'gallery' );
@@ -383,11 +391,19 @@
this.searchPanelVisible = false;
 
// Disconnect events
+   this.highlightedCaptionInput.disconnect( this );
this.searchWidget.getResults().disconnect( this );
this.showSearchPanelButton.disconnect( this );
this.galleryGroup.disconnect( this );
this.removeButton.disconnect( this );
this.modeDropdown.disconnect( this );
+   this.captionInput.disconnect( this );
+   this.widthsInput.disconnect( this );
+   this.heightsInput.disconnect( this );
+   this.perrowInput.disconnect( this );
+   this.showFilenameCheckbox.disconnect( this );
+   this.classesInput.disconnect( this );
+   this.stylesInput.disconnect( this );
}, this );
 };
 
@@ -481,6 +497,7 @@
  */
 ve.ui.MWGalleryDialog.prototype.onSearchResultsChoose = function ( item ) {
this.addNewImage( item.getData().title );
+   this.updateActions();
 };
 
 /**
@@ -544,6 +561,7 @@
 
this.widthsInput.setDisabled( disabled );
this.perrowInput.setDisabled( disabled );
+   this.updateActions();
 };
 
 /**
@@ -600,50 +618,65 @@
  * Disable the "Done" button if the gallery is empty, otherwise enable it
  */
 ve.ui.MWGalleryDialog.prototype.updateActions = function () {
-   this.actions.setAbilities( { done: this.galleryGroup.items.length > 0 } 
);
+   this.actions.setAbilities( { done: this.galleryGroup.items.length > 0 
&& this.isModified() } );
+};
+
+/**
+ * Get the current images and options data
+ 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable bottom language button in Minerva

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Disable bottom language button in Minerva
..


Disable bottom language button in Minerva

We plan to remove this config setting. Making this change here
will allow us to detect any issues with language button clicks
as a result of removing it and allow us to be sure it is the right
thing to do.

Bug: T143829
Change-Id: I1ac608388ec674e0f315c08208a66d299917a678
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  Bmansurov: 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 1d107fa..c0001a9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14524,6 +14524,9 @@
 'wgMinervaEnableSiteNotice' => [
'default' => false,
 ],
+'MinervaBottomLanguageButton' => [
+   'default' => false,
+],
 'wmgMFAppPackageId' => [
'default' => false,
'wikipedia' => 'org.wikipedia',

-- 
To view, visit https://gerrit.wikimedia.org/r/315314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ac608388ec674e0f315c08208a66d299917a678
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

a5a5e64 Add order_id to paypal audit donations
ac7318a Add source_ fields BEFORE encoding to js

Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/315448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315448

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

a5a5e64 Add order_id to paypal audit donations
ac7318a Add source_ fields BEFORE encoding to js

Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/48/315448/1


-- 
To view, visit https://gerrit.wikimedia.org/r/315448
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ad466fe2de33e250c33e68cd2a951df5f70864b
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Guard Database::explicitTrxActive() against returning false ...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Guard Database::explicitTrxActive() against returning false 
while in begin()
..


Guard Database::explicitTrxActive() against returning false while in begin()

This can happen in the special case of the srvCache using callbacks
triggered by getApproximateLagStatus(). Treat the transaction as
explicit until begin() finishes to avoid this since it can cause
transaction nesting errors if caller thinks its OK to commit when
startAtomic() is still in progress.

Bug: T147697
Change-Id: If1c0f14f6a72cbcbee365afab8ee5a0872e746c8
---
M includes/libs/rdbms/database/Database.php
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 9f1f228..fc55671 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2682,7 +2682,6 @@
$this->mTrxTimestamp = microtime( true );
$this->mTrxFname = $fname;
$this->mTrxDoneWrites = false;
-   $this->mTrxAutomatic = ( $mode === self::TRANSACTION_INTERNAL );
$this->mTrxAutomaticAtomic = false;
$this->mTrxAtomicLevels = [];
$this->mTrxShortId = sprintf( '%06x', mt_rand( 0, 0xff ) );
@@ -2696,6 +2695,10 @@
// as lag itself just to be safe
$status = $this->getApproximateLagStatus();
$this->mTrxReplicaLag = $status['lag'] + ( microtime( true ) - 
$status['since'] );
+   // T147697: make explicitTrxActive() return true until begin() 
finishes. This way, no
+   // caller will think its OK to muck around with the transaction 
just because startAtomic()
+   // has not yet completed (e.g. setting mTrxAtomicLevels).
+   $this->mTrxAutomatic = ( $mode === self::TRANSACTION_INTERNAL );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/315340
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If1c0f14f6a72cbcbee365afab8ee5a0872e746c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add source_ fields BEFORE encoding to json

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add source_ fields BEFORE encoding to json
..


Add source_ fields BEFORE encoding to json

D'oh!

Bug: T147341
Change-Id: Ic96ccc253da2919e0900b3d3a2b670b3c8bf7101
---
M queue/redis_wrap.py
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  XenoRyet: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/queue/redis_wrap.py b/queue/redis_wrap.py
index 6605475..38d4d5e 100644
--- a/queue/redis_wrap.py
+++ b/queue/redis_wrap.py
@@ -21,13 +21,13 @@
 
 def send(self, queue, msg):
 
+msg.update(Redis.source_meta())
+
 encoded = json.dumps(msg)
 
 if self.config.no_effect:
 log.info("not queueing message. " + encoded)
 return
-
-msg.update(Redis.source_meta())
 
 if queue in self.config.redis.queues:
 # Map queue name if desired.

-- 
To view, visit https://gerrit.wikimedia.org/r/315445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic96ccc253da2919e0900b3d3a2b670b3c8bf7101
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add order_id to paypal audit donations

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add order_id to paypal audit donations
..


Add order_id to paypal audit donations

Change-Id: Iaa216cb8304dae3615cc07236bec622ae11a7209
---
M audit/paypal/TrrFile.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  XenoRyet: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/audit/paypal/TrrFile.py b/audit/paypal/TrrFile.py
index 1bbed11..b96984f 100644
--- a/audit/paypal/TrrFile.py
+++ b/audit/paypal/TrrFile.py
@@ -137,6 +137,7 @@
 
 if re.search('^[0-9]+$', row['Transaction Subject']):
 out['contribution_tracking_id'] = row['Transaction Subject']
+out['order_id'] = row['Transaction Subject']
 
 event_type = row['Transaction Event Code'][0:3]
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa216cb8304dae3615cc07236bec622ae11a7209
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.28.0-wmf.21]: Fix logic of MinervaBottomLanguageButton

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix logic of MinervaBottomLanguageButton
..


Fix logic of MinervaBottomLanguageButton

When MinervaBottomLanguageButton is false we should still show
the language button on the main page

Bug: T143829
Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
(cherry picked from commit 68a856bb3ab207a4b389854393b1ac944076a442)
---
M includes/skins/SkinMinerva.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 189b639..1194914 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -936,9 +936,11 @@
}
}
 
-   if ( MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
+   if ( $title->isMainPage() && $this->doesPageHaveLanguages || (
+   MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
$this->doesPageHaveLanguages &&
-   ( $title->isMainPage() || 
$this->shouldSecondaryActionsIncludeLanguageBtn ) ) {
+   $this->shouldSecondaryActionsIncludeLanguageBtn )
+   ) {
$buttons['language'] = $this->getLanguageButton();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.28.0-wmf.22]: Fix logic of MinervaBottomLanguageButton

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix logic of MinervaBottomLanguageButton
..


Fix logic of MinervaBottomLanguageButton

When MinervaBottomLanguageButton is false we should still show
the language button on the main page

Bug: T143829
Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
(cherry picked from commit 68a856bb3ab207a4b389854393b1ac944076a442)
---
M includes/skins/SkinMinerva.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 00f2066..35b3e07 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -936,9 +936,11 @@
}
}
 
-   if ( MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
+   if ( $title->isMainPage() && $this->doesPageHaveLanguages || (
+   MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
$this->doesPageHaveLanguages &&
-   ( $title->isMainPage() || 
$this->shouldSecondaryActionsIncludeLanguageBtn ) ) {
+   $this->shouldSecondaryActionsIncludeLanguageBtn )
+   ) {
$buttons['language'] = $this->getLanguageButton();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set defaults for wgCirrusSearchClusterOverrides

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Set defaults for wgCirrusSearchClusterOverrides
..


Set defaults for wgCirrusSearchClusterOverrides

When cirrussearch pulls the configuration for another wiki to
run a query on it, it needs to have all the same variables as
the source wiki. wgCirrusSearchClusterOverrides was introduced
in wmf.22 so it needs to be set so a query from wmf.22 to wmf.21
doesn't error out.

Change-Id: If1502e332ce2435abc54490e6e2f5bd587a6c7df
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
M wmf-config/event-schemas
3 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 5d00f2f..b7b3466 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -29,6 +29,7 @@
$wgCirrusSearchDefaultCluster = $wmgCirrusSearchDefaultCluster;
 }
 $wgCirrusSearchWriteClusters = $wmgCirrusSearchWriteClusters;
+$wgCirrusSearchClusterOverrides = $wmgCirrusSearchClusterOverrides;
 
 # Enable user testing
 $wgCirrusSearchUserTesting = $wmgCirrusSearchUserTesting;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dfbbc26..1d107fa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16585,6 +16585,10 @@
'default' => 'local',
 ],
 
+'wmgCirrusSearchClusterOverrides' => [
+   'default' => [],
+],
+
 'wmgCirrusSearchWriteClusters' => [
'default' => [ 'eqiad', 'codfw' ],
 ],
diff --git a/wmf-config/event-schemas b/wmf-config/event-schemas
index 4db9d40..5cf257a 16
--- a/wmf-config/event-schemas
+++ b/wmf-config/event-schemas
@@ -1 +1 @@
-Subproject commit 4db9d40d28d61c53cdbca77059d9a2a6e714af89
+Subproject commit 5cf257a22a766b814e25a4af12e5d0bf3494e1cc

-- 
To view, visit https://gerrit.wikimedia.org/r/315443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If1502e332ce2435abc54490e6e2f5bd587a6c7df
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.28.0-wmf.21]: Fix logic of MinervaBottomLanguageButton

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315447

Change subject: Fix logic of MinervaBottomLanguageButton
..

Fix logic of MinervaBottomLanguageButton

When MinervaBottomLanguageButton is false we should still show
the language button on the main page

Bug: T143829
Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
(cherry picked from commit 68a856bb3ab207a4b389854393b1ac944076a442)
---
M includes/skins/SkinMinerva.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/47/315447/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 189b639..1194914 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -936,9 +936,11 @@
}
}
 
-   if ( MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
+   if ( $title->isMainPage() && $this->doesPageHaveLanguages || (
+   MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
$this->doesPageHaveLanguages &&
-   ( $title->isMainPage() || 
$this->shouldSecondaryActionsIncludeLanguageBtn ) ) {
+   $this->shouldSecondaryActionsIncludeLanguageBtn )
+   ) {
$buttons['language'] = $this->getLanguageButton();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.28.0-wmf.21
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: remove lead from site.pp, adjust comment

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: gerrit: remove lead from site.pp, adjust comment
..


gerrit: remove lead from site.pp, adjust comment

Bug: T147597
Change-Id: I6a9cd04d8bdf8b0cdfd6e55c5e61215890880b46
---
M manifests/site.pp
1 file changed, 1 insertion(+), 6 deletions(-)

Approvals:
  Dzahn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 03b89a9..79952d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -252,7 +252,7 @@
 }
 }
 
-# gerrit warm stand-by (T147597)
+# New https://www.mediawiki.org/wiki/Gerrit (T147597)
 node 'cobalt.wikimedia.org' {
 role(gerrit::server)
 }
@@ -1530,11 +1530,6 @@
 node /labstore200[3-4]\.codfw\.wmnet/ {
 role(labs::nfs::backup)
 include standard
-}
-
-# New https://www.mediawiki.org/wiki/Gerrit
-node 'lead.wikimedia.org' {
-role(gerrit::server)
 }
 
 node 'lithium.eqiad.wmnet' {

-- 
To view, visit https://gerrit.wikimedia.org/r/315418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a9cd04d8bdf8b0cdfd6e55c5e61215890880b46
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[wmf/1.28.0-wmf.22]: Fix logic of MinervaBottomLanguageButton

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315446

Change subject: Fix logic of MinervaBottomLanguageButton
..

Fix logic of MinervaBottomLanguageButton

When MinervaBottomLanguageButton is false we should still show
the language button on the main page

Bug: T143829
Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
(cherry picked from commit 68a856bb3ab207a4b389854393b1ac944076a442)
---
M includes/skins/SkinMinerva.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/46/315446/1

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 00f2066..35b3e07 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -936,9 +936,11 @@
}
}
 
-   if ( MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
+   if ( $title->isMainPage() && $this->doesPageHaveLanguages || (
+   MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
$this->doesPageHaveLanguages &&
-   ( $title->isMainPage() || 
$this->shouldSecondaryActionsIncludeLanguageBtn ) ) {
+   $this->shouldSecondaryActionsIncludeLanguageBtn )
+   ) {
$buttons['language'] = $this->getLanguageButton();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add source_ fields BEFORE encoding to json

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315445

Change subject: Add source_ fields BEFORE encoding to json
..

Add source_ fields BEFORE encoding to json

D'oh!

Bug: T147341
Change-Id: Ic96ccc253da2919e0900b3d3a2b670b3c8bf7101
---
M queue/redis_wrap.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/45/315445/1

diff --git a/queue/redis_wrap.py b/queue/redis_wrap.py
index 6605475..38d4d5e 100644
--- a/queue/redis_wrap.py
+++ b/queue/redis_wrap.py
@@ -21,13 +21,13 @@
 
 def send(self, queue, msg):
 
+msg.update(Redis.source_meta())
+
 encoded = json.dumps(msg)
 
 if self.config.no_effect:
 log.info("not queueing message. " + encoded)
 return
-
-msg.update(Redis.source_meta())
 
 if queue in self.config.redis.queues:
 # Map queue name if desired.

-- 
To view, visit https://gerrit.wikimedia.org/r/315445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic96ccc253da2919e0900b3d3a2b670b3c8bf7101
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add order_id to paypal audit donations

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315444

Change subject: Add order_id to paypal audit donations
..

Add order_id to paypal audit donations

Change-Id: Iaa216cb8304dae3615cc07236bec622ae11a7209
---
M audit/paypal/TrrFile.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/44/315444/1

diff --git a/audit/paypal/TrrFile.py b/audit/paypal/TrrFile.py
index 1bbed11..b96984f 100644
--- a/audit/paypal/TrrFile.py
+++ b/audit/paypal/TrrFile.py
@@ -137,6 +137,7 @@
 
 if re.search('^[0-9]+$', row['Transaction Subject']):
 out['contribution_tracking_id'] = row['Transaction Subject']
+out['order_id'] = row['Transaction Subject']
 
 event_type = row['Transaction Event Code'][0:3]
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa216cb8304dae3615cc07236bec622ae11a7209
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Set defaults for wgCirrusSearchClusterOverrides

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315443

Change subject: Set defaults for wgCirrusSearchClusterOverrides
..

Set defaults for wgCirrusSearchClusterOverrides

When cirrussearch pulls the configuration for another wiki to
run a query on it, it needs to have all the same variables as
the source wiki. wgCirrusSearchClusterOverrides was introduced
in wmf.22 so it needs to be set so a query from wmf.22 to wmf.21
doesn't error out.

Change-Id: If1502e332ce2435abc54490e6e2f5bd587a6c7df
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
M wmf-config/event-schemas
3 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/43/315443/1

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 5d00f2f..b7b3466 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -29,6 +29,7 @@
$wgCirrusSearchDefaultCluster = $wmgCirrusSearchDefaultCluster;
 }
 $wgCirrusSearchWriteClusters = $wmgCirrusSearchWriteClusters;
+$wgCirrusSearchClusterOverrides = $wmgCirrusSearchClusterOverrides;
 
 # Enable user testing
 $wgCirrusSearchUserTesting = $wmgCirrusSearchUserTesting;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dfbbc26..1d107fa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16585,6 +16585,10 @@
'default' => 'local',
 ],
 
+'wmgCirrusSearchClusterOverrides' => [
+   'default' => [],
+],
+
 'wmgCirrusSearchWriteClusters' => [
'default' => [ 'eqiad', 'codfw' ],
 ],
diff --git a/wmf-config/event-schemas b/wmf-config/event-schemas
index 4db9d40..5cf257a 16
--- a/wmf-config/event-schemas
+++ b/wmf-config/event-schemas
@@ -1 +1 @@
-Subproject commit 4db9d40d28d61c53cdbca77059d9a2a6e714af89
+Subproject commit 5cf257a22a766b814e25a4af12e5d0bf3494e1cc

-- 
To view, visit https://gerrit.wikimedia.org/r/315443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1502e332ce2435abc54490e6e2f5bd587a6c7df
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
..


Merge branch 'master' into deployment

and update vendor

16cb282 Update SmashPig lib for better re-queue handling

Change-Id: I7d2246f310521e0a162715041e315793a497d31e
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index 98cd37f..4a66806 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 98cd37f7c23453fdc75547a98c4fc5d4a8269af1
+Subproject commit 4a6680654f7b0633f8ac2c6358417636ad7fb26c

-- 
To view, visit https://gerrit.wikimedia.org/r/315442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d2246f310521e0a162715041e315793a497d31e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' into deployment

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315442

Change subject: Merge branch 'master' into deployment
..

Merge branch 'master' into deployment

and update vendor

16cb282 Update SmashPig lib for better re-queue handling

Change-Id: I7d2246f310521e0a162715041e315793a497d31e
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/42/315442/1

diff --git a/vendor b/vendor
index 98cd37f..4a66806 16
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 98cd37f7c23453fdc75547a98c4fc5d4a8269af1
+Subproject commit 4a6680654f7b0633f8ac2c6358417636ad7fb26c

-- 
To view, visit https://gerrit.wikimedia.org/r/315442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d2246f310521e0a162715041e315793a497d31e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update SmashPig lib for better re-queue handling

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update SmashPig lib for better re-queue handling
..


Update SmashPig lib for better re-queue handling

Change-Id: I26db0df441dfd43932cd614860fe30a2bd8e3a8d
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index f327edb..8d88681 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1140,7 +1140,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "259774101128fae2a8b34deb04d1afa4708db502"
+"reference": "c90adf17b48149d06e4b863f42da02570c5ff163"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1191,7 +1191,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-10-05 19:32:29"
+"time": "2016-10-11 19:00:16"
 },
 {
 "name": "zordius/lightncandy",

-- 
To view, visit https://gerrit.wikimedia.org/r/315438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I26db0df441dfd43932cd614860fe30a2bd8e3a8d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Remove position_increment_gap on source_text.trigram

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove position_increment_gap on source_text.trigram
..


Remove position_increment_gap on source_text.trigram

This one that was missed when I cleaned up position_increment_gap
on field where position are not stored.

Change-Id: I58788b940b98fcdc04c4421d697d311ccc57247a
---
M includes/Search/SourceTextIndexField.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Search/SourceTextIndexField.php 
b/includes/Search/SourceTextIndexField.php
index 142efe6..cce4219 100644
--- a/includes/Search/SourceTextIndexField.php
+++ b/includes/Search/SourceTextIndexField.php
@@ -56,7 +56,6 @@
'type' => 'string',
'analyzer' => 'trigram',
'index_options' => 'docs',
-   'position_increment_gap' => 
self::POSITION_INCREMENT_GAP,
];
}
$this->configureHighlighting( $field, ['plain'], false );

-- 
To view, visit https://gerrit.wikimedia.org/r/315259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I58788b940b98fcdc04c4421d697d311ccc57247a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use getLocalServerObjectCache() service

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use getLocalServerObjectCache() service
..


Use getLocalServerObjectCache() service

Change-Id: I425c71a51dc8d6923e0b09067f7919a85af5
---
M includes/Hooks.php
M profiles/PhraseSuggesterProfiles.php
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified

Objections:
  Smalyshev: There's a problem with this change, please improve



diff --git a/includes/Hooks.php b/includes/Hooks.php
index e480bde..d87d373 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -208,7 +208,7 @@
$wgCirrusSearchMoreLikeThisMaxQueryTermsLimit,
$wgCirrusSearchMoreLikeThisFields;
 
-   $cache = \ObjectCache::getLocalServerInstance();
+   $cache = 
MediaWikiServices::getInstance()->getLocalServerObjectCache();
$lines = $cache->getWithSetCallback(
$cache->makeKey( 'cirrussearch-morelikethis-settings' ),
600,
diff --git a/profiles/PhraseSuggesterProfiles.php 
b/profiles/PhraseSuggesterProfiles.php
index d2990a4..11d7430 100644
--- a/profiles/PhraseSuggesterProfiles.php
+++ b/profiles/PhraseSuggesterProfiles.php
@@ -1,6 +1,8 @@
 getLocalServerObjectCache();
$lines = $cache->getWithSetCallback(
$cache->makeKey( 'cirrussearch-didyoumean-settings' ),
600,

-- 
To view, visit https://gerrit.wikimedia.org/r/313350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I425c71a51dc8d6923e0b09067f7919a85af5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.28.0-wmf.22]: Add completion support to ClusterOverride

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315441

Change subject: Add completion support to ClusterOverride
..

Add completion support to ClusterOverride

It can be useful when we want to switch everything except completion
queries.

Change-Id: Ib32d0478309b6b482c6c5cf497e721545247e7e7
(cherry picked from commit defd26b9f0e8ea7b6f177eeae0bcf0eb53c1235e)
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/Searcher.php
3 files changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/41/315441/1

diff --git a/CirrusSearch.php b/CirrusSearch.php
index 122f79c..c7fa0ec 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -526,15 +526,16 @@
 // be retrieved by elasticsearch.
 $wgCirrusSearchMoreLikeThisUseFields = false;
 
-// This allows redirecting full text queries to a separate cluster configured
+// This allows redirecting queries to a separate cluster configured
 // in $wgCirrusSearchClusters. Note that queries can use multiple features, in
 // the case multiple features have overrides the first match wins.
 //
-// Example sending more_like queries to codfw:
-//   $wgCirrusSearchFullTextClusterOverrides = array(
+// Example sending more_like queries to codfw and completion to eqiad:
+//   $wgCirrusSearchClusterOverrides = [
 // 'more_like' => 'codfw',
-//   );
-$wgCirrusSearchFullTextClusterOverrides = array();
+// 'completion' => 'eqiad',
+//   ];
+$wgCirrusSearchClusterOverrides = [];
 
 // More like this queries can be quite expensive. Set this to > 0 to cache the
 // results for the specified # of seconds into ObjectCache (memcache, redis, or
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index ce43cd0..04c6ad0 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -491,9 +491,13 @@
if ( isset( 
$this->features[SearchEngine::COMPLETION_PROFILE_TYPE] ) ) {
$profile = 
$this->features[SearchEngine::COMPLETION_PROFILE_TYPE];
}
-   // offset is omitted, searchSuggestion does not support
-   // scrolling results
-   $suggester = new CompletionSuggester( $this->connection, 
$this->limit,
+   $clusterOverride = $config->getElement( 
'CirrusSearchClusterOverrides', 'completion' );
+   if ( $clusterOverride !== null ) {
+   $connection = Connection::getPool( $config, 
$clusterOverride );
+   } else {
+   $connection = $this->connection;
+   }
+   $suggester = new CompletionSuggester( $connection, $this->limit,
$this->offset, $config, $this->namespaces, null,
$this->indexBaseName, $profile );
 
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 48c3414..2c7034e 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -837,7 +837,7 @@
 * features to specific clusters.
 */
private function overrideConnectionIfNeeded() {
-   $overrides = $this->config->get( 
'CirrusSearchFullTextClusterOverrides' );
+   $overrides = $this->config->get( 'CirrusSearchClusterOverrides' 
);
foreach ( $overrides as $feature => $cluster ) {
if ( $this->searchContext->isSyntaxUsed( $feature ) ) {
$this->connection = Connection::getPool( 
$this->config, $cluster );

-- 
To view, visit https://gerrit.wikimedia.org/r/315441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib32d0478309b6b482c6c5cf497e721545247e7e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: DCausse 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[wmf/1.28.0-wmf.22]: Remove position_increment_gap on source_text.trigram

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315440

Change subject: Remove position_increment_gap on source_text.trigram
..

Remove position_increment_gap on source_text.trigram

This one that was missed when I cleaned up position_increment_gap
on field where position are not stored.

Change-Id: I58788b940b98fcdc04c4421d697d311ccc57247a
---
M includes/Search/SourceTextIndexField.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/40/315440/1

diff --git a/includes/Search/SourceTextIndexField.php 
b/includes/Search/SourceTextIndexField.php
index 142efe6..cce4219 100644
--- a/includes/Search/SourceTextIndexField.php
+++ b/includes/Search/SourceTextIndexField.php
@@ -56,7 +56,6 @@
'type' => 'string',
'analyzer' => 'trigram',
'index_options' => 'docs',
-   'position_increment_gap' => 
self::POSITION_INCREMENT_GAP,
];
}
$this->configureHighlighting( $field, ['plain'], false );

-- 
To view, visit https://gerrit.wikimedia.org/r/315440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58788b940b98fcdc04c4421d697d311ccc57247a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: DCausse 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update SmashPig lib

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Update SmashPig lib
..


Update SmashPig lib

Change-Id: I0a4457bc6869e869d110087027c7765bc9f8f6f3
---
M composer/installed.json
M wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
M wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
M wikimedia/smash-pig/Core/Jobs/RunnableJob.php
M wikimedia/smash-pig/Core/QueueConsumers/PendingQueueConsumer.php
M wikimedia/smash-pig/Core/UtcDate.php
A wikimedia/smash-pig/CrmLink/Messages/DateFields.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Actions/CaptureResponseAction.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Actions/PaymentCaptureAction.php
M 
wikimedia/smash-pig/PaymentProviders/Adyen/ExpatriatedMessages/ReportAvailable.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/config_test.yaml
A 
wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/CaptureResponseActionTest.php
A 
wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
M wikimedia/smash-pig/PaymentProviders/PayPal/Job.php
M wikimedia/smash-pig/PaymentProviders/PayPal/Listener.php
M wikimedia/smash-pig/SmashPig.yaml
M wikimedia/smash-pig/Tests/PendingQueueConsumerTest.php
17 files changed, 247 insertions(+), 63 deletions(-)

Approvals:
  Ejegg: Verified; Looks good to me, approved



diff --git a/composer/installed.json b/composer/installed.json
index 822915b..8b5cf07 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1223,7 +1223,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "259774101128fae2a8b34deb04d1afa4708db502"
+"reference": "c90adf17b48149d06e4b863f42da02570c5ff163"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1240,7 +1240,7 @@
 "jakub-onderka/php-parallel-lint": "^0.9",
 "phpunit/phpunit": "^4.8"
 },
-"time": "2016-10-05 19:32:29",
+"time": "2016-10-11 19:00:16",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git a/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php 
b/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
index 09edde3..8f6e60a 100644
--- a/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
+++ b/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
@@ -3,6 +3,7 @@
 
 use PDO;
 use SmashPig\Core\UtcDate;
+use SmashPig\CrmLink\Messages\DateFields;
 
 /**
  * Data store containing messages which were not successfully processed
@@ -27,9 +28,9 @@
$trace = '',
$retryDate = null
) {
-   $originalDate = empty( $message['date'] )
-   ? UtcDate::getUtcDatabaseString()
-   : UtcDate::getUtcDatabaseString( $message['date'] );
+   $originalDate = UtcDate::getUtcDatabaseString(
+   DateFields::getOriginalDateOrNow( $message )
+   );
 
$dbRecord = array(
'original_date' => $originalDate,
diff --git a/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php 
b/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
index 5411c58..dbd33e2 100644
--- a/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
+++ b/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
@@ -10,21 +10,20 @@
 
/**
 * Return true if the message already exists in the payments-init table,
-* and has a very final status indicating we don't expect to do any more
-* processing.
+* and is marked as having failed.
 *
 * @param array $message Payments initial message
 *  FIXME: Or pass ID parameters explicitly and call this
 *  isTransactionFinalizedByGatewayOrderId??
 * @return boolean
 */
-   public function isTransactionFinalized( $message ) {
+   public function isTransactionFailed( $message ) {
$message = $this->fetchMessageByGatewayOrderId(
$message['gateway'], $message['order_id'] );
if ( $message === null ) {
return false;
}
-   if ( in_array( $message['payments_final_status'], array( 
'failed', 'complete' ) ) ) {
+   if ( $message['payments_final_status'] === 'failed' ) {
return true;
}
return false;
diff --git a/wikimedia/smash-pig/Core/Jobs/RunnableJob.php 
b/wikimedia/smash-pig/Core/Jobs/RunnableJob.php
index 1ac5930..7b1385c 100644
--- a/wikimedia/smash-pig/Core/Jobs/RunnableJob.php
+++ b/wikimedia/smash-pig/Core/Jobs/RunnableJob.php
@@ -10,5 +10,10 @@
extends KeyedOpaqueStorableObject

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update SmashPig lib

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315439

Change subject: Update SmashPig lib
..

Update SmashPig lib

Change-Id: I0a4457bc6869e869d110087027c7765bc9f8f6f3
---
M composer/installed.json
M wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
M wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
M wikimedia/smash-pig/Core/Jobs/RunnableJob.php
M wikimedia/smash-pig/Core/QueueConsumers/PendingQueueConsumer.php
M wikimedia/smash-pig/Core/UtcDate.php
A wikimedia/smash-pig/CrmLink/Messages/DateFields.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Actions/CaptureResponseAction.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Actions/PaymentCaptureAction.php
M 
wikimedia/smash-pig/PaymentProviders/Adyen/ExpatriatedMessages/ReportAvailable.php
M wikimedia/smash-pig/PaymentProviders/Adyen/Tests/config_test.yaml
A 
wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/CaptureResponseActionTest.php
A 
wikimedia/smash-pig/PaymentProviders/Adyen/Tests/phpunit/PaymentCaptureActionTest.php
M wikimedia/smash-pig/PaymentProviders/PayPal/Job.php
M wikimedia/smash-pig/PaymentProviders/PayPal/Listener.php
M wikimedia/smash-pig/SmashPig.yaml
M wikimedia/smash-pig/Tests/PendingQueueConsumerTest.php
17 files changed, 247 insertions(+), 63 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor 
refs/changes/39/315439/1

diff --git a/composer/installed.json b/composer/installed.json
index 822915b..8b5cf07 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1223,7 +1223,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "259774101128fae2a8b34deb04d1afa4708db502"
+"reference": "c90adf17b48149d06e4b863f42da02570c5ff163"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1240,7 +1240,7 @@
 "jakub-onderka/php-parallel-lint": "^0.9",
 "phpunit/phpunit": "^4.8"
 },
-"time": "2016-10-05 19:32:29",
+"time": "2016-10-11 19:00:16",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git a/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php 
b/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
index 09edde3..8f6e60a 100644
--- a/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
+++ b/wikimedia/smash-pig/Core/DataStores/DamagedDatabase.php
@@ -3,6 +3,7 @@
 
 use PDO;
 use SmashPig\Core\UtcDate;
+use SmashPig\CrmLink\Messages\DateFields;
 
 /**
  * Data store containing messages which were not successfully processed
@@ -27,9 +28,9 @@
$trace = '',
$retryDate = null
) {
-   $originalDate = empty( $message['date'] )
-   ? UtcDate::getUtcDatabaseString()
-   : UtcDate::getUtcDatabaseString( $message['date'] );
+   $originalDate = UtcDate::getUtcDatabaseString(
+   DateFields::getOriginalDateOrNow( $message )
+   );
 
$dbRecord = array(
'original_date' => $originalDate,
diff --git a/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php 
b/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
index 5411c58..dbd33e2 100644
--- a/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
+++ b/wikimedia/smash-pig/Core/DataStores/PaymentsInitialDatabase.php
@@ -10,21 +10,20 @@
 
/**
 * Return true if the message already exists in the payments-init table,
-* and has a very final status indicating we don't expect to do any more
-* processing.
+* and is marked as having failed.
 *
 * @param array $message Payments initial message
 *  FIXME: Or pass ID parameters explicitly and call this
 *  isTransactionFinalizedByGatewayOrderId??
 * @return boolean
 */
-   public function isTransactionFinalized( $message ) {
+   public function isTransactionFailed( $message ) {
$message = $this->fetchMessageByGatewayOrderId(
$message['gateway'], $message['order_id'] );
if ( $message === null ) {
return false;
}
-   if ( in_array( $message['payments_final_status'], array( 
'failed', 'complete' ) ) ) {
+   if ( $message['payments_final_status'] === 'failed' ) {
return true;
}
return false;
diff --git a/wikimedia/smash-pig/Core/Jobs/RunnableJob.php 
b/wikimedia/smash-pig/Core/Jobs/RunnableJob.php
index 1ac5930..7b1385c 100644
--- a/wikimedia/smash-pig/Core/Jobs/RunnableJob.php
+++ b/wikimedia/smash-pig/Core/Jobs/RunnableJob.php

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add completion support to ClusterOverride

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add completion support to ClusterOverride
..


Add completion support to ClusterOverride

It can be useful when we want to switch everything except completion
queries.

Change-Id: Ib32d0478309b6b482c6c5cf497e721545247e7e7
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/Searcher.php
3 files changed, 14 insertions(+), 9 deletions(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CirrusSearch.php b/CirrusSearch.php
index 122f79c..c7fa0ec 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -526,15 +526,16 @@
 // be retrieved by elasticsearch.
 $wgCirrusSearchMoreLikeThisUseFields = false;
 
-// This allows redirecting full text queries to a separate cluster configured
+// This allows redirecting queries to a separate cluster configured
 // in $wgCirrusSearchClusters. Note that queries can use multiple features, in
 // the case multiple features have overrides the first match wins.
 //
-// Example sending more_like queries to codfw:
-//   $wgCirrusSearchFullTextClusterOverrides = array(
+// Example sending more_like queries to codfw and completion to eqiad:
+//   $wgCirrusSearchClusterOverrides = [
 // 'more_like' => 'codfw',
-//   );
-$wgCirrusSearchFullTextClusterOverrides = array();
+// 'completion' => 'eqiad',
+//   ];
+$wgCirrusSearchClusterOverrides = [];
 
 // More like this queries can be quite expensive. Set this to > 0 to cache the
 // results for the specified # of seconds into ObjectCache (memcache, redis, or
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index ce43cd0..04c6ad0 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -491,9 +491,13 @@
if ( isset( 
$this->features[SearchEngine::COMPLETION_PROFILE_TYPE] ) ) {
$profile = 
$this->features[SearchEngine::COMPLETION_PROFILE_TYPE];
}
-   // offset is omitted, searchSuggestion does not support
-   // scrolling results
-   $suggester = new CompletionSuggester( $this->connection, 
$this->limit,
+   $clusterOverride = $config->getElement( 
'CirrusSearchClusterOverrides', 'completion' );
+   if ( $clusterOverride !== null ) {
+   $connection = Connection::getPool( $config, 
$clusterOverride );
+   } else {
+   $connection = $this->connection;
+   }
+   $suggester = new CompletionSuggester( $connection, $this->limit,
$this->offset, $config, $this->namespaces, null,
$this->indexBaseName, $profile );
 
diff --git a/includes/Searcher.php b/includes/Searcher.php
index 48c3414..2c7034e 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -837,7 +837,7 @@
 * features to specific clusters.
 */
private function overrideConnectionIfNeeded() {
-   $overrides = $this->config->get( 
'CirrusSearchFullTextClusterOverrides' );
+   $overrides = $this->config->get( 'CirrusSearchClusterOverrides' 
);
foreach ( $overrides as $feature => $cluster ) {
if ( $this->searchContext->isSyntaxUsed( $feature ) ) {
$this->connection = Connection::getPool( 
$this->config, $cluster );

-- 
To view, visit https://gerrit.wikimedia.org/r/315258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib32d0478309b6b482c6c5cf497e721545247e7e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update SmashPig lib for better re-queue handling

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315438

Change subject: Update SmashPig lib for better re-queue handling
..

Update SmashPig lib for better re-queue handling

Change-Id: I26db0df441dfd43932cd614860fe30a2bd8e3a8d
---
M composer.lock
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/38/315438/1

diff --git a/composer.lock b/composer.lock
index f327edb..8d88681 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1140,7 +1140,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "259774101128fae2a8b34deb04d1afa4708db502"
+"reference": "c90adf17b48149d06e4b863f42da02570c5ff163"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1191,7 +1191,7 @@
 "donations",
 "payments"
 ],
-"time": "2016-10-05 19:32:29"
+"time": "2016-10-11 19:00:16"
 },
 {
 "name": "zordius/lightncandy",

-- 
To view, visit https://gerrit.wikimedia.org/r/315438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26db0df441dfd43932cd614860fe30a2bd8e3a8d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Factor out RESTBase ID regular expression

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Factor out RESTBase ID regular expression
..


Factor out RESTBase ID regular expression

Also factor out paste tests so we can move the RESTBase ID
test to MW.

Bug: T126044
Change-Id: Ifc1c15872a50f915e5ef8d561b3a363dc5f4d28f
---
M src/ce/ve.ce.Surface.js
M src/dm/ve.dm.Annotation.js
M src/init/ve.init.Platform.js
M tests/ce/ve.ce.Surface.test.js
4 files changed, 126 insertions(+), 113 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 1b52574..be8e88a 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1877,6 +1877,7 @@
context, left, right, contextRange, pastedText, handled,
tableAction,
items = [],
+   metadataIdRegExp = ve.init.platform.getMetadataIdRegExp(),
importantElement = '[id],[typeof],[rel]',
importRules = !this.pasteSpecial ? 
this.getSurface().getImportRules() : { all: { plainText: true, 
keepEmptyContentBranches: true } },
beforePasteData = this.beforePasteData || {},
@@ -1947,13 +1948,14 @@
// Remove style attributes. Any valid styles will be restored 
by data-ve-attributes.
this.$pasteTarget.find( '[style]' ).removeAttr( 'style' );
 
-   // FIXME T126044: Remove Parsoid IDs
-   this.$pasteTarget.find( '[id]' ).each( function () {
-   var $this = $( this );
-   if ( $this.attr( 'id' ).match( /^mw[\w-]{2,}$/ ) ) {
-   $this.removeAttr( 'id' );
-   }
-   } );
+   if ( metadataIdRegExp ) {
+   this.$pasteTarget.find( '[id]' ).each( function () {
+   var $this = $( this );
+   if ( $this.attr( 'id' ).match( metadataIdRegExp 
) ) {
+   $this.removeAttr( 'id' );
+   }
+   } );
+   }
 
// Remove the pasteProtect class (see #onCopy) and unwrap empty 
spans.
this.$pasteTarget.find( 'span' ).each( function () {
diff --git a/src/dm/ve.dm.Annotation.js b/src/dm/ve.dm.Annotation.js
index f71fde8..d1e2e97 100644
--- a/src/dm/ve.dm.Annotation.js
+++ b/src/dm/ve.dm.Annotation.js
@@ -102,21 +102,28 @@
 };
 
 /**
- * FIXME T126037: This method strips data-parsoid & Parsoid IDs from HTML 
attributes for comparisons.
+ * FIXME T126037: This method strips data-parsoid & RESTBase IDs from HTML 
attributes for comparisons.
  *
  * This should be removed once similar annotation merging is handled correctly
  * by Parsoid.
  *
- * @return {Object} An object all HTML attributes except data-parsoid & 
Parsoid IDs
+ * @return {Object} An object all HTML attributes except data-parsoid & 
RESTBase IDs
  */
 ve.dm.Annotation.prototype.getComparableHtmlAttributes = function () {
-   var comparableAttributes, domElements = this.store && 
this.getOriginalDomElements( this.store );
+   var comparableAttributes, metadataIdRegExp,
+   domElements = this.store && this.getOriginalDomElements( 
this.store );
+
if ( domElements && domElements[ 0 ] ) {
comparableAttributes = ve.getDomAttributes( domElements[ 0 ] );
delete comparableAttributes[ 'data-parsoid' ];
-   if ( comparableAttributes.id && comparableAttributes.id.match( 
/^mw[\w-]{2,}$/ ) ) {
-   delete comparableAttributes.id;
+
+   if ( comparableAttributes.id ) {
+   metadataIdRegExp = 
ve.init.platform.getMetadataIdRegExp();
+   if ( metadataIdRegExp && comparableAttributes.id.match( 
metadataIdRegExp ) ) {
+   delete comparableAttributes.id;
+   }
}
+
return comparableAttributes;
}
return {};
diff --git a/src/init/ve.init.Platform.js b/src/init/ve.init.Platform.js
index 29a68c9..0d3ad65 100644
--- a/src/init/ve.init.Platform.js
+++ b/src/init/ve.init.Platform.js
@@ -128,6 +128,16 @@
 ve.init.Platform.prototype.getUnanchoredExternalLinkUrlProtocolsRegExp = null;
 
 /**
+ * Get a regular expression that matches IDs used only for linking document
+ * data to metadata. Use null if your document format does not have such IDs.
+ *
+ * @property {RegExp|null} Regular expression object
+ */
+ve.init.Platform.prototype.getMetadataIdRegExp = function () {
+   return null;
+};
+
+/**
  * Get a platform config value
  *
  * @method
diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index 7adbd27..d6bfaad 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: IndentationCommand: Use hasMatchingAncestor

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: IndentationCommand: Use hasMatchingAncestor
..


IndentationCommand: Use hasMatchingAncestor

This also correctly requires all selected nodes to be in lists,
instead of just one of them.

Bug: T147858
Change-Id: I776f5a777189695a7fdcbe32323b34b732765fa5
---
M src/ui/commands/ve.ui.IndentationCommand.js
1 file changed, 1 insertion(+), 10 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ui/commands/ve.ui.IndentationCommand.js 
b/src/ui/commands/ve.ui.IndentationCommand.js
index cf79048..088c6f0 100644
--- a/src/ui/commands/ve.ui.IndentationCommand.js
+++ b/src/ui/commands/ve.ui.IndentationCommand.js
@@ -32,20 +32,11 @@
  * @inheritdoc
  */
 ve.ui.IndentationCommand.prototype.isExecutable = function ( fragment ) {
-   var i, len, nodes, any;
// Parent method
if ( !ve.ui.IndentationCommand.super.prototype.isExecutable.apply( 
this, arguments ) ) {
return false;
}
-   nodes = fragment.getSelectedLeafNodes();
-   any = false;
-   for ( i = 0, len = nodes.length; i < len; i++ ) {
-   if ( nodes[ i ].hasMatchingAncestor( 'listItem' ) ) {
-   any = true;
-   break;
-   }
-   }
-   return any;
+   return fragment.hasMatchingAncestor( 'listItem' );
 };
 
 /* Registration */

-- 
To view, visit https://gerrit.wikimedia.org/r/315415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I776f5a777189695a7fdcbe32323b34b732765fa5
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove elasticsearch plugins not enabled on wmf wikis

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove elasticsearch plugins not enabled on wmf wikis
..


Remove elasticsearch plugins not enabled on wmf wikis

This is confusing when testing various analysis chains. We should
use wmf production setup and let developpers experiment with new
techniques manually.

Bug: T147502
Change-Id: I943f18870f01105144577e249f250ceca9d03188
---
M puppet/modules/role/manifests/cirrussearch.pp
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Tjones: Looks good to me, but someone else must approve
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/role/manifests/cirrussearch.pp 
b/puppet/modules/role/manifests/cirrussearch.pp
index 1695865..57cb7db 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -26,13 +26,22 @@
 elasticsearch::plugin { 'analysis-icu':
 core => true,
 }
+
+# Not enabled on production wikis
 elasticsearch::plugin { 'analysis-kuromoji':
+ensure => absent,
 core => true,
 }
+
+# Not enabled on production wikis
 elasticsearch::plugin { 'analysis-stempel':
+ensure => absent,
 core => true,
 }
+
+# Not enabled on production wikis
 elasticsearch::plugin { 'analysis-smartcn':
+ensure => absent,
 core => true,
 }
 elasticsearch::plugin { 'elasticsearch-analysis-hebrew':

-- 
To view, visit https://gerrit.wikimedia.org/r/314551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I943f18870f01105144577e249f250ceca9d03188
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: @phuedx: One possible fix

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315437

Change subject: @phuedx: One possible fix
..

@phuedx: One possible fix

Change-Id: Ie7f20ea0a89d2ab8e1510a4662132fe244c9fd66
---
M tests/phpunit/devices/DeviceDetectorServiceIntegrationTest.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/37/315437/1

diff --git a/tests/phpunit/devices/DeviceDetectorServiceIntegrationTest.php 
b/tests/phpunit/devices/DeviceDetectorServiceIntegrationTest.php
index 6eddf62..1db81d3 100644
--- a/tests/phpunit/devices/DeviceDetectorServiceIntegrationTest.php
+++ b/tests/phpunit/devices/DeviceDetectorServiceIntegrationTest.php
@@ -51,6 +51,7 @@
}
 
public function test_it_should_handle_requests_from_mobile_UAs() {
+   $this->setMwGlobals( 'wgMFAutodetectMobileView', true );
$this->whenTheRequestIsFromAMobileUA();
 
$properties = $this->detectDeviceProperties();
@@ -60,6 +61,7 @@
}
 
public function test_it_should_handle_a_request_from_desktop_browsers() 
{
+   $this->setMwGlobals( 'wgMFAutodetectMobileView', true );
$properties =  $this->detectDeviceProperties();
 
$this->assertFalse( $properties->isMobileDevice() );
@@ -67,6 +69,7 @@
}
 
public function test_it_should_prioritize_the_custom_request_header() {
+   $this->setMwGlobals( 'wgMFAutodetectMobileView', true );
// @codingStandardsIgnoreStart
// The custom header //should// either be M or ZERO, per
// 
.
@@ -84,6 +87,7 @@
 * @FIXME Should this really be the case?
 */
public function 
test_it_should_prioritize_the_amf_environment_variables() {
+   $this->setMwGlobals( 'wgMFAutodetectMobileView', true );
$this->request->setHeader( 'X-Subdomain', 'M' );
 
$this->server[ 'AMF_DEVICE_IS_TABLET' ] = 'true';

-- 
To view, visit https://gerrit.wikimedia.org/r/315437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7f20ea0a89d2ab8e1510a4662132fe244c9fd66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315436

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

9b24337 One more missing import :S

Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/36/315436/1


-- 
To view, visit https://gerrit.wikimedia.org/r/315436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

9b24337 One more missing import :S

Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/315436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a77630d8cd1500f939f8f8c2015240b6c615c12
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: One more missing import :S

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: One more missing import :S
..


One more missing import :S

Change-Id: I36ac0d2058a69c33522337a22f60578bf24df54e
---
M queue/redis_wrap.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  XenoRyet: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/queue/redis_wrap.py b/queue/redis_wrap.py
index 543d458..6605475 100644
--- a/queue/redis_wrap.py
+++ b/queue/redis_wrap.py
@@ -2,6 +2,7 @@
 import process.globals
 import process.version_stamp
 import socket
+import sys
 import time
 from process.logging import Logger as log
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I36ac0d2058a69c33522337a22f60578bf24df54e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: One more missing import :S

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315435

Change subject: One more missing import :S
..

One more missing import :S

Change-Id: I36ac0d2058a69c33522337a22f60578bf24df54e
---
M queue/redis_wrap.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/35/315435/1

diff --git a/queue/redis_wrap.py b/queue/redis_wrap.py
index 543d458..6605475 100644
--- a/queue/redis_wrap.py
+++ b/queue/redis_wrap.py
@@ -2,6 +2,7 @@
 import process.globals
 import process.version_stamp
 import socket
+import sys
 import time
 from process.logging import Logger as log
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I36ac0d2058a69c33522337a22f60578bf24df54e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deploy
..


Merge branch 'master' into deploy

aa7090d Add missing import statements

Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/315434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: mw.LinkCache: Links aren't missing if they're known

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315432

Change subject: mw.LinkCache: Links aren't missing if they're known
..

mw.LinkCache: Links aren't missing if they're known

Thanks to new sparkly API data.

Bug: T72123
Change-Id: I9d4ff14bb2e81404224819c9153a7b8d86ca6f11
---
M modules/ve-mw/init/ve.init.mw.LinkCache.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/32/315432/1

diff --git a/modules/ve-mw/init/ve.init.mw.LinkCache.js 
b/modules/ve-mw/init/ve.init.mw.LinkCache.js
index f2d01af..888ee27 100644
--- a/modules/ve-mw/init/ve.init.mw.LinkCache.js
+++ b/modules/ve-mw/init/ve.init.mw.LinkCache.js
@@ -50,7 +50,7 @@
  */
 ve.init.mw.LinkCache.static.processPage = function ( page ) {
return {
-   missing: page.missing !== undefined,
+   missing: ( page.missing !== undefined ) && ( page.known === 
undefined ),
redirect: page.redirect !== undefined,
disambiguation: ve.getProp( page, 'pageprops', 'disambiguation' 
) !== undefined,
imageUrl: ve.getProp( page, 'thumbnail', 'source' ),

-- 
To view, visit https://gerrit.wikimedia.org/r/315432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d4ff14bb2e81404224819c9153a7b8d86ca6f11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[deploy]: Merge branch 'master' into deploy

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315434

Change subject: Merge branch 'master' into deploy
..

Merge branch 'master' into deploy

aa7090d Add missing import statements

Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/34/315434/1


-- 
To view, visit https://gerrit.wikimedia.org/r/315434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I464c4be9b4edc28cf0fe1adef7dee934923b7f64
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: deploy
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (fb43a0a)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315433

Change subject: Update VE core submodule to master (fb43a0a)
..

Update VE core submodule to master (fb43a0a)

New changes:
abf8f41 Replace Array#concat with Array#push in converter
02aeb90 Localisation updates from https://translatewiki.net.
902ddda Use safer batchPush in converter
6368191 Use current surface's sequence registry in command help dialog
f7ce4b9 Optimize batchPush on small lists
fb43a0a ve.batchPush: add unit test to exercise long-array path

Change-Id: I2d3ccaf39bcfb7c06cbcb5e414f3fbb2ff733413
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/33/315433/1

diff --git a/lib/ve b/lib/ve
index 89ce43b..fb43a0a 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 89ce43b137d6f02c3341815e143bf3ae3d68c440
+Subproject commit fb43a0a10459e1728dfe283c78c405f949487ebe

-- 
To view, visit https://gerrit.wikimedia.org/r/315433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d3ccaf39bcfb7c06cbcb5e414f3fbb2ff733413
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add missing import statements

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add missing import statements
..


Add missing import statements

Change-Id: Ifeee3b53f5ca2a8f0757cd905a6a2aa0f9742c8d
---
M queue/redis_wrap.py
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  XenoRyet: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/queue/redis_wrap.py b/queue/redis_wrap.py
index 8f2b92f..543d458 100644
--- a/queue/redis_wrap.py
+++ b/queue/redis_wrap.py
@@ -1,4 +1,8 @@
+import os
 import process.globals
+import process.version_stamp
+import socket
+import time
 from process.logging import Logger as log
 
 import json

-- 
To view, visit https://gerrit.wikimedia.org/r/315431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeee3b53f5ca2a8f0757cd905a6a2aa0f9742c8d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Add missing import statements

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315431

Change subject: Add missing import statements
..

Add missing import statements

Change-Id: Ifeee3b53f5ca2a8f0757cd905a6a2aa0f9742c8d
---
M queue/redis_wrap.py
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/31/315431/1

diff --git a/queue/redis_wrap.py b/queue/redis_wrap.py
index 8f2b92f..543d458 100644
--- a/queue/redis_wrap.py
+++ b/queue/redis_wrap.py
@@ -1,4 +1,8 @@
+import os
 import process.globals
+import process.version_stamp
+import socket
+import time
 from process.logging import Logger as log
 
 import json

-- 
To view, visit https://gerrit.wikimedia.org/r/315431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeee3b53f5ca2a8f0757cd905a6a2aa0f9742c8d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Clean up ObjectCache calls

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Clean up ObjectCache calls
..


Clean up ObjectCache calls

Change-Id: I6b741a82dca2fead8b1392208bec4303cc064d87
---
M includes/MediaWikiGadgetsDefinitionRepo.php
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/MediaWikiGadgetsDefinitionRepo.php 
b/includes/MediaWikiGadgetsDefinitionRepo.php
index f717650..dbb3ae8 100644
--- a/includes/MediaWikiGadgetsDefinitionRepo.php
+++ b/includes/MediaWikiGadgetsDefinitionRepo.php
@@ -1,4 +1,5 @@
 touchCheckKey( 
$this->getCheckKey() );
+   $cache = 
MediaWikiServices::getInstance()->getMainWANObjectCache();
+   $cache->touchCheckKey( $this->getCheckKey() );
}
 
private function getCheckKey() {
@@ -51,8 +53,8 @@
}
 
// Ideally $t1Cache is APC, and $wanCache is memcached
-   $t1Cache = ObjectCache::newAccelerator( array(), 'hash' );
-   $wanCache = ObjectCache::getMainWANInstance();
+   $t1Cache = ObjectCache::getLocalServerInstance( 'hash' );
+   $wanCache = 
MediaWikiServices::getInstance()->getMainWANObjectCache();
 
$key = $this->getCheckKey();
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b741a82dca2fead8b1392208bec4303cc064d87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Clean up ObjectCache calls

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Clean up ObjectCache calls
..


Clean up ObjectCache calls

Change-Id: I95b2d4d0f94a2e7f42372615ea9c612845502b30
---
M common/Hooks.php
M engines/LuaCommon/LuaCommon.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/common/Hooks.php b/common/Hooks.php
index b6582a4..baccde3 100644
--- a/common/Hooks.php
+++ b/common/Hooks.php
@@ -190,7 +190,7 @@
static $cache;
 
if ( !$cache ) {
-   $cache = ObjectCache::newAccelerator( CACHE_NONE );
+   $cache = ObjectCache::getLocalServerInstance( 
CACHE_NONE );
}
 
// To control the sampling rate, we keep a compact histogram of
diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index 4f6e536..9de4784 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -315,7 +315,7 @@
static $cache = null;
 
if ( !$cache ) {
-   $cache = ObjectCache::newAccelerator( array(), 'hash' );
+   $cache = ObjectCache::getLocalServerInstance( 'hash' );
}
 
$mtime = filemtime( $fileName );

-- 
To view, visit https://gerrit.wikimedia.org/r/315416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I95b2d4d0f94a2e7f42372615ea9c612845502b30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Clean up ObjectCache calls

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Clean up ObjectCache calls
..


Clean up ObjectCache calls

Change-Id: Idfef24864a9a33417d755ca14ff3ecbce02817c8
---
M AbuseFilterTokenizer.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/AbuseFilterTokenizer.php b/AbuseFilterTokenizer.php
index 1a6a2b6..2a532c6 100644
--- a/AbuseFilterTokenizer.php
+++ b/AbuseFilterTokenizer.php
@@ -64,7 +64,7 @@
static $tokenizerCache = null;
 
if ( !$tokenizerCache ) {
-   $tokenizerCache = ObjectCache::newAccelerator( array(), 
'hash' );
+   $tokenizerCache = ObjectCache::getLocalServerInstance( 
'hash' );
}
 
static $stats = null;

-- 
To view, visit https://gerrit.wikimedia.org/r/315425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfef24864a9a33417d755ca14ff3ecbce02817c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: Merge branch 'debian/precise-wikimedia' into debian/jessie-w...

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: Merge branch 'debian/precise-wikimedia' into 
debian/jessie-wikimedia
..


Merge branch 'debian/precise-wikimedia' into debian/jessie-wikimedia

Change-Id: I1816a01cd8cea5a1b9ea92f70cb9ec5fd2051910
---
M debian/changelog
1 file changed, 0 insertions(+), 12 deletions(-)

Approvals:
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 84c6eaf..4b2c739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,6 @@
-<<< HEAD   (1b5a8f New release 2.5.0-8-gcbc7f62-wmf3jessie1)
 zuul (2.5.0-8-gcbc7f62-wmf3jessie1) jessie-wikimedia; urgency=medium
 
   * sync with precise-wikimedia:
-===
-zuul (2.5.0-8-gcbc7f62-wmf4precise1) precise-wikimedia; urgency=medium
-
-  * Link zuul-launcher in /usr/bin
-  * Properly set zuul-clear-refs and shebang. Fix T103529
-  * source ignore .pyc files and .tox directory
-
- -- Antoine Musso   Tue, 11 Oct 2016 17:53:38 +0200
-
-zuul (2.5.0-8-gcbc7f62-wmf3precise1) precise-wikimedia; urgency=medium
->>> BRANCH (3d87ab 2.5.0-8-gcbc7f62-wmf4precise1)
 
   * Fix shebang of several scripts to point to the virtualenv.
 Refresh 0002-Replace-python-shebang-with-python2.7.patch

-- 
To view, visit https://gerrit.wikimedia.org/r/315429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1816a01cd8cea5a1b9ea92f70cb9ec5fd2051910
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: 2.5.0-8-gcbc7f62-wmf4jessie1

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: 2.5.0-8-gcbc7f62-wmf4jessie1
..


2.5.0-8-gcbc7f62-wmf4jessie1

* sync with precise-wikimedia:

* Link zuul-launcher in /usr/bin
* Properly set zuul-clear-refs and shebang. Fix T103529
* source ignore .pyc files and .tox directory

Bug: T103529
Change-Id: I2d296ffd685b4015ef42672a1336fe16055b6d60
---
M debian/changelog
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 4b2c739..8b0545b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zuul (2.5.0-8-gcbc7f62-wmf4jessie1) jessie-wikimedia; urgency=medium
+
+  * sync with precise-wikimedia:
+
+  * Link zuul-launcher in /usr/bin
+  * Properly set zuul-clear-refs and shebang. Fix T103529
+  * source ignore .pyc files and .tox directory
+
+ -- Antoine Musso   Tue, 11 Oct 2016 17:53:38 +0200
+
 zuul (2.5.0-8-gcbc7f62-wmf3jessie1) jessie-wikimedia; urgency=medium
 
   * sync with precise-wikimedia:

-- 
To view, visit https://gerrit.wikimedia.org/r/315430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d296ffd685b4015ef42672a1336fe16055b6d60
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: Merge branch 'debian/precise-wikimedia' into debian/jessie-w...

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315429

Change subject: Merge branch 'debian/precise-wikimedia' into 
debian/jessie-wikimedia
..

Merge branch 'debian/precise-wikimedia' into debian/jessie-wikimedia

Change-Id: I1816a01cd8cea5a1b9ea92f70cb9ec5fd2051910
---
M debian/changelog
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/29/315429/1

diff --git a/debian/changelog b/debian/changelog
index 84c6eaf..4b2c739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,6 @@
-<<< HEAD   (1b5a8f New release 2.5.0-8-gcbc7f62-wmf3jessie1)
 zuul (2.5.0-8-gcbc7f62-wmf3jessie1) jessie-wikimedia; urgency=medium
 
   * sync with precise-wikimedia:
-===
-zuul (2.5.0-8-gcbc7f62-wmf4precise1) precise-wikimedia; urgency=medium
-
-  * Link zuul-launcher in /usr/bin
-  * Properly set zuul-clear-refs and shebang. Fix T103529
-  * source ignore .pyc files and .tox directory
-
- -- Antoine Musso   Tue, 11 Oct 2016 17:53:38 +0200
-
-zuul (2.5.0-8-gcbc7f62-wmf3precise1) precise-wikimedia; urgency=medium
->>> BRANCH (3d87ab 2.5.0-8-gcbc7f62-wmf4precise1)
 
   * Fix shebang of several scripts to point to the virtualenv.
 Refresh 0002-Replace-python-shebang-with-python2.7.patch

-- 
To view, visit https://gerrit.wikimedia.org/r/315429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1816a01cd8cea5a1b9ea92f70cb9ec5fd2051910
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/zuul[debian/jessie-wikimedia]: 2.5.0-8-gcbc7f62-wmf4jessie1

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315430

Change subject: 2.5.0-8-gcbc7f62-wmf4jessie1
..

2.5.0-8-gcbc7f62-wmf4jessie1

* sync with precise-wikimedia:

* Link zuul-launcher in /usr/bin
* Properly set zuul-clear-refs and shebang. Fix T103529
* source ignore .pyc files and .tox directory

Bug: T103529
Change-Id: I2d296ffd685b4015ef42672a1336fe16055b6d60
---
M debian/changelog
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/30/315430/1

diff --git a/debian/changelog b/debian/changelog
index 4b2c739..8b0545b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zuul (2.5.0-8-gcbc7f62-wmf4jessie1) jessie-wikimedia; urgency=medium
+
+  * sync with precise-wikimedia:
+
+  * Link zuul-launcher in /usr/bin
+  * Properly set zuul-clear-refs and shebang. Fix T103529
+  * source ignore .pyc files and .tox directory
+
+ -- Antoine Musso   Tue, 11 Oct 2016 17:53:38 +0200
+
 zuul (2.5.0-8-gcbc7f62-wmf3jessie1) jessie-wikimedia; urgency=medium
 
   * sync with precise-wikimedia:

-- 
To view, visit https://gerrit.wikimedia.org/r/315430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d296ffd685b4015ef42672a1336fe16055b6d60
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: All View's can now call toHtmlString

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315427

Change subject: All View's can now call toHtmlString
..

All View's can now call toHtmlString

Change-Id: I92272d65bebdbcda407f98713be26ee712d233c1
---
M resources/mobile.startup/Icon.js
M resources/mobile.view/View.js
2 files changed, 10 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/27/315427/1

diff --git a/resources/mobile.startup/Icon.js b/resources/mobile.startup/Icon.js
index afee83b..b72f2e2 100644
--- a/resources/mobile.startup/Icon.js
+++ b/resources/mobile.startup/Icon.js
@@ -59,14 +59,6 @@
getGlyphClassName: function () {
return this.options.base + '-' + this.options.name;
},
-   /**
-* Return the HTML representation of this view
-* @method
-* @return {String}
-*/
-   toHtmlString: function () {
-   return $( '' ).append( this.$el ).html();
-   },
template: mw.template.get( 'mobile.startup', 'icon.hogan' )
} );
 
diff --git a/resources/mobile.view/View.js b/resources/mobile.view/View.js
index 197f65d..bf38f37 100644
--- a/resources/mobile.view/View.js
+++ b/resources/mobile.view/View.js
@@ -322,6 +322,16 @@
},
 
/**
+* Return the HTML representation of this view
+* FIXME: See https://phabricator.wikimedia.org/T129943
+* @method
+* @return {String}
+*/
+   toHtmlString: function () {
+   return $( '' ).append( this.$el ).html();
+   },
+
+   /**
 * A finer-grained `undelegateEvents` for removing a single 
delegated event.
 * `selector` and `listener` are both optional.
 *

-- 
To view, visit https://gerrit.wikimedia.org/r/315427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92272d65bebdbcda407f98713be26ee712d233c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Talk overlay's should not need so many partials

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315428

Change subject: Talk overlay's should not need so many partials
..

Talk overlay's should not need so many partials

Change-Id: I6820849028c58f54917dea5b14923b8a5ab0c49a
---
M extension.json
A resources/mobile.search/searchForm.hogan
M resources/mobile.talk.overlays/TalkOverlay.js
M resources/mobile.talk.overlays/TalkOverlayBase.js
M resources/mobile.talk.overlays/TalkSectionAddOverlay.js
M resources/mobile.talk.overlays/TalkSectionOverlay.js
M resources/mobile.talk.overlays/talkSectionAdd.hogan
D resources/mobile.talk.overlays/talkSectionAddContentHeader.hogan
D resources/mobile.talk.overlays/talkSectionHeader.hogan
9 files changed, 65 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/28/315428/1

diff --git a/extension.json b/extension.json
index 940409b..d31dcd9 100644
--- a/extension.json
+++ b/extension.json
@@ -855,9 +855,7 @@
],
"templates": {
"content.hogan": 
"resources/mobile.talk.overlays/content.hogan",
-   "SectionAddOverlay/contentHeader.hogan": 
"resources/mobile.talk.overlays/talkSectionAddContentHeader.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/talkSectionContent.hogan"
},
"messages": [
diff --git a/resources/mobile.search/searchForm.hogan 
b/resources/mobile.search/searchForm.hogan
new file mode 100644
index 000..8b9bb41
--- /dev/null
+++ b/resources/mobile.search/searchForm.hogan
@@ -0,0 +1,5 @@
+
+   
+
+{{! See: T136243. Do not put the clear button inside the form as hitting enter 
on the input element triggers a button click, rather than submitting the form. 
}}
+{{#clearIcon}}{{>icon}}{{/clearIcon}}
diff --git a/resources/mobile.talk.overlays/TalkOverlay.js 
b/resources/mobile.talk.overlays/TalkOverlay.js
index 42b0c2f..cfe7872 100644
--- a/resources/mobile.talk.overlays/TalkOverlay.js
+++ b/resources/mobile.talk.overlays/TalkOverlay.js
@@ -2,6 +2,7 @@
var TalkOverlayBase = M.require( 'mobile.talk.overlays/TalkOverlayBase' 
),
Page = M.require( 'mobile.startup/Page' ),
Anchor = M.require( 'mobile.startup/Anchor' ),
+   Button = M.require( 'mobile.startup/Button' ),
user = M.require( 'mobile.user/user' );
/**
 * Overlay for talk page
@@ -34,15 +35,20 @@
 * a new talk overlay.
 */
defaults: $.extend( {}, TalkOverlayBase.prototype.defaults, {
+   headers: [
+   {
+   headerChrome: false,
+   heading: '' + mw.msg( 
'mobile-frontend-talk-overlay-header' ) + '',
+   secondaryAction: new Button( {
+   href: '#/talk/new',
+   className: 'add continue 
hidden',
+   progressive: true,
+   label: mw.msg( 
'mobile-frontend-talk-add-overlay-submit' )
+   } ).toHtmlString()
+   }
+   ],
headings: undefined,
-   heading: '' + mw.msg( 
'mobile-frontend-talk-overlay-header' ) + '',
leadHeading: mw.msg( 
'mobile-frontend-talk-overlay-lead-header' ),
-   headerButtonsListClassName: 'header-action',
-   headerButtons: [ {
-   href: '#/talk/new',
-   className: 'add continue hidden',
-   msg: mw.msg( 
'mobile-frontend-talk-add-overlay-submit' )
-   } ],
footerAnchor: new Anchor( {
progressive: true,
additionalClassNames: 'footer-link 
talk-fullpage',
diff --git a/resources/mobile.talk.overlays/TalkOverlayBase.js 
b/resources/mobile.talk.overlays/TalkOverlayBase.js
index 0b39c8b..a5bf232 100644
--- a/resources/mobile.talk.overlays/TalkOverlayBase.js
+++ b/resources/mobile.talk.overlays/TalkOverlayBase.js
@@ -16,6 +16,9 @@
Overlay.apply( this, arguments );
}
OO.mfExtend( TalkOverlayBase, Overlay, {
+   defaults: $.extend( {}, Overlay.prototype.defaults, {
+

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Allow a more generalised Overlay header

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315426

Change subject: Hygiene: Allow a more generalised Overlay header
..

Hygiene: Allow a more generalised Overlay header

Overlays can opt into the more flexible header template
simply by passing useHeaderV2 as a template parameter

Change-Id: Ia2ee1a99dae4befc748e2ad1159be487bb0d15c1
---
M extension.json
M resources/mobile.overlays/Overlay.hogan
M resources/mobile.overlays/Overlay.js
M resources/mobile.overlays/OverlayHeader.hogan
A resources/mobile.overlays/title.hogan
5 files changed, 51 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/26/315426/1

diff --git a/extension.json b/extension.json
index f3f9576..940409b 100644
--- a/extension.json
+++ b/extension.json
@@ -1018,6 +1018,7 @@
"mobile-frontend-overlay-continue"
],
"templates": {
+   "title.hogan": 
"resources/mobile.overlays/title.hogan",
"header.hogan": 
"resources/mobile.overlays/OverlayHeader.hogan",
"Overlay.hogan": 
"resources/mobile.overlays/Overlay.hogan",
"LoadingOverlay.hogan": 
"resources/mobile.overlays/LoadingOverlay.hogan"
diff --git a/resources/mobile.overlays/Overlay.hogan 
b/resources/mobile.overlays/Overlay.hogan
index 5ed256a..f65f81d 100644
--- a/resources/mobile.overlays/Overlay.hogan
+++ b/resources/mobile.overlays/Overlay.hogan
@@ -1,8 +1,13 @@
+{{^useHeaderV2}}
 

{{>header}}

 
+{{/useHeaderV2}}
+{{#useHeaderV2}}
+{{#headers}}{{>header}}{{/headers}}
+{{/useHeaderV2}}
 
{{>content}}
 
diff --git a/resources/mobile.overlays/Overlay.js 
b/resources/mobile.overlays/Overlay.js
index 8554660..5ef4e40 100644
--- a/resources/mobile.overlays/Overlay.js
+++ b/resources/mobile.overlays/Overlay.js
@@ -7,6 +7,12 @@
Anchor = M.require( 'mobile.startup/Anchor' ),
icons = M.require( 'mobile.startup/icons' ),
browser = M.require( 'mobile.browser/Browser' ).getSingleton(),
+   cancelButton = new Icon( {
+   tagName: 'button',
+   name: 'overlay-close',
+   additionalClassNames: 'cancel',
+   label: mw.msg( 'mobile-frontend-overlay-close' )
+   } ).toHtmlString(),
$window = $( window );
 
/**
@@ -53,6 +59,7 @@
className: 'overlay',
templatePartials: {
header: mw.template.get( 'mobile.overlays', 
'header.hogan' ),
+   title: mw.template.get( 'mobile.overlays', 
'title.hogan' ),
anchor: Anchor.prototype.template,
button: Button.prototype.template
},
@@ -64,20 +71,22 @@
 * @cfg {String} defaults.cancelButton HTML of the cancel 
button.
 * @cfg {String} defaults.backButton HTML of the back button.
 * @cfg {String} defaults.headerButtonsListClassName A comma 
separated string of class
-* names of the wrapper of the header buttons.
+* names of the wrapper of the header buttons. [Deprecated]
 * @cfg {Boolean} defaults.headerChrome Whether the header has 
chrome.
 * @cfg {Boolean} defaults.fixedHeader Whether the header is 
fixed.
 * @cfg {String} defaults.spinner HTML of the spinner icon.
 * @cfg {Object} [defaults.footerAnchor] options for an 
optional Anchor that can appear in the footer
+* @cfg {Boolean} defaults.useHeaderV2 Whether to use the more 
flexible header partial.
+*  In future this will default to true.
+* @cfg {String} [defaults.primaryAction] HTML that will be 
rendered in the header when useHeaderV2 is true
+* @cfg {String} [defaults.secondaryAction] HTML that will be 
rendered in the header when useHeaderV2 is true
+* @cfg {String} [defaults.heading] HTML that will be rendered 
in the overlay header when useHeaderV2 is true
 */
defaults: {
saveMsg: mw.msg( 'mobile-frontend-editor-save' ),
-   cancelButton: new Icon( {
-   tagName: 'button',
-   name: 'overlay-close',
-   additionalClassNames: 'cancel',
-   label: mw.msg( 'mobile-frontend-overlay-close' )
-   } ).toHtmlString(),
+   useHeaderV2: false,
+   cancelButton: cancelButton,
+   primaryAction: cancelButton,

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Clean up ObjectCache calls

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315425

Change subject: Clean up ObjectCache calls
..

Clean up ObjectCache calls

Change-Id: Idfef24864a9a33417d755ca14ff3ecbce02817c8
---
M AbuseFilterTokenizer.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/25/315425/1

diff --git a/AbuseFilterTokenizer.php b/AbuseFilterTokenizer.php
index 1a6a2b6..2a532c6 100644
--- a/AbuseFilterTokenizer.php
+++ b/AbuseFilterTokenizer.php
@@ -64,7 +64,7 @@
static $tokenizerCache = null;
 
if ( !$tokenizerCache ) {
-   $tokenizerCache = ObjectCache::newAccelerator( array(), 
'hash' );
+   $tokenizerCache = ObjectCache::getLocalServerInstance( 
'hash' );
}
 
static $stats = null;

-- 
To view, visit https://gerrit.wikimedia.org/r/315425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfef24864a9a33417d755ca14ff3ecbce02817c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.28.0-wmf.22]: Follow-up I9547dfd: Only enable VE tabs if VE is available

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315424

Change subject: Follow-up I9547dfd: Only enable VE tabs if VE is available
..

Follow-up I9547dfd: Only enable VE tabs if VE is available

Otherwise VE is launched on namespaces where it is disabled
(but NWE is enabled).

Bug: T147890
Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
(cherry picked from commit 4fc2904a87d7e4fa5f7bf1d61b37de1c6ddc850d)
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/24/315424/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index bcd39b4..41cfd7b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -970,7 +970,7 @@
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
init.setupSkin();
-   } else if ( pageCanLoadVE && onlyTabIsVE ) {
+   } else if ( init.isVisualAvailable && 
pageCanLoadVE && onlyTabIsVE ) {
// … on single-edit-tab wikis, where VE 
is the user's preferred editor
// Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', 
function ( e ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/315424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Follow-up I9547dfd: Only enable VE tabs if VE is available

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up I9547dfd: Only enable VE tabs if VE is available
..


Follow-up I9547dfd: Only enable VE tabs if VE is available

Otherwise VE is launched on namespaces where it is disabled
(but NWE is enabled).

Bug: T147890
Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index bcd39b4..41cfd7b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -970,7 +970,7 @@
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
init.setupSkin();
-   } else if ( pageCanLoadVE && onlyTabIsVE ) {
+   } else if ( init.isVisualAvailable && 
pageCanLoadVE && onlyTabIsVE ) {
// … on single-edit-tab wikis, where VE 
is the user's preferred editor
// Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', 
function ( e ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/315420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Call parent::__construct() in MysqlBase AFTER transferring s...

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315423

Change subject: Call parent::__construct() in MysqlBase AFTER transferring 
specific parameters
..

Call parent::__construct() in MysqlBase AFTER transferring specific parameters

Bug: T147852
Change-Id: Id07bb38efb6a9a3b4f4f7e07c0a2c6a74bb1b58d
---
M includes/libs/rdbms/database/DatabaseMysqlBase.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/315423/1

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php 
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index f504ec4..e55680a 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -72,8 +72,6 @@
 * @param array $params
 */
function __construct( array $params ) {
-   parent::__construct( $params );
-
$this->lagDetectionMethod = isset( 
$params['lagDetectionMethod'] )
? $params['lagDetectionMethod']
: 'Seconds_Behind_Master';
@@ -89,6 +87,8 @@
}
$this->sqlMode = isset( $params['sqlMode'] ) ? 
$params['sqlMode'] : '';
$this->utf8Mode = !empty( $params['utf8Mode'] );
+
+   parent::__construct( $params );
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/315423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id07bb38efb6a9a3b4f4f7e07c0a2c6a74bb1b58d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb: maintain-views mediawiki-config checkout

[Rush (Code Review)]

Rush has submitted this change and it was merged.

Change subject: labsdb: maintain-views mediawiki-config checkout
..


labsdb: maintain-views mediawiki-config checkout

* don't shadow owner defaults for type
* extend path to mediawiki-config dir under /usr/local/lib

Change-Id: Iabd62bb28e3bb3f93177c09106463bdc9cbe82aa
---
M modules/role/manifests/labsdb/views.pp
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/labsdb/views.pp 
b/modules/role/manifests/labsdb/views.pp
index ecea7bc..c05646c 100644
--- a/modules/role/manifests/labsdb/views.pp
+++ b/modules/role/manifests/labsdb/views.pp
@@ -2,9 +2,7 @@
 
 git::clone { 'operations/mediawiki-config':
 ensure => 'latest',
-directory  => '/usr/local/lib',
-owner  => 'root',
-group  => 'root',
+directory  => '/usr/local/lib/mediawiki-config',
 before => File['/usr/local/sbin/maintain-views'],
 recurse_submodules => true,
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabd62bb28e3bb3f93177c09106463bdc9cbe82aa
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Clean up ObjectCache calls

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315422

Change subject: Clean up ObjectCache calls
..

Clean up ObjectCache calls

Change-Id: I6b741a82dca2fead8b1392208bec4303cc064d87
---
M includes/MediaWikiGadgetsDefinitionRepo.php
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets 
refs/changes/22/315422/1

diff --git a/includes/MediaWikiGadgetsDefinitionRepo.php 
b/includes/MediaWikiGadgetsDefinitionRepo.php
index f717650..dbb3ae8 100644
--- a/includes/MediaWikiGadgetsDefinitionRepo.php
+++ b/includes/MediaWikiGadgetsDefinitionRepo.php
@@ -1,4 +1,5 @@
 touchCheckKey( 
$this->getCheckKey() );
+   $cache = 
MediaWikiServices::getInstance()->getMainWANObjectCache();
+   $cache->touchCheckKey( $this->getCheckKey() );
}
 
private function getCheckKey() {
@@ -51,8 +53,8 @@
}
 
// Ideally $t1Cache is APC, and $wanCache is memcached
-   $t1Cache = ObjectCache::newAccelerator( array(), 'hash' );
-   $wanCache = ObjectCache::getMainWANInstance();
+   $t1Cache = ObjectCache::getLocalServerInstance( 'hash' );
+   $wanCache = 
MediaWikiServices::getInstance()->getMainWANObjectCache();
 
$key = $this->getCheckKey();
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b741a82dca2fead8b1392208bec4303cc064d87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb: maintain-views mediawiki-config checkout

[Rush (Code Review)]

Rush has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315421

Change subject: labsdb: maintain-views mediawiki-config checkout
..

labsdb: maintain-views mediawiki-config checkout

* don't shadow owner defaults for type
* extend path to mediawiki-config dir under /usr/local/lib

Change-Id: Iabd62bb28e3bb3f93177c09106463bdc9cbe82aa
---
M modules/role/manifests/labsdb/views.pp
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/315421/1

diff --git a/modules/role/manifests/labsdb/views.pp 
b/modules/role/manifests/labsdb/views.pp
index ecea7bc..c05646c 100644
--- a/modules/role/manifests/labsdb/views.pp
+++ b/modules/role/manifests/labsdb/views.pp
@@ -2,9 +2,7 @@
 
 git::clone { 'operations/mediawiki-config':
 ensure => 'latest',
-directory  => '/usr/local/lib',
-owner  => 'root',
-group  => 'root',
+directory  => '/usr/local/lib/mediawiki-config',
 before => File['/usr/local/sbin/maintain-views'],
 recurse_submodules => true,
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabd62bb28e3bb3f93177c09106463bdc9cbe82aa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Follow-up I9547dfd: Only enable VE tabs if VE is available

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315420

Change subject: Follow-up I9547dfd: Only enable VE tabs if VE is available
..

Follow-up I9547dfd: Only enable VE tabs if VE is available

Otherwise VE is launched on namespaces it is disabled (but NWE is enabled).

Bug: T147890
Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/20/315420/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index bcd39b4..41cfd7b 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -970,7 +970,7 @@
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.
init.setupSkin();
-   } else if ( pageCanLoadVE && onlyTabIsVE ) {
+   } else if ( init.isVisualAvailable && 
pageCanLoadVE && onlyTabIsVE ) {
// … on single-edit-tab wikis, where VE 
is the user's preferred editor
// Handle section edit link clicks
$( '.mw-editsection a' ).on( 'click', 
function ( e ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/315420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62f4ff96b991553a4eb0be9efb2e84bc80ca2bb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Qualify more classes to distinguish them from roles

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Qualify more classes to distinguish them from roles
..


Qualify more classes to distinguish them from roles

Change-Id: Ia7d749f8f338320b79cbf9a0dbccc3a9a1b72a09
---
M modules/role/manifests/toollabs/node/compute/dedicated.pp
M modules/role/manifests/toollabs/node/compute/general.pp
M modules/role/manifests/toollabs/node/web/generic.pp
M modules/role/manifests/toollabs/node/web/lighttpd.pp
M modules/role/manifests/toollabs/services.pp
M modules/role/manifests/toollabs/shadow.pp
6 files changed, 9 insertions(+), 9 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/toollabs/node/compute/dedicated.pp 
b/modules/role/manifests/toollabs/node/compute/dedicated.pp
index 238b6db..5d624a4 100644
--- a/modules/role/manifests/toollabs/node/compute/dedicated.pp
+++ b/modules/role/manifests/toollabs/node/compute/dedicated.pp
@@ -20,7 +20,7 @@
 description => "Computation node dedicated to 
${::labsproject}.${dedicated_tool}",
 }
 
-class { 'toollabs::queues': queues => [ $dedicated_tool ] }
+class { '::toollabs::queues': queues => [ $dedicated_tool ] }
 
 # Having the collector in the instance means that, for the time
 # being, dedicated queues can have just the one one in them.
diff --git a/modules/role/manifests/toollabs/node/compute/general.pp 
b/modules/role/manifests/toollabs/node/compute/general.pp
index e5c7180..c5fc046 100644
--- a/modules/role/manifests/toollabs/node/compute/general.pp
+++ b/modules/role/manifests/toollabs/node/compute/general.pp
@@ -20,7 +20,7 @@
 config => 'toollabs/gridengine/host-vmem.erb',
 }
 
-class { 'toollabs::hostgroups': groups => [ '@general' ] }
+class { '::toollabs::hostgroups': groups => [ '@general' ] }
 
 file { '/usr/local/bin/jobkill':
 ensure => file,
diff --git a/modules/role/manifests/toollabs/node/web/generic.pp 
b/modules/role/manifests/toollabs/node/web/generic.pp
index 0398c28..cb33a3d 100644
--- a/modules/role/manifests/toollabs/node/web/generic.pp
+++ b/modules/role/manifests/toollabs/node/web/generic.pp
@@ -3,7 +3,7 @@
 # Sets up a node for running generic webservices.
 # Currently explicitly supports nodejs
 class role::toollabs::node::web::generic inherits role::toollabs::node::web {
-class { 'toollabs::queues':
+class { '::toollabs::queues':
 queues => [ 'webgrid-generic' ],
 }
 
diff --git a/modules/role/manifests/toollabs/node/web/lighttpd.pp 
b/modules/role/manifests/toollabs/node/web/lighttpd.pp
index f62cb00..df51e79 100644
--- a/modules/role/manifests/toollabs/node/web/lighttpd.pp
+++ b/modules/role/manifests/toollabs/node/web/lighttpd.pp
@@ -24,7 +24,7 @@
 require => File['/var/run/lighttpd'],
 }
 
-class { 'toollabs::queues': queues => [ 'webgrid-lighttpd' ] }
+class { '::toollabs::queues': queues => [ 'webgrid-lighttpd' ] }
 
 file { '/var/run/lighttpd':
 ensure => directory,
diff --git a/modules/role/manifests/toollabs/services.pp 
b/modules/role/manifests/toollabs/services.pp
index fcef48a..43a22f7 100644
--- a/modules/role/manifests/toollabs/services.pp
+++ b/modules/role/manifests/toollabs/services.pp
@@ -25,19 +25,19 @@
 show_diff => false,
 }
 
-class { 'toollabs::services':
+class { '::toollabs::services':
 active => ($::fqdn == $active_host),
 }
 
-class { 'toollabs::bigbrother':
+class { '::toollabs::bigbrother':
 active => ($::fqdn == $active_host),
 }
 
-class { 'toollabs::updatetools':
+class { '::toollabs::updatetools':
 active => ($::fqdn == $active_host),
 }
 
-class { 'toollabs::admin_web_updater':
+class { '::toollabs::admin_web_updater':
 active => ($::fqdn == $active_host)
 }
 }
diff --git a/modules/role/manifests/toollabs/shadow.pp 
b/modules/role/manifests/toollabs/shadow.pp
index f3fd073..a4522ed 100644
--- a/modules/role/manifests/toollabs/shadow.pp
+++ b/modules/role/manifests/toollabs/shadow.pp
@@ -1,7 +1,7 @@
 class role::toollabs::shadow {
 system::role { 'role::toollabs::shadow': description => 'Tool Labs 
gridengine shadow (backup) master' }
 
-class { 'toollabs::shadow':
+class { '::toollabs::shadow':
 gridmaster => $role::toollabs::common::gridmaster,
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7d749f8f338320b79cbf9a0dbccc3a9a1b72a09
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Qualify more classes to distinguish them from roles

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315419

Change subject: Qualify more classes to distinguish them from roles
..

Qualify more classes to distinguish them from roles

Change-Id: Ia7d749f8f338320b79cbf9a0dbccc3a9a1b72a09
---
M modules/role/manifests/toollabs/node/compute/dedicated.pp
M modules/role/manifests/toollabs/node/compute/general.pp
M modules/role/manifests/toollabs/node/web/generic.pp
M modules/role/manifests/toollabs/node/web/lighttpd.pp
M modules/role/manifests/toollabs/services.pp
M modules/role/manifests/toollabs/shadow.pp
6 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/315419/1

diff --git a/modules/role/manifests/toollabs/node/compute/dedicated.pp 
b/modules/role/manifests/toollabs/node/compute/dedicated.pp
index 238b6db..5d624a4 100644
--- a/modules/role/manifests/toollabs/node/compute/dedicated.pp
+++ b/modules/role/manifests/toollabs/node/compute/dedicated.pp
@@ -20,7 +20,7 @@
 description => "Computation node dedicated to 
${::labsproject}.${dedicated_tool}",
 }
 
-class { 'toollabs::queues': queues => [ $dedicated_tool ] }
+class { '::toollabs::queues': queues => [ $dedicated_tool ] }
 
 # Having the collector in the instance means that, for the time
 # being, dedicated queues can have just the one one in them.
diff --git a/modules/role/manifests/toollabs/node/compute/general.pp 
b/modules/role/manifests/toollabs/node/compute/general.pp
index e5c7180..c5fc046 100644
--- a/modules/role/manifests/toollabs/node/compute/general.pp
+++ b/modules/role/manifests/toollabs/node/compute/general.pp
@@ -20,7 +20,7 @@
 config => 'toollabs/gridengine/host-vmem.erb',
 }
 
-class { 'toollabs::hostgroups': groups => [ '@general' ] }
+class { '::toollabs::hostgroups': groups => [ '@general' ] }
 
 file { '/usr/local/bin/jobkill':
 ensure => file,
diff --git a/modules/role/manifests/toollabs/node/web/generic.pp 
b/modules/role/manifests/toollabs/node/web/generic.pp
index 0398c28..cb33a3d 100644
--- a/modules/role/manifests/toollabs/node/web/generic.pp
+++ b/modules/role/manifests/toollabs/node/web/generic.pp
@@ -3,7 +3,7 @@
 # Sets up a node for running generic webservices.
 # Currently explicitly supports nodejs
 class role::toollabs::node::web::generic inherits role::toollabs::node::web {
-class { 'toollabs::queues':
+class { '::toollabs::queues':
 queues => [ 'webgrid-generic' ],
 }
 
diff --git a/modules/role/manifests/toollabs/node/web/lighttpd.pp 
b/modules/role/manifests/toollabs/node/web/lighttpd.pp
index f62cb00..df51e79 100644
--- a/modules/role/manifests/toollabs/node/web/lighttpd.pp
+++ b/modules/role/manifests/toollabs/node/web/lighttpd.pp
@@ -24,7 +24,7 @@
 require => File['/var/run/lighttpd'],
 }
 
-class { 'toollabs::queues': queues => [ 'webgrid-lighttpd' ] }
+class { '::toollabs::queues': queues => [ 'webgrid-lighttpd' ] }
 
 file { '/var/run/lighttpd':
 ensure => directory,
diff --git a/modules/role/manifests/toollabs/services.pp 
b/modules/role/manifests/toollabs/services.pp
index fcef48a..43a22f7 100644
--- a/modules/role/manifests/toollabs/services.pp
+++ b/modules/role/manifests/toollabs/services.pp
@@ -25,19 +25,19 @@
 show_diff => false,
 }
 
-class { 'toollabs::services':
+class { '::toollabs::services':
 active => ($::fqdn == $active_host),
 }
 
-class { 'toollabs::bigbrother':
+class { '::toollabs::bigbrother':
 active => ($::fqdn == $active_host),
 }
 
-class { 'toollabs::updatetools':
+class { '::toollabs::updatetools':
 active => ($::fqdn == $active_host),
 }
 
-class { 'toollabs::admin_web_updater':
+class { '::toollabs::admin_web_updater':
 active => ($::fqdn == $active_host)
 }
 }
diff --git a/modules/role/manifests/toollabs/shadow.pp 
b/modules/role/manifests/toollabs/shadow.pp
index f3fd073..a4522ed 100644
--- a/modules/role/manifests/toollabs/shadow.pp
+++ b/modules/role/manifests/toollabs/shadow.pp
@@ -1,7 +1,7 @@
 class role::toollabs::shadow {
 system::role { 'role::toollabs::shadow': description => 'Tool Labs 
gridengine shadow (backup) master' }
 
-class { 'toollabs::shadow':
+class { '::toollabs::shadow':
 gridmaster => $role::toollabs::common::gridmaster,
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7d749f8f338320b79cbf9a0dbccc3a9a1b72a09
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit: remove lead from site.pp, adjust comment

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315418

Change subject: gerrit: remove lead from site.pp, adjust comment
..

gerrit: remove lead from site.pp, adjust comment

Bug: T147597
Change-Id: I6a9cd04d8bdf8b0cdfd6e55c5e61215890880b46
---
M manifests/site.pp
1 file changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/315418/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 03b89a9..79952d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -252,7 +252,7 @@
 }
 }
 
-# gerrit warm stand-by (T147597)
+# New https://www.mediawiki.org/wiki/Gerrit (T147597)
 node 'cobalt.wikimedia.org' {
 role(gerrit::server)
 }
@@ -1530,11 +1530,6 @@
 node /labstore200[3-4]\.codfw\.wmnet/ {
 role(labs::nfs::backup)
 include standard
-}
-
-# New https://www.mediawiki.org/wiki/Gerrit
-node 'lead.wikimedia.org' {
-role(gerrit::server)
 }
 
 node 'lithium.eqiad.wmnet' {

-- 
To view, visit https://gerrit.wikimedia.org/r/315418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a9cd04d8bdf8b0cdfd6e55c5e61215890880b46
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Fix logic of MinervaBottomLanguageButton

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix logic of MinervaBottomLanguageButton
..


Fix logic of MinervaBottomLanguageButton

When MinervaBottomLanguageButton is false we should still show
the language button on the main page

Bug: T143829
Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
---
M includes/skins/SkinMinerva.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Bmansurov: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 00f2066..35b3e07 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -936,9 +936,11 @@
}
}
 
-   if ( MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
+   if ( $title->isMainPage() && $this->doesPageHaveLanguages || (
+   MobileContext::singleton()->getMFConfig()->get( 
'MinervaBottomLanguageButton' ) &&
$this->doesPageHaveLanguages &&
-   ( $title->isMainPage() || 
$this->shouldSecondaryActionsIncludeLanguageBtn ) ) {
+   $this->shouldSecondaryActionsIncludeLanguageBtn )
+   ) {
$buttons['language'] = $this->getLanguageButton();
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/315414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7980c7eb046f130420cf1af9d9fbacd3378d6d62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] analytics/wikistats[master]: Replace Bugzilla links by Phabricator links

[Aklapper (Code Review)]

Aklapper has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315417

Change subject: Replace Bugzilla links by Phabricator links
..

Replace Bugzilla links by Phabricator links

Change-Id: I5ca3091d899670084dfc2a3dfa115485d438f111
---
M squids/perl/SquidReportArchive.pl
1 file changed, 2 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats 
refs/changes/17/315417/1

diff --git a/squids/perl/SquidReportArchive.pl 
b/squids/perl/SquidReportArchive.pl
index 23fb268..349a454 100755
--- a/squids/perl/SquidReportArchive.pl
+++ b/squids/perl/SquidReportArchive.pl
@@ -4,7 +4,7 @@
 # https://bugzilla.wikimedia.org/show_bug.cgi?id=46205   fixed
 # https://bugzilla.wikimedia.org/show_bug.cgi?id=46267
 # https://bugzilla.wikimedia.org/show_bug.cgi?id=46277
-# https://bugzilla.wikimedia.org/show_bug.cgi?id=46289
+# https://bugzilla.wikimedia.org/show_bug.cgi?id=46289   fixed
 
 # -v -q 2012q3 -c -i "w:/# out stat1/squid/csv" -o "w:/# out 
test/squid/reports" -l . -a "w:/# out stat1/squid/csv/meta"
 
@@ -667,10 +667,6 @@
   # $notice = "" .
   #   "Unresolved Bugzilla bugs: " .
   #   "55443" .
-  #   "" .
-  #"Recently resolved bugs: " .
-  #   "46205 (Aug 
2013)" .
-  #   "46289 (Nov 
2013)" .
   #   "" ;
   }
   else
@@ -678,23 +674,7 @@
 $notice = "" .
 # "Warning: all recent Wikimedia traffic analysis reports have 
been generated from old scripts." .
# "The scripts are orphaned, and have not been maintained for at 
least 6 months. Many bugs are considerably older." .
-  "Unresolved Bugzilla bugs: " .
-"46190, " .
-"46191, " .
-"46195, " .
-"46201, " .
-"46265, " .
-"(46267), " .
-"46268, " .
-"46269, " .
-"46271, " .
-"46273, " .
-"46274, " .
-"46275, " .
-"46277, " .
-"46278, " .
-"46279, " .
-"57376" .
+  "Unresolved
 bugs " .
   "" ;
   }
   $header =~ s/NOTICE/$notice/ ;

-- 
To view, visit https://gerrit.wikimedia.org/r/315417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ca3091d899670084dfc2a3dfa115485d438f111
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats
Gerrit-Branch: master
Gerrit-Owner: Aklapper 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maintain-views: externalize dependencies

[Rush (Code Review)]

Rush has submitted this change and it was merged.

Change subject: maintain-views: externalize dependencies
..


maintain-views: externalize dependencies

* mediawiki-config checkout is managed by puppet
* maintain-views user/pass come from private

Change-Id: I5dba2bc375148e47b1ffd68f44aee3f69ea7ccf3
---
M modules/role/files/labsdb/maintain-views.py
M modules/role/manifests/labsdb/views.pp
M modules/role/templates/labsdb/maintain-views.json
3 files changed, 24 insertions(+), 20 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/files/labsdb/maintain-views.py 
b/modules/role/files/labsdb/maintain-views.py
index 5062f5c..eefaa6f 100644
--- a/modules/role/files/labsdb/maintain-views.py
+++ b/modules/role/files/labsdb/maintain-views.py
@@ -25,17 +25,14 @@
 #  By default, it processes every database but it accepts a list of
 #  databases to process
 #
-#  The script uses a clone of operations/mediawiki-config in a directory called
-#  mediawiki-config, from which it will get it's database list information. It
-#  will clone the repository from https://gerrit.wikimedia.org if necessary.
+#  Information on available and operational databases is sourced from
+#  a checkout of mediawiki-config.
 #
 
 import argparse
 import json
 import logging
-import os
 import re
-import subprocess
 
 import pymysql
 
@@ -298,6 +295,12 @@
   " values can be given space-separated."),
 nargs="+"
 )
+argparser.add_argument(
+"--mediawiki-config",
+help=("Specify path to mediawiki-config checkout"
+  " values can be given space-separated."),
+default="/usr/local/lib/mediawiki-config"
+)
 args = argparser.parse_args()
 with open(args.config_location) as f:
 config = json.load(f)
@@ -313,19 +316,9 @@
 customviews["logging_userindex"]["where"] = ("(log_deleted&4)=0 and " +
  safelog)
 
-if os.path.isdir('mediawiki-config'):
-logging.info("Running git pull in mediawiki-config")
-subprocess.call(["git", "pull"], cwd="mediawiki-config")
-else:
-logging.info("Running git clone for mediawiki-config")
-subprocess.call([
-"git",
-"clone",
-"https://gerrit.wikimedia.org/r/p/operations/mediawiki-config.git;
-])
-
-with open("mediawiki-config/dblists/all.dblist") as f:
+with open("{}/dblists/all.dblist".format(args.mediawiki_config)) as f:
 all_available_dbs = f.read().splitlines()
+
 all_available_dbs.append("centralauth")
 if args.databases:
 dbs = {}
@@ -344,7 +337,7 @@
 dbs = {db: {} for db in all_available_dbs}
 
 def read_list(fname, prop, val):
-with open("mediawiki-config/dblists/{}.dblist".format(fname)) as f:
+with open("{}/dblists/{}.dblist".format(args.mediawiki_config, fname)) 
as f:
 for db in f.read().splitlines():
 if db in dbs:
 dbs[db][prop] = val
diff --git a/modules/role/manifests/labsdb/views.pp 
b/modules/role/manifests/labsdb/views.pp
index 78f1fd3..ecea7bc 100644
--- a/modules/role/manifests/labsdb/views.pp
+++ b/modules/role/manifests/labsdb/views.pp
@@ -1,5 +1,16 @@
 class role::labsdb::views {
 
+git::clone { 'operations/mediawiki-config':
+ensure => 'latest',
+directory  => '/usr/local/lib',
+owner  => 'root',
+group  => 'root',
+before => File['/usr/local/sbin/maintain-views'],
+recurse_submodules => true,
+}
+
+$view_user = $passwords::mysql::maintain_views::user
+$view_pass = $passwords::mysql::maintain_views::password
 file { '/etc/maintain-views.json':
 ensure  => file,
 content => template('role/labsdb/maintain-views.json'),
diff --git a/modules/role/templates/labsdb/maintain-views.json 
b/modules/role/templates/labsdb/maintain-views.json
index df6fe88..a4881c9 100644
--- a/modules/role/templates/labsdb/maintain-views.json
+++ b/modules/role/templates/labsdb/maintain-views.json
@@ -2,8 +2,8 @@
 "slices": [
 ["<%= @fqdn %>", 3306]
 ],
-"mysql_user": "maintain-views",
-"mysql_password": "",
+"mysql_user": "<%= @view_user %>",
+"mysql_password": "<%= @view_pass %>",
 "fullviews": [
 "abuse_filter_action", "aft_article_answer", "aft_article_answer_text",
 "aft_article_feedback_properties", 
"aft_article_feedback_ratings_rollup",

-- 
To view, visit https://gerrit.wikimedia.org/r/315413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5dba2bc375148e47b1ffd68f44aee3f69ea7ccf3
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Clean up ObjectCache calls

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315416

Change subject: Clean up ObjectCache calls
..

Clean up ObjectCache calls

Change-Id: I95b2d4d0f94a2e7f42372615ea9c612845502b30
---
M common/Hooks.php
M engines/LuaCommon/LuaCommon.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto 
refs/changes/16/315416/1

diff --git a/common/Hooks.php b/common/Hooks.php
index b6582a4..baccde3 100644
--- a/common/Hooks.php
+++ b/common/Hooks.php
@@ -190,7 +190,7 @@
static $cache;
 
if ( !$cache ) {
-   $cache = ObjectCache::newAccelerator( CACHE_NONE );
+   $cache = ObjectCache::getLocalServerInstance( 
CACHE_NONE );
}
 
// To control the sampling rate, we keep a compact histogram of
diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index 4f6e536..9de4784 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -315,7 +315,7 @@
static $cache = null;
 
if ( !$cache ) {
-   $cache = ObjectCache::newAccelerator( array(), 'hash' );
+   $cache = ObjectCache::getLocalServerInstance( 'hash' );
}
 
$mtime = filemtime( $fileName );

-- 
To view, visit https://gerrit.wikimedia.org/r/315416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95b2d4d0f94a2e7f42372615ea9c612845502b30
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Use hasMatchingAncestor for indetation command

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315415

Change subject: Use hasMatchingAncestor for indetation command
..

Use hasMatchingAncestor for indetation command

This also correctly requires all selected nodes to be in lists,
instead of just one.

Change-Id: I776f5a777189695a7fdcbe32323b34b732765fa5
---
M src/ui/commands/ve.ui.IndentationCommand.js
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/15/315415/1

diff --git a/src/ui/commands/ve.ui.IndentationCommand.js 
b/src/ui/commands/ve.ui.IndentationCommand.js
index cf79048..088c6f0 100644
--- a/src/ui/commands/ve.ui.IndentationCommand.js
+++ b/src/ui/commands/ve.ui.IndentationCommand.js
@@ -32,20 +32,11 @@
  * @inheritdoc
  */
 ve.ui.IndentationCommand.prototype.isExecutable = function ( fragment ) {
-   var i, len, nodes, any;
// Parent method
if ( !ve.ui.IndentationCommand.super.prototype.isExecutable.apply( 
this, arguments ) ) {
return false;
}
-   nodes = fragment.getSelectedLeafNodes();
-   any = false;
-   for ( i = 0, len = nodes.length; i < len; i++ ) {
-   if ( nodes[ i ].hasMatchingAncestor( 'listItem' ) ) {
-   any = true;
-   break;
-   }
-   }
-   return any;
+   return fragment.hasMatchingAncestor( 'listItem' );
 };
 
 /* Registration */

-- 
To view, visit https://gerrit.wikimedia.org/r/315415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I776f5a777189695a7fdcbe32323b34b732765fa5
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits