[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update cxserver to 0b2c3fa

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: Update cxserver to 0b2c3fa
..

Update cxserver to 0b2c3fa

List of changes:
f74a048 Add sc->srd mapping for Sardinian
185f22f Update Apertium pairs for Jessie
f99e633 Update some documentation
da9c2ca registry: Add missing da->nb,nn,sv pairs
4107a93 registry: Add is->simple pair
xxx Update node module dependencies

Change-Id: Ib0ac53faa3645f3d507ccffb293ac207c5668a24
---
M node_modules/bl/node_modules/readable-stream/node_modules/inherits/inherits.js
M 
node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json
D node_modules/bl/node_modules/readable-stream/node_modules/inherits/test.js
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/js/release/cancel.js
M node_modules/bluebird/js/release/debuggability.js
M node_modules/bluebird/js/release/each.js
M node_modules/bluebird/js/release/finally.js
M node_modules/bluebird/js/release/generators.js
M node_modules/bluebird/js/release/join.js
M node_modules/bluebird/js/release/map.js
M node_modules/bluebird/js/release/promise.js
M node_modules/bluebird/js/release/promise_array.js
M node_modules/bluebird/js/release/reduce.js
M node_modules/bluebird/js/release/schedule.js
M node_modules/bluebird/js/release/synchronous_inspection.js
M node_modules/bluebird/js/release/timers.js
M node_modules/bluebird/js/release/util.js
M node_modules/bluebird/package.json
D node_modules/bunyan/node_modules/moment/.npmignore
A node_modules/bunyan/node_modules/moment/locale/ar-ly.js
M node_modules/bunyan/node_modules/moment/locale/ar-tn.js
M node_modules/bunyan/node_modules/moment/locale/ar.js
M node_modules/bunyan/node_modules/moment/locale/bn.js
M node_modules/bunyan/node_modules/moment/locale/bs.js
M node_modules/bunyan/node_modules/moment/locale/cy.js
M node_modules/bunyan/node_modules/moment/locale/en-au.js
M node_modules/bunyan/node_modules/moment/locale/en-nz.js
M node_modules/bunyan/node_modules/moment/locale/gl.js
M node_modules/bunyan/node_modules/moment/locale/hr.js
M node_modules/bunyan/node_modules/moment/locale/ko.js
M node_modules/bunyan/node_modules/moment/locale/lb.js
M node_modules/bunyan/node_modules/moment/locale/me.js
A node_modules/bunyan/node_modules/moment/locale/mi.js
M node_modules/bunyan/node_modules/moment/locale/my.js
M node_modules/bunyan/node_modules/moment/locale/nl.js
M node_modules/bunyan/node_modules/moment/locale/sl.js
M node_modules/bunyan/node_modules/moment/locale/sq.js
M node_modules/bunyan/node_modules/moment/locale/sr-cyrl.js
M node_modules/bunyan/node_modules/moment/locale/sr.js
M node_modules/bunyan/node_modules/moment/locale/ss.js
M node_modules/bunyan/node_modules/moment/locale/th.js
M node_modules/bunyan/node_modules/moment/locale/tl-ph.js
M node_modules/bunyan/node_modules/moment/locale/tzl.js
A node_modules/bunyan/node_modules/moment/locale/zh-hk.js
M node_modules/bunyan/node_modules/moment/min/locales.js
M node_modules/bunyan/node_modules/moment/min/locales.min.js
M node_modules/bunyan/node_modules/moment/min/moment-with-locales.js
M node_modules/bunyan/node_modules/moment/min/moment-with-locales.min.js
M node_modules/bunyan/node_modules/moment/min/moment.min.js
M node_modules/bunyan/node_modules/moment/moment.d.ts
M node_modules/bunyan/node_modules/moment/moment.js
M node_modules/bunyan/node_modules/moment/package.json
M node_modules/bunyan/node_modules/moment/src/lib/create/from-string.js
M node_modules/bunyan/node_modules/moment/src/lib/create/valid.js
M node_modules/bunyan/node_modules/moment/src/lib/duration/create.js
M node_modules/bunyan/node_modules/moment/src/lib/units/day-of-week.js
M node_modules/bunyan/node_modules/moment/src/lib/units/month.js
M node_modules/bunyan/node_modules/moment/src/lib/units/offset.js
M node_modules/bunyan/node_modules/moment/src/lib/utils/deprecate.js
M node_modules/bunyan/node_modules/moment/src/lib/utils/is-object.js
A node_modules/bunyan/node_modules/moment/src/locale/ar-ly.js
M node_modules/bunyan/node_modules/moment/src/locale/ar-tn.js
M node_modules/bunyan/node_modules/moment/src/locale/ar.js
M node_modules/bunyan/node_modules/moment/src/locale/bn.js
M node_modules/bunyan/node_modules/moment/src/locale/bs.js
M node_modules/bunyan/node_modules/moment/src/locale/cy.js
M node_modules/bunyan/node_modules/moment/src/locale/en-au.js
M node_modules/bunyan/node_modules/moment/src/locale/en-nz.js
M node_modules/bunyan/node_modules/moment/src/locale/gl.js
M node_modules/bunyan/node_modules/moment/src/locale/hr.js
M node_modules/bunyan/node_modules/moment/src/locale/ko.js
M node_modules/bunyan/node_modules/moment/src/locale/lb.js
M node_modules/bunyan/node_modules/moment/src/locale/me.js
A 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move most of MWCryptRand into libs

[jenkins-bot (Code Review)]

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

Change subject: Move most of MWCryptRand into libs
..


Move most of MWCryptRand into libs

Dependency-inject the MW-specific parts of MWCryptRand via
MediaWikiServices into a generic CryptRand class that is in libs/.

Note that this removes the wfGetAllCallers() debug logging from
generate().

Change-Id: I9742735c266ee69fb247199d3c553cd2ad2a3987
---
M autoload.php
M includes/MediaWikiServices.php
M includes/ServiceWiring.php
A includes/libs/CryptRand.php
M includes/utils/MWCryptRand.php
M tests/phpunit/includes/MediaWikiServicesTest.php
6 files changed, 433 insertions(+), 350 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 5e81e83..cf491cb 100644
--- a/autoload.php
+++ b/autoload.php
@@ -295,6 +295,7 @@
'CreateAndPromote' => __DIR__ . '/maintenance/createAndPromote.php',
'CreateFileOp' => __DIR__ . 
'/includes/libs/filebackend/fileop/CreateFileOp.php',
'CreditsAction' => __DIR__ . '/includes/actions/CreditsAction.php',
+   'CryptRand' => __DIR__ . '/includes/libs/CryptRand.php',
'CssContent' => __DIR__ . '/includes/content/CssContent.php',
'CssContentHandler' => __DIR__ . 
'/includes/content/CssContentHandler.php',
'CsvStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index b16044e..0f56797 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -3,6 +3,7 @@
 
 use Config;
 use ConfigFactory;
+use CryptRand;
 use EventRelayerGroup;
 use GenderCache;
 use GlobalVarConfig;
@@ -524,6 +525,14 @@
 
/**
 * @since 1.28
+* @return CryptRand
+*/
+   public function getCryptRand() {
+   return $this->getService( 'CryptRand' );
+   }
+
+   /**
+* @since 1.28
 * @return MediaHandlerFactory
 */
public function getMediaHandlerFactory() {
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 11ee616..86f4578 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -39,6 +39,7 @@
 
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Linker\LinkRendererFactory;
+use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 
 return [
@@ -158,6 +159,31 @@
return new WatchedItemQueryService( 
$services->getDBLoadBalancer() );
},
 
+   'CryptRand' => function( MediaWikiServices $services ) {
+   $secretKey = $services->getMainConfig()->get( 'SecretKey' );
+   return new CryptRand(
+   [
+   // To try vary the system information of the 
state a bit more
+   // by including the system's hostname into the 
state
+   'wfHostname',
+   // It's mostly worthless but throw the wiki's 
id into the data
+   // for a little more variance
+   'wfWikiID',
+   // If we have a secret key set then throw it 
into the state as well
+   function() use ( $secretKey ) {
+   return $secretKey ?: '';
+   }
+   ],
+   // The config file is likely the most often edited file 
we know should
+   // be around so include its stat info into the state.
+   // The constant with its location will almost always be 
defined, as
+   // WebStart.php defines MW_CONFIG_FILE to 
$IP/LocalSettings.php unless
+   // being configured with MW_CONFIG_CALLBACK (e.g. the 
installer).
+   defined( 'MW_CONFIG_FILE' ) ? [ MW_CONFIG_FILE ] : [],
+   LoggerFactory::getInstance( 'CryptRand' )
+   );
+   },
+
'MediaHandlerFactory' => function( MediaWikiServices $services ) {
return new MediaHandlerFactory(
$services->getMainConfig()->get( 'MediaHandlers' )
diff --git a/includes/libs/CryptRand.php b/includes/libs/CryptRand.php
new file mode 100644
index 000..6d18c81
--- /dev/null
+++ b/includes/libs/CryptRand.php
@@ -0,0 +1,389 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @author Daniel Friesen
+ * @file
+ */
+use Psr\Log\LoggerInterface;
+
+class CryptRand {
+   /**
+* Minimum number of iterations we want to make in our drift 
calculations.
+*/
+   const MIN_ITERATIONS = 1000;
+
+   /**
+* Number of milliseconds we want to spend generating each separate byte
+* of the final generated bytes.
+* This is used in 

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Set valid $wgRateLimits in tests

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: Set valid $wgRateLimits in tests
..

Set valid $wgRateLimits in tests

Change-Id: Iacdd1719d5f08eca91de0a35c0042ffee2136f34
---
M tests/phpunit/CaptchaPreAuthenticationProviderTest.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/44/313944/1

diff --git a/tests/phpunit/CaptchaPreAuthenticationProviderTest.php 
b/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
index 3dcc63d..03016e1 100644
--- a/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
+++ b/tests/phpunit/CaptchaPreAuthenticationProviderTest.php
@@ -216,7 +216,14 @@
 * @dataProvider providePingLimiter
 */
public function testPingLimiter( array $attempts ) {
-   $this->mergeMwGlobalArrayValue( 'wgRateLimits', [ 'badcaptcha' 
=> 1 ] );
+   $this->mergeMwGlobalArrayValue(
+   'wgRateLimits',
+   [
+   'badcaptcha' => [
+   'user' => [ 1, 1 ],
+   ],
+   ]
+   );
$provider = new CaptchaPreAuthenticationProvider();
$provider->setManager( AuthManager::singleton() );
$providerAccess = TestingAccessWrapper::newFromObject( 
$provider );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacdd1719d5f08eca91de0a35c0042ffee2136f34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve Database::factory() $driver validation

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Improve Database::factory() $driver validation
..

Improve Database::factory() $driver validation

Change-Id: Ie034e6f2f94f0f1731dbe2468f075297d5a171a2
---
M includes/libs/rdbms/database/Database.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/313943/1

diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 16d30d7..9f1f228 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -352,7 +352,7 @@
} else {
$driver = $dbType;
}
-   if ( $driver === false ) {
+   if ( $driver === false || $driver === '' ) {
throw new InvalidArgumentException( __METHOD__ .
" no viable database extension found for type 
'$dbType'" );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie034e6f2f94f0f1731dbe2468f075297d5a171a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] maps...deploy[master]: Update tilerator to 51a246e

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Update tilerator to 51a246e
..

Update tilerator to 51a246e

List of changes:
3eb0a0a v0.0.16 Bumped npm-shrinkwrap
51a246e 0.0.17 removed npm-shrinkwrap, will use deploy repo
xxx Update node module dependencies

Change-Id: I058aa50f08852ca6ee05923fa9360128d9ff
---
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/lib/core.js
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
A node_modules/kartotherian-core/test/core.js
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M node_modules/kartotherian-postgres/node_modules/packet-reader/package.json
M 
node_modules/kartotherian-postgres/node_modules/pg-connection-string/package.json
D 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/inherits/LICENSE
D 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/inherits/inherits.js
D 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/inherits/inherits_browser.js
D 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/inherits/package.json
M node_modules/kartotherian-postgres/node_modules/pg-types/package.json
M node_modules/kartotherian-postgres/node_modules/pgpass/package.json
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/kue-ui/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/node_modules/number-is-nan/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/code-point-at/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/npmlog/node_modules/gauge/node_modules/string-width/node_modules/is-fullwidth-code-point/node_modules/number-is-nan/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rc/node_modules/minimist/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/form-data/node_modules/asynckit/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml
A 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/benchmark.js
M 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: wgRateLimits: Add configuration option to ignore 'noratelimi...

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review.

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

Change subject: wgRateLimits: Add configuration option to ignore 'noratelimit' 
right
..

wgRateLimits: Add configuration option to ignore 'noratelimit' right

It may be reasonable to ignore the 'noratelimit' right granted to a user
when perfuming some rate limit checks. As an example, a rate limit check
on failed authentication attempts should not be bypassed.

Add an optional '' configuration option for each
$wgRateLimits action that can be set to false to disable checking
User::isPingLimitable(). This bypasses both 'noratelimit' and
$wgRateLimitsExcludedIPs exclusions.

Change-Id: Ia3add8bbbab0307f036e9b77e752c382da3a0d04
---
M includes/DefaultSettings.php
M includes/user/User.php
2 files changed, 17 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/313941/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b1436b0..2ae33b2 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5533,13 +5533,7 @@
  * elapses.
  *
  * @par Example:
- * To set a generic maximum of 4 hits in 60 seconds:
- * @code
- * $wgRateLimits = [ 4, 60 ];
- * @endcode
- *
- * @par Example:
- * You could also limit per action and then type of users.
+ * Limits per configured per action and then type of users.
  * @code
  * $wgRateLimits = [
  * 'edit' => [
@@ -5548,8 +5542,20 @@
  * 'newbie' => [ x, y ], // each new autoconfirmed accounts; 
overrides 'user'
  * 'ip' => [ x, y ], // each anon and recent account
  * 'subnet' => [ x, y ], // ... within a /24 subnet in IPv4 or /64 
in IPv6
+ * 'groupName' => [ x, y ], // by group membership
  * ]
- * ]
+ * ];
+ * @endcode
+ *
+ * @par Normally, the 'noratelimit' right allows a user to bypass any rate
+ * limit checks. This can be disabled on a per-action basis by setting the
+ * special '' key to false in that action's configuration.
+ * @code
+ * $wgRateLimits = [
+ * 'some-action' => [
+ * '' => false,
+ * 'user' => [ x, y ],
+ * ];
  * @endcode
  *
  * @warning Requires that $wgMainCacheType is set to something persistent
diff --git a/includes/user/User.php b/includes/user/User.php
index 6083db9..9ae3e42 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1802,12 +1802,13 @@
return false;
}
 
+   $limits = $wgRateLimits[$action] + [ '' => true ];
+
// Some groups shouldn't trigger the ping limiter, ever
-   if ( !$this->isPingLimitable() ) {
+   if ( $limits[''] && !$this->isPingLimitable() ) {
return false;
}
 
-   $limits = $wgRateLimits[$action];
$keys = [];
$id = $this->getId();
$userLimit = false;

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: ButtonWidget: Switch `box-sizing` over to `border-box`

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: ButtonWidget: Switch `box-sizing` over to `border-box`
..

ButtonWidget: Switch `box-sizing` over to `border-box`

Switching `box-sizing` to `border-box` value, making it easier
to calculate sizes and centralizing occurences already in use
by widgets with buttons.

Bug: T146962
Change-Id: I618876ba6e1e397513f6a3ec001f2d815e755e9e
---
M src/styles/elements/ButtonElement.less
M src/styles/widgets/ComboBoxInputWidget.less
M src/styles/widgets/NumberInputWidget.less
M src/themes/mediawiki/common.less
M src/themes/mediawiki/elements.less
M src/themes/mediawiki/widgets.less
6 files changed, 14 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/40/313940/1

diff --git a/src/styles/elements/ButtonElement.less 
b/src/styles/elements/ButtonElement.less
index 4ec67f3..60903d2 100644
--- a/src/styles/elements/ButtonElement.less
+++ b/src/styles/elements/ButtonElement.less
@@ -7,6 +7,7 @@
> .oo-ui-buttonElement-button {
cursor: pointer;
display: inline-block;
+   .oo-ui-box-sizing( border-box );
vertical-align: middle;
font-family: inherit;
font-size: inherit;
diff --git a/src/styles/widgets/ComboBoxInputWidget.less 
b/src/styles/widgets/ComboBoxInputWidget.less
index a73a9ff..96c826c 100644
--- a/src/styles/widgets/ComboBoxInputWidget.less
+++ b/src/styles/widgets/ComboBoxInputWidget.less
@@ -22,7 +22,6 @@
 
> .oo-ui-buttonElement-button {
display: block;
-   .oo-ui-box-sizing( border-box );
overflow: hidden;
}
}
diff --git a/src/styles/widgets/NumberInputWidget.less 
b/src/styles/widgets/NumberInputWidget.less
index 57422d4..ad86406 100644
--- a/src/styles/widgets/NumberInputWidget.less
+++ b/src/styles/widgets/NumberInputWidget.less
@@ -9,10 +9,6 @@
.oo-ui-textInputWidget {
display: table-cell;
}
-
-   .oo-ui-buttonElement-button {
-   .oo-ui-box-sizing( border-box );
-   }
}
 
&-field {
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index e620458..8ba503d 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -54,6 +54,9 @@
 @border-toolbar: @border-width-default solid #c8ccd1;
 
 // Box Sizes
+@min-width-button-default: 3.125em; // equals `40px` at base `font-size: 0.8em`
+@min-width-button-combo-widget: 2.5em; // equals `32px` at base `font-size: 
0.8em`
+@min-height-button-default: 2.344em; // equals `30px` at base `font-size: 
0.8em`
 @min-height-toggleswitch: 26px; // equals `16px` @size-toggleswitch-grip-min + 
4px*2 distance top/bottom + 1px*2 border top/bottom
 @max-width-default: 50em;
 @max-width-input: @max-width-default;
@@ -64,6 +67,8 @@
 @size-indicator: unit( 12 / 16 / 0.8, em );
 @size-toggleswitch-grip-min: 16px;
 
+@width-button-combo-widget: @min-width-button-combo-widget;
+
 @border-default: @border-width-default solid @border-color-default;
 @border-disabled: @border-width-default solid @border-color-disabled;
 @border-disabled-filled: @border-width-default solid 
@border-color-disabled-filled;
diff --git a/src/themes/mediawiki/elements.less 
b/src/themes/mediawiki/elements.less
index 52c4b3e..3cf698a 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -165,8 +165,8 @@
 
> .oo-ui-buttonElement-button {
padding: 0.5em 1em;
-   min-height: 1.2em;
-   min-width: 1em;
+   min-height: @min-height-button-default;
+   min-width: @min-width-button-default;
border-radius: @border-radius-default;
position: relative;
}
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index fcf846d..c17a6dd 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -864,10 +864,12 @@
}
 
&-dropdownButton {
-   width: 2.5em;
+   width: @width-button-combo-widget;
 
.oo-ui-buttonElement-button {
-   padding: 0.5em;
+   min-width: @min-width-button-combo-widget;
+   padding-left: 0;
+   padding-right: 0;
}
 
.oo-ui-buttonElement-button,
@@ -1445,11 +1447,12 @@
 
&-buttoned {
.oo-ui-buttonWidget {
-   width: 2.5em;
+   width: @width-button-combo-widget;
}
 
.oo-ui-buttonElement-button 

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add more services to completion

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

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

Change subject: Add more services to completion
..

Add more services to completion

Change-Id: I2bc245be0af1ac3b2d460bb990f40d291da44f11
---
M wikibase/queryService/ui/editor/hint/Sparql.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/39/313939/1

diff --git a/wikibase/queryService/ui/editor/hint/Sparql.js 
b/wikibase/queryService/ui/editor/hint/Sparql.js
index 3e38292..44ab08c 100755
--- a/wikibase/queryService/ui/editor/hint/Sparql.js
+++ b/wikibase/queryService/ui/editor/hint/Sparql.js
@@ -18,7 +18,9 @@
'FILTER ()', 'FILTER NOT EXISTS', 'FILTER NOT EXISTS 
{\n\n}', 'UNION', 'UNION {\n\n}',
'BIND', 'BIND ()', 'GROUP_CONCAT', '(GROUP_CONCAT() as 
)', 'ORDER BY',
'#defaultView:Map', '#defaultView:ImageGrid', 
'#defaultView:Map', '#defaultView:BubbleChart',
-   '#defaultView:TreeMap', '#defaultView:Timeline', 
'#defaultView:Dimensions', '#defaultView:Graph'
+   '#defaultView:TreeMap', '#defaultView:Timeline', 
'#defaultView:Dimensions', '#defaultView:Graph',
+   'SERVICE wikibase:around {\n\t?place wdt:P625 ?location 
.\n\tbd:serviceParam wikibase:center ? .\n\tbd:serviceParam wikibase:radius ? 
.\n\tbd:serviceParam wikibase:distance ?dist .\n}',
+   'SERVICE wikibase:box {\n\t?place wdt:P625 ?location 
.\n\tbd:serviceParam wikibase:cornerWest ? .\n\tbd:serviceParam 
wikibase:cornerEast ? .\n}'
];
 
var SPARQL_PREDICATES = [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc245be0af1ac3b2d460bb990f40d291da44f11
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move MWCryptHash into libs/

[jenkins-bot (Code Review)]

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

Change subject: Move MWCryptHash into libs/
..


Move MWCryptHash into libs/

Remove the single wfDebug() call that was making this class MW specific,
someone can log the return value of MWCryptHash::hashAlgo() if they'd
like to know the specific implementation being used.

Change-Id: Ibb7ead7594edab7861631046dd8316daab613401
---
M autoload.php
R includes/libs/MWCryptHash.php
2 files changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 8d9a80f..5e81e83 100644
--- a/autoload.php
+++ b/autoload.php
@@ -771,7 +771,7 @@
'MWCallableUpdate' => __DIR__ . 
'/includes/deferred/MWCallableUpdate.php',
'MWContentSerializationException' => __DIR__ . 
'/includes/content/ContentHandler.php',
'MWCryptHKDF' => __DIR__ . '/includes/utils/MWCryptHKDF.php',
-   'MWCryptHash' => __DIR__ . '/includes/utils/MWCryptHash.php',
+   'MWCryptHash' => __DIR__ . '/includes/libs/MWCryptHash.php',
'MWCryptRand' => __DIR__ . '/includes/utils/MWCryptRand.php',
'MWDebug' => __DIR__ . '/includes/debug/MWDebug.php',
'MWDocGen' => __DIR__ . '/maintenance/mwdocgen.php',
diff --git a/includes/utils/MWCryptHash.php b/includes/libs/MWCryptHash.php
similarity index 97%
rename from includes/utils/MWCryptHash.php
rename to includes/libs/MWCryptHash.php
index 1117357..f9b7172 100644
--- a/includes/utils/MWCryptHash.php
+++ b/includes/libs/MWCryptHash.php
@@ -52,7 +52,6 @@
foreach ( $preference as $algorithm ) {
if ( in_array( $algorithm, $algos ) ) {
self::$algo = $algorithm;
-   wfDebug( __METHOD__ . ': Using the ' . 
self::$algo . " hash algorithm.\n" );
 
return self::$algo;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb7ead7594edab7861631046dd8316daab613401
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Parent5446 
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...cxserver[master]: registry: Add missing da->nb, nn, sv pairs

[jenkins-bot (Code Review)]

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

Change subject: registry: Add missing da->nb,nn,sv pairs
..


registry: Add missing da->nb,nn,sv pairs

Change-Id: Ib854e79a8911225913fa362df6347cdbac678992
---
M registry.wikimedia.yaml
M registry.yaml
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml
index 0ef3926..05721a5 100644
--- a/registry.wikimedia.yaml
+++ b/registry.wikimedia.yaml
@@ -591,6 +591,10 @@
   - simple
 cy:
   - simple
+da:
+  - nb
+  - nn
+  - sv
 en:
   - ca
   - eo
diff --git a/registry.yaml b/registry.yaml
index 3778d85..2332579 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -593,6 +593,10 @@
 cy:
   - en
   - simple
+da:
+  - nb
+  - nn
+  - sv
 en:
   - ca
   - eo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib854e79a8911225913fa362df6347cdbac678992
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Arrbee 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
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...cxserver[master]: registry: Add is->simple pair

[jenkins-bot (Code Review)]

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

Change subject: registry: Add is->simple pair
..


registry: Add is->simple pair

is->en is supported, so is->simple can be added.

Change-Id: Iae26eac3067b7f1d8f349bab06a371ea9615cd2d
---
M registry.wikimedia.yaml
M registry.yaml
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml
index 0ef3926..3324303 100644
--- a/registry.wikimedia.yaml
+++ b/registry.wikimedia.yaml
@@ -626,6 +626,7 @@
 id:
   - ms
 is:
+  - simple
   - sv
 it:
   - ca
diff --git a/registry.yaml b/registry.yaml
index 3778d85..a364d28 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -633,6 +633,7 @@
   - ms
 is:
   - en
+  - simple
   - sv
 it:
   - ca

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae26eac3067b7f1d8f349bab06a371ea9615cd2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Arrbee 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
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...cxserver[master]: registry: Add is->simple pair

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: registry: Add is->simple pair
..

registry: Add is->simple pair

is->en is supported, so is->simple can be added.

Change-Id: Iae26eac3067b7f1d8f349bab06a371ea9615cd2d
---
M registry.wikimedia.yaml
M registry.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/38/313938/1

diff --git a/registry.wikimedia.yaml b/registry.wikimedia.yaml
index 0ef3926..3324303 100644
--- a/registry.wikimedia.yaml
+++ b/registry.wikimedia.yaml
@@ -626,6 +626,7 @@
 id:
   - ms
 is:
+  - simple
   - sv
 it:
   - ca
diff --git a/registry.yaml b/registry.yaml
index 3778d85..a364d28 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -633,6 +633,7 @@
   - ms
 is:
   - en
+  - simple
   - sv
 it:
   - ca

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae26eac3067b7f1d8f349bab06a371ea9615cd2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Exception fix to Converter

[jenkins-bot (Code Review)]

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

Change subject: Exception fix to Converter
..


Exception fix to Converter

* Don't output error for normal 'end of list' cases.

Change-Id: I803458b2383a0ac7f091a0a8d3417ff444a3be4c
---
M includes/Import/LiquidThreadsApi/Source.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/Import/LiquidThreadsApi/Source.php 
b/includes/Import/LiquidThreadsApi/Source.php
index 53d2d5a..c4e70c5 100644
--- a/includes/Import/LiquidThreadsApi/Source.php
+++ b/includes/Import/LiquidThreadsApi/Source.php
@@ -316,12 +316,12 @@
$data = $this->apiCall( $conditions );
 
if ( ! isset( $data['query'] ) ) {
-   $this->logger->error( __METHOD__ . ': Failed API call 
against ' . $this->getKey() . ' with conditions : ' . json_encode( $conditions 
) );
if ( $this->isNotFoundError( $data ) ) {
$message = "Did not find pages: " . 
json_encode( $conditions );
$this->logger->debug( __METHOD__ . ": $message" 
);
throw new ApiNotFoundException( $message );
} else {
+   $this->logger->error( __METHOD__ . ': Failed 
API call against ' . $this->getKey() . ' with conditions : ' . json_encode( 
$conditions ) );
throw new ImportException( "Null response from 
API module: " . json_encode( $data ) );
}
} elseif ( !$expectContinue && isset( $data['continue'] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I803458b2383a0ac7f091a0a8d3417ff444a3be4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
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]: Configuration for Aphlict

[20after4 (Code Review)]

20after4 has uploaded a new change for review.

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

Change subject: Configuration for Aphlict
..

Configuration for Aphlict

Aphlict is the node.js-based websocket server that powers the
Phabricator real-time notification service refs T112765, T765

Bug: T112765
Change-Id: I182e2e28e38514cb03e8ac79192fe165ad6e6ee0
---
A modules/phabricator/files/logrotate_aphlict
A modules/phabricator/manifests/aphlict.pp
A modules/phabricator/templates/aphlict-config.json.erb
A modules/phabricator/templates/aphlict-upstart.conf.erb
A modules/phabricator/templates/aphlict.service.erb
5 files changed, 161 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/313937/1

diff --git a/modules/phabricator/files/logrotate_aphlict 
b/modules/phabricator/files/logrotate_aphlict
new file mode 100644
index 000..99b5672
--- /dev/null
+++ b/modules/phabricator/files/logrotate_aphlict
@@ -0,0 +1,8 @@
+/var/log/aphlict {
+daily
+compress
+delaycompress
+missingok
+notifempty
+rotate 7
+}
diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
new file mode 100644
index 000..aa4d971
--- /dev/null
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -0,0 +1,98 @@
+# == Class: phabricator::aphlict
+# Aphlict is the phabricator real-time notification relay service.
+# Docs: https://secure.phabricator.com/book/phabricator/article/notifications/
+class phabricator::aphlict(
+$user   = 'aphlict',
+$group  = 'aphlict',
+) {
+# packages
+require_package('nodejs')
+
+# paths
+$basedir = $phabricator::phabdir
+$phabdir = "${basedir}/phabricator/"
+$aphlict_dir = "${phabdir}/support/aphlict/server"
+$node_modules = "${aphlict_dir}/node_modules"
+$aphlict_conf = "${basedir}/aphlict/config.json"
+$aphlict_cmd = "${phabdir}/bin/aphlict start --config ${aphlict_conf}"
+
+# Ordering
+Package['nodejs'] -> File[$aphlict_conf] ~> Service['aphlict']
+File['/var/run/aphlict/'] -> File['/var/log/aphlict/'] -> 
Service['aphlict']
+User[$user] -> Service['aphlict']
+File[$node_modules] ~> Service['aphlict']
+
+# Defines
+file { $node_modules:
+ensure => 'link',
+target => "${basedir}/aphlict/node_modules",
+}
+
+file { $aphlict_conf:
+ensure  => 'present',
+content => template('phabricator/aphlict-config.json.erb'),
+owner   => $user,
+group   => $group,
+mode=> '0644',
+}
+
+if $::initsystem == 'upstart' {
+# upstart init conf file
+$init_file = '/etc/init/aphlict.conf'
+$init_source = 'aphlict-upstart.conf.erb'
+} else {
+# systemd service unit
+$init_file = '/etc/systemd/system/aphlict.service'
+$init_source = 'aphlict.service.erb'
+}
+
+file { '/etc/init.d/aphlict':
+ensure => 'link',
+target => "${phabdir}/bin/aphlict",
+}
+
+file { $init_file:
+content => template("phabricator/${init_source}"),
+mode=> '0644',
+owner   => 'root',
+group   => 'root',
+}
+
+service { 'aphlict':
+ensure => running,
+provider   => $::initsystem,
+hasrestart => true,
+}
+
+file { '/var/run/aphlict/':
+ensure => 'directory',
+owner  => $user,
+group  => $group,
+}
+
+file { '/var/log/aphlict/':
+ensure => 'directory',
+owner  => $user,
+group  => $group,
+}
+
+logrotate::conf { 'aphlict':
+ensure  => 'present',
+source  => 'puppet:///modules/phabricator/logrotate_aphlict',
+require => File['/var/log/aphlict/']
+}
+
+# accounts
+group { $group:
+ensure => 'present',
+system => true,
+}
+
+user { $user:
+gid=> 'aphlict',
+shell  => '/bin/false',
+home   => '/var/run/aphlict',
+system => true,
+}
+
+}
diff --git a/modules/phabricator/templates/aphlict-config.json.erb 
b/modules/phabricator/templates/aphlict-config.json.erb
new file mode 100644
index 000..56b6556
--- /dev/null
+++ b/modules/phabricator/templates/aphlict-config.json.erb
@@ -0,0 +1,26 @@
+{
+  "servers": [
+{
+  "type": "client",
+  "port": 22280,
+  "listen": "0.0.0.0",
+  "ssl.key": null,
+  "ssl.cert": null,
+  "ssl.chain": null
+},
+{
+  "type": "admin",
+  "port": 22281,
+  "listen": "127.0.0.1",
+  "ssl.key": null,
+  "ssl.cert": null,
+  "ssl.chain": null
+}
+  ],
+  "logs": [
+{
+  "path": "/var/log/aphlict/aphlict.log"
+}
+  ],
+  "pidfile": "/var/run/aphlict/aphlict.pid"
+}
diff --git a/modules/phabricator/templates/aphlict-upstart.conf.erb 
b/modules/phabricator/templates/aphlict-upstart.conf.erb
new file mode 100644
index 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Set default load monitor class in LBFactoryMulti

[jenkins-bot (Code Review)]

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

Change subject: Set default load monitor class in LBFactoryMulti
..


Set default load monitor class in LBFactoryMulti

Bug: T147240
Change-Id: I6d1c86e714d537f43b01bbf9581032aec2a4e59b
---
M includes/libs/rdbms/lbfactory/LBFactoryMulti.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php 
b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index bee32dc..83ca650 100644
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -95,7 +95,7 @@
private $extLBs = [];
 
/** @var string */
-   private $loadMonitorClass;
+   private $loadMonitorClass = 'LoadMonitor';
 
/** @var string */
private $lastDomain;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d1c86e714d537f43b01bbf9581032aec2a4e59b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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]: Set default load monitor class in LBFactoryMulti

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Set default load monitor class in LBFactoryMulti
..

Set default load monitor class in LBFactoryMulti

Bug: T147240
Change-Id: I6d1c86e714d537f43b01bbf9581032aec2a4e59b
---
M includes/libs/rdbms/lbfactory/LBFactoryMulti.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/313936/1

diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php 
b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index bee32dc..83ca650 100644
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -95,7 +95,7 @@
private $extLBs = [];
 
/** @var string */
-   private $loadMonitorClass;
+   private $loadMonitorClass = 'LoadMonitor';
 
/** @var string */
private $lastDomain;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d1c86e714d537f43b01bbf9581032aec2a4e59b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: http: Use Psr\Log instead of wfDebug*

[jenkins-bot (Code Review)]

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

Change subject: http: Use Psr\Log instead of wfDebug*
..


http: Use Psr\Log instead of wfDebug*

MWHttpRequest::factory() will pass in a logger to move the dependency up
to the factory instead of individual functions.

Change-Id: I4e428f060c90ef49cb3acb3e3dceab64bd952330
---
M includes/http/CurlHttpRequest.php
M includes/http/Http.php
M includes/http/MWHttpRequest.php
M includes/http/PhpHttpRequest.php
4 files changed, 38 insertions(+), 7 deletions(-)

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



diff --git a/includes/http/CurlHttpRequest.php 
b/includes/http/CurlHttpRequest.php
index 7714818..f58c3a9 100644
--- a/includes/http/CurlHttpRequest.php
+++ b/includes/http/CurlHttpRequest.php
@@ -108,7 +108,7 @@
if ( $this->followRedirects && $this->canFollowRedirects() ) {
MediaWiki\suppressWarnings();
if ( !curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, 
true ) ) {
-   wfDebug( __METHOD__ . ": Couldn't set 
CURLOPT_FOLLOWLOCATION. " .
+   $this->logger->debug( __METHOD__ . ": Couldn't 
set CURLOPT_FOLLOWLOCATION. " .
"Probably open_basedir is set.\n" );
// Continue the processing. If it were in 
curl_setopt_array,
// processing would have halted on its entry
@@ -149,13 +149,13 @@
public function canFollowRedirects() {
$curlVersionInfo = curl_version();
if ( $curlVersionInfo['version_number'] < 0x071304 ) {
-   wfDebug( "Cannot follow redirects with libcurl < 7.19.4 
due to CVE-2009-0037\n" );
+   $this->logger->debug( "Cannot follow redirects with 
libcurl < 7.19.4 due to CVE-2009-0037\n" );
return false;
}
 
if ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
if ( strval( ini_get( 'open_basedir' ) ) !== '' ) {
-   wfDebug( "Cannot follow redirects when 
open_basedir is set\n" );
+   $this->logger->debug( "Cannot follow redirects 
when open_basedir is set\n" );
return false;
}
}
diff --git a/includes/http/Http.php b/includes/http/Http.php
index 46d2047..43ae2d0 100644
--- a/includes/http/Http.php
+++ b/includes/http/Http.php
@@ -50,6 +50,7 @@
 *  to avoid attacks on intranet 
services accessible by HTTP.
 *- userAgent   A user agent, if you want to override the 
default
 *  MediaWiki/$wgVersion
+*- logger  A \Psr\Logger\LoggerInterface instance for 
debug logging
 * @param string $caller The method making this request, for profiling
 * @return string|bool (bool)false on failure or a string on success
 */
diff --git a/includes/http/MWHttpRequest.php b/includes/http/MWHttpRequest.php
index 30a5c21..458854a 100644
--- a/includes/http/MWHttpRequest.php
+++ b/includes/http/MWHttpRequest.php
@@ -18,6 +18,11 @@
  * @file
  */
 
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\NullLogger;
+
 /**
  * This wrapper class will call out to curl (if available) or fallback
  * to regular PHP if necessary for handling internal HTTP requests.
@@ -25,7 +30,7 @@
  * Renamed from HttpRequest to MWHttpRequest to avoid conflict with
  * PHP's HTTP extension.
  */
-class MWHttpRequest {
+class MWHttpRequest implements LoggerAwareInterface {
const SUPPORTS_FILE_POSTS = false;
 
protected $content;
@@ -68,6 +73,11 @@
protected $profileName;
 
/**
+* @var LoggerInterface;
+*/
+   protected $logger;
+
+   /**
 * @param string $url Url to use. If protocol-relative, will be 
expanded to an http:// URL
 * @param array $options (optional) extra params to pass (see 
Http::request())
 * @param string $caller The method making this request, for profiling
@@ -80,6 +90,12 @@
 
$this->url = wfExpandUrl( $url, PROTO_HTTP );
$this->parsedUrl = wfParseUrl( $this->url );
+
+   if ( isset( $options['logger'] ) ) {
+   $this->logger = $options['logger'];
+   } else {
+   $this->logger = new NullLogger();
+   }
 
if ( !$this->parsedUrl || !Http::isValidURI( $this->url ) ) {
$this->status = Status::newFatal( 'http-invalid-url', 
$url );
@@ -125,6 +141,13 @@
}
 
/**
+* @param LoggerInterface $logger
+*/
+   public function 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split HttpFunctions.php into separate files

[jenkins-bot (Code Review)]

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

Change subject: Split HttpFunctions.php into separate files
..


Split HttpFunctions.php into separate files

Change-Id: I30d5f77de08e42ec43baf5722f40d9205c4bde67
---
M autoload.php
D includes/HttpFunctions.php
A includes/http/CurlHttpRequest.php
A includes/http/Http.php
A includes/http/MWHttpRequest.php
A includes/http/PhpHttpRequest.php
6 files changed, 1,177 insertions(+), 1,126 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index 8d9a80f..41875de 100644
--- a/autoload.php
+++ b/autoload.php
@@ -298,7 +298,7 @@
'CssContent' => __DIR__ . '/includes/content/CssContent.php',
'CssContentHandler' => __DIR__ . 
'/includes/content/CssContentHandler.php',
'CsvStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
-   'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+   'CurlHttpRequest' => __DIR__ . '/includes/http/CurlHttpRequest.php',
'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
'DBAccessError' => __DIR__ . 
'/includes/libs/rdbms/exception/DBAccessError.php',
'DBAccessObjectUtils' => __DIR__ . 
'/includes/dao/DBAccessObjectUtils.php',
@@ -576,7 +576,7 @@
'Html' => __DIR__ . '/includes/Html.php',
'HtmlArmor' => __DIR__ . '/includes/libs/HtmlArmor.php',
'HtmlFormatter' => __DIR__ . '/includes/HtmlFormatter.php',
-   'Http' => __DIR__ . '/includes/HttpFunctions.php',
+   'Http' => __DIR__ . '/includes/http/Http.php',
'HttpError' => __DIR__ . '/includes/exception/HttpError.php',
'HttpStatus' => __DIR__ . '/includes/libs/HttpStatus.php',
'IApiMessage' => __DIR__ . '/includes/api/ApiMessage.php',
@@ -780,7 +780,7 @@
'MWExceptionRenderer' => __DIR__ . 
'/includes/exception/MWExceptionRenderer.php',
'MWFileProps' => __DIR__ . '/includes/utils/MWFileProps.php',
'MWGrants' => __DIR__ . '/includes/utils/MWGrants.php',
-   'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+   'MWHttpRequest' => __DIR__ . '/includes/http/MWHttpRequest.php',
'MWLBFactory' => __DIR__ . '/includes/db/MWLBFactory.php',
'MWMemcached' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
'MWMessagePack' => __DIR__ . '/includes/libs/MWMessagePack.php',
@@ -1057,7 +1057,7 @@
'Pbkdf2Password' => __DIR__ . '/includes/password/Pbkdf2Password.php',
'PerRowAugmentor' => __DIR__ . '/includes/search/PerRowAugmentor.php',
'PermissionsError' => __DIR__ . 
'/includes/exception/PermissionsError.php',
-   'PhpHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+   'PhpHttpRequest' => __DIR__ . '/includes/http/PhpHttpRequest.php',
'PhpXmlBugTester' => __DIR__ . '/includes/installer/PhpBugTests.php',
'Pingback' => __DIR__ . '/includes/Pingback.php',
'PoolCounter' => __DIR__ . '/includes/poolcounter/PoolCounter.php',
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
deleted file mode 100644
index 2ca5e1b..000
--- a/includes/HttpFunctions.php
+++ /dev/null
@@ -1,1122 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup HTTP
- */
-
-/**
- * @defgroup HTTP HTTP
- */
-
-use MediaWiki\Logger\LoggerFactory;
-
-/**
- * Various HTTP related functions
- * @ingroup HTTP
- */
-class Http {
-   static public $httpEngine = false;
-
-   /**
-* Perform an HTTP request
-*
-* @param string $method HTTP method. Usually GET/POST
-* @param string $url Full URL to act on. If protocol-relative, will be 
expanded to an http:// URL
-* @param array $options Options to pass to MWHttpRequest object.
-*  Possible keys for the array:
-*- timeout Timeout length in seconds
-*- connectTimeout  Timeout for connection, in seconds (curl 
only)
-*- postDataAn array of key-value pairs or a 
url-encoded form data
-*- proxy   The proxy to use.
-*  Otherwise it will use $wgHTTPProxy (if set)
-*  Otherwise it will use the environment 
variable "http_proxy" (if set)
-*- noProxy Don't use any proxy at all. Takes 
precedence over proxy value(s).
-*- sslVerifyHost   Verify hostname against certificate
-*- sslVerifyCert   Verify SSL certificate
-*- caInfo  Provide CA information
-*- maxRedirectsMaximum number of redirects to follow 
(defaults to 5)
-*- followRedirects Whether to follow redirects (defaults to 
false).
-*  Note: this should only be used when 
the target URL is trusted,
-*  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove pre-5.5 compat from MultiHttpClient

[jenkins-bot (Code Review)]

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

Change subject: Remove pre-5.5 compat from MultiHttpClient
..


Remove pre-5.5 compat from MultiHttpClient

Change-Id: I5f9f1a94c0207a14c0d5cc77292aa04af4ac6470
---
M includes/libs/MultiHttpClient.php
1 file changed, 11 insertions(+), 22 deletions(-)

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



diff --git a/includes/libs/MultiHttpClient.php 
b/includes/libs/MultiHttpClient.php
index fdcbf49..a870204 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -184,14 +184,12 @@
unset( $req ); // don't assign over this by accident
 
$indexes = array_keys( $reqs );
-   if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
-   if ( isset( $opts['usePipelining'] ) ) {
-   curl_multi_setopt( $chm, CURLMOPT_PIPELINING, 
(int)$opts['usePipelining'] );
-   }
-   if ( isset( $opts['maxConnsPerHost'] ) ) {
-   // Keep these sockets around as they may be 
needed later in the request
-   curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, 
(int)$opts['maxConnsPerHost'] );
-   }
+   if ( isset( $opts['usePipelining'] ) ) {
+   curl_multi_setopt( $chm, CURLMOPT_PIPELINING, 
(int)$opts['usePipelining'] );
+   }
+   if ( isset( $opts['maxConnsPerHost'] ) ) {
+   // Keep these sockets around as they may be needed 
later in the request
+   curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, 
(int)$opts['maxConnsPerHost'] );
}
 
// @TODO: use a per-host rolling handle window (e.g. 
CURLMOPT_MAX_HOST_CONNECTIONS)
@@ -258,10 +256,8 @@
unset( $req ); // don't assign over this by accident
 
// Restore the default settings
-   if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
-   curl_multi_setopt( $chm, CURLMOPT_PIPELINING, 
(int)$this->usePipelining );
-   curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, 
(int)$this->maxConnsPerHost );
-   }
+   curl_multi_setopt( $chm, CURLMOPT_PIPELINING, 
(int)$this->usePipelining );
+   curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, 
(int)$this->maxConnsPerHost );
 
return $reqs;
}
@@ -292,12 +288,7 @@
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 
$url = $req['url'];
-   // PHP_QUERY_RFC3986 is PHP 5.4+ only
-   $query = str_replace(
-   [ '+', '%7E' ],
-   [ '%20', '~' ],
-   http_build_query( $req['query'], '', '&' )
-   );
+   $query = http_build_query( $req['query'], '', '&', 
PHP_QUERY_RFC3986 );
if ( $query != '' ) {
$url .= strpos( $req['url'], '?' ) === false ? 
"?$query" : "&$query";
}
@@ -422,10 +413,8 @@
protected function getCurlMulti() {
if ( !$this->multiHandle ) {
$cmh = curl_multi_init();
-   if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 
5.5
-   curl_multi_setopt( $cmh, CURLMOPT_PIPELINING, 
(int)$this->usePipelining );
-   curl_multi_setopt( $cmh, CURLMOPT_MAXCONNECTS, 
(int)$this->maxConnsPerHost );
-   }
+   curl_multi_setopt( $cmh, CURLMOPT_PIPELINING, 
(int)$this->usePipelining );
+   curl_multi_setopt( $cmh, CURLMOPT_MAXCONNECTS, 
(int)$this->maxConnsPerHost );
$this->multiHandle = $cmh;
}
return $this->multiHandle;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f9f1a94c0207a14c0d5cc77292aa04af4ac6470
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Aaron Schulz 
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]: Don't use wfHttpError in Special:MobileLanguages

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Don't use wfHttpError in Special:MobileLanguages
..

Don't use wfHttpError in Special:MobileLanguages

Bug: T127818
Change-Id: I76692ea775f1b53fffa7ab0b5513ad0e2ef274b7
---
M includes/specials/SpecialMobileLanguages.php
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/includes/specials/SpecialMobileLanguages.php 
b/includes/specials/SpecialMobileLanguages.php
index 9cb9606..2272f2d 100644
--- a/includes/specials/SpecialMobileLanguages.php
+++ b/includes/specials/SpecialMobileLanguages.php
@@ -134,17 +134,17 @@
 * @param string $pagename The name of the page
 */
public function executeWhenAvailable( $pagename ) {
+   $output = $this->getOutput();
if ( !is_string( $pagename ) || $pagename === '' ) {
-   wfHttpError( 404, $this->msg( 
'mobile-frontend-languages-404-title' )->text(),
-   $this->msg( 
'mobile-frontend-languages-404-desc' )->text()
+   $output->setStatusCode( 404 );
+   throw new ErrorPageError(
+   $this->msg( 
'mobile-frontend-languages-404-title' ),
+   $this->msg( 
'mobile-frontend-languages-404-desc' )
);
-
-   return;
}
 
$this->title = Title::newFromText( $pagename );
 
-   $output = $this->getOutput();
 
$html = '';
if ( $this->title && $this->title->exists() ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76692ea775f1b53fffa7ab0b5513ad0e2ef274b7
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/core[master]: Restore Content-Language header change from e53ff931a

[jenkins-bot (Code Review)]

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

Change subject: Restore Content-Language header change from e53ff931a
..


Restore Content-Language header change from e53ff931a

This was lost in a rebase at some point.

Change-Id: I46f376a82205a5c99b98c9e971f9e9d7868ce9fb
---
M includes/cache/HTMLFileCache.php
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index a85639f..060837e 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -167,9 +167,10 @@
$context->getTitle()->resetArticleID( 0 );
}
 
+   $contLang = $config->get( 'ContLang' );
$context->getOutput()->sendCacheControl();
header( "Content-Type: {$config->get( 'MimeType' )}; 
charset=UTF-8" );
-   header( "Content-Language: {$config->get( 'LanguageCode' )}" );
+   header( "Content-Language: {$contLang->getHtmlCode()}" );
if ( $this->useGzip() ) {
if ( wfClientAcceptsGzip() ) {
header( 'Content-Encoding: gzip' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46f376a82205a5c99b98c9e971f9e9d7868ce9fb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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...UserMerge[master]: Remove old UserMerge special page class alias

[jenkins-bot (Code Review)]

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

Change subject: Remove old UserMerge special page class alias
..


Remove old UserMerge special page class alias

Change-Id: Ie9e1231ea4f73a94d14f7c588befcbd4060205d7
---
M SpecialUserMerge.php
M extension.json
2 files changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index 9180b73..bdf7d5b 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -174,10 +174,3 @@
return 'users';
}
 }
-
-/**
- * Former class name, for backwards compatability
- * @deprecated
- */
-class UserMerge extends SpecialUserMerge {
-}
diff --git a/extension.json b/extension.json
index e0a3364..7d77f4b 100644
--- a/extension.json
+++ b/extension.json
@@ -39,7 +39,6 @@
},
"AutoloadClasses": {
"SpecialUserMerge": "SpecialUserMerge.php",
-   "UserMerge": "SpecialUserMerge.php",
"MergeUser": "MergeUser.php",
"IUserMergeLogger": "IUserMergeLogger.php",
"UserMergeLogger": "UserMergeLogger.php"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9e1231ea4f73a94d14f7c588befcbd4060205d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Reedy 
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]: Revert "Localisation updates from https://translatewiki.net."

[jenkins-bot (Code Review)]

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

Change subject: Revert "Localisation updates from https://translatewiki.net.;
..


Revert "Localisation updates from https://translatewiki.net.;

Broke the tests.

This reverts commit 17ef4586787be33bf00980c42516bed6643656b3.

Bug: T147245
Change-Id: Ic5db3a4243c9543e12852faecf4f2425b16bab39
---
M includes/installer/i18n/nl.json
M includes/installer/i18n/pl.json
M languages/i18n/ace.json
M languages/i18n/ar.json
M languages/i18n/be-tarask.json
M languages/i18n/be.json
M languages/i18n/cdo.json
M languages/i18n/diq.json
M languages/i18n/egl.json
M languages/i18n/eu.json
M languages/i18n/fr.json
M languages/i18n/gor.json
M languages/i18n/got.json
M languages/i18n/he.json
M languages/i18n/lb.json
M languages/i18n/li.json
M languages/i18n/lv.json
M languages/i18n/lzz.json
M languages/i18n/mr.json
M languages/i18n/nl.json
M languages/i18n/pl.json
M languages/i18n/pt.json
M languages/i18n/qqq.json
M languages/i18n/sl.json
M languages/i18n/ur.json
M languages/i18n/vi.json
M languages/i18n/zh-hans.json
27 files changed, 84 insertions(+), 128 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/installer/i18n/nl.json b/includes/installer/i18n/nl.json
index 0a77232..78649ce 100644
--- a/includes/installer/i18n/nl.json
+++ b/includes/installer/i18n/nl.json
@@ -57,7 +57,7 @@
"config-restart": "Ja, opnieuw starten",
"config-welcome": "=== Controle omgeving ===\nEr worden een aantal 
basiscontroles uitgevoerd met als doel vast te stellen of deze omgeving 
geschikt is voor een installatie van MediaWiki.\nLever deze gegevens aan als u 
ondersteuning vraagt bij de installatie.",
"config-copyright": "=== Auteursrechten en voorwaarden ===\n\n$1\n\nDit 
programma is vrije software. U mag het verder verspreiden en/of aanpassen in 
overeenstemming met de voorwaarden van de GNU General Public License zoals 
uitgegeven door de Free Software Foundation; ofwel versie 2 van de Licentie of 
- naar uw keuze - enige latere versie.\n\nDit programma wordt verspreid in de 
hoop dat het nuttig is, maar '''zonder enige garantie''', zelfs zonder de 
impliciete garantie van '''verkoopbaarheid''' of '''geschiktheid voor een 
bepaald doel'''.\nZie de GNU General Public License voor meer 
informatie.\n\nSamen met dit programma hoort u een exemplaar van de GNU General Public License ontvangen te 
hebben; zo niet, schrijf dan aan de Free Software Foundation, Inc., 51 Franklin 
Street, Fifth Floor, Boston, MA 02110-1301, Verenigde Staten. Of 
[http://www.gnu.org/copyleft/gpl.html lees de licentie online].",
-   "config-sidebar": "* [https://www.mediawiki.org 
MediaWiki-thuispagina]\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents 
Gebruikershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents 
Beheerdershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Veelgestelde 
vragen] (Engelstalig)\n\n* Leesmij 
(Engelstalig)\n* Release notes 
(Engelstalig)\n* Kopiëren (Engelstalig)\n* 
Versie bijwerken (Engelstalig)",
+   "config-sidebar": "* [https://www.mediawiki.org MediaWiki 
thuispagina]\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents 
Gebruikershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents 
Beheerdershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Veelgestelde 
vragen] (Engelstalig)\n\n* Leesmij 
(Engelstalig)\n* Release notes 
(Engelstalig)\n* Kopiëren (Engelstalig)\n* 
Versie bijwerken (Engelstalig)",
"config-env-good": "De omgeving is gecontroleerd.\nU kunt MediaWiki 
installeren.",
"config-env-bad": "De omgeving is gecontroleerd.\nU kunt MediaWiki niet 
installeren.",
"config-env-php": "PHP $1 is op dit moment geïnstalleerd.",
@@ -193,7 +193,7 @@
"config-ns-site-name": "Zelfde als de wiki: $1",
"config-ns-other": "Andere (geef aan welke)",
"config-ns-other-default": "MijnWiki",
-   "config-project-namespace-help": "In het kielzog van Wikipedia beheren 
veel wiki's hun beleidspagina's apart van hun inhoudelijke pagina's in een 
'''projectnaamruimte'''.\nAlle paginanamen in deze naamruimte beginnen met een 
bepaald voorvoegsel dat u hier kunt opgeven.\nDit voorvoegsel wordt meestal 
afgeleid van de naam van de wiki, maar het kan geen bijzondere tekens bevatten 
als \"#\" of \":\".",
+   "config-project-namespace-help": "In het kielzog van Wikipedia beheren 
veel wiki's hun beleidspagina's apart van hun inhoudelijke pagina's in een 
\"'''projectnaamruimte'''\".\nAlle paginanamen in deze naamruimte beginnen met 
een bepaald voorvoegsel dat u hier kunt opgeven.\nDit voorvoegsel wordt meestal 
afgeleid van de naam van de wiki, maar het kan geen 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "Localisation updates from https://translatewiki.net."

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Revert "Localisation updates from https://translatewiki.net.;
..

Revert "Localisation updates from https://translatewiki.net.;

Broke the tests.

This reverts commit 17ef4586787be33bf00980c42516bed6643656b3.

Bug: T147245
Change-Id: Ic5db3a4243c9543e12852faecf4f2425b16bab39
---
M includes/installer/i18n/nl.json
M includes/installer/i18n/pl.json
M languages/i18n/ace.json
M languages/i18n/ar.json
M languages/i18n/be-tarask.json
M languages/i18n/be.json
M languages/i18n/cdo.json
M languages/i18n/diq.json
M languages/i18n/egl.json
M languages/i18n/eu.json
M languages/i18n/fr.json
M languages/i18n/gor.json
M languages/i18n/got.json
M languages/i18n/he.json
M languages/i18n/lb.json
M languages/i18n/li.json
M languages/i18n/lv.json
M languages/i18n/lzz.json
M languages/i18n/mr.json
M languages/i18n/nl.json
M languages/i18n/pl.json
M languages/i18n/pt.json
M languages/i18n/qqq.json
M languages/i18n/sl.json
M languages/i18n/ur.json
M languages/i18n/vi.json
M languages/i18n/zh-hans.json
27 files changed, 84 insertions(+), 128 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/313934/1

diff --git a/includes/installer/i18n/nl.json b/includes/installer/i18n/nl.json
index 0a77232..78649ce 100644
--- a/includes/installer/i18n/nl.json
+++ b/includes/installer/i18n/nl.json
@@ -57,7 +57,7 @@
"config-restart": "Ja, opnieuw starten",
"config-welcome": "=== Controle omgeving ===\nEr worden een aantal 
basiscontroles uitgevoerd met als doel vast te stellen of deze omgeving 
geschikt is voor een installatie van MediaWiki.\nLever deze gegevens aan als u 
ondersteuning vraagt bij de installatie.",
"config-copyright": "=== Auteursrechten en voorwaarden ===\n\n$1\n\nDit 
programma is vrije software. U mag het verder verspreiden en/of aanpassen in 
overeenstemming met de voorwaarden van de GNU General Public License zoals 
uitgegeven door de Free Software Foundation; ofwel versie 2 van de Licentie of 
- naar uw keuze - enige latere versie.\n\nDit programma wordt verspreid in de 
hoop dat het nuttig is, maar '''zonder enige garantie''', zelfs zonder de 
impliciete garantie van '''verkoopbaarheid''' of '''geschiktheid voor een 
bepaald doel'''.\nZie de GNU General Public License voor meer 
informatie.\n\nSamen met dit programma hoort u een exemplaar van de GNU General Public License ontvangen te 
hebben; zo niet, schrijf dan aan de Free Software Foundation, Inc., 51 Franklin 
Street, Fifth Floor, Boston, MA 02110-1301, Verenigde Staten. Of 
[http://www.gnu.org/copyleft/gpl.html lees de licentie online].",
-   "config-sidebar": "* [https://www.mediawiki.org 
MediaWiki-thuispagina]\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents 
Gebruikershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents 
Beheerdershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Veelgestelde 
vragen] (Engelstalig)\n\n* Leesmij 
(Engelstalig)\n* Release notes 
(Engelstalig)\n* Kopiëren (Engelstalig)\n* 
Versie bijwerken (Engelstalig)",
+   "config-sidebar": "* [https://www.mediawiki.org MediaWiki 
thuispagina]\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents 
Gebruikershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents 
Beheerdershandleiding] (Engelstalig)\n* 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Veelgestelde 
vragen] (Engelstalig)\n\n* Leesmij 
(Engelstalig)\n* Release notes 
(Engelstalig)\n* Kopiëren (Engelstalig)\n* 
Versie bijwerken (Engelstalig)",
"config-env-good": "De omgeving is gecontroleerd.\nU kunt MediaWiki 
installeren.",
"config-env-bad": "De omgeving is gecontroleerd.\nU kunt MediaWiki niet 
installeren.",
"config-env-php": "PHP $1 is op dit moment geïnstalleerd.",
@@ -193,7 +193,7 @@
"config-ns-site-name": "Zelfde als de wiki: $1",
"config-ns-other": "Andere (geef aan welke)",
"config-ns-other-default": "MijnWiki",
-   "config-project-namespace-help": "In het kielzog van Wikipedia beheren 
veel wiki's hun beleidspagina's apart van hun inhoudelijke pagina's in een 
'''projectnaamruimte'''.\nAlle paginanamen in deze naamruimte beginnen met een 
bepaald voorvoegsel dat u hier kunt opgeven.\nDit voorvoegsel wordt meestal 
afgeleid van de naam van de wiki, maar het kan geen bijzondere tekens bevatten 
als \"#\" of \":\".",
+   "config-project-namespace-help": "In het kielzog van Wikipedia beheren 
veel wiki's hun beleidspagina's apart van hun inhoudelijke pagina's in een 
\"'''projectnaamruimte'''\".\nAlle paginanamen in deze naamruimte beginnen met 
een bepaald voorvoegsel dat u hier kunt opgeven.\nDit voorvoegsel wordt meestal 
afgeleid van 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Address a second way in which contacts are winding up withou...

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Address a second way in which contacts are winding up without 
primaries.
..

Address a second way in which contacts are winding up without primaries.

It turns out than sometimes core is making the choice to demote an address from 
primary and sometimes
our choice was to bring across a non-primary, resulting in no primary. Undo 
core choice.

Testing scenarios are quite thorough here, giving some confidence.

Bug: T145873
Change-Id: If011c3426f40b7dfc445aee9227ed80a0aeb4675
---
M sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 77 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/33/313933/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
index 2a3c0f6..1802651 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
@@ -968,7 +968,78 @@
   )),
 ),
   ),
-
+  'duplicate_mixed_address_on_one_contact' => array(
+'duplicate_mixed_address_on_one_contact' => array(
+  'merged' => 1,
+  'skipped' => 0,
+  'comment' => 'We want to be sure we still have a primary. Ideally we 
would squash
+  matching addresses here too but currently that only happens on the 
to-merge contact.
+  (no high priority improvement)',
+  'is_major_gifts' => 0,
+  'entity' => $entity,
+  'contact_1' => array(
+array_merge(array(
+  'location_type_id' => 'Home',
+  'is_primary' => 0,
+), $locationParams1),
+  ),
+  'contact_2' => array(
+array_merge(array(
+  'location_type_id' => 'Main',
+  'is_primary' => 1,
+), $locationParams1),
+array_merge(array(
+  'location_type_id' => 'Home',
+  'is_primary' => 0,
+), $locationParams1),
+  ),
+  'expected_hook' => array_merge($additionalExpected, array(
+array_merge(array(
+  'location_type_id' => 'Main',
+  'is_primary' => 1,
+), $locationParams1),
+array_merge(array(
+  'location_type_id' => 'Home',
+  'is_primary' => 0,
+), $locationParams1),
+  )),
+),
+  ),
+  'duplicate_mixed_address_on_one_contact_second_primary' => array(
+'duplicate_mixedaddress_on_one_contact_second_primary' => array(
+  'comment' => 'check we do not lose the primary. Matching addresses 
are squashed.',
+  'merged' => 1,
+  'skipped' => 0,
+  'is_major_gifts' => 0,
+  'entity' => $entity,
+  'contact_1' => array(
+array_merge(array(
+  'location_type_id' => 'Home',
+  'is_primary' => 0,
+), $locationParams1),
+  ),
+  'contact_2' => array(
+array_merge(array(
+  'location_type_id' => 'Home',
+  'is_primary' => 0,
+), $locationParams1),
+array_merge(array(
+  'location_type_id' => 'Main',
+  'is_primary' => 1,
+), $locationParams1),
+  ),
+  'expected_hook' => array_merge($additionalExpected, array(
+array_merge(array(
+  'location_type_id' => 'Home',
+  'is_primary' => 0,
+), $locationParams1),
+array_merge(array(
+  'location_type_id' => 'Main',
+  'is_primary' => 1,
+), $locationParams1),
+  )),
+),
+  ),
 );
 return $data;
   }
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 5f76f55..0e626fc 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2324,9 +2324,14 @@
 
 foreach ($higherPriorityLocationBlocks as $blockType => $blocks) {
   foreach ($blocks as $block) {
+if ($block['is_primary'] == 1 && 
isset($blocksDAO[$blockType]['update'][$block['id']])) {
+  unset($blocksDAO[$blockType]['update'][$block['id']]->is_primary);
+}
+
 if (empty($lowerPriorityLocationBlocks[$blockType])) {
   continue;
 }
+
 foreach ($lowerPriorityLocationBlocks[$blockType] as $index => 
$lowerPriorityLocationBlock) {
   if (_wmf_civicrm_is_delete_location_in_favour_of_higher_priority_one(
 $blocks, $block, $lowerPriorityLocationBlock)

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

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

[jenkins-bot (Code Review)]

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

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


Update VE core submodule to master (e8f7947)

New changes:
c314cb6 On CBN detach, mark contentBranchNodeChanged in the CE Surface
0e8e79e Localisation updates from https://translatewiki.net.
ae7cea9 Follow-up 3ca658ed, e3192e2d: avoid JS errors when checking for rAF
328d2db Localisation updates from https://translatewiki.net.
e76de27 Set spellcheck=true on nested contentEditables
7d80ec5 Add method to compare elements and their annotations
f7679c5 Test selections without relying on a ve.dm.Surface select event listener
e8f7947 Localisation updates from https://translatewiki.net.

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

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



diff --git a/lib/ve b/lib/ve
index e3192e2..e8f7947 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit e3192e2d398fcd643b564141879d12a685173548
+Subproject commit e8f794793199818035ec4014cd868f3d0076c294

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib369c13662e6f8747b0fe9976555d96e198d077f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: DLynch 
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]: Warn when a log context accidentally overrides 'message'

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Warn when a log context accidentally overrides 'message'
..

Warn when a log context accidentally overrides 'message'

Bug: T145133
Change-Id: I6677dbf608aac1d7fd6036f5e51977d56ce2fc57
---
M includes/debug/logger/monolog/WikiProcessor.php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/313932/1

diff --git a/includes/debug/logger/monolog/WikiProcessor.php 
b/includes/debug/logger/monolog/WikiProcessor.php
index ad939a0..c41f9e2 100644
--- a/includes/debug/logger/monolog/WikiProcessor.php
+++ b/includes/debug/logger/monolog/WikiProcessor.php
@@ -36,6 +36,14 @@
 */
public function __invoke( array $record ) {
global $wgVersion;
+
+   if ( isset( $record['context']['message'] ) ) {
+   // some log aggregators such as Logstash will merge the 
log context into the main
+   // metadata (where 'message' is the log message) and 
end up overwriting the message
+   wfLogWarning( __METHOD__ . ": 'message' key overwritten 
in log context. Message was: "
+   . $record['message'] );
+   }
+
$record['extra'] = array_merge(
$record['extra'],
[

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6677dbf608aac1d7fd6036f5e51977d56ce2fc57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove dead pybal link

[jenkins-bot (Code Review)]

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

Change subject: Remove dead pybal link
..


Remove dead pybal link

Change-Id: I6634a5a996253da3f611fb7b62cb628a19c5a81a
---
M docroot/noc/index.html
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/docroot/noc/index.html b/docroot/noc/index.html
index 9a3e039..4033a94 100644
--- a/docroot/noc/index.html
+++ b/docroot/noc/index.html
@@ -41,9 +41,6 @@
https://config-master.wikimedia.org/conftool/;>Conftool 
configuration
   Config files of Wikimedia's https://wikitech.wikimedia.org/wiki/Etcd;>etcd
used for pooling services in LVS
-   https://config-master.wikimedia.org/pybal/;>PyBal/LVS 
configuration
-   Config files of Wikimedia's https://wikitech.wikimedia.org/wiki/PyBal;>PyBal
-   https://wikitech.wikimedia.org/wiki/LVS;>LVS 
installation
https://dbtree.wikimedia.org/;>Core dbs
   Core DB Replication Layout and Lag
   DB clusters

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6634a5a996253da3f611fb7b62cb628a19c5a81a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Dereckson 
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...Flow[wmf/1.28.0-wmf.20]: BoardMover: don't try to save a null edit

[jenkins-bot (Code Review)]

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

Change subject: BoardMover: don't try to save a null edit
..


BoardMover: don't try to save a null edit

BoardMover assists in the move of Flow pages by
updating objects' association from the old to
the new page.

It also tries to reparse the current header
so magic words like basepagename are updated
for the new page location. This part
sometimes generates null edits that are not
seen as null edits by the storage layer. This
leads to exceptions that abort the move but do
not bubble up to the OptinController. It results
in inconsistent state.

Bug: T138310
Change-Id: Iff7f699b7604da608154231c4d46b17c1dc08541
(cherry picked from commit 0cbfa1b4f81794710513489a418a3b0682f8fb7c)
---
M includes/BoardMover.php
1 file changed, 5 insertions(+), 3 deletions(-)

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



diff --git a/includes/BoardMover.php b/includes/BoardMover.php
index 988a8c2..41344bd 100644
--- a/includes/BoardMover.php
+++ b/includes/BoardMover.php
@@ -109,9 +109,11 @@
'edit-header',
$newPage
);
-   $this->storage->put( $nextHeader, array(
-   'workflow' => $discussionWorkflow,
-   ) );
+   if ( $header !== $nextHeader ) {
+   $this->storage->put( $nextHeader, array(
+   'workflow' => $discussionWorkflow,
+   ) );
+   }
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff7f699b7604da608154231c4d46b17c1dc08541
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.28.0-wmf.20
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Wikidata descriptions on Japanese and Spanish Wikipedias

[jenkins-bot (Code Review)]

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

Change subject: Enable Wikidata descriptions on Japanese and Spanish Wikipedias
..


Enable Wikidata descriptions on Japanese and Spanish Wikipedias

Bug: T145786
Change-Id: Idfab2cbc66a56c0f67276da16806e53461b13e92
---
M wmf-config/InitialiseSettings.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index acca5db..44b18b5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14486,6 +14486,14 @@
'nowikidatadescriptiontaglines' => [
'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
+   // This can be removed when top6-wikipedia.dblist is no longer inside 
nowikidatadescriptiontaglines
+   'jawiki' => [
+   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => true
+   ],
+   // This can be removed when top6-wikipedia.dblist is no longer inside 
nowikidatadescriptiontaglines
+   'eswiki' => [
+   'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => true
+   ],
 ],
 'wmgMFMobileFormatterHeadings' => [
'default' => [ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfab2cbc66a56c0f67276da16806e53461b13e92
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Initial RequestLogger tests

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Initial RequestLogger tests
..

Initial RequestLogger tests

These tests don't seem particularly amazing, but they should
provide some ability to see that the refactor of request logging
works as expected and still generates the same output for some
sets of inputs.

These test cases obviously don't workout all the various options
that could exist, failure cases, etc, but its better than nothing.
Testing everything from this high of level would be incredibly verbose.

Maybe this should be re-worked to use fixtures like the searchText
instead of trying to spell out the full response/log cycle in the code?

Change-Id: If15f280d1bf0b8f8df30b9c25f2bcd4e860aee0a
---
M includes/CompletionSuggester.php
M includes/Connection.php
M includes/RequestLogger.php
A tests/unit/RequestLogger.php
4 files changed, 278 insertions(+), 12 deletions(-)


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

diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index 1ff38d5..d232693 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -222,14 +222,11 @@
$profiles, $text ) {
$description = "{queryType} search for 
'{query}'";
$this->start( $description, $logContext );
-   $this->logContext['timing']['start'] = 
microtime( true );
try {
$result = $index->request( "_suggest", 
Request::POST, $suggest, $queryOptions );
-   
$this->logContext['timing']['end-comp-req'] = microtime( true );
if( $result->isOk() ) {
$result = 
$this->postProcessSuggest( $result, $profiles );
}
-   $this->logContext['timing']['done'] = 
microtime( true );
return $this->success( $result );
} catch ( 
\Elastica\Exception\ExceptionInterface $e ) {
return $this->failure( $e );
@@ -428,7 +425,6 @@
$data = $response->getData();
unset( $data['_shards'] );
 
-   $this->logContext['timing']['mark1'] = microtime( true );
$limit = $this->getHardLimit();
$suggestionsByDocId = [];
$suggestionProfileByDocId = [];
@@ -462,7 +458,6 @@
}
}
}
-   $this->logContext['timing']['mark2'] = microtime( true );
 
// simply sort by existing scores
uasort( $suggestionsByDocId, function ( SearchSuggestion $a, 
SearchSuggestion $b ) {
@@ -487,7 +482,6 @@
}
 
if ( !empty ( $missingTextDocIds ) ) {
-   $this->logContext['timing']['mark3'] = microtime( true 
);
// Experimental.
//
// Second pass query to fetch redirects.
@@ -505,7 +499,6 @@
$redirResponse = $type->request( '_mget', 'GET',
[ 'ids' => $missingTextDocIds ],
[ '_source_include' => 'redirect' ] );
-   $this->logContext['timing']['mark4'] = 
microtime( true );
if ( $redirResponse->isOk() ) {
$this->logContext['elasticTook2PassMs'] 
= intval( $redirResponse->getQueryTime() * 1000 );
$docs = $redirResponse->getData();
@@ -538,10 +531,8 @@
]
);
}
-   $this->logContext['timing']['mark5'] = microtime( true 
);
}
 
-   $this->logContext['timing']['mark6'] = microtime( true );
$finalResults = array_filter(
$suggestionsByDocId,
function ( SearchSuggestion $suggestion ) {
@@ -570,7 +561,6 @@
];
}
$this->logContext['maxScore'] = $maxScore;
-   $this->logContext['timing']['mark7'] = microtime( true );
 
return new SearchSuggestionSet( $finalResults );
}
diff --git a/includes/Connection.php b/includes/Connection.php
index 035d534..af2a881 100644
--- a/includes/Connection.php
+++ b/includes/Connection.php
@@ -171,6 +171,7 @@
foreach ( $config as $idx => $server ) {
 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable wmgEchoFooterNotice

[jenkins-bot (Code Review)]

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

Change subject: Disable wmgEchoFooterNotice
..


Disable wmgEchoFooterNotice

We've advertised the new Special:Notifications page for long enough,
it's not that new any more.

Change-Id: I3c9e9e8e261affd81055febe63b9127f8307fe46
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 10 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c89244a..acca5db 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15782,18 +15782,10 @@
'nonglobal' => false,
 ],
 'wmgEchoShowFooterNotice' => [
-   'default' => true,
+   'default' => false,
 ],
 'wmgEchoFooterNoticeURL' => [
-   'default' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3',
-   'frwiki' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR', // 
All French wikis: T131893
-   'frwikibooks' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR',
-   'frwikinews' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR',
-   'frwikiquote' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR',
-   'frwikisource' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR',
-   'frwikiversity' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR',
-   'frwikivoyage' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR',
-   'frwiktionary' => 
'https://wikimedia.qualtrics.com/SE/?SID=SV_eRMpgEPhVcUEkn3_Language=FR',
+   'default' => '',
 ],
 # from and reply to address when Echo sends email notifications
 'wmgNotificationSender' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c9e9e8e261affd81055febe63b9127f8307fe46
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.28.0-wmf.20]: Update OOjs UI to v0.17.10

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.17.10
..


Update OOjs UI to v0.17.10

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.10

Change-Id: I4faf83e301417ef5721a81a4a69890854e6c266b
(cherry picked from commit 5dc0cc4082e7b83050b83e77d26dd0f6e8a02819)
---
M composer.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
15 files changed, 38 insertions(+), 29 deletions(-)

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



diff --git a/composer.json b/composer.json
index eedaa4e..c626205 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
"ext-xml": "*",
"liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
-   "oojs/oojs-ui": "0.17.9",
+   "oojs/oojs-ui": "0.17.10",
"oyejorge/less.php": "1.7.0.10",
"php": ">=5.5.9",
"psr/log": "1.0.0",
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js 
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 594cea2..d72957d 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css 
b/resources/lib/oojs-ui/oojs-ui-core-apex.css
index 6437ca8..2f811da 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-element-hidden {
display: none !important;
@@ -406,6 +406,10 @@
max-width: 100%;
padding: 0;
white-space: normal;
+   float: left;
+}
+.oo-ui-fieldsetLayout-group {
+   clear: both;
 }
 .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help {
float: right;
diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css 
b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
index 08d91b4..9a3d7eb 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-element-hidden {
display: none !important;
@@ -529,6 +529,10 @@
max-width: 100%;
padding: 0;
white-space: normal;
+   float: left;
+}
+.oo-ui-fieldsetLayout-group {
+   clear: both;
 }
 .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help {
float: right;
diff --git a/resources/lib/oojs-ui/oojs-ui-core.js 
b/resources/lib/oojs-ui/oojs-ui-core.js
index c982010..109645b 100644
--- a/resources/lib/oojs-ui/oojs-ui-core.js
+++ b/resources/lib/oojs-ui/oojs-ui-core.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.9
+ * OOjs UI v0.17.10
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( function ( OO ) {
 
@@ -10121,6 +10121,7 @@
}
 
// Initialization
+   this.$group.addClass( 'oo-ui-fieldsetLayout-group' );
this.$element
.addClass( 'oo-ui-fieldsetLayout' )
.prepend( this.$label, this.$help, this.$icon, this.$group );
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js 
b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index 343508c..616f78e 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ 

[MediaWiki-commits] [Gerrit] mediawiki/vendor[wmf/1.28.0-wmf.20]: Update OOjs UI to v0.17.10

[jenkins-bot (Code Review)]

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

Change subject: Update OOjs UI to v0.17.10
..


Update OOjs UI to v0.17.10

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.10

Change-Id: I4faf83e301417ef5721a81a4a69890854e6c266b
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/layouts/FieldsetLayout.php
6 files changed, 25 insertions(+), 19 deletions(-)

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



diff --git a/composer.json b/composer.json
index 34b3340..c74f952 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.17.9",
+   "oojs/oojs-ui": "0.17.10",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index df4c168..47f75f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "af9c4f437fc756059cc8b9c824ef611b",
-"content-hash": "6a4e7ba32ff57b59d66039b7315e5d28",
+"hash": "2bbd1201e7aef49cb83c3958f5e57a88",
+"content-hash": "4d803924e47a9f8cf6d533d16ddcc7db",
 "packages": [
 {
 "name": "composer/semver",
@@ -430,16 +430,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.17.9",
+"version": "v0.17.10",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "3e3e0f9efbd0811aa6b7d534e56b3f3f0e3c0861"
+"reference": "e4ba87bf92499538128363ffc0213c4055396782"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/3e3e0f9efbd0811aa6b7d534e56b3f3f0e3c0861;,
-"reference": "3e3e0f9efbd0811aa6b7d534e56b3f3f0e3c0861",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/e4ba87bf92499538128363ffc0213c4055396782;,
+"reference": "e4ba87bf92499538128363ffc0213c4055396782",
 "shasum": ""
 },
 "require": {
@@ -505,7 +505,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2016-09-13 17:35:32"
+"time": "2016-10-03 18:37:58"
 },
 {
 "name": "oyejorge/less.php",
@@ -1129,12 +1129,12 @@
 "version": "v0.2.2",
 "source": {
 "type": "git",
-"url": "https://github.com/wmde/Assert.git;,
+"url": "https://github.com/wikimedia/Assert.git;,
 "reference": "2da55927525975f8d52825fc3ee02e5e36f5036c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wmde/Assert/zipball/2da55927525975f8d52825fc3ee02e5e36f5036c;,
+"url": 
"https://api.github.com/repos/wikimedia/Assert/zipball/2da55927525975f8d52825fc3ee02e5e36f5036c;,
 "reference": "2da55927525975f8d52825fc3ee02e5e36f5036c",
 "shasum": ""
 },
diff --git a/composer/installed.json b/composer/installed.json
index e751a50..daeb71e 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -661,12 +661,12 @@
 "version_normalized": "0.2.2.0",
 "source": {
 "type": "git",
-"url": "https://github.com/wmde/Assert.git;,
+"url": "https://github.com/wikimedia/Assert.git;,
 "reference": "2da55927525975f8d52825fc3ee02e5e36f5036c"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wmde/Assert/zipball/2da55927525975f8d52825fc3ee02e5e36f5036c;,
+"url": 
"https://api.github.com/repos/wikimedia/Assert/zipball/2da55927525975f8d52825fc3ee02e5e36f5036c;,
 "reference": "2da55927525975f8d52825fc3ee02e5e36f5036c",
 "shasum": ""
 },
@@ -1801,17 +1801,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.17.9",
-"version_normalized": "0.17.9.0",
+"version": "v0.17.10",
+"version_normalized": "0.17.10.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Reduce number of replicas for titlesuggest indices

[jenkins-bot (Code Review)]

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

Change subject: Reduce number of replicas for titlesuggest indices
..


Reduce number of replicas for titlesuggest indices

The new settings have been updated live on the cluster mon oct 3 2016 at ~1pm
UTC.
The effect on server load percentiles is hardly visible.
6g of ram can be reclaimed.

NOTE: I'm tempted to reduce enwiki to 2 as well.

Bug: T147192
Change-Id: Iae77aa7b39d53b1567471bf2f0553aae1ec62acf
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 9 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index be27d65..c89244a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16635,18 +16635,13 @@
'eqiad' => [ 'content' => '0-2', 'general' => '0-2', 
'titlesuggest' => '0-2', 'file' => '0-3' ],
'codfw' => [ 'content' => '0-2', 'general' => '0-2', 
'titlesuggest' => '0-2', 'file' => '0-2' ],
],
-   '+eswiki' => [ 'titlesuggest' => '0-5' ],
-   '+jawiki' => [ 'titlesuggest' => '0-5' ],
-   '+ruwiki' => [ 'titlesuggest' => '0-5' ],
-   '+zhwiki' => [ 'titlesuggest' => '0-5' ],
-   '+frwiki' => [ 'titlesuggest' => '0-5' ],
'enwiki' => [
-   'eqiad' => [ 'content' => '0-4', 'general' => '0-3', 
'titlesuggest' => '0-5' ],
-   'codfw' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-5' ],
+   'eqiad' => [ 'content' => '0-4', 'general' => '0-3', 
'titlesuggest' => '0-3' ],
+   'codfw' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-3' ],
],
'dewiki' => [
-   'eqiad' => [ 'content' => '0-4', 'general' => '0-3', 
'titlesuggest' => '0-5' ],
-   'codfw' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-5' ],
+   'eqiad' => [ 'content' => '0-4', 'general' => '0-3', 
'titlesuggest' => '0-2' ],
+   'codfw' => [ 'content' => '0-3', 'general' => '0-2', 
'titlesuggest' => '0-2' ],
],
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae77aa7b39d53b1567471bf2f0553aae1ec62acf
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Add `box-sizing` mixin

[jenkins-bot (Code Review)]

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

Change subject: Add `box-sizing` mixin
..


Add `box-sizing` mixin

Replacing standard `box-sizing` with MediaWiki's Less mixin, which also
features prefixed properties for older browsers like Firefox 28 and below.

Change-Id: Iafb88b192045fb7df6bbe6954a166a198d04c5cf
---
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
M modules/styles/mw.echo.ui.NotificationItemWidget.less
M modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
M modules/styles/mw.echo.ui.ToggleReadCircleButtonWidget.less
4 files changed, 9 insertions(+), 5 deletions(-)

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



diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less 
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
index d5084c9..f12773f 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
@@ -1,3 +1,4 @@
+@import 'mediawiki.mixins';
 @import '../echo.variables';
 
 .mw-echo-ui-notificationBadgeButtonPopupWidget {
@@ -70,7 +71,7 @@
white-space: normal;
font-weight: bold;
width: 
@notification-popup-width / 2;
-   box-sizing: border-box;
+   .box-sizing( border-box );
 
&:last-child {
border-left: 1px solid 
#DD;
diff --git a/modules/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/styles/mw.echo.ui.NotificationItemWidget.less
index 13cb37a..3df5746 100644
--- a/modules/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationItemWidget.less
@@ -1,3 +1,4 @@
+@import 'mediawiki.mixins';
 @import '../echo.variables';
 @import '../echo.mixins';
 
@@ -5,7 +6,7 @@
position: relative;
white-space: normal;
padding: 0.8em 1em 0.5em 1em;
-   box-sizing: border-box;
+   .box-sizing( border-box );
 
border: 1px solid #DD;
border-bottom: 0;
@@ -46,7 +47,7 @@
// The icon is 30px
margin-left: 30px;
padding-left: 0.8em;
-   box-sizing: border-box;
+   .box-sizing( border-box );
 
&-message {
line-height: 1.3em;
diff --git a/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less 
b/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
index 1966d9d..ce54f10 100644
--- a/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
+++ b/modules/styles/mw.echo.ui.PageNotificationsOptionWidget.less
@@ -1,8 +1,9 @@
+@import 'mediawiki.mixins';
 @import '../echo.variables';
 
 .mw-echo-ui-pageNotificationsOptionWidget {
width: 100%;
-   box-sizing: border-box;
+   .box-sizing( border-box );
clear: both;
 
&-icon {
diff --git a/modules/styles/mw.echo.ui.ToggleReadCircleButtonWidget.less 
b/modules/styles/mw.echo.ui.ToggleReadCircleButtonWidget.less
index f311cb0..a1b92ed 100644
--- a/modules/styles/mw.echo.ui.ToggleReadCircleButtonWidget.less
+++ b/modules/styles/mw.echo.ui.ToggleReadCircleButtonWidget.less
@@ -1,3 +1,4 @@
+@import 'mediawiki.mixins';
 @import '../echo.variables';
 
 .mw-echo-ui-toggleReadCircleButtonWidget {
@@ -6,7 +7,7 @@
width: @bundle-group-padding;
height: @bundle-group-padding;
margin: @bundle-group-padding;
-   box-sizing: border-box;
+   .box-sizing( border-box );
 
// Mark as read
background-color: #36c;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafb88b192045fb7df6bbe6954a166a198d04c5cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: ComboBoxInputWidget: Align to design specification

[jenkins-bot (Code Review)]

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

Change subject: ComboBoxInputWidget: Align to design specification
..


ComboBoxInputWidget: Align to design specification

Aligning ComboBoxInputWidget to design specification
in https://phabricator.wikimedia.org/M101 – mainly adding
ButtonWidget instead of relying on TextInput indicator.

Bug: T87832
Change-Id: Ia6d1327149880bb860798ae778ebd56387e796b2
---
M src/styles/widgets/ComboBoxInputWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
M src/widgets/ComboBoxInputWidget.js
4 files changed, 89 insertions(+), 50 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  VolkerE: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/src/styles/widgets/ComboBoxInputWidget.less 
b/src/styles/widgets/ComboBoxInputWidget.less
index 1d1789b..a73a9ff 100644
--- a/src/styles/widgets/ComboBoxInputWidget.less
+++ b/src/styles/widgets/ComboBoxInputWidget.less
@@ -2,16 +2,34 @@
 
 .oo-ui-comboBoxInputWidget {
display: inline-block;
+   position: relative;
 
-   &.oo-ui-comboBoxInputWidget-empty {
-   > .oo-ui-indicatorElement-indicator {
-   display: none;
+   &-field {
+   display: table;
+   width: 100%;
+   table-layout: fixed;
+   }
+
+   .oo-ui-inputWidget-input {
+   display: table-cell;
+   vertical-align: middle;
+   position: relative;
+   overflow: hidden;
+   }
+
+   &-dropdownButton {
+   display: table-cell;
+
+   > .oo-ui-buttonElement-button {
+   display: block;
+   .oo-ui-box-sizing( border-box );
+   overflow: hidden;
}
}
 
-   &.oo-ui-widget-enabled {
-   > .oo-ui-indicatorElement-indicator {
-   cursor: pointer;
+   &.oo-ui-comboBoxInputWidget-empty {
+   .oo-ui-comboBoxInputWidget-dropdownButton {
+   display: none;
}
}
 
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index f9f875b..6b9c240 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -470,10 +470,25 @@
 .theme-oo-ui-comboBoxInputWidget () {
width: 100%;
max-width: @max-width-input-default;
-   .oo-ui-inline-spacing(0.5em);
+   .oo-ui-inline-spacing( 0.5em );
 
-   &.oo-ui-widget-disabled,
-   &-empty {
+   &-dropdownButton {
+   position: absolute;
+   top: 0;
+   right: 0;
+   visibility: hidden;
+
+   .oo-ui-buttonElement-button {
+   padding: 0;
+
+   .oo-ui-indicatorElement-indicator.oo-ui-indicator-down {
+   visibility: visible;
+   margin: 0.775em;
+   }
+   }
+   }
+
+   &.oo-ui-widget-disabled {
.oo-ui-textInputWidget.oo-ui-indicatorElement {
.oo-ui-indicatorElement-indicator {
cursor: default;
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 1ced784..fcf846d 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -858,22 +858,35 @@
input,
textarea {
height: 2.35em;
+   border-top-right-radius: 0;
+   border-bottom-right-radius: 0;
+   border-right-width: 0;
}
 
-   &.oo-ui-widget-enabled:hover {
+   &-dropdownButton {
+   width: 2.5em;
+
+   .oo-ui-buttonElement-button {
+   padding: 0.5em;
+   }
+
+   .oo-ui-buttonElement-button,
+   .oo-ui-buttonElement-button:focus {
+   border-top-left-radius: 0;
+   border-bottom-left-radius: 0;
+   }
+   }
+
+   &.oo-ui-comboBoxInputWidget-empty {
input,
textarea {
-   border-color: @border-color-input-hover;
-
-   &:focus {
-   border-color: @border-color-default-focus;
-   }
+   border-right-width: 1px;
}
}
 
&.oo-ui-widget-disabled {
.oo-ui-indicatorElement-indicator {
-   opacity: @opacity-disabled-indicator;
+   opacity: @opacity-disabled-filled;
}
}
 }
diff --git a/src/widgets/ComboBoxInputWidget.js 
b/src/widgets/ComboBoxInputWidget.js
index 2acf54b..bf84c55 100644
--- a/src/widgets/ComboBoxInputWidget.js
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Align last modified bar active color to new color palette

[jenkins-bot (Code Review)]

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

Change subject: Align last modified bar active color to new color palette
..


Align last modified bar active color to new color palette

Aligning active color of last modified bar variable
`@lastModifiedBarActiveBackgroundColor` to improved color palette
https://phabricator.wikimedia.org/M82

Additional change:
* Fix whitespace issue in font declaration for Times

Bug: T146799
Change-Id: Id2a120c9cc002f2289d98f8a0862e7ead5ada2dd
---
M minerva.less/minerva.variables.less
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/minerva.less/minerva.variables.less 
b/minerva.less/minerva.variables.less
index 6bc5100..f57eef2 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -40,7 +40,7 @@
 @redBase: @colorErrorText;
 @colorTutorial: #2e76ff;
 @linkColor: #002bb8;
-@lastModifiedBarActiveBackgroundColor: #00af8b;
+@lastModifiedBarActiveBackgroundColor: #00af89;
 @toastNotificationColor: @colorGray2;
 
 // Use when an element is selected. FIXME: This should be in mediawiki ui.
@@ -58,7 +58,7 @@
 
 // typography
 @fontFamily: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial', 
'Liberation Sans', sans-serif;
-@fontFamilyHeading: 'Linux Libertine', 'Georgia',' Times', serif;
+@fontFamilyHeading: 'Linux Libertine', 'Georgia', 'Times', serif;
 @fontScalingFactor: 1;
 @contentLineHeight: 1.65;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2a120c9cc002f2289d98f8a0862e7ead5ada2dd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Nirzar 
Gerrit-Reviewer: VolkerE 
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...Flow[wmf/1.28.0-wmf.20]: BoardMover: don't try to save a null edit

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: BoardMover: don't try to save a null edit
..

BoardMover: don't try to save a null edit

BoardMover assists in the move of Flow pages by
updating objects' association from the old to
the new page.

It also tries to reparse the current header
so magic words like basepagename are updated
for the new page location. This part
sometimes generates null edits that are not
seen as null edits by the storage layer. This
leads to exceptions that abort the move but do
not bubble up to the OptinController. It results
in inconsistent state.

Bug: T138310
Change-Id: Iff7f699b7604da608154231c4d46b17c1dc08541
(cherry picked from commit 0cbfa1b4f81794710513489a418a3b0682f8fb7c)
---
M includes/BoardMover.php
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/30/313930/1

diff --git a/includes/BoardMover.php b/includes/BoardMover.php
index 988a8c2..41344bd 100644
--- a/includes/BoardMover.php
+++ b/includes/BoardMover.php
@@ -109,9 +109,11 @@
'edit-header',
$newPage
);
-   $this->storage->put( $nextHeader, array(
-   'workflow' => $discussionWorkflow,
-   ) );
+   if ( $header !== $nextHeader ) {
+   $this->storage->put( $nextHeader, array(
+   'workflow' => $discussionWorkflow,
+   ) );
+   }
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff7f699b7604da608154231c4d46b17c1dc08541
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.28.0-wmf.20
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Sbisson 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Update the Lua documentation to reflect multilingual wikis

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Update the Lua documentation to reflect multilingual wikis
..

Update the Lua documentation to reflect multilingual wikis

For mw.wikibase.label/ mw.wikibase.description.

On multilingual wikis (where "allowDataAccessInUserLanguage" is
true), we will not default to the content language, but rather
to the user's language.

Change-Id: I32127f42bc2b31924363ae23512fc58b3497
---
M docs/lua.wiki
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/docs/lua.wiki b/docs/lua.wiki
index 6dea9b8..0eadfa0 100644
--- a/docs/lua.wiki
+++ b/docs/lua.wiki
@@ -46,7 +46,7 @@
 wikibase.label( id )
 Takes an item ID and returns the label in the language of the local Wiki.
 
-If no ID was specified, then the label of the item connected to the current 
page will be returned, if the page is indeed connected and a label exists in 
the wiki's language or in a fallback language. See also 
[[#mw.wikibase.getLabelWithLang|mw.wikibase.getLabelWithLang]].
+If no ID was specified, then the label of the item connected to the current 
page will be returned, if the page is indeed connected and a label exists. The 
label will either be in the Wiki's language (on monolingual wikis) or the 
user's language (on multilingual Wikis), furthermore language fallbacks will be 
applied. See also 
[[#mw.wikibase.getLabelWithLang|mw.wikibase.getLabelWithLang]].
 
 An example call might look like this:
 
@@ -77,7 +77,7 @@
 wikibase.description( id )
 Takes an item ID and returns the description in the language of the local Wiki.
 
-If no ID was specified, then the description of the item connected to the 
current page will be returned, if the page is indeed connected and a 
description exists in the wiki's language or in a fallback language. See also 
[[#mw.wikibase.getDescriptionWithLang|mw.wikibase.getDescriptionWithLang]].
+If no ID was specified, then the description of the item connected to the 
current page will be returned, if the page is indeed connected and a 
description exists. The description will either be in the Wiki's language (on 
monolingual wikis) or the user's language (on multilingual Wikis), furthermore 
language fallbacks will be applied. See also 
[[#mw.wikibase.getDescriptionWithLang|mw.wikibase.getDescriptionWithLang]].
 
 An example call might look like this:
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32127f42bc2b31924363ae23512fc58b3497
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Implement scaleLoads() in LoadMonitorMySQL

[jenkins-bot (Code Review)]

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

Change subject: Implement scaleLoads() in LoadMonitorMySQL
..


Implement scaleLoads() in LoadMonitorMySQL

* Recently pooled servers will get more traffic as
  their internal caches warm up by getting queries
* Also let LoadMonitor support options for flexibility
  The "loadMonitor" config field now takes in array in
  LoadBalancer.
* Make LoadMonitor the default instead of LoadMonitorNull.

Change-Id: I53b89b0c25bdcc30deec3f8b502fb14479c53ae8
---
M includes/libs/rdbms/lbfactory/LBFactoryMulti.php
M includes/libs/rdbms/lbfactory/LBFactorySimple.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/libs/rdbms/loadmonitor/ILoadMonitor.php
M includes/libs/rdbms/loadmonitor/LoadMonitor.php
M includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
M includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
7 files changed, 130 insertions(+), 45 deletions(-)

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



diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php 
b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index 2fb8c4b..bee32dc 100644
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -309,7 +309,7 @@
$this->baseLoadBalancerParams(),
[
'servers' => $this->makeServerArray( $template, 
$loads, $groupLoads ),
-   'loadMonitor' => $this->loadMonitorClass,
+   'loadMonitor' => [ 'class' => 
$this->loadMonitorClass ],
'readOnlyReason' => $readOnlyReason
]
) );
diff --git a/includes/libs/rdbms/lbfactory/LBFactorySimple.php 
b/includes/libs/rdbms/lbfactory/LBFactorySimple.php
index 610052f..674bafd 100644
--- a/includes/libs/rdbms/lbfactory/LBFactorySimple.php
+++ b/includes/libs/rdbms/lbfactory/LBFactorySimple.php
@@ -67,7 +67,7 @@
: [];
$this->loadMonitorClass = isset( $conf['loadMonitorClass'] )
? $conf['loadMonitorClass']
-   : null;
+   : 'LoadMonitor';
}
 
/**
@@ -124,7 +124,7 @@
$this->baseLoadBalancerParams(),
[
'servers' => $servers,
-   'loadMonitor' => $this->loadMonitorClass,
+   'loadMonitor' => [ 'class' => 
$this->loadMonitorClass ],
]
) );
$this->initLoadBalancer( $lb );
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 37c028b..31c022c 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -32,7 +32,7 @@
private $mServers;
/** @var array[] Map of (local/foreignUsed/foreignFree => server index 
=> IDatabase array) */
private $mConns;
-   /** @var array Map of (server index => weight) */
+   /** @var float[] Map of (server index => weight) */
private $mLoads;
/** @var array[] Map of (group => server index => weight) */
private $mGroupLoads;
@@ -40,13 +40,13 @@
private $mAllowLagged;
/** @var integer Seconds to spend waiting on replica DB lag to resolve 
*/
private $mWaitTimeout;
-   /** @var string The LoadMonitor subclass name */
-   private $mLoadMonitorClass;
+   /** @var array The LoadMonitor configuration */
+   private $loadMonitorConfig;
/** @var array[] $aliases Map of (table => (dbname, schema, prefix) 
map) */
private $tableAliases = [];
 
/** @var ILoadMonitor */
-   private $mLoadMonitor;
+   private $loadMonitor;
/** @var BagOStuff */
private $srvCache;
/** @var BagOStuff */
@@ -150,14 +150,9 @@
}
 
if ( isset( $params['loadMonitor'] ) ) {
-   $this->mLoadMonitorClass = $params['loadMonitor'];
+   $this->loadMonitorConfig = $params['loadMonitor'];
} else {
-   $master = reset( $params['servers'] );
-   if ( isset( $master['type'] ) && $master['type'] === 
'mysql' ) {
-   $this->mLoadMonitorClass = 'LoadMonitorMySQL';
-   } else {
-   $this->mLoadMonitorClass = 'LoadMonitorNull';
-   }
+   $this->loadMonitorConfig = [ 'class' => 
'LoadMonitorNull' ];
}
 
foreach ( $params['servers'] as $i => $server ) {
@@ -217,13 +212,14 @@
 * @return ILoadMonitor
 */
private function 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: TabsProvider: Add close all tabs button

[Nes (Code Review)]

Nes has uploaded a new change for review.

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

Change subject: TabsProvider: Add close all tabs button
..

TabsProvider: Add close all tabs button

There wasn't a button to close all tabs at the tab overview screen. The
only way was to close each tab individually. This button is added to the
left of the "+" button, closes all tabs after confirmation.

Bug: 146800
Change-Id: Icaa03f190b15706794a97c7bb92ee10d317dd401
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/res/menu/menu_tabs.xml
M app/src/main/res/values/strings.xml
4 files changed, 46 insertions(+), 9 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 111928d..b2ee0f0 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -506,6 +506,13 @@
 pageDataClient.loadFromBackStack();
 }
 }
+
+@Override
+public void onCloseAllTabs() {
+while (tabList.size() > 0) {
+onCloseTabRequested(0);
+}
+}
 };
 
 @Override
diff --git a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java 
b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
index f7e86de..8fc3059 100644
--- a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
+++ b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
@@ -1,17 +1,10 @@
 package org.wikipedia.page.tabs;
 
-import org.wikipedia.R;
-import org.wikipedia.page.PageBackStackItem;
-import org.wikipedia.page.PageFragment;
-import org.wikipedia.page.PageTitle;
-import org.wikipedia.util.DimenUtil;
-import org.wikipedia.views.ViewUtil;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-
+import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -25,6 +18,16 @@
 import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+
+import org.wikipedia.R;
+import org.wikipedia.page.PageBackStackItem;
+import org.wikipedia.page.PageFragment;
+import org.wikipedia.page.PageTitle;
+import org.wikipedia.util.DimenUtil;
+import org.wikipedia.views.ViewUtil;
+
 import java.util.List;
 
 import static org.wikipedia.util.DimenUtil.getContentTopOffsetPx;
@@ -37,6 +40,7 @@
 void onTabSelected(int position);
 void onNewTabRequested();
 void onCloseTabRequested(int position);
+void onCloseAllTabs();
 }
 
 public enum TabPosition {
@@ -168,6 +172,24 @@
 switch (item.getItemId()) {
 case R.id.menu_new_tab:
 providerListener.onNewTabRequested();
+return true;
+case R.id.menu_close_all_tabs:
+AlertDialog.Builder alert = new 
AlertDialog.Builder(fragment.getContext());
+alert.setMessage(R.string.close_all_tabs_confirm);
+alert.setPositiveButton(R.string.yes, new 
DialogInterface.OnClickListener() {
+@Override
+public void onClick(DialogInterface dialog, int id) {
+dialog.dismiss();
+providerListener.onCloseAllTabs();
+}
+});
+alert.setNegativeButton(R.string.no, new 
DialogInterface.OnClickListener() {
+@Override
+public void onClick(DialogInterface dialog, int id) {
+dialog.dismiss();
+}
+});
+alert.create().show();
 return true;
 default:
 return false;
@@ -373,6 +395,8 @@
 @Override public void onTabSelected(int position) { }
 @Override public void onNewTabRequested() { }
 @Override public void onCloseTabRequested(int position) { }
+@Override public void onCloseAllTabs() { }
+
 }
 
 private static class ViewHolder {
diff --git a/app/src/main/res/menu/menu_tabs.xml 
b/app/src/main/res/menu/menu_tabs.xml
index 64c8c0d..040a43c 100644
--- a/app/src/main/res/menu/menu_tabs.xml
+++ b/app/src/main/res/menu/menu_tabs.xml
@@ -3,6 +3,10 @@
 http://schemas.android.com/apk/res/android;
   xmlns:app="http://schemas.android.com/apk/res-auto;

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Beta: Move beta::deployaccess to role::beta::deployaccess

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Beta: Move beta::deployaccess to role::beta::deployaccess
..


Beta: Move beta::deployaccess to role::beta::deployaccess

Change-Id: I16cb7cc2e8f9ef81cec41ce9a29e00d2c34e64a3
---
D modules/beta/manifests/deployaccess.pp
A modules/role/manifests/beta/mediawiki.pp
2 files changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/modules/beta/manifests/deployaccess.pp 
b/modules/beta/manifests/deployaccess.pp
deleted file mode 100644
index 754412b..000
--- a/modules/beta/manifests/deployaccess.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# TODO: remove this if https://phabricator.wikimedia.org/T121721
-# is fixed.
-class beta::deployaccess(
-$bastion_ip = '10.68.20.135', # ip of deployment-mira
-) {
-
-security::access::config { 'beta-allow-mwdeploy':
-content  => "+ : deploy-service mwdeploy : ${bastion_ip}\n",
-priority => 50,
-}
-
-}
diff --git a/modules/role/manifests/beta/mediawiki.pp 
b/modules/role/manifests/beta/mediawiki.pp
new file mode 100644
index 000..f37cb52
--- /dev/null
+++ b/modules/role/manifests/beta/mediawiki.pp
@@ -0,0 +1,12 @@
+# == Class role::beta::mediawiki
+#
+# Allow mwdeploy to login from scap deployment host. Adds an exception in
+# /etc/security/access.conf to work around labs-specific restrictions
+class role::beta::mediawiki {
+$deployment_host = hiera('scap::deployment_server')
+$deployment_ip = ipresolve($deployment_host)
+security::access::config { 'scap-allow-mwdeploy':
+content  => "+ : mwdeploy : ${deployment_ip}\n",
+priority => 60,
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16cb7cc2e8f9ef81cec41ce9a29e00d2c34e64a3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Beta: Move beta::deployaccess to role::beta::deployaccess

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Beta: Move beta::deployaccess to role::beta::deployaccess
..

Beta: Move beta::deployaccess to role::beta::deployaccess

Change-Id: I16cb7cc2e8f9ef81cec41ce9a29e00d2c34e64a3
---
D modules/beta/manifests/deployaccess.pp
A modules/role/manifests/beta/mediawiki.pp
2 files changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/313927/1

diff --git a/modules/beta/manifests/deployaccess.pp 
b/modules/beta/manifests/deployaccess.pp
deleted file mode 100644
index 754412b..000
--- a/modules/beta/manifests/deployaccess.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# TODO: remove this if https://phabricator.wikimedia.org/T121721
-# is fixed.
-class beta::deployaccess(
-$bastion_ip = '10.68.20.135', # ip of deployment-mira
-) {
-
-security::access::config { 'beta-allow-mwdeploy':
-content  => "+ : deploy-service mwdeploy : ${bastion_ip}\n",
-priority => 50,
-}
-
-}
diff --git a/modules/role/manifests/beta/mediawiki.pp 
b/modules/role/manifests/beta/mediawiki.pp
new file mode 100644
index 000..f37cb52
--- /dev/null
+++ b/modules/role/manifests/beta/mediawiki.pp
@@ -0,0 +1,12 @@
+# == Class role::beta::mediawiki
+#
+# Allow mwdeploy to login from scap deployment host. Adds an exception in
+# /etc/security/access.conf to work around labs-specific restrictions
+class role::beta::mediawiki {
+$deployment_host = hiera('scap::deployment_server')
+$deployment_ip = ipresolve($deployment_host)
+security::access::config { 'scap-allow-mwdeploy':
+content  => "+ : mwdeploy : ${deployment_ip}\n",
+priority => 60,
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make mw.wikibase.entity:getLabel/:getDescription obey allowD...

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Make mw.wikibase.entity:getLabel/:getDescription obey 
allowDataAccessInUserLanguage
..

Make mw.wikibase.entity:getLabel/:getDescription obey 
allowDataAccessInUserLanguage

Bug: T143277
Change-Id: Idbbbf1cbfa1e10bdbc6c6bec1e27df19f30b2ab1
---
M client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
M client/includes/DataAccess/Scribunto/mw.wikibase.entity.lua
M 
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M 
client/tests/phpunit/includes/DataAccess/Scribunto/WikibaseLuaEntityBindingsTest.php
M docs/lua.wiki
6 files changed, 77 insertions(+), 9 deletions(-)


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

diff --git 
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php 
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
index 80379da..e9634d7 100644
--- 
a/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
+++ 
b/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibrary.php
@@ -79,6 +79,7 @@
return new WikibaseLuaEntityBindings(
$entityStatementsRenderer,
$wikibaseClient->getEntityIdParser(),
+   $lang,
$wikibaseClient->getSettings()->getSetting( 
'siteGlobalID' )
);
}
@@ -135,6 +136,7 @@
// these can't be called from user code, unless explicitly 
exposed in Lua.
$lib = array(
'getGlobalSiteId' => array( $this, 'getGlobalSiteId' ),
+   'getLanguageCode' => array( $this, 'getLanguageCode' ),
'formatPropertyValues' => array( $this, 
'formatPropertyValues' ),
);
 
@@ -155,6 +157,17 @@
}
 
/**
+* Wrapper for getLanguageCode in WikibaseLuaEntityBindings
+*
+* @since 0.5
+*
+* @return string[]
+*/
+   public function getLanguageCode() {
+   return array( $this->getImplementation()->getLanguageCode() );
+   }
+
+   /**
 * Render the main Snaks belonging to a Statement (which is identified 
by a PropertyId
 * or the label of a Property).
 *
diff --git a/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php 
b/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
index 8c4652c..50ef48b 100644
--- a/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
+++ b/client/includes/DataAccess/Scribunto/WikibaseLuaEntityBindings.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Client\DataAccess\Scribunto;
 
+use Language;
 use Wikibase\Client\DataAccess\StatementTransclusionInteractor;
 use Wikibase\DataModel\Entity\EntityIdParser;
 
@@ -26,6 +27,11 @@
private $entityIdParser;
 
/**
+* @var Language
+*/
+   private $language;
+
+   /**
 * @var string
 */
private $siteId;
@@ -33,15 +39,18 @@
/**
 * @param StatementTransclusionInteractor 
$statementTransclusionInteractor
 * @param EntityIdParser $entityIdParser
+* @param Language $language
 * @param string $siteId
 */
public function __construct(
StatementTransclusionInteractor 
$statementTransclusionInteractor,
EntityIdParser $entityIdParser,
+   Language $language,
$siteId
) {
$this->statementTransclusionInteractor = 
$statementTransclusionInteractor;
$this->entityIdParser = $entityIdParser;
+   $this->language = $language;
$this->siteId = $siteId;
}
 
@@ -80,4 +89,17 @@
return $this->siteId;
}
 
+   /**
+* Get the language we are currently working with.
+* @TODO: Once T114640 has been implemented, this should probably be
+* generally exposed in Scribunto as parser target language.
+*
+* @since 0.5
+*
+* @return string
+*/
+   public function getLanguageCode() {
+   return $this->language->getCode();
+   }
+
 }
diff --git a/client/includes/DataAccess/Scribunto/mw.wikibase.entity.lua 
b/client/includes/DataAccess/Scribunto/mw.wikibase.entity.lua
index 1fb0623..b3acf5c 100644
--- a/client/includes/DataAccess/Scribunto/mw.wikibase.entity.lua
+++ b/client/includes/DataAccess/Scribunto/mw.wikibase.entity.lua
@@ -44,14 +44,15 @@
return entity
 end
 
--- Get a term of a given type for a given language code or the content 
language.
+-- Get a term of a given type for a given 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Repool db1091 with regular weight

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Repool db1091 with regular weight
..


Repool db1091 with regular weight

Bug: T147113
Change-Id: I7a5b059e656b6d1927b1618dc79c93ff118cec93
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ba56de3..13fc14b 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -137,7 +137,7 @@
'db1068' => 1,   # 2.8TB 160GB, api
'db1081' => 500, # 3.6TB 512GB
'db1084' => 500, # 3.6TB 512GB
-   'db1091' => 100, # 3.6TB 512GB
+   'db1091' => 500, # 3.6TB 512GB
],
's5' => [
'db1049' => 0,   # 2.8TB  64GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a5b059e656b6d1927b1618dc79c93ff118cec93
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
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]: Remove dead link in readme

[jenkins-bot (Code Review)]

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

Change subject: Remove dead link in readme
..


Remove dead link in readme

Change-Id: I6e7bdd8a51bdd3a5e93d8fe1ae04a08af56d3e86
---
M README.md
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index e8af8f7..9aa9c5e 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,6 @@
 A list of language codes can be found 
[here](https://meta.wikimedia.org/wiki/Special:SiteMatrix).
 
 Feed endpoints:
-* http://localhost:6927/en.wikipedia.org/v1/feed/featured/2016/05/30
 * http://localhost:6927/en.wikipedia.org/v1/page/featured/2016/05/30
 * http://localhost:6927/en.wikipedia.org/v1/media/image/featured/2016/05/30
 * http://localhost:6927/en.wikipedia.org/v1/page/news

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e7bdd8a51bdd3a5e93d8fe1ae04a08af56d3e86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
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]: mariadb: change phabricator's stopwords and init's owner to ...

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: mariadb: change phabricator's stopwords and init's owner to root
..


mariadb: change phabricator's stopwords and init's owner to root

Both of these 2 files are world-readable, make sure they are only
writable by root, and cannot be overwritten by random mysql
processes.

Change-Id: I5b805fc20c22ecff1732068fe117a82ae770a27b
---
M manifests/role/mariadb.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index b33b5e3..a01d113 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -308,16 +308,16 @@
 
 file { '/etc/mysql/phabricator-init.sql':
 ensure  => present,
-owner   => 'mysql',
-group   => 'mysql',
+owner   => 'root',
+group   => 'root',
 mode=> '0644',
 content => template('mariadb/phabricator-init.sql.erb'),
 }
 
 file { '/etc/mysql/phabricator-stopwords.txt':
 ensure  => present,
-owner   => 'mysql',
-group   => 'mysql',
+owner   => 'root',
+group   => 'root',
 mode=> '0644',
 content => template('mariadb/phabricator-stopwords.txt.erb'),
 }

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: CapsuleMultiselectWidget: Don't discard current input value ...

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: CapsuleMultiselectWidget: Don't discard current input value 
when editing an item
..

CapsuleMultiselectWidget: Don't discard current input value when editing an item

Previously, if the user clicked on one capsule, and then on another,
the last one (which was in text input mode) would be lost.

Change-Id: I5d5b33455601e5681a803bd7c08e9bc0cd541008
---
M src/widgets/CapsuleMultiselectWidget.js
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/25/313925/1

diff --git a/src/widgets/CapsuleMultiselectWidget.js 
b/src/widgets/CapsuleMultiselectWidget.js
index f3e2952..ce8d189 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -388,6 +388,8 @@
  * @param {Object} item
  */
 OO.ui.CapsuleMultiselectWidget.prototype.editItem = function ( item ) {
+   this.addItemFromLabel( this.$input.val() );
+   this.clearInput();
this.$input.val( item.label );
this.updateInputSize();
this.focus();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d5b33455601e5681a803bd7c08e9bc0cd541008
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: [XenForoAuth] Add jenkins tests

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [XenForoAuth] Add jenkins tests
..

[XenForoAuth] Add jenkins tests

Adds composer-test and npm test

Also add a non voting uinit test test so that we can test to see which
test will work then make it voting.

Change-Id: Ia4f167f609119d1acba9b16726ce54b7e27991cb
---
M zuul/layout.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/24/313924/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c98ea8e..dd7f65b 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7038,6 +7038,14 @@
 template:
  - name: archived
 
+  - name: mediawiki/extensions/XenForoAuth
+template:
+  - name: composer-test
+  - name: extension-unittests-composer-non-voting
+  - name: npm
+check:
+  - jsonlint
+
   - name: mediawiki/extensions/XAnalytics
 template:
   - name: mw-checks-test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4f167f609119d1acba9b16726ce54b7e27991cb
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Repool db1091 with regular weight

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Repool db1091 with regular weight
..

Repool db1091 with regular weight

Bug: T147113
Change-Id: I7a5b059e656b6d1927b1618dc79c93ff118cec93
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ba56de3..13fc14b 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -137,7 +137,7 @@
'db1068' => 1,   # 2.8TB 160GB, api
'db1081' => 500, # 3.6TB 512GB
'db1084' => 500, # 3.6TB 512GB
-   'db1091' => 100, # 3.6TB 512GB
+   'db1091' => 500, # 3.6TB 512GB
],
's5' => [
'db1049' => 0,   # 2.8TB  64GB, master

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [XenForoAuth] Add extension to translation list

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: [XenForoAuth] Add extension to translation list
..

Insert the description of the change.

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/22/313922/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3338c8976d4dc1c2162d2d939048a194661027fa
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Remove beta::deployaccess as it's no longer needed."

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Revert "Remove beta::deployaccess as it's no longer needed."
..


Revert "Remove beta::deployaccess as it's no longer needed."

We still need this, I guess?

This reverts commit 279d10aedfaf3604c8f977df930548327635da11.

Change-Id: I61740a508c322b37104542bdfb162bb6bdb87686
---
A modules/beta/manifests/deployaccess.pp
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/modules/beta/manifests/deployaccess.pp 
b/modules/beta/manifests/deployaccess.pp
new file mode 100644
index 000..754412b
--- /dev/null
+++ b/modules/beta/manifests/deployaccess.pp
@@ -0,0 +1,12 @@
+# TODO: remove this if https://phabricator.wikimedia.org/T121721
+# is fixed.
+class beta::deployaccess(
+$bastion_ip = '10.68.20.135', # ip of deployment-mira
+) {
+
+security::access::config { 'beta-allow-mwdeploy':
+content  => "+ : deploy-service mwdeploy : ${bastion_ip}\n",
+priority => 50,
+}
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61740a508c322b37104542bdfb162bb6bdb87686
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@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Remove beta::deployaccess as it's no longer needed."

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Revert "Remove beta::deployaccess as it's no longer needed."
..

Revert "Remove beta::deployaccess as it's no longer needed."

We still need this, I guess?

This reverts commit 279d10aedfaf3604c8f977df930548327635da11.

Change-Id: I61740a508c322b37104542bdfb162bb6bdb87686
---
A modules/beta/manifests/deployaccess.pp
1 file changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/modules/beta/manifests/deployaccess.pp 
b/modules/beta/manifests/deployaccess.pp
new file mode 100644
index 000..754412b
--- /dev/null
+++ b/modules/beta/manifests/deployaccess.pp
@@ -0,0 +1,12 @@
+# TODO: remove this if https://phabricator.wikimedia.org/T121721
+# is fixed.
+class beta::deployaccess(
+$bastion_ip = '10.68.20.135', # ip of deployment-mira
+) {
+
+security::access::config { 'beta-allow-mwdeploy':
+content  => "+ : deploy-service mwdeploy : ${bastion_ip}\n",
+priority => 50,
+}
+
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61740a508c322b37104542bdfb162bb6bdb87686
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Add a version; set to 1.1

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Add a version; set to 1.1
..

Add a version; set to 1.1

Change-Id: I32f2e24c2d06f0bc27d64c43ab6f55b0daac4233
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke 
refs/changes/20/313920/1

diff --git a/extension.json b/extension.json
index 40ef5b6..cab8580 100644
--- a/extension.json
+++ b/extension.json
@@ -1,5 +1,6 @@
 {
"name": "BlockAndNuke",
+   "version": "1.1",
"author": [
"Eliora Stahl",
"..."

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32f2e24c2d06f0bc27d64c43ab6f55b0daac4233
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
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/mediawiki-config[master]: Repool db1091 with low weight after maintenance

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Repool db1091 with low weight after maintenance
..


Repool db1091 with low weight after maintenance

Bug: T147113
Change-Id: Ib047c4d6db066cba9640603baa8ea7e5595fd34c
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5235e98..ba56de3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -137,7 +137,7 @@
'db1068' => 1,   # 2.8TB 160GB, api
'db1081' => 500, # 3.6TB 512GB
'db1084' => 500, # 3.6TB 512GB
-#  'db1091' => 500, # 3.6TB 512GB
+   'db1091' => 100, # 3.6TB 512GB
],
's5' => [
'db1049' => 0,   # 2.8TB  64GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib047c4d6db066cba9640603baa8ea7e5595fd34c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
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]: Repool db1091 with low weight after maintenance

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Repool db1091 with low weight after maintenance
..

Repool db1091 with low weight after maintenance

Bug: T147113
Change-Id: Ib047c4d6db066cba9640603baa8ea7e5595fd34c
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5235e98..ba56de3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -137,7 +137,7 @@
'db1068' => 1,   # 2.8TB 160GB, api
'db1081' => 500, # 3.6TB 512GB
'db1084' => 500, # 3.6TB 512GB
-#  'db1091' => 500, # 3.6TB 512GB
+   'db1091' => 100, # 3.6TB 512GB
],
's5' => [
'db1049' => 0,   # 2.8TB  64GB, master

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove beta::deployaccess as it's no longer needed.

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Remove beta::deployaccess as it's no longer needed.
..


Remove beta::deployaccess as it's no longer needed.

Bug: T121721
Bug: T147233
Change-Id: I82a9d1bb44122df37ad403da20d3bcd260ebca0f
---
D modules/beta/manifests/deployaccess.pp
1 file changed, 0 insertions(+), 12 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  20after4: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/beta/manifests/deployaccess.pp 
b/modules/beta/manifests/deployaccess.pp
deleted file mode 100644
index 754412b..000
--- a/modules/beta/manifests/deployaccess.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# TODO: remove this if https://phabricator.wikimedia.org/T121721
-# is fixed.
-class beta::deployaccess(
-$bastion_ip = '10.68.20.135', # ip of deployment-mira
-) {
-
-security::access::config { 'beta-allow-mwdeploy':
-content  => "+ : deploy-service mwdeploy : ${bastion_ip}\n",
-priority => 50,
-}
-
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82a9d1bb44122df37ad403da20d3bcd260ebca0f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[wmf-deploy]: Add en.wiktionary.org to blacklist temporarily to prevent DoS.

[C. Scott Ananian (Code Review)]

C. Scott Ananian has submitted this change and it was merged.

Change subject: Add en.wiktionary.org to blacklist temporarily to prevent DoS.
..


Add en.wiktionary.org to blacklist temporarily to prevent DoS.

Bug: T147211
Change-Id: I9e14710601bb8a3311e10971a8975fb641ee1a1b
---
M LocalSettings.js
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  C. Scott Ananian: Verified; Looks good to me, approved



diff --git a/LocalSettings.js b/LocalSettings.js
index 86e998d..60afb3e 100644
--- a/LocalSettings.js
+++ b/LocalSettings.js
@@ -10,6 +10,9 @@
config.backend.writers.rdf2latex.bin = 
"/srv/deployment/ocg/ocg/mw-ocg-latexer/bin/mw-ocg-latexer";
config.backend.writers.rdf2text.bin = 
"/srv/deployment/ocg/ocg/mw-ocg-texter/bin/mw-ocg-texter";
 
+   // DoS prevention: stop spider of wiktionary (2016-10-03, T147211)
+   config.frontend.blacklist = /"baseurl":"[^"]*en\.wiktionary\.org/;
+
// DoS prevention: limit bundle sizes to 512MB

config.backend.bundler.additionalArgs.push('--image-size-limit=5');

config.backend.bundler.additionalArgs.push('--bundle-size-limit=536870912');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e14710601bb8a3311e10971a8975fb641ee1a1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: change phabricator's stopwords and init's owner to ...

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: mariadb: change phabricator's stopwords and init's owner to root
..

mariadb: change phabricator's stopwords and init's owner to root

Both of these 2 files are world-readable, make sure they are only
writable by root, and cannot be overwritten by random mysql
processes.

Change-Id: I5b805fc20c22ecff1732068fe117a82ae770a27b
---
M manifests/role/mariadb.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/313918/1

diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index b33b5e3..a01d113 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -308,16 +308,16 @@
 
 file { '/etc/mysql/phabricator-init.sql':
 ensure  => present,
-owner   => 'mysql',
-group   => 'mysql',
+owner   => 'root',
+group   => 'root',
 mode=> '0644',
 content => template('mariadb/phabricator-init.sql.erb'),
 }
 
 file { '/etc/mysql/phabricator-stopwords.txt':
 ensure  => present,
-owner   => 'mysql',
-group   => 'mysql',
+owner   => 'root',
+group   => 'root',
 mode=> '0644',
 content => template('mariadb/phabricator-stopwords.txt.erb'),
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Revert "Temporarily override broken toolbar border colour"

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Revert "Temporarily override broken toolbar border colour"
..

Revert "Temporarily override broken toolbar border colour"

This reverts commit 4c8a97f9e83248719705220d5a049d4512bc62e7.

[Pending next OOUI release.]

Change-Id: I890a7081ffa7c015bd32466fa88d61e3f38af4e6
---
M modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
1 file changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css 
b/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
index 71e01eb..952e42a 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css
@@ -23,9 +23,3 @@
 .ve-init-target-ie .ve-ce-surface h6 {
overflow: visible;
 }
-
-/* HACK: Fix border color from MW theme, will be fixed in next OO-UI release */
-.oo-ui-toolbar-actions .oo-ui-toolGroup,
-.oo-ui-toolbar-actions > .oo-ui-toolbar:not( :last-child ) {
-   border-color: #c8ccd1;
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I890a7081ffa7c015bd32466fa88d61e3f38af4e6
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] mediawiki...BlockAndNuke[master]: Fix completely broken UserMerge support

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Fix completely broken UserMerge support
..

Fix completely broken UserMerge support

Define static functions as public

Change-Id: I9fa2dbcf39df1e084b550fd131116bf36a37673b
---
M BanPests.php
M ban.php
2 files changed, 20 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke 
refs/changes/17/313917/1

diff --git a/BanPests.php b/BanPests.php
index 67fd9b7..cb03b8b 100644
--- a/BanPests.php
+++ b/BanPests.php
@@ -2,7 +2,7 @@
 
 class BanPests {
 
-   static function getWhitelist() {
+   public static function getWhitelist() {
global $wgBaNwhitelist, $wgWhitelist;
 
/* Backward compatibility */
@@ -20,7 +20,7 @@
return preg_split( '/\r\n|\r|\n/', $file );
}
 
-   static function getBannableUsers() {
+   public static function getBannableUsers() {
$dbr = wfGetDB( DB_SLAVE );
$cond = array( 'rc_new' => 1 ); /* Anyone creating new pages */
$cond[] = $dbr->makeList(   /* Anyone uploading 
stuff */
@@ -56,7 +56,7 @@
);
}
 
-   static function getBannableIP( $user ) {
+   public static function getBannableIP( $user ) {
$dbr = wfGetDB( DB_SLAVE );
$ip = array();
if( is_array( $user ) ) {
@@ -87,7 +87,7 @@
);
}
 
-   static function getBannablePages( $user ) {
+   public static function getBannablePages( $user ) {
$dbr = wfGetDB( DB_SLAVE );
$result = null;
if( $user ) {
@@ -115,7 +115,7 @@
return $pages;
}
 
-   static function banIPs( $ips, $banningUser, $sp = null ) {
+   public static function banIPs( $ips, $banningUser, $sp = null ) {
$ret = array();
foreach( (array)$ips as $ip ) {
if( !Block::newFromTarget( $ip ) ) {
@@ -149,12 +149,19 @@
return (bool)$ret;
}
 
-   static function banUser( $user, $banningUser, $spammer, $um ) {
+   /**
+* @param User $user User to be banned
+* @param User $banningUser User doing the ban
+* @param User $spammer User for account to be merged into if UserMerge 
installed
+* @return array|bool|null
+*/
+   public static function banUser( $user, $banningUser, $spammer ) {
$ret = null;
if ( !is_object( $user ) ) {
/* Skip this one */
-   } elseif ( $user->getID() != 0 && $um ) {
-   $ret = $um->merge( $user, $spammer, "block", 
$banningUser );
+   } elseif ( $user->getID() != 0 && class_exists( "MergeUser" ) ) 
{
+   $um = new MergeUser( $spammer, $user );
+   $ret = $um->merge( $banningUser, __METHOD__ );
} else {
if( !Block::newFromTarget( $user->getName() ) ) {
$blk = new Block(
@@ -183,7 +190,7 @@
return $ret;
}
 
-   static function blockUser($user, $user_id, $banningUser, $spammer, $um) 
{
+   public static function blockUser($user, $user_id, $banningUser, 
$spammer ) {
$ret = array();
for($c = 0; $c < max( count($user), count($user_id) ); $c++ ){
if( isset( $user[$c] ) ) {
@@ -191,13 +198,13 @@
} elseif( isset( $user_id[$c] ) ) {
$thisUserObj = User::newFromId( $user_id[$c] );
}
-   $ret[] = self::banUser( $thisUserObj, $banningUser, 
$spammer, $um );
+   $ret[] = self::banUser( $thisUserObj, $banningUser, 
$spammer );
}
$ret = array_filter( $ret );
return (bool)$ret;
}
 
-   static function deletePage( $title, $sp = null ) {
+   public static function deletePage( $title, $sp = null ) {
$ret = null;
$file = $title->getNamespace() == NS_IMAGE ? wfLocalFile( 
$title ) : false;
if ( $file ) {
@@ -217,7 +224,7 @@
return $ret;
}
 
-   static function deletePages( $pages, $sp = null ) {
+   public static function deletePages( $pages, $sp = null ) {
$ret = array();
foreach( (array)$pages as $page ) {
$ret[] = self::deletePage( Title::newFromText( $page ), 
$sp );
diff --git a/ban.php b/ban.php
index b046204..ad5e419 100644
--- a/ban.php
+++ b/ban.php
@@ -53,10 +53,6 @@
 
$spammer = User::newFromName( $wgBaNSpamUser );
$banningUser = User::newFromName( "WikiSysop" );
-  

[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[wmf-deploy]: Add en.wiktionary.org to blacklist temporarily to prevent DoS.

[C. Scott Ananian (Code Review)]

C. Scott Ananian has uploaded a new change for review.

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

Change subject: Add en.wiktionary.org to blacklist temporarily to prevent DoS.
..

Add en.wiktionary.org to blacklist temporarily to prevent DoS.

Bug: T147211
Change-Id: I9e14710601bb8a3311e10971a8975fb641ee1a1b
---
M LocalSettings.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/15/313915/1

diff --git a/LocalSettings.js b/LocalSettings.js
index 86e998d..60afb3e 100644
--- a/LocalSettings.js
+++ b/LocalSettings.js
@@ -10,6 +10,9 @@
config.backend.writers.rdf2latex.bin = 
"/srv/deployment/ocg/ocg/mw-ocg-latexer/bin/mw-ocg-latexer";
config.backend.writers.rdf2text.bin = 
"/srv/deployment/ocg/ocg/mw-ocg-texter/bin/mw-ocg-texter";
 
+   // DoS prevention: stop spider of wiktionary (2016-10-03, T147211)
+   config.frontend.blacklist = /"baseurl":"[^"]*en\.wiktionary\.org/;
+
// DoS prevention: limit bundle sizes to 512MB

config.backend.bundler.additionalArgs.push('--image-size-limit=5');

config.backend.bundler.additionalArgs.push('--bundle-size-limit=536870912');

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e14710601bb8a3311e10971a8975fb641ee1a1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Fix UserMerge support

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Fix UserMerge support
..

Fix UserMerge support

Change-Id: Ib8d4e05e60ecd9557f1ba418671a401ffc28ccdb
---
M BlockandNuke.body.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke 
refs/changes/14/313914/2

diff --git a/BlockandNuke.body.php b/BlockandNuke.body.php
index 65d42b8..48e2cde 100644
--- a/BlockandNuke.body.php
+++ b/BlockandNuke.body.php
@@ -23,8 +23,8 @@
 
$um = null;
$spammer = User::newFromName( $wgBaNSpamUser );
-   if( class_exists( "UserMerger" ) && $spammer->getID() != 0 )  {
-   $um = new UserMerger( $this );
+   if( class_exists( "SpecialUserMerge" ) && $spammer->getID() != 
0 )  {
+   $um = new SpecialUserMerge( $this );
}
$posted = $wgRequest->wasPosted();
if( $posted ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8d4e05e60ecd9557f1ba418671a401ffc28ccdb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Paladox 
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...ocg-collection[wmf-deploy]: Merge branch 'master' into wmf-deploy

[C. Scott Ananian (Code Review)]

C. Scott Ananian has submitted this change and it was merged.

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


Merge branch 'master' into wmf-deploy

Change-Id: Ibc86a4ca0bb8e01cdaaf39ce9078214c7de99c85
---
M Makefile
1 file changed, 1 insertion(+), 9 deletions(-)

Approvals:
  C. Scott Ananian: Verified; Looks good to me, approved



diff --git a/Makefile b/Makefile
index 113bd4d..a56d6ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,12 @@
-<<< HEAD   (e3e0fd Merge branch 'master' into wmf-deploy)
-all: production
-===
 NODE?=/usr/bin/env nodejs
 
-all: debug
->>> BRANCH (02e565 Synchronize package.json unification code with 
wmf-deploy br)
+all: production
 
 core:
export LINK=g++
rm -f ./package.json
npm install core-js@0.9.x prfun@2.1.x semver@4.1.x
-<<< HEAD   (e3e0fd Merge branch 'master' into wmf-deploy)
-   ./unify-package-json.js
-===
$(NODE) ./unify-package-json.js
->>> BRANCH (02e565 Synchronize package.json unification code with 
wmf-deploy br)
npm install
npm update
npm dedupe

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc86a4ca0bb8e01cdaaf39ce9078214c7de99c85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[master]: Updating to latest masters

[C. Scott Ananian (Code Review)]

C. Scott Ananian has submitted this change and it was merged.

Change subject: Updating to latest masters
..


Updating to latest masters

Deployed new service (d0f8e126f5d1ad53358c7c7380ca02f41c33ead6):
* T147211: Allow administrators to blacklist renders of certain metabooks.

Deployed new latexer (45c30840d22a7590cee904aff5f2e272c75d3bdb):
* T144120: Add `\FloatBarrier`s after articles.

Change-Id: I3bd1339214d5d752d934ed80a92d0647bd1f2efa
---
M mw-ocg-latexer
M mw-ocg-service
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  C. Scott Ananian: Verified; Looks good to me, approved



diff --git a/mw-ocg-latexer b/mw-ocg-latexer
index 544a26a..45c3084 16
--- a/mw-ocg-latexer
+++ b/mw-ocg-latexer
@@ -1 +1 @@
-Subproject commit 544a26ae19eb0e0c0ae9bea98e24630b8ca7982b
+Subproject commit 45c30840d22a7590cee904aff5f2e272c75d3bdb
diff --git a/mw-ocg-service b/mw-ocg-service
index 51d2eb6..d0f8e12 16
--- a/mw-ocg-service
+++ b/mw-ocg-service
@@ -1 +1 @@
-Subproject commit 51d2eb6d47dfc5225d8d5bc45444e81cc233b1c7
+Subproject commit d0f8e126f5d1ad53358c7c7380ca02f41c33ead6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3bd1339214d5d752d934ed80a92d0647bd1f2efa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[master]: Synchronize package.json unification code with wmf-deploy br...

[C. Scott Ananian (Code Review)]

C. Scott Ananian has submitted this change and it was merged.

Change subject: Synchronize package.json unification code with wmf-deploy 
branch.
..


Synchronize package.json unification code with wmf-deploy branch.

This is a cherry-pick of 4533acd571ec9a5114a1a53233552c16a298d4fe.

Change-Id: I7baf0f84ae8b8b0627d68107033a860623684858
---
M Makefile
M unify-package-json.js
2 files changed, 29 insertions(+), 8 deletions(-)

Approvals:
  C. Scott Ananian: Verified; Looks good to me, approved



diff --git a/Makefile b/Makefile
index b591b28..3ff2eab 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 core:
export LINK=g++
rm -f ./package.json
-   npm install prfun semver
+   npm install core-js@0.9.x prfun@2.1.x semver@4.1.x
$(NODE) ./unify-package-json.js
npm install
npm update
diff --git a/unify-package-json.js b/unify-package-json.js
index 9dbfaf0..1b99a77 100755
--- a/unify-package-json.js
+++ b/unify-package-json.js
@@ -11,17 +11,26 @@
  * library (since we want to use fancy non-standard Promise features).
  */
 
+var haveAllPackages = true;
+['core-js','prfun','semver'].forEach(function(pkg) {
+   try {
+   require(pkg);
+   } catch (err) {
+   console.err( "The '"+pkg+"' library could not be loaded.  
Please `npm install "+pkg+"`" );
+   haveAllPackages = false;
+   }
+});
+if (!haveAllPackages) {
+   process.exit(1);
+}
+
+require('core-js'); // for Map/Set
 var child_process = require( 'child_process' ),
semver = require( 'semver' ),
fs = require( 'fs' ),
path = require( 'path' ),
-   util = require( 'util' );
-
-try {
-   require('prfun/smash');
-} catch ( err ) {
-   console.err( "The 'prfun' library could not be loaded. Please `npm 
install prfun`")
-}
+   util = require( 'util' ),
+   Promise = require( 'prfun' );
 
 function findPackageJson() {
var readdir = Promise.promisify(fs.readdir, false, fs);
@@ -94,6 +103,18 @@
optdeps = iterate( 'optionalDependencies', packageObjs );
console.info( 'Unifying unified development dependencies' );
glodevdeps = iterate( 'devDependencies', packageObjs );
+   // Hack around the 'mw-ocg-bundler' dev dependency; don't make it global
+   delete glodevdeps['mw-ocg-bundler'];
+   // Remove optional and dev dependencies if they are already in 
dependencies
+   // (In particular we need to remove the `request` package from
+   // devDependencies so that `npm prune --production` doesn't delete it!)
+   [ optdeps, glodevdeps ].forEach( function( d ) {
+   Object.keys(d).forEach( function( pkg ) {
+   if ( d[pkg] === glodeps[pkg] ) {
+   delete d[pkg];
+   }
+   } );
+   } );
 
return {
'dependencies': glodeps,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7baf0f84ae8b8b0627d68107033a860623684858
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[wmf-deploy]: Merge branch 'master' into wmf-deploy

[C. Scott Ananian (Code Review)]

C. Scott Ananian has uploaded a new change for review.

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

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

Merge branch 'master' into wmf-deploy

Change-Id: Ibc86a4ca0bb8e01cdaaf39ce9078214c7de99c85
---
M Makefile
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/13/313913/1

diff --git a/Makefile b/Makefile
index 113bd4d..a56d6ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,12 @@
-<<< HEAD   (e3e0fd Merge branch 'master' into wmf-deploy)
-all: production
-===
 NODE?=/usr/bin/env nodejs
 
-all: debug
->>> BRANCH (02e565 Synchronize package.json unification code with 
wmf-deploy br)
+all: production
 
 core:
export LINK=g++
rm -f ./package.json
npm install core-js@0.9.x prfun@2.1.x semver@4.1.x
-<<< HEAD   (e3e0fd Merge branch 'master' into wmf-deploy)
-   ./unify-package-json.js
-===
$(NODE) ./unify-package-json.js
->>> BRANCH (02e565 Synchronize package.json unification code with 
wmf-deploy br)
npm install
npm update
npm dedupe

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc86a4ca0bb8e01cdaaf39ce9078214c7de99c85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[master]: Synchronize package.json unification code with wmf-deploy br...

[C. Scott Ananian (Code Review)]

C. Scott Ananian has uploaded a new change for review.

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

Change subject: Synchronize package.json unification code with wmf-deploy 
branch.
..

Synchronize package.json unification code with wmf-deploy branch.

This is a cherry-pick of 4533acd571ec9a5114a1a53233552c16a298d4fe.

Change-Id: I7baf0f84ae8b8b0627d68107033a860623684858
---
M Makefile
M unify-package-json.js
2 files changed, 29 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/12/313912/1

diff --git a/Makefile b/Makefile
index b591b28..3ff2eab 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 core:
export LINK=g++
rm -f ./package.json
-   npm install prfun semver
+   npm install core-js@0.9.x prfun@2.1.x semver@4.1.x
$(NODE) ./unify-package-json.js
npm install
npm update
diff --git a/unify-package-json.js b/unify-package-json.js
index 9dbfaf0..1b99a77 100755
--- a/unify-package-json.js
+++ b/unify-package-json.js
@@ -11,17 +11,26 @@
  * library (since we want to use fancy non-standard Promise features).
  */
 
+var haveAllPackages = true;
+['core-js','prfun','semver'].forEach(function(pkg) {
+   try {
+   require(pkg);
+   } catch (err) {
+   console.err( "The '"+pkg+"' library could not be loaded.  
Please `npm install "+pkg+"`" );
+   haveAllPackages = false;
+   }
+});
+if (!haveAllPackages) {
+   process.exit(1);
+}
+
+require('core-js'); // for Map/Set
 var child_process = require( 'child_process' ),
semver = require( 'semver' ),
fs = require( 'fs' ),
path = require( 'path' ),
-   util = require( 'util' );
-
-try {
-   require('prfun/smash');
-} catch ( err ) {
-   console.err( "The 'prfun' library could not be loaded. Please `npm 
install prfun`")
-}
+   util = require( 'util' ),
+   Promise = require( 'prfun' );
 
 function findPackageJson() {
var readdir = Promise.promisify(fs.readdir, false, fs);
@@ -94,6 +103,18 @@
optdeps = iterate( 'optionalDependencies', packageObjs );
console.info( 'Unifying unified development dependencies' );
glodevdeps = iterate( 'devDependencies', packageObjs );
+   // Hack around the 'mw-ocg-bundler' dev dependency; don't make it global
+   delete glodevdeps['mw-ocg-bundler'];
+   // Remove optional and dev dependencies if they are already in 
dependencies
+   // (In particular we need to remove the `request` package from
+   // devDependencies so that `npm prune --production` doesn't delete it!)
+   [ optdeps, glodevdeps ].forEach( function( d ) {
+   Object.keys(d).forEach( function( pkg ) {
+   if ( d[pkg] === glodeps[pkg] ) {
+   delete d[pkg];
+   }
+   } );
+   } );
 
return {
'dependencies': glodeps,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7baf0f84ae8b8b0627d68107033a860623684858
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Language selector should inherit float rather than clear it

[jenkins-bot (Code Review)]

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

Change subject: Language selector should inherit float rather than clear it
..


Language selector should inherit float rather than clear it

Change-Id: I5c833082722e499429769efb04a3af97559cb8d9
---
M resources/skins.minerva.base.styles/pageactions.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 24ab367..3188115 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -131,7 +131,7 @@
margin: 0 0 @iconGutterWidth @iconGutterWidth;
 
.language-selector {
-   float: none;
+   float: inherit;
}
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c833082722e499429769efb04a3af97559cb8d9
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] apps...wikipedia[master]: Add comment to search-related eventlogging to inform Discove...

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Add comment to search-related eventlogging to inform Discovery 
of changes
..

Add comment to search-related eventlogging to inform Discovery of changes

Change-Id: Ib5be8daa93cc9022487dbdf0bfbfad5c5d4f4625
---
M Wikipedia/WMFSearchFunnel.m
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia 
refs/changes/10/313910/1

diff --git a/Wikipedia/WMFSearchFunnel.m b/Wikipedia/WMFSearchFunnel.m
index 5db3d8b..e7773a1 100644
--- a/Wikipedia/WMFSearchFunnel.m
+++ b/Wikipedia/WMFSearchFunnel.m
@@ -9,7 +9,7 @@
 #import "WMFSearchFunnel.h"
 
 static NSString* const kSchemaName= @"MobileWikiAppSearch";
-static int const kSchemaVersion   = 10641988;
+static int const kSchemaVersion   = 10641988; // Please email 
someone in Discovery (Search Team's Product Manager or a Data Analyst) if you 
change the schema name or version.
 static NSString* const kAppInstallIdKey   = @"appInstallID";
 static NSString* const kSearchSessionTokenKey = @"searchSessionToken";
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5be8daa93cc9022487dbdf0bfbfad5c5d4f4625
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add comment to search-related eventlogging to inform Discove...

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Add comment to search-related eventlogging to inform Discovery 
of changes
..

Add comment to search-related eventlogging to inform Discovery of changes

Change-Id: I95fbea9a69858882c59e110843eab834b9947ce1
---
M app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
index 737f980..2e7c204 100644
--- a/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/SessionFunnel.java
@@ -17,6 +17,10 @@
 public static final int DEFAULT_SESSION_TIMEOUT = 30;
 public static final int MIN_SESSION_TIMEOUT = 1;
 
+/**
+ * Please email someone in Discovery (Search Team's Product Manager or a 
Data Analyst)
+ * if you change the schema name or version.
+ */
 private static final String SCHEMA_NAME = "MobileWikiAppSessions";
 private static final int REVISION = 15522505;
 

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: CapsuleItemWidget: Make interactivity of label clearer

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: CapsuleItemWidget: Make interactivity of label clearer
..

CapsuleItemWidget: Make interactivity of label clearer

Adding `cursor: text` to give user an additional hint, that clicking
the label is bound to an action – `cursor: pointer` would be more
appropriate but is in direct competition with remove indicator.

Change-Id: Ifd97ace4236cf5f03d5eda09be67a36f96e300d4
---
M src/styles/widgets/CapsuleItemWidget.less
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/09/313909/1

diff --git a/src/styles/widgets/CapsuleItemWidget.less 
b/src/styles/widgets/CapsuleItemWidget.less
index aa6e085..2cf7f58 100644
--- a/src/styles/widgets/CapsuleItemWidget.less
+++ b/src/styles/widgets/CapsuleItemWidget.less
@@ -10,6 +10,7 @@
display: inline-block;
text-overflow: ellipsis;
overflow: hidden;
+   cursor: text;
}
 
.theme-oo-ui-capsuleItemWidget();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd97ace4236cf5f03d5eda09be67a36f96e300d4
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] mediawiki...VisualEditor[master]: Allow NWE on non-VE namespaces

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Allow NWE on non-VE namespaces
..

Allow NWE on non-VE namespaces

Bug: T146182
Change-Id: I9547dfd591ad1e68e045b4928765a95895e37737
---
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/08/313908/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 e1d6aee..bcd39b4 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
@@ -965,7 +965,7 @@
}
 
// Set up the tabs appropriately if the user has VE on
-   if ( init.isVisualAvailable && userPrefPreferShow ) {
+   if ( init.isAvailable && userPrefPreferShow ) {
// … on two-edit-tab wikis, or single-edit-tab 
wikis, where the user wants both …
if ( !conf.singleEditTab || tabPreference === 
'multi-tab' ) {
// … set the skin up with both tabs and 
both section edit links.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9547dfd591ad1e68e045b4928765a95895e37737
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] mediawiki...UserMerge[master]: Remove old UserMerge special page class alias

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Remove old UserMerge special page class alias
..

Remove old UserMerge special page class alias

Change-Id: Ie9e1231ea4f73a94d14f7c588befcbd4060205d7
---
M SpecialUserMerge.php
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge 
refs/changes/07/313907/1

diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index 9180b73..bdf7d5b 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -174,10 +174,3 @@
return 'users';
}
 }
-
-/**
- * Former class name, for backwards compatability
- * @deprecated
- */
-class UserMerge extends SpecialUserMerge {
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9e1231ea4f73a94d14f7c588befcbd4060205d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
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] mediawiki...UploadWizard[master]: Add parsererror message and debug line

[jenkins-bot (Code Review)]

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

Change subject: Add parsererror message and debug line
..


Add parsererror message and debug line

Let's tell the user what actually happened, and get them some useful information
for bug reports when they open the developer console.

Bug: T146473
Change-Id: I74326d05f490be652b8c5805ced04a2935a1008f
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/mw.UploadWizardUploadInterface.js
M resources/transports/mw.FormDataTransport.js
5 files changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 5532fc3..f46df3c 100644
--- a/extension.json
+++ b/extension.json
@@ -306,6 +306,7 @@
"api-error-abusefilter-warning",
"api-error-abusefilter-disallowed",
"api-error-spamblacklist",
+   "api-error-parsererror",
"mwe-upwiz-api-warning-was-deleted",
"mwe-upwiz-api-warning-exists",

"mwe-upwiz-tutorial-error-localized-file-missing",
diff --git a/i18n/en.json b/i18n/en.json
index b3e3143..5b108c6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,6 +20,7 @@
"api-error-abusefilter-warning": "This action has been automatically 
identified as harmful ([$1 more info]).\nUnconstructive edits will be quickly 
reverted,\nand egregious or repeated unconstructive editing will result in your 
account or IP address being blocked.",
"api-error-abusefilter-disallowed": "This action has been automatically 
identified as harmful, and therefore disallowed ([$1 more info]).",
"api-error-spamblacklist": "The text you wanted to save was blocked by 
the spam filter.\nThis is probably caused by a link to a blacklisted external 
site.",
+   "api-error-parsererror": "The server responded with an invalid JSON 
document. This could be a problem with the API, or you could be using a proxy 
server that prevents you from uploading files.",
"mwe-upwiz-unavailable": "Your browser is not compatible with 
UploadWizard or has JavaScript turned off, so we are showing you a simple 
upload form. ([https://www.mediawiki.org/wiki/UploadWizard#Compatibility View 
compatibility requirements].)",
"mwe-upwiz-extension-disabled": "This page has been disabled due to 
temporary technical problems. In the meantime try the standard upload form.",
"mwe-upwiz-step-tutorial": "Learn",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 66ae06b..3b81229 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -44,6 +44,7 @@
"api-error-abusefilter-warning": "API error message that can be used 
for client side localisation of API errors. This is a shorter version of 
{{msg-mw|abusefilter-warning}} that is specific to file uploads. Parameters:\n* 
$1 - link that displays a more complete error information when clicked",
"api-error-abusefilter-disallowed": "API error message that can be used 
for client side localisation of API errors. This is a shorter version of 
{{msg-mw|abusefilter-disallowed}} that is specific to file uploads. 
Parameters:\n* $1 - link that displays a more complete error information when 
clicked",
"api-error-spamblacklist": "API error message that can be used for 
client side localisation of API errors. This is a shorter version of 
{{msg-mw|spamprotectiontext}} that is specific to file uploads.",
+   "api-error-parsererror": "Error message for when, for an unknown 
reason, the server sent the client an invalid response.",
"mwe-upwiz-unavailable": "Shown if the user visits Special:UploadWizard 
using a browser that can't display the wizard due to JavaScript being disabled 
or lack of support for modern features.",
"mwe-upwiz-extension-disabled": "Shown if the UploadWizard page has 
been disabled.",
"mwe-upwiz-step-tutorial": "{| align=\"right\"\n| 
[[file:commons-uw-L524.png|Initial \"{{MediaWiki:mwe-upwiz-step-file/en}}\" 
page|thumb|right]]\n| [[file:commons-uw-L521.png|Beginning of 
\"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" page|thumb|right]]\n| 
[[file:commons-uw-L522.png|Center of 
\"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" page|thumb|right]]\n| 
[[file:commons-uw-L523.png|End of \"{{MediaWiki:mwe-upwiz-step-tutorial/en}}\" 
page|thumb|right]]\n|} This is a short greyed or bolded label, in the top bar 
of all pages of the [[:mw:Extension:UploadWizard|MediaWiki Upload Wizard]].",
diff --git a/resources/mw.UploadWizardUploadInterface.js 
b/resources/mw.UploadWizardUploadInterface.js
index 5c2f0e2..bb7575d 100644
--- a/resources/mw.UploadWizardUploadInterface.js
+++ b/resources/mw.UploadWizardUploadInterface.js
@@ -187,7 +187,8 @@
'unknown-warning',

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Should be possible to scroll to footer on diff page

[jenkins-bot (Code Review)]

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

Change subject: Should be possible to scroll to footer on diff page
..


Should be possible to scroll to footer on diff page

Bug: T144579
Change-Id: I4c7d3b314bbce5c3d34b33e98cec802e87976713
---
M resources/mobile.special.mobilediff.styles/mobilediff.less
1 file changed, 11 insertions(+), 3 deletions(-)

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



diff --git a/resources/mobile.special.mobilediff.styles/mobilediff.less 
b/resources/mobile.special.mobilediff.styles/mobilediff.less
index d737d47..d72a1b2 100644
--- a/resources/mobile.special.mobilediff.styles/mobilediff.less
+++ b/resources/mobile.special.mobilediff.styles/mobilediff.less
@@ -4,11 +4,19 @@
 @userinfoBackgroundColor: #f0f0f0;
 @userinfoBorderColor: #c0c0c0;
 @diffDateColor: #c6c6c6;
-@userInfoHeight: 5em;
+// includes padding as well as enough space for 2 lines of user groups
+@userInfoHeight: 8em;
+@userInfoPadding: 1em;
 
 // FIXME: Not a long term solution (see bug 64607) - footers and position 
fixed elements do not play well
 #footer {
display: none;
+}
+
+// In lieu of no generic way to handle this we reserve space below the footer
+// the footer can sit above the user info box.
+footer {
+   margin-bottom: @userInfoHeight + ( 2 * @userInfoPadding );
 }
 
 // FIXME: Overly specific selector
@@ -75,8 +83,8 @@
 
// FIXME: Overly specific selector
#mw-mf-userinfo {
-   min-height: @userInfoHeight;
-   padding: 1em;
+   height: @userInfoHeight;
+   padding: @userInfoPadding;
background-color: @colorGray15;
border-top: solid 1px @colorGray12;
bottom: 0;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4c7d3b314bbce5c3d34b33e98cec802e87976713
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] operations/mediawiki-config[master]: Enable RelatedArticles on Minerva skin for all but top 6 wikis

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Enable RelatedArticles on Minerva skin for all but top 6 wikis
..

Enable RelatedArticles on Minerva skin for all but top 6 wikis

Note that even though 'vector' and the other desktop skins are
not included in the blacklist this will not push RelatedArticles
to those skins. To add them to the blacklist there would lead to related 
articles
disappearing from beta. Confusingly it will promote Minerva to stable for 
everything
except the top 6 wikis.

Bug: T144812
Change-Id: Ie7689477c163384eb27776f194f3ccc77a5abd8f
---
M wmf-config/InitialiseSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3503fcd..77f1074 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16130,6 +16130,12 @@
'frwikinews' => true, // T143480
 ],
 
+'wgRelatedArticlesFooterBlacklistedSkins' => [
+   // T144812
+   'default' => [],
+   'top6-wikipedia' => [ 'minerva' ],
+],
+
 'wmgRelatedArticlesShowInSidebar' => [
'default' => false,
'wikivoyage' => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7689477c163384eb27776f194f3ccc77a5abd8f
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...MobileFrontend[master]: Move positioning logic from tagline to container element

[jenkins-bot (Code Review)]

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

Change subject: Move positioning logic from tagline to container element
..


Move positioning logic from tagline to container element

Bug: T143533
Change-Id: I52576a6e744cbfb533032c7326f5f6e28631c202
---
M resources/skins.minerva.base.styles/pageactions.less
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 24ab367..5ba2d1d 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -17,7 +17,7 @@
 
 .heading-holder {
@pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
-   padding: @titleSectionSpacingTop 0 @pageActionsHeight;
+   padding: @titleSectionSpacingTop 0 (@pageActionsHeight + 0.5em);
overflow: hidden;
position: relative;
 
@@ -28,7 +28,7 @@
.tagline {
color: @colorGray5;
font-size: 0.85em;
-   margin: 7px 0 10px 0;
+   margin: 7px 0 0;
 
&:first-letter {
text-transform: capitalize;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52576a6e744cbfb533032c7326f5f6e28631c202
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Phuedx 
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]: feature-page-action-bar-v2 class is no longer necessary

[jenkins-bot (Code Review)]

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

Change subject: feature-page-action-bar-v2 class is no longer necessary
..


feature-page-action-bar-v2 class is no longer necessary

This feature is stable.

Bug: T146912
change-Id: I75b05df254d7f569285c56950fe15ef7ebc08d0c
---
M includes/MobileFrontend.hooks.php
M resources/skins.minerva.base.styles/pageactions.less
2 files changed, 31 insertions(+), 59 deletions(-)

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



diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 34f1dd7..c870f14 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1270,8 +1270,6 @@
/**
 * OutputPageBodyAttributes hook handler.
 *
-* feature-action-bar-v2 CSS feature flag is added to the 
body tag.
-*
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/OutputPageBodyAttributes
 *
 * @param OutputPage $outputPage
@@ -1285,8 +1283,6 @@
) {
$context = MobileContext::singleton();
$config = $context->getMFConfig();
-
-   $bodyAttributes['class'] .= ' feature-page-action-bar-v2';
 
if ( $config->get( 'MinervaUseFooterV2' ) || 
$context->isBetaGroupMember() ) {
$bodyAttributes['class'] .= ' feature-footer-v2';
diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 55ed8cf..24ab367 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -16,7 +16,10 @@
 }
 
 .heading-holder {
-   padding: @titleSectionSpacingTop 0 @titleSectionSpacingBottom;
+   @pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
+   padding: @titleSectionSpacingTop 0 @pageActionsHeight;
+   overflow: hidden;
+   position: relative;
 
h1 {
padding-right: @contentMargin;
@@ -41,18 +44,26 @@
 
 #page-actions {
font-size: @pageActionFontSize;
-   float: right;
+   float: none;
border: 0;
overflow: hidden;
+   position: absolute;
+   bottom: 0;
+   width: 100%;
+   border-top: 1px solid @colorGray14;
+   border-bottom: 1px solid @colorGray12;
+
+   padding: 0.5em 0;
 
li {
-   display: block;
+   display: inline-block;
// Needed for non-JavaScript users
position: relative;
cursor: pointer;
// Override .hlist rule.
margin-right: 0;
-   margin-bottom: 20px;
+   margin-bottom: 0;
+   float: right;
 
// FIXME: use .cloaked class
// file inputs are notoriously difficult to style
@@ -79,55 +90,22 @@
}
 
&:first-child {
-   margin-top: 3px;
+   margin-top: 0;
}
}
-}
 
-// FIXME: Merge these styles with those above as part of T130849.
-.feature-page-action-bar-v2 {
-   .heading-holder {
-   @pageActionsHeight: @pageActionFontSize + (2 * 
@iconGutterWidth);
+   .language-selector {
+   float: left;
+   margin-left: -@iconGutterWidth;
 
-   overflow: hidden;
-   position: relative;
-   padding-bottom: @pageActionsHeight;
+   &.disabled {
+   cursor: default;
+   opacity: 0.25;
+   }
}
 
-   #page-actions {
-   position: absolute;
-   float: none;
-   bottom: 0;
-   width: 100%;
-
-   border-top: 1px solid @colorGray14;
-   border-bottom: 1px solid @colorGray12;
-
-   padding: 0.5em 0;
-
-   li {
-   display: inline-block;
-   margin-bottom: 0;
-   float: right;
-
-   &:first-child {
-   margin-top: 0;
-   }
-   }
-
-   .language-selector {
-   float: left;
-   margin-left: -@iconGutterWidth;
-
-   &.disabled {
-   cursor: default;
-   opacity: 0.25;
-   }
-   }
-
-   #ca-edit {
-   margin-right: -@iconGutterWidth;
-   }
+   #ca-edit {
+   margin-right: -@iconGutterWidth;
}
 }
 
@@ -145,14 +123,12 @@
 }
 
 @media all and ( min-width: @deviceWidthTablet ) {
-   .feature-page-action-bar-v2 {
-   #page-actions {
-   position: initial;
- 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add role::beta::autoupdater

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Add role::beta::autoupdater
..

Add role::beta::autoupdater

This is a simple wrapper around beta::autoupdater, so that
that functionality can be included as a role.

Bug: T147233

Change-Id: I26f8eb5382c2ce629682895ba4c81f824033b04d
---
A modules/role/manifests/beta/autoupdater.pp
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/313904/1

diff --git a/modules/role/manifests/beta/autoupdater.pp 
b/modules/role/manifests/beta/autoupdater.pp
new file mode 100644
index 000..64cd3ac
--- /dev/null
+++ b/modules/role/manifests/beta/autoupdater.pp
@@ -0,0 +1,4 @@
+# Trivial role wrapper around beta::autoupdater
+class role::beta::autoupdater {
+import beta::autoupdater
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26f8eb5382c2ce629682895ba4c81f824033b04d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove beta::deployaccess as it's no longer needed.

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Remove beta::deployaccess as it's no longer needed.
..

Remove beta::deployaccess as it's no longer needed.

Bug: T121721
Bug: T147233
Change-Id: I82a9d1bb44122df37ad403da20d3bcd260ebca0f
---
D modules/beta/manifests/deployaccess.pp
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/313903/1

diff --git a/modules/beta/manifests/deployaccess.pp 
b/modules/beta/manifests/deployaccess.pp
deleted file mode 100644
index 754412b..000
--- a/modules/beta/manifests/deployaccess.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# TODO: remove this if https://phabricator.wikimedia.org/T121721
-# is fixed.
-class beta::deployaccess(
-$bastion_ip = '10.68.20.135', # ip of deployment-mira
-) {
-
-security::access::config { 'beta-allow-mwdeploy':
-content  => "+ : deploy-service mwdeploy : ${bastion_ip}\n",
-priority => 50,
-}
-
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82a9d1bb44122df37ad403da20d3bcd260ebca0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Convert to extension registration

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Convert to extension registration
..

Convert to extension registration

Bug: T98668
Change-Id: I3fcd2f19bbec4096149b4d0f63488d4608604f2f
---
M BlockAndNuke.php
A extension.json
2 files changed, 58 insertions(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke 
refs/changes/02/313902/1

diff --git a/BlockAndNuke.php b/BlockAndNuke.php
index d28e8c4..a7ec1d5 100644
--- a/BlockAndNuke.php
+++ b/BlockAndNuke.php
@@ -1,46 +1,14 @@
 https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );*/
+   return;
+} else {
+   die( 'This version of the BlockAndNuke extension requires MediaWiki 
1.28+' );
 }
-
-// Load internationalization files
-$wgMessagesDirs['BlockAndNuke'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['BlockAndNuke'] = __DIR__ . '/BlockandNuke.i18n.php';
-
-// Register extension
-$wgExtensionCredits['specialpage'][] = array(
-   'path' => __FILE__,
-   'name' => 'BlockAndNuke',
-   'descriptionmsg' => 'blockandnuke-desc',
-   'author' => array(
-   'Eliora Stahl',
-   '...'
-   ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:BlockAndNuke',
-   'license-name' => 'GPL-3.0+'
-);
-
-// Setup permissions - not recognised as admin
-$wgGroupPermissions['sysop']['blockandnuke'] = true;
-$wgAvailableRights[] = 'blockandnuke';
-
-// Load classes
-$wgAutoloadClasses['SpecialBlock_Nuke'] = __DIR__ . '/BlockAndNuke.body.php';
-$wgAutoloadClasses['BanPests'] = __DIR__ . '/BanPests.php';
-$wgAutoloadClasses['BlockAndNukeHooks'] = __DIR__ . '/BlockAndNuke.hooks.php';
-
-// Setup special page and its class name 'Block_Nuke'
-$wgSpecialPages['BlockandNuke'] = 'SpecialBlock_Nuke';
-
-// Extension parameters
-$wgBaNwhitelist = __DIR__ . "/whitelist.txt";
-$wgBaNSpamUser = "Spammer";
-
-// Register hooks
-$wgHooks['PerformRetroactiveAutoblock'][] = 
'BlockAndNukeHooks::onPerformRetroactiveAutoblock';
-$wgHooks['LanguageGetSpecialPageAliases'][] = 
'BlockAndNukeHooks::onLanguageGetSpecialPageAliases';
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..40ef5b6
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,46 @@
+{
+   "name": "BlockAndNuke",
+   "author": [
+   "Eliora Stahl",
+   "..."
+   ],
+   "url": "https://www.mediawiki.org/wiki/Extension:BlockAndNuke;,
+   "descriptionmsg": "blockandnuke-desc",
+   "license-name": "GPL-3.0+",
+   "type": "specialpage",
+   "GroupPermissions": {
+   "sysop": {
+   "blockandnuke": true
+   }
+   },
+   "AvailableRights": [
+   "blockandnuke"
+   ],
+   "SpecialPages": {
+   "BlockandNuke": "SpecialBlock_Nuke"
+   },
+   "MessagesDirs": {
+   "BlockAndNuke": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "SpecialBlock_Nuke": "BlockAndNuke.body.php",
+   "BanPests": "BanPests.php",
+   "BlockAndNukeHooks": "BlockAndNuke.hooks.php"
+   },
+   "Hooks": {
+   "PerformRetroactiveAutoblock": 
"BlockAndNukeHooks::onPerformRetroactiveAutoblock",
+   "LanguageGetSpecialPageAliases": 
"BlockAndNukeHooks::onLanguageGetSpecialPageAliases"
+   },
+   "config": {
+   "BaNwhitelist": {
+   "value": "whitelist.txt",
+   "path": true
+   },
+   "BaNSpamUser": {
+   "value": "Spammer"
+   }
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fcd2f19bbec4096149b4d0f63488d4608604f2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlockAndNuke
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] mediawiki...BlockAndNuke[master]: Code cleanup

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Code cleanup
..

Code cleanup

Move hooks to seperate file

Change-Id: I3688723a6b411f1b06ce7b90065160d6af89fd1a
---
M BanPests.php
R BlockAndNuke.body.php
A BlockAndNuke.hooks.php
M BlockAndNuke.php
M ban.php
5 files changed, 153 insertions(+), 94 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke 
refs/changes/01/313901/1

diff --git a/BanPests.php b/BanPests.php
index 68e9f24..67fd9b7 100644
--- a/BanPests.php
+++ b/BanPests.php
@@ -9,13 +9,15 @@
if ( isset( $wgWhitelist ) && file_exists( $wgWhitelist ) ) {
$wgBaNwhitelist = $wgWhitelist;
} elseif ( !isset( $wgBaNwhitelist ) || !file_exists( 
$wgBaNwhitelist ) ) {
-   throw new MWException( 'You need to specify a 
whitelist!  $wgBaNwhitelist should point to a filename that contains the 
whitelist.' );
+   throw new MWException(
+   'You need to specify a whitelist!  
$wgBaNwhitelist should point to a filename that contains the whitelist.'
+   );
}
 
-   $fh = fopen($wgBaNwhitelist, 'r');
-   $file = fread($fh,200);
-   fclose($fh);
-   return (preg_split('/\r\n|\r|\n/', $file));
+   $fh = fopen( $wgBaNwhitelist, 'r' );
+   $file = fread( $fh, 200 );
+   fclose( $fh );
+   return preg_split( '/\r\n|\r|\n/', $file );
}
 
static function getBannableUsers() {
@@ -25,24 +27,32 @@
array(
'rc_log_type' => 'upload',
'rc_log_action' => 'upload'
-   ), LIST_AND );
+   ),
+   LIST_AND
+   );
$cond[] = $dbr->makeList( /* New Users older than a day who 
haven't done anything yet */
array(
'rc_log_action' => 'create',
'rc_log_type' => 'newusers',
-   ), LIST_AND );
-   $result = $dbr->select( 'recentchanges',
+   ),
+   LIST_AND
+   );
+   $result = $dbr->select(
+   'recentchanges',
array( 'DISTINCT rc_user_text' ),
$dbr->makeList( $cond, LIST_OR ),
__METHOD__,
-   array( 'ORDER BY' => 'rc_user_text ASC' ) );
-   $names=array();
-   while( $row = $dbr->fetchObject( $result ) ) {
+   array( 'ORDER BY' => 'rc_user_text ASC' )
+   );
+   $names = array();
+   foreach( $result as $row ) {
$names[] = $row->rc_user_text;
}
$whitelist = array_flip( self::getWhitelist() );
return array_filter( $names,
-   function($u) use ($whitelist) { if( isset( $whitelist[ 
$u ] ) ) return false; return true; }
+   function( $u ) use ($whitelist) {
+   return !isset( $whitelist[ $u ] );
+   }
);
}
 
@@ -56,12 +66,14 @@
}
}
} elseif ( is_object( $user ) ) {
-   $result = $dbr->select( 'recentchanges',
+   $result = $dbr->select(
+   'recentchanges',
array( 'DISTINCT rc_ip' ),
array( 'rc_user_text' => $user->getName() ),
__METHOD__,
-   array( 'ORDER BY' => 'rc_ip ASC' ) );
-   while( $row = $dbr->fetchObject( $result ) ) {
+   array( 'ORDER BY' => 'rc_ip ASC' )
+   );
+   foreach( $result as $row ) {
$ip[] = $row->rc_ip;
}
} else {
@@ -69,7 +81,9 @@
}
$whitelist = array_flip( self::getWhitelist() );
return array_filter( $ip,
-   function($u) use ($whitelist) { if( isset( $whitelist[ 
$u ] ) ) return false; return true; }
+   function( $u ) use ($whitelist) {
+   return !isset( $whitelist[ $u ] );
+   }
);
}
 
@@ -77,7 +91,8 @@
$dbr = wfGetDB( DB_SLAVE );
$result = null;
if( $user ) {
-   $result = $dbr->select( 'recentchanges',
+   

[MediaWiki-commits] [Gerrit] mediawiki...ocg-collection[master]: Updating to latest masters

[C. Scott Ananian (Code Review)]

C. Scott Ananian has uploaded a new change for review.

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

Change subject: Updating to latest masters
..

Updating to latest masters

Deployed new service (d0f8e126f5d1ad53358c7c7380ca02f41c33ead6):
* T147211: Allow administrators to blacklist renders of certain metabooks.

Deployed new latexer (45c30840d22a7590cee904aff5f2e272c75d3bdb):
* T144120: Add `\FloatBarrier`s after articles.

Change-Id: I3bd1339214d5d752d934ed80a92d0647bd1f2efa
---
M mw-ocg-latexer
M mw-ocg-service
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/00/313900/1

diff --git a/mw-ocg-latexer b/mw-ocg-latexer
index 544a26a..45c3084 16
--- a/mw-ocg-latexer
+++ b/mw-ocg-latexer
@@ -1 +1 @@
-Subproject commit 544a26ae19eb0e0c0ae9bea98e24630b8ca7982b
+Subproject commit 45c30840d22a7590cee904aff5f2e272c75d3bdb
diff --git a/mw-ocg-service b/mw-ocg-service
index 51d2eb6..d0f8e12 16
--- a/mw-ocg-service
+++ b/mw-ocg-service
@@ -1 +1 @@
-Subproject commit 51d2eb6d47dfc5225d8d5bc45444e81cc233b1c7
+Subproject commit d0f8e126f5d1ad53358c7c7380ca02f41c33ead6

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bd1339214d5d752d934ed80a92d0647bd1f2efa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Separate Thumbor 404s into their own log

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Separate Thumbor 404s into their own log
..

Separate Thumbor 404s into their own log

Refs T145632
Depends on python-thumbor-wikimedia 0.1.22

Change-Id: Ib79bb56ab44bf865fa80d9567fb7df760de3119b
---
M modules/thumbor/files/thumbor.logrotate.conf
M modules/thumbor/files/thumbor.rsyslog.conf
M modules/thumbor/templates/server.conf.erb
3 files changed, 70 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/313899/1

diff --git a/modules/thumbor/files/thumbor.logrotate.conf 
b/modules/thumbor/files/thumbor.logrotate.conf
index f44ae1e..c457d82 100644
--- a/modules/thumbor/files/thumbor.logrotate.conf
+++ b/modules/thumbor/files/thumbor.logrotate.conf
@@ -1,4 +1,4 @@
-/var/log/thumbor/*.log
+/var/log/thumbor/thumbor.error.log
 {
 rotate 4
 daily
diff --git a/modules/thumbor/files/thumbor.rsyslog.conf 
b/modules/thumbor/files/thumbor.rsyslog.conf
index d866ea6..0d84006 100644
--- a/modules/thumbor/files/thumbor.rsyslog.conf
+++ b/modules/thumbor/files/thumbor.rsyslog.conf
@@ -1,4 +1,4 @@
 if ($programname startswith 'thumbor') then {
-action(type="omfile" file="/var/log/thumbor/thumbor.log")
+action(type="omfile" file="/var/log/thumbor/thumbor.error.log")
 stop
 }
diff --git a/modules/thumbor/templates/server.conf.erb 
b/modules/thumbor/templates/server.conf.erb
index 0ee9639..c0e5f48 100644
--- a/modules/thumbor/templates/server.conf.erb
+++ b/modules/thumbor/templates/server.conf.erb
@@ -1,7 +1,3 @@
-## Log Format to be used by thumbor when writing log messages.
-## Defaults to: %(asctime)s %(name)s:%(levelname)s %(message)s
-THUMBOR_LOG_FORMAT = '%(name)s:%(levelname)s %(message)s'
-
 ## Host to send statsd instrumentation to
 ## Defaults to: None
 STATSD_HOST = '<%= @statsd_host %>'
@@ -144,3 +140,71 @@
 
 # Overrides the community core class in order to install manhole
 APP_CLASS = 'wikimedia_thumbor.app.App'
+
+
+### Logging ##
+
+from wikimedia_thumbor.logging.filter.context import ContextFilter
+from wikimedia_thumbor.logging.filter.http404 import Http404Filter
+
+# Sends 404s to a dedicated rotating log file and filters them out of the 
error log
+# The error log still goes out to stdout, to be grabbed by systemd
+
+THUMBOR_LOG_CONFIG = {
+'version': 1,
+'disable_existing_loggers': False,
+'formatters': {
+'default': {
+'format': '%(asctime)s %(port)s %(name)s:%(levelname)s %(message)s'
+}
+},
+'filters': {
+'context': {
+'()': ContextFilter,
+'flag': 'log'
+},
+'404only': {
+'()': Http404Filter,
+'flag': 'only'
+},
+'404exclude': {
+'()': Http404Filter,
+'flag': 'exclude'
+},
+'silentcontext': {
+'()': ContextFilter,
+}
+},
+'handlers': {
+'errorstream': {
+'level': 'ERROR',
+'class': 'logging.StreamHandler',
+'formatter': 'default',
+'filters': ['context', '404exclude']
+},
+'debugstream': {
+'level': 'DEBUG',
+'class': 'logging.StreamHandler',
+'formatter': 'default',
+'filters': ['silentcontext']
+},
+'http404': {
+'level': 'WARNING',
+'class': 'logging.handlers.TimedRotatingFileHandler',
+'formatter': 'default',
+'filename': '/var/log/thumbor/thumbor.404.log',
+'interval': 1,
+'when': 'D',
+'backupCount': 4,
+'encoding': 'utf8',
+'delay': False,
+'filters': ['context', '404only']
+}
+},
+'loggers': {
+'': {
+'level': 'DEBUG',
+'handlers': ['debugstream', 'errorstream', 'http404']
+}
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Push footer version 2 to stable

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Push footer version 2 to stable
..

Push footer version 2 to stable

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index be27d65..3503fcd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14487,6 +14487,9 @@
'search' => true, 'nearby' => true, 'watchlist' => true, 
'tagline' => false
],
 ],
+'wgMinervaUseFooterV2' => [
+   'default' => true,
+],
 'wmgMFMobileFormatterHeadings' => [
'default' => [ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6' ],
'wikivoyage' => [ 'h2', 'h3', 'h4', 'h5', 'h6' ], // T110436, T110837

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2c011c5bcf7296a302fd174e8a79562307b9f3f
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/vagrant[master]: Make Thumbor logging configuration closer to what production...

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Make Thumbor logging configuration closer to what production's 
will be
..

Make Thumbor logging configuration closer to what production's will be

Refs T145632

Change-Id: I3b0ba25f1e63b4395b825c03c6197ebbfc789bd0
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
2 files changed, 19 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/97/313897/1

diff --git a/puppet/modules/thumbor/manifests/init.pp 
b/puppet/modules/thumbor/manifests/init.pp
index 563cc2c..79fb13a 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -126,11 +126,11 @@
 }
 
 file { $cfg_dir:
-ensure  => directory,
+ensure => directory,
 }
 
 file { $log_dir:
-ensure  => directory,
+ensure => directory,
 }
 
 file { "${cfg_dir}/10-thumbor.conf":
@@ -146,22 +146,22 @@
 }
 
 file { "${cfg_dir}/20-thumbor-logging.conf":
-ensure=> present,
-group => 'thumbor',
-content   => template('thumbor/20-thumbor-logging.conf.erb'),
-mode  => '0640',
-require   => [
+ensure  => present,
+group   => 'thumbor',
+content => template('thumbor/20-thumbor-logging.conf.erb'),
+mode=> '0640',
+require => [
 File[$cfg_dir, $log_dir],
 Group['thumbor'],
 ],
 }
 
 file { "${cfg_dir}/20-thumbor-wikimedia.conf":
-ensure=> present,
-group => 'thumbor',
-content   => template('thumbor/20-thumbor-wikimedia.conf.erb'),
-mode  => '0640',
-require   => [
+ensure  => present,
+group   => 'thumbor',
+content => template('thumbor/20-thumbor-wikimedia.conf.erb'),
+mode=> '0640',
+require => [
 File[$cfg_dir],
 Group['thumbor'],
 ],
diff --git a/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb 
b/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
index 2d770f9..2dea41c 100644
--- a/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
+++ b/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
@@ -24,23 +24,18 @@
 'flag': 'exclude'
 },
 'silentcontext': {
-'()': ContextFilter
+'()': ContextFilter,
 }
 },
 'handlers': {
-'error': {
+'errorstream': {
 'level': 'ERROR',
-'class': 'logging.handlers.TimedRotatingFileHandler',
+'class': 'logging.StreamHandler',
 'formatter': 'default',
-'filename': '<%= @log_dir %>/thumbor.error.log',
-'interval': 1,
-'when': 'D',
-'backupCount': 4,
-'encoding': 'utf8',
-'delay': False,
 'filters': ['context', '404exclude']
 },
-'rootdebug': {
+'debugstream': {
+'level': 'DEBUG',
 'class': 'logging.StreamHandler',
 'formatter': 'default',
 'filters': ['silentcontext']
@@ -73,12 +68,7 @@
 'loggers': {
 '': {
 'level': 'DEBUG',
-'handlers': ['rootdebug']
-},
-'thumbor': {
-'level': 'DEBUG',
-'handlers': ['debug', 'error', 'http404']
+'handlers': ['debug', 'debugstream', 'errorstream', 'http404']
 }
-
 }
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b0ba25f1e63b4395b825c03c6197ebbfc789bd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Make Thumbor logging configuration closer to what production...

[jenkins-bot (Code Review)]

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

Change subject: Make Thumbor logging configuration closer to what production's 
will be
..


Make Thumbor logging configuration closer to what production's will be

Refs T145632

Change-Id: I3b0ba25f1e63b4395b825c03c6197ebbfc789bd0
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
2 files changed, 19 insertions(+), 29 deletions(-)

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



diff --git a/puppet/modules/thumbor/manifests/init.pp 
b/puppet/modules/thumbor/manifests/init.pp
index 563cc2c..79fb13a 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -126,11 +126,11 @@
 }
 
 file { $cfg_dir:
-ensure  => directory,
+ensure => directory,
 }
 
 file { $log_dir:
-ensure  => directory,
+ensure => directory,
 }
 
 file { "${cfg_dir}/10-thumbor.conf":
@@ -146,22 +146,22 @@
 }
 
 file { "${cfg_dir}/20-thumbor-logging.conf":
-ensure=> present,
-group => 'thumbor',
-content   => template('thumbor/20-thumbor-logging.conf.erb'),
-mode  => '0640',
-require   => [
+ensure  => present,
+group   => 'thumbor',
+content => template('thumbor/20-thumbor-logging.conf.erb'),
+mode=> '0640',
+require => [
 File[$cfg_dir, $log_dir],
 Group['thumbor'],
 ],
 }
 
 file { "${cfg_dir}/20-thumbor-wikimedia.conf":
-ensure=> present,
-group => 'thumbor',
-content   => template('thumbor/20-thumbor-wikimedia.conf.erb'),
-mode  => '0640',
-require   => [
+ensure  => present,
+group   => 'thumbor',
+content => template('thumbor/20-thumbor-wikimedia.conf.erb'),
+mode=> '0640',
+require => [
 File[$cfg_dir],
 Group['thumbor'],
 ],
diff --git a/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb 
b/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
index 2d770f9..2dea41c 100644
--- a/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
+++ b/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
@@ -24,23 +24,18 @@
 'flag': 'exclude'
 },
 'silentcontext': {
-'()': ContextFilter
+'()': ContextFilter,
 }
 },
 'handlers': {
-'error': {
+'errorstream': {
 'level': 'ERROR',
-'class': 'logging.handlers.TimedRotatingFileHandler',
+'class': 'logging.StreamHandler',
 'formatter': 'default',
-'filename': '<%= @log_dir %>/thumbor.error.log',
-'interval': 1,
-'when': 'D',
-'backupCount': 4,
-'encoding': 'utf8',
-'delay': False,
 'filters': ['context', '404exclude']
 },
-'rootdebug': {
+'debugstream': {
+'level': 'DEBUG',
 'class': 'logging.StreamHandler',
 'formatter': 'default',
 'filters': ['silentcontext']
@@ -73,12 +68,7 @@
 'loggers': {
 '': {
 'level': 'DEBUG',
-'handlers': ['rootdebug']
-},
-'thumbor': {
-'level': 'DEBUG',
-'handlers': ['debug', 'error', 'http404']
+'handlers': ['debug', 'debugstream', 'errorstream', 'http404']
 }
-
 }
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b0ba25f1e63b4395b825c03c6197ebbfc789bd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Gilles 
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]: toolschecker: remove all references to labsdb1002

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: toolschecker: remove all references to labsdb1002
..

toolschecker: remove all references to labsdb1002

Blindly removing all references to labsdb1002, which is about to
be decomissioned.

Bug: T146455
Change-Id: I2c1cd87e5cfcd44bb497464aaeb195ac0f9577ea
---
M modules/toollabs/files/toolschecker.py
1 file changed, 0 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/313896/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index a585df2..a0736fb 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -144,11 +144,6 @@
 return db_query_check('labsdb1001.eqiad.wmnet')
 
 
-@check('/labsdb/labsdb1002')
-def labsdb_check_labsdb1002():
-return db_query_check('labsdb1002.eqiad.wmnet')
-
-
 @check('/labsdb/labsdb1003')
 def labsdb_check_labsdb1003():
 return db_query_check('labsdb1003.eqiad.wmnet')
@@ -300,11 +295,6 @@
 @check('/labsdb/labsdb1001rw')
 def labsdb_check_labsdb1001rw():
 return db_read_write_check('labsdb1001.eqiad.wmnet', 's52524__rwtest')
-
-
-@check('/labsdb/labsdb1002rw')
-def labsdb_check_labsdb1002rw():
-return db_read_write_check('labsdb1002.eqiad.wmnet', 's52524__rwtest')
 
 
 @check('/labsdb/labsdb1003rw')

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Should be possible to scroll to footer on diff page

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Should be possible to scroll to footer on diff page
..

Should be possible to scroll to footer on diff page

Bug: T144579
Change-Id: I4c7d3b314bbce5c3d34b33e98cec802e87976713
---
M resources/mobile.special.mobilediff.styles/mobilediff.less
1 file changed, 11 insertions(+), 3 deletions(-)


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

diff --git a/resources/mobile.special.mobilediff.styles/mobilediff.less 
b/resources/mobile.special.mobilediff.styles/mobilediff.less
index d737d47..d72a1b2 100644
--- a/resources/mobile.special.mobilediff.styles/mobilediff.less
+++ b/resources/mobile.special.mobilediff.styles/mobilediff.less
@@ -4,11 +4,19 @@
 @userinfoBackgroundColor: #f0f0f0;
 @userinfoBorderColor: #c0c0c0;
 @diffDateColor: #c6c6c6;
-@userInfoHeight: 5em;
+// includes padding as well as enough space for 2 lines of user groups
+@userInfoHeight: 8em;
+@userInfoPadding: 1em;
 
 // FIXME: Not a long term solution (see bug 64607) - footers and position 
fixed elements do not play well
 #footer {
display: none;
+}
+
+// In lieu of no generic way to handle this we reserve space below the footer
+// the footer can sit above the user info box.
+footer {
+   margin-bottom: @userInfoHeight + ( 2 * @userInfoPadding );
 }
 
 // FIXME: Overly specific selector
@@ -75,8 +83,8 @@
 
// FIXME: Overly specific selector
#mw-mf-userinfo {
-   min-height: @userInfoHeight;
-   padding: 1em;
+   height: @userInfoHeight;
+   padding: @userInfoPadding;
background-color: @colorGray15;
border-top: solid 1px @colorGray12;
bottom: 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c7d3b314bbce5c3d34b33e98cec802e87976713
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] operations/dns[master]: wmnet: remove labsdb1002.eqiad.wmnet

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: wmnet: remove labsdb1002.eqiad.wmnet
..

wmnet: remove labsdb1002.eqiad.wmnet

Management entries stay.

Bug: T146455
Change-Id: Iac60578e3b70eb4d4116ae231c5c55b346209937
---
M templates/wmnet
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/94/313894/1

diff --git a/templates/wmnet b/templates/wmnet
index f108874..8b2407b 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -387,7 +387,6 @@
 labnet1002  1H  IN A10.64.20.25
 labnodepool1001 1H  IN A10.64.20.18
 labsdb1001  1H  IN A10.64.4.11
-labsdb1002  1H  IN A10.64.37.4
 labsdb1003  1H  IN A10.64.37.5
 labstore10011H  IN A10.64.37.6
 labstore10021H  IN A10.64.37.7

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac60578e3b70eb4d4116ae231c5c55b346209937
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Move hasMatchingAncestor code from FormatTool to SurfaceFrag...

[jenkins-bot (Code Review)]

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

Change subject: Move hasMatchingAncestor code from FormatTool to SurfaceFragment
..


Move hasMatchingAncestor code from FormatTool to SurfaceFragment

Change-Id: I575d92c4faed1c3e1fedd9c15a4975d16c20c9d5
---
M src/dm/ve.dm.Node.js
M src/dm/ve.dm.SurfaceFragment.js
M src/ui/tools/ve.ui.FormatTool.js
3 files changed, 45 insertions(+), 24 deletions(-)

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



diff --git a/src/dm/ve.dm.Node.js b/src/dm/ve.dm.Node.js
index 1db5074..13bd754 100644
--- a/src/dm/ve.dm.Node.js
+++ b/src/dm/ve.dm.Node.js
@@ -519,6 +519,8 @@
  * Check if the node has an ancestor with matching type and attribute values.
  *
  * @method
+ * @param {string} type Node type to match
+ * @param {Object} [attributes] Node attributes to match
  * @return {boolean} Node has an ancestor with matching type and attribute 
values
  */
 ve.dm.Node.prototype.hasMatchingAncestor = function ( type, attributes ) {
@@ -538,6 +540,8 @@
  * Check if the node matches type and attribute values.
  *
  * @method
+ * @param {string} type Node type to match
+ * @param {Object} [attributes] Node attributes to match
  * @return {boolean} Node matches type and attribute values
  */
 ve.dm.Node.prototype.matches = function ( type, attributes ) {
diff --git a/src/dm/ve.dm.SurfaceFragment.js b/src/dm/ve.dm.SurfaceFragment.js
index 4d76e5b..c7456b5 100644
--- a/src/dm/ve.dm.SurfaceFragment.js
+++ b/src/dm/ve.dm.SurfaceFragment.js
@@ -606,6 +606,42 @@
 };
 
 /**
+ * Check if the nodes at the current fragment have an ancestor with matching 
type and attribute values.
+ *
+ * @param {string} type Node type to match
+ * @param {Object} [attributes] Node attributes to match
+ * @return {boolean} Nodes have a matching ancestor
+ */
+ve.dm.SurfaceFragment.prototype.hasMatchingAncestor = function ( type, 
attributes ) {
+   var i, len, cells,
+   selection = this.getSelection(),
+   nodes = this.getSelectedLeafNodes(),
+   all = !!nodes.length;
+
+   if ( selection instanceof ve.dm.LinearSelection ) {
+   nodes = this.getSelectedLeafNodes();
+   all = !!nodes.length;
+   for ( i = 0, len = nodes.length; i < len; i++ ) {
+   if ( !nodes[ i ].hasMatchingAncestor( type, attributes 
) ) {
+   all = false;
+   break;
+   }
+   }
+   } else if ( selection instanceof ve.dm.TableSelection ) {
+   cells = selection.getMatrixCells();
+   all = true;
+   for ( i = cells.length - 1; i >= 0; i-- ) {
+   if ( !cells[ i ].node.matches( type, attributes ) ) {
+   all = false;
+   break;
+   }
+   }
+   }
+
+   return all;
+};
+
+/**
  * Apply the fragment's range to the surface as a selection.
  *
  * @method
diff --git a/src/ui/tools/ve.ui.FormatTool.js b/src/ui/tools/ve.ui.FormatTool.js
index f08df29..86071ad 100644
--- a/src/ui/tools/ve.ui.FormatTool.js
+++ b/src/ui/tools/ve.ui.FormatTool.js
@@ -48,7 +48,8 @@
  * @inheritdoc
  */
 ve.ui.FormatTool.prototype.onUpdateState = function ( fragment ) {
-   var i, len, nodes, all, cells, selection, format;
+   var isMatching,
+   format = this.constructor.static.format;
 
// Parent method
ve.ui.FormatTool.super.prototype.onUpdateState.apply( this, arguments );
@@ -62,30 +63,10 @@
 
this.toggle( true );
 
-   selection = fragment.getSelection();
-   format = this.constructor.static.format;
+   isMatching = fragment.hasMatchingAncestor( format.type, 
format.attributes );
 
-   if ( selection instanceof ve.dm.LinearSelection ) {
-   nodes = fragment.getSelectedLeafNodes();
-   all = !!nodes.length;
-   for ( i = 0, len = nodes.length; i < len; i++ ) {
-   if ( !nodes[ i ].hasMatchingAncestor( format.type, 
format.attributes ) ) {
-   all = false;
-   break;
-   }
-   }
-   } else if ( selection instanceof ve.dm.TableSelection ) {
-   cells = selection.getMatrixCells();
-   all = true;
-   for ( i = cells.length - 1; i >= 0; i-- ) {
-   if ( !cells[ i ].node.matches( format.type, 
format.attributes ) ) {
-   all = false;
-   break;
-   }
-   }
-   }
-   this.convertible = !all;
-   this.setActive( all );
+   this.convertible = !isMatching;
+   this.setActive( isMatching );
 };
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/313878
To 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to 17bc059

[jenkins-bot (Code Review)]

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

Change subject: Update mobileapps to 17bc059
..


Update mobileapps to 17bc059

List of changes:
8a7c139 Add spec examples for individual feed endpoints with ?aggregated=true
efee52f Make aggregated feed work on Beta Cluster
95ae034 Hatnotes should be promoted outside lead section html
7762945 Hygiene: Uncomment assert statement in transforms-test
3897e6c Fix fixVideoAnchor
c2aefa4 Update definition test
f7a2c01 Prepatory work for versioning
6e29a92 Enforcing coding style conventions with jscs
3f9bfbe jscs: Enforce 4 space indents
17bc059 Fix most read test date calculation
xxx Update node module dependencies

Change-Id: I22b0f596777e332ad2c50ff6bce5b5c7cfd3521c
---
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/index.js
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json
M node_modules/js-yaml/node_modules/argparse/lib/action_container.js
M node_modules/js-yaml/node_modules/argparse/lib/argument_parser.js
M node_modules/js-yaml/node_modules/argparse/lib/help/added_formatters.js
M node_modules/js-yaml/node_modules/argparse/lib/help/formatter.js
M node_modules/js-yaml/node_modules/argparse/package.json
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml
A 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/benchmark.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/.npmignore
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl-fast.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl-fast.min.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl.min.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/package.json
R 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.min.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.min.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M node_modules/service-runner/lib/logger.js
M node_modules/service-runner/node_modules/hot-shots/lib/statsd.js
M node_modules/service-runner/node_modules/hot-shots/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/lib/encoder.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/31-chars-strings.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/service-runner/node_modules/yargs/node_modules/lodash.assign/package.json
M 
node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/graceful-fs.js
M 
node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/package.json
M 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Fix content being added to v1 footer via `.hlist-separated`

[jenkins-bot (Code Review)]

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

Change subject: Fix content being added to v1 footer via `.hlist-separated`
..


Fix content being added to v1 footer via `.hlist-separated`

Remove `::after` psuedo-element for v1 footer

Bug: T145442
Change-Id: I3cbeb10154651a3c16b459ceba4969d29fc3a4f5
---
M resources/skins.minerva.base.styles/footer.less
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/resources/skins.minerva.base.styles/footer.less 
b/resources/skins.minerva.base.styles/footer.less
index 75c1fcd..d4498c1 100644
--- a/resources/skins.minerva.base.styles/footer.less
+++ b/resources/skins.minerva.base.styles/footer.less
@@ -54,6 +54,12 @@
}
}
/* stylelint-enable no-descending-specificity */
+
+   // Fix for v1 footer links
+   // FIXME: Remove this rule once FooterV2 is in production 
everywhere
+   &.hlist-separated li:after {
+   content: '';
+   }
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cbeb10154651a3c16b459ceba4969d29fc3a4f5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhobs 
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...deploy[master]: Update mobileapps to 17bc059

[BearND (Code Review)]

BearND has uploaded a new change for review.

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

Change subject: Update mobileapps to 17bc059
..

Update mobileapps to 17bc059

List of changes:
8a7c139 Add spec examples for individual feed endpoints with ?aggregated=true
efee52f Make aggregated feed work on Beta Cluster
95ae034 Hatnotes should be promoted outside lead section html
7762945 Hygiene: Uncomment assert statement in transforms-test
3897e6c Fix fixVideoAnchor
c2aefa4 Update definition test
f7a2c01 Prepatory work for versioning
6e29a92 Enforcing coding style conventions with jscs
3f9bfbe jscs: Enforce 4 space indents
17bc059 Fix most read test date calculation
xxx Update node module dependencies

Change-Id: I22b0f596777e332ad2c50ff6bce5b5c7cfd3521c
---
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/index.js
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json
M node_modules/js-yaml/node_modules/argparse/lib/action_container.js
M node_modules/js-yaml/node_modules/argparse/lib/argument_parser.js
M node_modules/js-yaml/node_modules/argparse/lib/help/added_formatters.js
M node_modules/js-yaml/node_modules/argparse/lib/help/formatter.js
M node_modules/js-yaml/node_modules/argparse/package.json
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml
A 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/benchmark.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/.npmignore
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl-fast.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl-fast.min.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/nacl.min.js
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/package.json
R 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.min.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.min.js
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
M 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M node_modules/service-runner/lib/logger.js
M node_modules/service-runner/node_modules/hot-shots/lib/statsd.js
M node_modules/service-runner/node_modules/hot-shots/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/lib/encoder.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/node_modules/msgpack5/test/31-chars-strings.js
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/service-runner/node_modules/yargs/node_modules/lodash.assign/package.json
M 
node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/graceful-fs.js
M 
node_modules/service-runner/node_modules/yargs/node_modules/read-pkg-up/node_modules/read-pkg/node_modules/graceful-fs/package.json
M 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Enable cassandra/twcs deploy repository

[Eevans (Code Review)]

Eevans has uploaded a new change for review.

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

Change subject: Enable cassandra/twcs deploy repository
..

Enable cassandra/twcs deploy repository

Bug: T133395
Change-Id: I6386ce9ebe3e0f5e6dc700e76b18dc8c98753965
---
M hieradata/common/role/deployment.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/313892/1

diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index d82023b..60aa83e 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -90,3 +90,6 @@
 checkout_submodules: true
   dumps/dumps:
 upstream: https://gerrit.wikimedia.org/r/operations/dumps
+  cassandra/twcs:
+gitfat_enabled: true
+upstream: https://gerrit.wikimedia.org/r/operations/software/cassandra-twcs

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsdb1002: remove from dhcp install server config

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: labsdb1002: remove from dhcp install server config
..


labsdb1002: remove from dhcp install server config

Bug: T146455
Change-Id: If69fe72a8c5d879b8458bcc90807e62506405ce8
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
1 file changed, 0 insertions(+), 7 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 7bafb63..44153dc 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -71,13 +71,6 @@
 filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
 }
 
-host labsdb1002 {
-hardware ethernet 00:22:BD:D3:63:F4;
-fixed-address labsdb1002.eqiad.wmnet;
-option pxelinux.pathprefix "trusty-installer/";
-filename "trusty-installer/ubuntu-installer/amd64/pxelinux.0";
-}
-
 host labsdb1003 {
 hardware ethernet 88:43:E1:C2:54:98;
 fixed-address labsdb1003.eqiad.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If69fe72a8c5d879b8458bcc90807e62506405ce8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
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...Collection[master]: Remove unused 'OfflineContentGenerator' submodule.

[jenkins-bot (Code Review)]

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

Change subject: Remove unused 'OfflineContentGenerator' submodule.
..


Remove unused 'OfflineContentGenerator' submodule.

Change-Id: Id272952e42fddb22911e687548ea63f4ae1410e1
---
M .gitmodules
D OfflineContentGenerator
2 files changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/.gitmodules b/.gitmodules
index a3f4a54..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "OfflineContentGenerator"]
-   path = OfflineContentGenerator
-   url = 
https://gerrit.wikimedia.org/r/mediawiki/extensions/Collection/OfflineContentGenerator
diff --git a/OfflineContentGenerator b/OfflineContentGenerator
deleted file mode 16
index a7a79cc..000
--- a/OfflineContentGenerator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a7a79ccc3f7cf774cf42f91991381b2799df0ff6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id272952e42fddb22911e687548ea63f4ae1410e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] phabricator...Sprint[wmf/stable]: Merge branch 'master' into wmf/stable

[20after4 (Code Review)]

20after4 has submitted this change and it was merged.

Change subject: Merge branch 'master' into wmf/stable
..


Merge branch 'master' into wmf/stable

Bug: T147195
Bug: T144295
Change-Id: Icac5671bb4199b4a24579e3d6be1adc53d664571
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  20after4: Verified; Looks good to me, approved




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icac5671bb4199b4a24579e3d6be1adc53d664571
Gerrit-PatchSet: 2
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: wmf/stable
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Christopher Johnson (WMDE) 
Gerrit-Reviewer: Christopher Johnson 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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