[MediaWiki-commits] [Gerrit] Run composer-(php55|hhvm) too! - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Run composer-(php55|hhvm) too!
..

Run composer-(php55|hhvm) too!

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/18/269618/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index eeb5b88..c58b03e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1398,8 +1398,12 @@
   - composer-validate
 test:
   - composer-php53
+  - composer-php55
+  - composer-hhvm
 gate-and-submit:
   - composer-php53
+  - composer-php55
+  - composer-hhvm
 
   - name: jshint
 check:

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

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

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

[MediaWiki-commits] [Gerrit] role::memcached: explicitly bind redis to 0.0.0.0 - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: role::memcached: explicitly bind redis to 0.0.0.0
..


role::memcached: explicitly bind redis to 0.0.0.0

Bug: T126395
Change-Id: Ifaa43e3ee637d62c091aa2262d22f165b842af52
---
M manifests/role/memcached.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index 93873e3..d0babe9 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -73,6 +73,7 @@
 
 redis::instance { 6379:
 settings => {
+bind=> '0.0.0.0',
 auto_aof_rewrite_min_size   => '512mb',
 client_output_buffer_limit  => 'slave 512mb 200mb 60',
 dir => '/srv/redis',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaa43e3ee637d62c091aa2262d22f165b842af52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix PHP 5.5 compat - change (mediawiki...JsonData)

[jenkins-bot (Code Review)]

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

Change subject: Fix PHP 5.5 compat
..


Fix PHP 5.5 compat

Change-Id: I44cbb2174608da11b8750484b4552a58c11ff4cc
---
M JsonData.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/JsonData.hooks.php b/JsonData.hooks.php
index ccc8e75..6cbbb3e 100644
--- a/JsonData.hooks.php
+++ b/JsonData.hooks.php
@@ -47,7 +47,7 @@
wfMessage('jsondata-server-error') . 
": " . 
htmlspecialchars( $e->getMessage() ) . 
"";
}
-   $wgJsonData->outputEditor( &$editPage );
+   $wgJsonData->outputEditor( $editPage );
}
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44cbb2174608da11b8750484b4552a58c11ff4cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonData
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
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] Fix tests - change (mediawiki...ExtensionDistributor)

[jenkins-bot (Code Review)]

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

Change subject: Fix tests
..


Fix tests

Change-Id: I7b4b0dc19da1c80c5f3bcd9f92f21332f0f3ba58
---
M includes/api/ApiListExtDistBranches.php
M includes/providers/ExtDistProvider.php
2 files changed, 12 insertions(+), 2 deletions(-)

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



diff --git a/includes/api/ApiListExtDistBranches.php 
b/includes/api/ApiListExtDistBranches.php
index 75dba77..ae8a1a2 100644
--- a/includes/api/ApiListExtDistBranches.php
+++ b/includes/api/ApiListExtDistBranches.php
@@ -77,14 +77,20 @@
}
 
public function getAllowedParams() {
+   $extensionsProvider = $this->getProvider( 
ExtDistProvider::EXTENSIONS );
+   $skinsProvider = $this->getProvider( ExtDistProvider::SKINS );
return array(
'exts' => array(
ApiBase::PARAM_ISMULTI => true,
-   ApiBase::PARAM_TYPE => $this->getProvider( 
ExtDistProvider::EXTENSIONS )->getRepositoryList(),
+   ApiBase::PARAM_TYPE => $extensionsProvider
+   ? 
$extensionsProvider->getRepositoryList()
+   : array(),
),
'skins' => array(
ApiBase::PARAM_ISMULTI => true,
-   ApiBase::PARAM_TYPE => $this->getProvider( 
ExtDistProvider::SKINS )->getRepositoryList(),
+   ApiBase::PARAM_TYPE => $skinsProvider
+   ? $skinsProvider->getRepositoryList()
+   : array(),
)
);
}
diff --git a/includes/providers/ExtDistProvider.php 
b/includes/providers/ExtDistProvider.php
index 85a2921..43f1d44 100644
--- a/includes/providers/ExtDistProvider.php
+++ b/includes/providers/ExtDistProvider.php
@@ -75,6 +75,10 @@
 */
public static function getProviderFor( $type ) {
global $wgExtDistAPIConfig;
+
+   if ( !$wgExtDistAPIConfig ) {
+   return null;
+   }
return self::factory(
$wgExtDistAPIConfig + array( 'repoType' => $type )
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b4b0dc19da1c80c5f3bcd9f92f21332f0f3ba58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
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] Add support for Laki - change (mediawiki/core)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Add support for Laki
..

Add support for Laki

Change-Id: I46a65cb047546e0c6274d78dc342759e4c7f4171
---
M languages/data/Names.php
A languages/messages/MessagesLki.php
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/269617/1

diff --git a/languages/data/Names.php b/languages/data/Names.php
index 7711d8f..da02109 100644
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -260,6 +260,7 @@
'li' => 'Limburgs', # Limburgian
'lij' => 'Ligure',  # Ligurian
'liv' => 'Līvõ kēļ',# Livonian
+   'lki' => 'لەکی‎',   # Laki
'lmo' => 'lumbaart',# Lombard
'ln' => 'lingála',  # Lingala
'lo' => 'ລາວ',  # Laotian
diff --git a/languages/messages/MessagesLki.php 
b/languages/messages/MessagesLki.php
new file mode 100644
index 000..10d06e5
--- /dev/null
+++ b/languages/messages/MessagesLki.php
@@ -0,0 +1,13 @@
+https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'fa';
+
+$rtl = true;

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

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

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

[MediaWiki-commits] [Gerrit] role::memcached: explicitly bind redis to 0.0.0.0 - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: role::memcached: explicitly bind redis to 0.0.0.0
..

role::memcached: explicitly bind redis to 0.0.0.0

Bug: T126395
Change-Id: Ifaa43e3ee637d62c091aa2262d22f165b842af52
---
M manifests/role/memcached.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/269616/1

diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index 93873e3..d0babe9 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -73,6 +73,7 @@
 
 redis::instance { 6379:
 settings => {
+bind=> '0.0.0.0',
 auto_aof_rewrite_min_size   => '512mb',
 client_output_buffer_limit  => 'slave 512mb 200mb 60',
 dir => '/srv/redis',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifaa43e3ee637d62c091aa2262d22f165b842af52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] Remove lki. Was added to core - change (translatewiki)

[Siebrand (Code Review)]

Siebrand has uploaded a new change for review.

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

Change subject: Remove lki. Was added to core
..

Remove lki. Was added to core

Change-Id: I77b051a1a2df1d7b45268e3c53da34bde41d8731
---
M LanguageSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/15/269615/1

diff --git a/LanguageSettings.php b/LanguageSettings.php
index 3ac6e5d..d38626d 100644
--- a/LanguageSettings.php
+++ b/LanguageSettings.php
@@ -40,7 +40,6 @@
 $wgExtraLanguageNames['knn'] = 'महाराष्ट्रीय कोंकणी'; # Maharashtrian Konkani 
/ 2015-XX-XX
 $wgExtraLanguageNames['krl'] = 'Karjala'; # Karelian / Siebrand 2008-04-12
 $wgExtraLanguageNames['ksf'] = 'Bafia'; # Robin 2011-10-21
-$wgExtraLanguageNames['lki'] = 'لەکی‎'; # Laki / Siebrand 2014-04-08
 $wgExtraLanguageNames['lkt'] = 'Lakȟótiyapi'; # Lakota / 2014-04-08
 $wgExtraLanguageNames['lld'] = 'Ladin'; # Ladin / Siebrand 2009-09-23
 $wgExtraLanguageNames['mfe'] = 'Morisyen'; # Robin 2011-10-18

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77b051a1a2df1d7b45268e3c53da34bde41d8731
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

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

[MediaWiki-commits] [Gerrit] Fix tests - change (mediawiki...ExtensionDistributor)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Fix tests
..

Fix tests

Change-Id: I7b4b0dc19da1c80c5f3bcd9f92f21332f0f3ba58
---
M includes/api/ApiListExtDistBranches.php
M includes/providers/ExtDistProvider.php
2 files changed, 12 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor 
refs/changes/14/269614/1

diff --git a/includes/api/ApiListExtDistBranches.php 
b/includes/api/ApiListExtDistBranches.php
index 75dba77..ae8a1a2 100644
--- a/includes/api/ApiListExtDistBranches.php
+++ b/includes/api/ApiListExtDistBranches.php
@@ -77,14 +77,20 @@
}
 
public function getAllowedParams() {
+   $extensionsProvider = $this->getProvider( 
ExtDistProvider::EXTENSIONS );
+   $skinsProvider = $this->getProvider( ExtDistProvider::SKINS );
return array(
'exts' => array(
ApiBase::PARAM_ISMULTI => true,
-   ApiBase::PARAM_TYPE => $this->getProvider( 
ExtDistProvider::EXTENSIONS )->getRepositoryList(),
+   ApiBase::PARAM_TYPE => $extensionsProvider
+   ? 
$extensionsProvider->getRepositoryList()
+   : array(),
),
'skins' => array(
ApiBase::PARAM_ISMULTI => true,
-   ApiBase::PARAM_TYPE => $this->getProvider( 
ExtDistProvider::SKINS )->getRepositoryList(),
+   ApiBase::PARAM_TYPE => $skinsProvider
+   ? $skinsProvider->getRepositoryList()
+   : array(),
)
);
}
diff --git a/includes/providers/ExtDistProvider.php 
b/includes/providers/ExtDistProvider.php
index 85a2921..43f1d44 100644
--- a/includes/providers/ExtDistProvider.php
+++ b/includes/providers/ExtDistProvider.php
@@ -75,6 +75,10 @@
 */
public static function getProviderFor( $type ) {
global $wgExtDistAPIConfig;
+
+   if ( !$wgExtDistAPIConfig ) {
+   return null;
+   }
return self::factory(
$wgExtDistAPIConfig + array( 'repoType' => $type )
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b4b0dc19da1c80c5f3bcd9f92f21332f0f3ba58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExtensionDistributor
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Drop php- prefix for composer validate jobs, pin to trusty - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Drop php- prefix for composer validate jobs, pin to trusty
..

Drop php- prefix for composer validate jobs, pin to trusty

Change-Id: Iea6d5b584bdec8c696edcf2cd33a0cb53801c827
---
M jjb/php.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
3 files changed, 60 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/13/269613/1

diff --git a/jjb/php.yaml b/jjb/php.yaml
index a26eb21..8525017 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -3,8 +3,8 @@
 # Job for libraries that are published as composer packages.
 # Includes full validation that packagist.org requires.
 - job:
-name: php-composer-package-validate
-node: contintLabsSlave && UbuntuPrecise
+name: composer-package-validate
+node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 
@@ -18,8 +18,8 @@
 # Job for anything with a composer.json, but *isn't* going to be
 # published on packagist.org.
 - job:
-name: php-composer-validate
-node: contintLabsSlave && UbuntuPrecise
+name: composer-validate
+node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-shallow-clone
 concurrent: true
 
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 07fe6da..32b7168 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -111,14 +111,14 @@
 # Tests
 
 def assertProjectHasComposerValidate(self, name, definition, pipeline):
-# php-composer-validate
-# php-composer-validate-package
-# php-composer-test-(zend|hhvm)
+# composer-validate
+# composer-validate-package
+# composer-test-(zend|hhvm)
 self.assertTrue(
 any([job for job in definition
- if job.startswith(('php-composer', 'composer-'))]),
+ if job.startswith(('composer', 'composer-'))]),
 'Project %s pipeline %s must have either '
-'php-composer-validate or a composer-* job'
+'composer-validate or a composer-* job'
 % (name, pipeline))
 
 def assertProjectHasPhplint(self, name, definition, pipeline):
@@ -293,8 +293,8 @@
 '.*-puppetlint-(strict|lenient)',
 '.*-whitespaces',
 'noop',
-'php-composer-validate',
-'php-composer-package-validate',
+'composer-validate',
+'composer-package-validate',
 'fail-archived-repositories',
 'tox-jessie',
 ]
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5d3819e..eeb5b88 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -622,11 +622,11 @@
 files:
  - '^.*\.pp$'
 
-  - name: ^php-composer-validate$
+  - name: ^composer-validate$
 files:
  - '^composer.json$'
 
-  - name: ^php-composer-package-validate$
+  - name: ^composer-package-validate$
 files:
  - '^composer.json$'
 
@@ -1193,7 +1193,7 @@
 check:
  - php53lint
  - php55lint
- - php-composer-validate
+ - composer-validate
 test:
  - php53lint
  - php55lint
@@ -1201,7 +1201,7 @@
  - 'mwext-{name}-testextension-php53'
  - 'mwext-{name}-testextension-php55'
  - 'mwext-{name}-testextension-hhvm'
- - php-composer-validate
+ - composer-validate
 gate-and-submit:
  - mediawiki-gate
  - php53lint
@@ -1210,7 +1210,7 @@
  - 'mwext-{name}-testextension-php53'
  - 'mwext-{name}-testextension-php55'
  - 'mwext-{name}-testextension-hhvm'
- - php-composer-validate
+ - composer-validate
 experimental:
   - 'mediawiki-extensions-hhvm'
   - mediawiki-extensions-qunit
@@ -1224,14 +1224,14 @@
 check:
  - php53lint
  - php55lint
- - php-composer-validate
+ - composer-validate
 test:
  - php53lint
  - php55lint
  - mwext-testextension-php53-composer
  - mwext-testextension-php55-composer
  - mwext-testextension-hhvm-composer
- - php-composer-validate
+ - composer-validate
 gate-and-submit:
  - mediawiki-gate
  - php53lint
@@ -1239,7 +1239,7 @@
  - mwext-testextension-php53-composer
  - mwext-testextension-php55-composer
  - mwext-testextension-hhvm-composer
- - php-composer-validate
+ - composer-validate
 experimental:
  - mwext-qunit-composer
  - npm
@@ -1249,7 +1249,7 @@
 check:
  - php53lint
  - php55lint
- - php-composer-validate
+ - composer-validate
 test:
  - php53lint
  - php55lint
@@ -1257,7 +1257,7 @@
  - mwext-testextension-php53
  - mwext-testextension-php55
  - mwext-testextension-hhvm
- - php-composer-validate
+ - composer-validate
 gate-and-submit:
  - mediawiki-gate
  - php53lint
@@ -1266,7 +1266,

[MediaWiki-commits] [Gerrit] Travis: Convert one of the HHVM builds to PHP7 - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Travis: Convert one of the HHVM builds to PHP7
..


Travis: Convert one of the HHVM builds to PHP7

And use Arabic to test for i10n issues (aude can read that).

Change-Id: I3e98c49e70b4cb81469cfa92bc0d03c5f855a71d
---
M .travis.yml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 25f72f8..4092bd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,9 @@
   php: 5.5
 - env: DBTYPE=mysql LANG=en MW=master WB=repo
   php: 5.6
+- env: DBTYPE=sqlite LANG=ar MW=master WB=both
+  php: 7.0
 - env: DBTYPE=mysql LANG=en MW=master WB=both
-  php: hhvm
-- env: DBTYPE=sqlite LANG=en MW=master WB=both
   php: hhvm
 
 before_script:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e98c49e70b4cb81469cfa92bc0d03c5f855a71d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove PHP 5.3 and 5.4 builds from travis - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Remove PHP 5.3 and 5.4 builds from travis
..


Remove PHP 5.3 and 5.4 builds from travis

As we and MediaWiki drop support for these right now.

Add more 5.5 and hhvm builds as replacement.

Feel free to +2 any time, will be merged only after
I68c5b5d60952418ff8300c163edfe2275571f41f.

Change-Id: Ie3b76973b7cc6a0fa8f822ebae2585d5b498175f
Depends-On: I68c5b5d60952418ff8300c163edfe2275571f41f
---
M .travis.yml
1 file changed, 3 insertions(+), 5 deletions(-)

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



diff --git a/.travis.yml b/.travis.yml
index 165e574..25f72f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,14 @@
 matrix:
   fast_finish: true
   include:
-- env: DBTYPE=mysql LANG=de MW=master WB=client
-  php: 5.3
-- env: DBTYPE=sqlite LANG=ar MW=master WB=both
-  php: 5.3
 - env: DBTYPE=sqlite LANG=ru MW=master WB=both
-  php: 5.4
+  php: 5.5
 - env: DBTYPE=sqlite LANG=en MW=master WB=client
   php: 5.5
 - env: DBTYPE=mysql LANG=en MW=master WB=repo
   php: 5.6
+- env: DBTYPE=mysql LANG=en MW=master WB=both
+  php: hhvm
 - env: DBTYPE=sqlite LANG=en MW=master WB=both
   php: hhvm
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3b76973b7cc6a0fa8f822ebae2585d5b498175f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Revert "Stop doing $that = $this in Client Tests"" - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Revert "Stop doing $that = $this in Client Tests""
..


Revert "Revert "Stop doing $that = $this in Client Tests""

This reverts commit 579925749ae5d0b20d8d5f46e6f3ce7a42555708.

Depends-On: I68c5b5d60952418ff8300c163edfe2275571f41f
Change-Id: Ib19e52156babbdeb7e25bd9f70172514c8525126
---
M 
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
M 
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
M 
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
M client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
M client/tests/phpunit/includes/api/PageTermsTest.php
8 files changed, 25 insertions(+), 38 deletions(-)

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



diff --git 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
index 3bc40e4..e3fc738 100644
--- 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactoryTest.php
@@ -149,16 +149,15 @@
$formatterFactory = $this->getMockBuilder( 
'Wikibase\Lib\OutputFormatSnakFormatterFactory' )
->disableOriginalConstructor()
->getMock();
-   $self = $this;
$formatterFactory->expects( $this->once() )
->method( 'getSnakFormatter' )
->will( $this->returnCallback(
-   function( $format, FormatterOptions $options ) 
use ( $self, $allowDataAccessInUserLanguage )  {
-   $self->assertSame(
+   function( $format, FormatterOptions $options ) 
use ( $allowDataAccessInUserLanguage )  {
+   $this->assertSame(
$allowDataAccessInUserLanguage 
? 'es' : 'de',
$options->getOption( 
ValueFormatter::OPT_LANG )
);
-   return $self->getMock( 
'Wikibase\Lib\SnakFormatter' );
+   return $this->getMock( 
'Wikibase\Lib\SnakFormatter' );
}
) );
 
diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
 
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
index 11bfc8f..508e34b 100644
--- 
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseEntityLibraryTest.php
@@ -160,10 +160,9 @@
Parser::OT_HTML
);
 
-   $self = $this; // PHP 5.3 ...
$parserOptions->registerWatcher(
-   function( $optionName ) use ( $self, &$cacheSplit ) {
-   $self->assertSame( 'userlang', $optionName );
+   function( $optionName ) use ( &$cacheSplit ) {
+   $this->assertSame( 'userlang', $optionName );
$cacheSplit = true;
}
);
diff --git 
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
 
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
index 21582d4..2a3a9f6 100644
--- 
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
@@ -319,10 +319,9 @@
Parser::OT_HTML
);
 
-   $self = $this; // PHP 5.3 ...
$parserOptions->registerWatcher(
-   function( $optionName ) use ( $self, &$cacheSplit ) {
-   $self->assertSame( 'userlang', $optionName );
+   function( $optionName ) use ( &$cacheSplit ) {
+   $this->assertSame( 'userlang', $optionName );
$cacheSplit = true;
}
);
diff --git 
a/client/tests/phpunit/includes/Hook

[MediaWiki-commits] [Gerrit] Stop doing $that = $this in Repo Tests - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Stop doing $that = $this in Repo Tests
..


Stop doing $that = $this in Repo Tests

Closuers support $this as of 5.4

Change-Id: Ie0d5a9adef1db5c4dae892e3062fc58ebc00efa7
Depends-On: I68c5b5d60952418ff8300c163edfe2275571f41f
---
M repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php
M repo/tests/phpunit/includes/ChangePrunerTest.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
M repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M repo/tests/phpunit/includes/Interactors/RedirectCreationInteractorTest.php
M repo/tests/phpunit/includes/api/CreateRedirectTest.php
M repo/tests/phpunit/includes/api/EntitySearchHelperTest.php
M repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
M repo/tests/phpunit/includes/specials/SpecialRedirectEntityTest.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
11 files changed, 41 insertions(+), 53 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php 
b/repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php
index f801935..a2dd042 100644
--- a/repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php
+++ b/repo/tests/phpunit/includes/CachingCommonsMediaFileNameLookupTest.php
@@ -80,11 +80,10 @@
->disableOriginalConstructor()
->getMock();
 
-   $self = $this; // We all love PHP 5.3
$fileNameLookup->expects( $matcher )
->method( 'normalizePageName' )
-   ->will( $this->returnCallback( function( $fileName, 
$apiUrl ) use ( $self ) {
-   $self->assertSame( 
'https://commons.wikimedia.org/w/api.php', $apiUrl );
+   ->will( $this->returnCallback( function( $fileName, 
$apiUrl ) {
+   $this->assertSame( 
'https://commons.wikimedia.org/w/api.php', $apiUrl );
 
if ( strpos( $fileName, 'NOT-FOUND' ) !== false 
) {
return false;
diff --git a/repo/tests/phpunit/includes/ChangePrunerTest.php 
b/repo/tests/phpunit/includes/ChangePrunerTest.php
index 97d9f3b..455a2f2 100644
--- a/repo/tests/phpunit/includes/ChangePrunerTest.php
+++ b/repo/tests/phpunit/includes/ChangePrunerTest.php
@@ -93,10 +93,9 @@
private function newMessageReporter() {
$reporter = new ObservableMessageReporter();
 
-   $self = $this; // evil PHP 5.3 ;)
$reporter->registerReporterCallback(
-   function ( $message ) use ( $self ) {
-   $self->messages[] = $message;
+   function ( $message ) {
+   $this->messages[] = $message;
}
);
 
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php 
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index 70bce76..bb61630 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -175,13 +175,12 @@
public function makeIdPager( array $ids, $entityType = null ) {
$pager = $this->getMock( 'Wikibase\Repo\Store\EntityIdPager' );
 
-   $self = $this;
$offset = 0;
 
$pager->expects( $this->any() )
->method( 'fetchIds' )
-   ->will( $this->returnCallback( function( $limit ) use ( 
$ids, $entityType, &$offset, $self ) {
-   return $self->listEntities( $ids, $entityType, 
$limit, $offset );
+   ->will( $this->returnCallback( function( $limit ) use ( 
$ids, $entityType, &$offset ) {
+   return $this->listEntities( $ids, $entityType, 
$limit, $offset );
} ) );
 
return $pager;
diff --git a/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php 
b/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
index 0f1910e..45e861b 100644
--- a/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
+++ b/repo/tests/phpunit/includes/Hooks/EditFilterHookRunnerTest.php
@@ -154,8 +154,6 @@
array( 'EditFilterMergedContent' => array() )
);
 
-   $testCase = $this;
-
$hooks['EditFilterMergedContent'][] =
function(
IContextSource $context,
@@ -164,16 +162,16 @@
$summary,

[MediaWiki-commits] [Gerrit] Bump required PHP version to 5.5.9 - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Bump required PHP version to 5.5.9
..


Bump required PHP version to 5.5.9

Result of RfC and extensive discussion. RfC approved
by Tim/ArchCom on 2016-01-27.

Bug: T75901
Depends-On: I00e2e7adf5202384fc92371b8d0551782c3c17cb
Change-Id: I68c5b5d60952418ff8300c163edfe2275571f41f
---
M .travis.yml
M INSTALL
M RELEASE-NOTES-1.27
M composer.json
M includes/PHPVersionCheck.php
5 files changed, 10 insertions(+), 6 deletions(-)

Approvals:
  Reedy: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.travis.yml b/.travis.yml
index 2d07596..9062194 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,9 @@
   fast_finish: true
   include:
 - env: dbtype=mysql
-  php: 5.3
+  php: 5.5
 - env: dbtype=postgres
-  php: 5.3
+  php: 5.5
 - env: dbtype=mysql
   php: hhvm
 - env: dbtype=mysql
diff --git a/INSTALL b/INSTALL
index 2054a57..4651a0c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@
 "in-place", as long as you have the necessary prerequisites available.
 
 Required software:
-* Web server with PHP 5.3.3 or higher.
+* Web server with PHP 5.5.9 or higher.
 * A SQL server, the following types are supported
 ** MySQL 5.0.3 or higher
 ** PostgreSQL 8.3 or higher
diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index d1f8ca7..ff1b61f 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -8,6 +8,10 @@
 MediaWiki 1.27 is an alpha-quality branch and is not recommended for use in
 production.
 
+=== PHP version requirement ===
+As of 1.27, MediaWiki now requires PHP 5.5.9 or higher. This corresponds with
+HHVM 3.1.
+
 === Configuration changes in 1.27 ===
 * $wgUseLinkNamespaceDBFields was removed.
 * Deprecated $wgResourceLoaderMinifierStatementsOnOwnLine and
@@ -314,7 +318,7 @@
 
 == Compatibility ==
 
-MediaWiki 1.27 requires PHP 5.3.3 or later. There is experimental support for
+MediaWiki 1.27 requires PHP 5.5.9 or later. There is experimental support for
 HHVM 3.6.5 or later.
 
 MySQL is the recommended DBMS. PostgreSQL or SQLite can also be used, but
diff --git a/composer.json b/composer.json
index f326dcb..6e9594c 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
"mediawiki/at-ease": "1.1.0",
"oojs/oojs-ui": "0.15.2",
"oyejorge/less.php": "1.7.0.10",
-   "php": ">=5.3.3",
+   "php": ">=5.5.9",
"psr/log": "1.0.0",
"wikimedia/assert": "0.2.2",
"wikimedia/base-convert": "1.0.1",
diff --git a/includes/PHPVersionCheck.php b/includes/PHPVersionCheck.php
index eaab9c8..1eafcfa 100644
--- a/includes/PHPVersionCheck.php
+++ b/includes/PHPVersionCheck.php
@@ -31,7 +31,7 @@
  */
 function wfEntryPointCheck( $entryPoint ) {
$mwVersion = '1.27';
-   $minimumVersionPHP = '5.3.3';
+   $minimumVersionPHP = '5.5.9';
$phpVersion = PHP_VERSION;
 
if ( !function_exists( 'version_compare' )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68c5b5d60952418ff8300c163edfe2275571f41f
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jeroen De Dauw 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add Generic.Arrays.DisallowLongArraySyntax to ruleset, autof... - change (mediawiki...codesniffer)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add Generic.Arrays.DisallowLongArraySyntax to ruleset, autofix 
this repo
..

Add Generic.Arrays.DisallowLongArraySyntax to ruleset, autofix this repo

Change-Id: I2a805d7e43b92ccde87d244a17b96b0f1be332c9
---
M MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
M MediaWiki/Sniffs/ControlStructures/AssignmentInControlStructuresSniff.php
M MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
M MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php
M MediaWiki/Sniffs/NamingConventions/PrefixedGlobalFunctionsSniff.php
M MediaWiki/Sniffs/NamingConventions/ValidGlobalNameSniff.php
M MediaWiki/Sniffs/Usage/DirUsageSniff.php
M MediaWiki/Sniffs/Usage/GotoUsageSniff.php
M MediaWiki/Sniffs/VariableAnalysis/UnusedGlobalVariablesSniff.php
M MediaWiki/Sniffs/WhiteSpace/MultipleEmptyLinesSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceAfterControlStructureSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceBeforeSingleLineCommentSniff.php
M MediaWiki/Sniffs/WhiteSpace/SpaceyParenthesisSniff.php
M MediaWiki/Tests/MediaWikiStandardTest.php
M MediaWiki/Tests/files/AlternativeSyntax/alternative_syntax_pass.php
M 
MediaWiki/Tests/files/ControlStructures/assignment_in_control_structures_pass.php
M MediaWiki/Tests/files/NamingConventions/wf_namespace_pass.php
M MediaWiki/Tests/files/WhiteSpace/space_before_parens_pass.php
M MediaWiki/Tests/files/WhiteSpace/spacey_parenthesis_pass.php
M MediaWiki/Tests/files/generic_pass.php
M MediaWiki/ruleset.xml
M TestHelper.php
22 files changed, 68 insertions(+), 66 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/12/269612/1

diff --git a/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php 
b/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
index 9924e6a..7c3d082 100644
--- a/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
+++ b/MediaWiki/Sniffs/AlternativeSyntax/AlternativeSyntaxSniff.php
@@ -9,20 +9,20 @@
public function register() {
// Per 
https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP
// section on alternative syntax.
-   return array(
+   return [
T_ENDDECLARE,
T_ENDFOR,
T_ENDFOREACH,
T_ENDIF,
T_ENDSWITCH,
T_ENDWHILE,
-   );
+   ];
}
 
public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
$tokens = $phpcsFile->getTokens();
$error = 'Alternative syntax such as "%s" should not be used';
-   $data = array( $tokens[$stackPtr]['content'] );
+   $data = [ $tokens[$stackPtr]['content'] ];
$phpcsFile->addWarning( $error, $stackPtr, 'AlternativeSyntax', 
$data );
}
 }
diff --git 
a/MediaWiki/Sniffs/ControlStructures/AssignmentInControlStructuresSniff.php 
b/MediaWiki/Sniffs/ControlStructures/AssignmentInControlStructuresSniff.php
index 21786e8..4ea1f08 100644
--- a/MediaWiki/Sniffs/ControlStructures/AssignmentInControlStructuresSniff.php
+++ b/MediaWiki/Sniffs/ControlStructures/AssignmentInControlStructuresSniff.php
@@ -15,11 +15,11 @@
implements PHP_CodeSniffer_Sniff {
// @codingStandardsIgnoreEnd
public function register() {
-   return array(
+   return [
T_IF,
T_WHILE,
T_ELSEIF,
-   );
+   ];
}
public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
$tokens = $phpcsFile->getTokens();
diff --git a/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php 
b/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
index fb46827..005da88 100644
--- a/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
+++ b/MediaWiki/Sniffs/ControlStructures/IfElseStructureSniff.php
@@ -11,10 +11,10 @@
implements PHP_CodeSniffer_Sniff {
// @codingStandardsIgnoreEnd
public function register() {
-   return array(
+   return [
T_ELSE,
T_ELSEIF,
-   );
+   ];
}
 
public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr ) {
@@ -27,7 +27,7 @@
'Single space expected before "%s"',
$stackPtr + 1,
'SpaceBeforeElse',
-   array( $tokens[$stackPtr]['content'] )
+   [ $tokens[$stackPtr]['content'] ]
);
if ( $fix === true ) {
 

[MediaWiki-commits] [Gerrit] Bump required PHP version to 5.5.9 - change (mediawiki/vendor)

[jenkins-bot (Code Review)]

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

Change subject: Bump required PHP version to 5.5.9
..


Bump required PHP version to 5.5.9

Doesn't re-add psr/log Traits yet
Bug: T75901
Change-Id: I00e2e7adf5202384fc92371b8d0551782c3c17cb
---
M composer.json
M composer.lock
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/composer.json b/composer.json
index d665e42..3c811de 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
"pear/net_socket": "1.0.14",
"pear/pear-core-minimal": "1.10.1",
"pear/pear_exception": "1.0.0",
-   "php": ">=5.3.3",
+   "php": ">=5.5.9",
"psr/log": "1.0.0",
"ruflin/elastica": "2.2.1",
"symfony/process": "2.6.12",
diff --git a/composer.lock b/composer.lock
index 0d4c5a4..51adab8 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": "9bf2edb527ec59f8276cb4c20b9c581c",
-"content-hash": "d59a1e6057e8a5e2458a4ff967079dfa",
+"hash": "c24611863b746c96d13fa90320f038ef",
+"content-hash": "415ec65f398947f60157428398e488fd",
 "packages": [
 {
 "name": "composer/semver",
@@ -1707,7 +1707,7 @@
 "prefer-stable": true,
 "prefer-lowest": false,
 "platform": {
-"php": ">=5.3.3"
+"php": ">=5.5.9"
 },
 "platform-dev": []
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00e2e7adf5202384fc92371b8d0551782c3c17cb
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] keyholder: fix lint, indentation - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: keyholder: fix lint, indentation
..

keyholder: fix lint, indentation

Change-Id: I5dfd0612e4c4c0dbbbd41e8ee0a8481047931a7d
---
M modules/keyholder/manifests/init.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/269611/1

diff --git a/modules/keyholder/manifests/init.pp 
b/modules/keyholder/manifests/init.pp
index 8638767..9c1f9b0 100644
--- a/modules/keyholder/manifests/init.pp
+++ b/modules/keyholder/manifests/init.pp
@@ -101,10 +101,10 @@
 
 file { '/etc/init/keyholder-proxy.conf':
 source => 'puppet:///modules/keyholder/keyholder-proxy.conf',
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-notify  => Service['keyholder-proxy'],
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+notify => Service['keyholder-proxy'],
 }
 
 service { 'keyholder-proxy':

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

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

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

[MediaWiki-commits] [Gerrit] pybal: fix lint, indentation - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: pybal: fix lint, indentation
..

pybal: fix lint, indentation

Change-Id: Iddbc5bc9e15efdfad71f83ac99b00084c4da4464
---
M modules/pybal/manifests/confd.pp
M modules/pybal/manifests/monitoring.pp
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/269610/1

diff --git a/modules/pybal/manifests/confd.pp b/modules/pybal/manifests/confd.pp
index 311b435..c163b54 100644
--- a/modules/pybal/manifests/confd.pp
+++ b/modules/pybal/manifests/confd.pp
@@ -3,7 +3,7 @@
 class pybal::confd {
 
 file { '/etc/pybal/pools':
-ensure => directory,
+ensure  => directory,
 require => Package[pybal],
 }
 
diff --git a/modules/pybal/manifests/monitoring.pp 
b/modules/pybal/manifests/monitoring.pp
index e17a16e..0366bce 100644
--- a/modules/pybal/manifests/monitoring.pp
+++ b/modules/pybal/manifests/monitoring.pp
@@ -10,11 +10,11 @@
 }
 
 file { '/usr/local/lib/nagios/plugins/check_pybal':
-ensure  => present,
-source  => 'puppet:///modules/pybal/check_pybal',
-owner   => 'root',
-group   => 'root',
-mode=> '0555',
+ensure => present,
+source => 'puppet:///modules/pybal/check_pybal',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
 }
 
 nrpe::monitor_service { 'pybal_backends':

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

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

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

[MediaWiki-commits] [Gerrit] ssh: fix lint, indentation - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: ssh: fix lint, indentation
..

ssh: fix lint, indentation

Change-Id: If830f766f438435643b6eed586b19f34c0b481c5
---
M modules/ssh/manifests/userkey.pp
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/269609/1

diff --git a/modules/ssh/manifests/userkey.pp b/modules/ssh/manifests/userkey.pp
index 028da67..c819d90 100644
--- a/modules/ssh/manifests/userkey.pp
+++ b/modules/ssh/manifests/userkey.pp
@@ -47,11 +47,11 @@
 if $skey {
 if !defined(File["/etc/ssh/userkeys/${user}.d/"]) {
 file { "/etc/ssh/userkeys/${user}.d/":
-ensure  => directory,
-force   => true,
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
+ensure => directory,
+force  => true,
+owner  => 'root',
+group  => 'root',
+mode   => '0755',
 }
 }
 $path = "/etc/ssh/userkeys/${user}.d/${skey}"

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

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

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

[MediaWiki-commits] [Gerrit] Add @since to ParserOptions::newFromAnon - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add @since to ParserOptions::newFromAnon
..


Add @since to ParserOptions::newFromAnon

Change-Id: I0e70904fb908fa9ed5c3c6fc30df9d02c742e29e
---
M includes/parser/ParserOptions.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/parser/ParserOptions.php 
b/includes/parser/ParserOptions.php
index 0e8d76d..49c6ce9 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -601,6 +601,7 @@
 
/**
 * Get a ParserOptions object for an anonymous user
+* @since 1.27
 * @return ParserOptions
 */
public static function newFromAnon() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e70904fb908fa9ed5c3c6fc30df9d02c742e29e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Jackmcbarn 
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] Flip skip-if regex for php53 jobs, whoops - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Flip skip-if regex for php53 jobs, whoops
..


Flip skip-if regex for php53 jobs, whoops

Change-Id: Ia971c84d1f46f6a199f444fc8c76de1e2940939a
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f1770c0..5d3819e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -656,7 +656,7 @@
   - name: ^.*php53.*$
 skip-if:
   - project: '^mediawiki/.*$'
-branch: (REL1_2[3-6])
+branch: (?!REL1_2[3-6]$)
 
   # Jobs testing multiple extensions together
   #

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia971c84d1f46f6a199f444fc8c76de1e2940939a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix PHP 5.5 compat - change (mediawiki...JsonData)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Fix PHP 5.5 compat
..

Fix PHP 5.5 compat

Change-Id: I44cbb2174608da11b8750484b4552a58c11ff4cc
---
M JsonData.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonData 
refs/changes/08/269608/1

diff --git a/JsonData.hooks.php b/JsonData.hooks.php
index ccc8e75..6cbbb3e 100644
--- a/JsonData.hooks.php
+++ b/JsonData.hooks.php
@@ -47,7 +47,7 @@
wfMessage('jsondata-server-error') . 
": " . 
htmlspecialchars( $e->getMessage() ) . 
"";
}
-   $wgJsonData->outputEditor( &$editPage );
+   $wgJsonData->outputEditor( $editPage );
}
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44cbb2174608da11b8750484b4552a58c11ff4cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonData
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Flip skip-if regex for php53 jobs, whoops - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Flip skip-if regex for php53 jobs, whoops
..

Flip skip-if regex for php53 jobs, whoops

Change-Id: Ia971c84d1f46f6a199f444fc8c76de1e2940939a
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/07/269607/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f1770c0..5d3819e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -656,7 +656,7 @@
   - name: ^.*php53.*$
 skip-if:
   - project: '^mediawiki/.*$'
-branch: (REL1_2[3-6])
+branch: (?!REL1_2[3-6]$)
 
   # Jobs testing multiple extensions together
   #

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

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

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

[MediaWiki-commits] [Gerrit] Disable php53 jobs on MW master + extensions - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Disable php53 jobs on MW master + extensions
..


Disable php53 jobs on MW master + extensions

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1655579..f1770c0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -653,6 +653,11 @@
   - name: ^.*php55.*$
 branch: (?!REL1_2[3-6]$)
 
+  - name: ^.*php53.*$
+skip-if:
+  - project: '^mediawiki/.*$'
+branch: (REL1_2[3-6])
+
   # Jobs testing multiple extensions together
   #
   # TODO stop triggering php53 jobs for the wmf branches

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6afac71200a380305590f1307a0bd9d1ebdf237
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] parsoid::testing: usr /srv instead /usr/lib - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: parsoid::testing: usr /srv instead /usr/lib
..

parsoid::testing: usr /srv instead /usr/lib

As the FIXME said, yes, use /srv.

Change-Id: I1b8f98e19320a348a555ec745950fb0b04324a0c
---
M modules/role/parsoid/testing.pp
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/269606/1

diff --git a/modules/role/parsoid/testing.pp b/modules/role/parsoid/testing.pp
index 26017a0..27d9789 100644
--- a/modules/role/parsoid/testing.pp
+++ b/modules/role/parsoid/testing.pp
@@ -26,14 +26,11 @@
 # We clone the git repo and let testing services
 # update / modify the repo as appropriate
 # (via scripts, manually, however).
-# FIXME: Should we move this to /srv/parsoid ?
-# I am picking /usr/lib to minimize changes to
-# ruthenium setup.
 git::clone { 'mediawiki/services/parsoid/deploy':
 owner  => 'root',
 group  => 'wikidev',
 recurse_submodules => true,
-directory  => '/usr/lib/parsoid',
+directory  => '/srv/parsoid',
 before => Service['parsoid'],
 }
 
@@ -61,7 +58,7 @@
 }
 
 # Use this parsoid instance for parsoid rt-testing
-file { '/usr/lib/parsoid/src/localsettings.js':
+file { '/srv/parsoid/src/localsettings.js':
 source => 
'puppet:///modules/testreduce/parsoid-rt-client.rttest.localsettings.js',
 owner  => 'root',
 group  => 'wikidev',

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

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

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

[MediaWiki-commits] [Gerrit] Disable php53 jobs on MW master + extensions - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Disable php53 jobs on MW master + extensions
..

Disable php53 jobs on MW master + extensions

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/05/269605/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1655579..f458004 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -653,6 +653,9 @@
   - name: ^.*php55.*$
 branch: (?!REL1_2[3-6]$)
 
+  - name: ^(mw|mediawiki).*php53.*$
+branch: (REL1_2[3-6])
+
   # Jobs testing multiple extensions together
   #
   # TODO stop triggering php53 jobs for the wmf branches

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

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

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

[MediaWiki-commits] [Gerrit] Use same values of kafka.max.pull.hrs and kafka.max.historic... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Use same values of kafka.max.pull.hrs and 
kafka.max.historical.days
..


Use same values of kafka.max.pull.hrs and kafka.max.historical.days

This was causing camus to throw out lagging data for 
mediawiki_CirrusSearchRequestSet

Change-Id: I8fddc2abab4c298fc51bdcbc19f0254986125fee
---
M modules/camus/templates/mediawiki.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/camus/templates/mediawiki.erb 
b/modules/camus/templates/mediawiki.erb
index cbeb3c5..2bc8fa5 100644
--- a/modules/camus/templates/mediawiki.erb
+++ b/modules/camus/templates/mediawiki.erb
@@ -55,9 +55,9 @@
 #  This will take some more sleuthing to figure out why, but in our case
 #  here its ok, as we hope to never be this far behind in Kafka messages to
 #  consume.
-kafka.max.pull.hrs=24
+kafka.max.pull.hrs=168
 # events with a timestamp older than this will be discarded.
-kafka.max.historical.days=1
+kafka.max.historical.days=7
 # Max minutes for each mapper to pull messages (-1 means no limit)
 # Let each mapper run for no more than 55 minutes.
 # Camus creates hourly directories, and we don't want a single

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fddc2abab4c298fc51bdcbc19f0254986125fee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] Use same values of kafka.max.pull.hrs and kafka.max.historic... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Use same values of kafka.max.pull.hrs and 
kafka.max.historical.days
..

Use same values of kafka.max.pull.hrs and kafka.max.historical.days

This was causing camus to throw out lagging data for 
mediawiki_CirrusSearchRequestSet

Change-Id: I8fddc2abab4c298fc51bdcbc19f0254986125fee
---
M modules/camus/templates/mediawiki.erb
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/camus/templates/mediawiki.erb 
b/modules/camus/templates/mediawiki.erb
index cbeb3c5..2bc8fa5 100644
--- a/modules/camus/templates/mediawiki.erb
+++ b/modules/camus/templates/mediawiki.erb
@@ -55,9 +55,9 @@
 #  This will take some more sleuthing to figure out why, but in our case
 #  here its ok, as we hope to never be this far behind in Kafka messages to
 #  consume.
-kafka.max.pull.hrs=24
+kafka.max.pull.hrs=168
 # events with a timestamp older than this will be discarded.
-kafka.max.historical.days=1
+kafka.max.historical.days=7
 # Max minutes for each mapper to pull messages (-1 means no limit)
 # Let each mapper run for no more than 55 minutes.
 # Camus creates hourly directories, and we don't want a single

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

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

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

[MediaWiki-commits] [Gerrit] parsoid: one file per role, move to module/role - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: parsoid: one file per role, move to module/role
..

parsoid: one file per role, move to module/role

Split the single large role file into one file
per class per style guide for easier readibality.

Move them into the module/role/ structure which for
proper autoload layout and which also makes lint happy.

This should not result in any change.

Change-Id: I379220a4f2c6d41874b75b253d22f2c08100f762
---
D manifests/role/parsoid.pp
A modules/role/parsoid/beta.pp
A modules/role/parsoid/common.pp
A modules/role/parsoid/production.pp
A modules/role/parsoid/testing.pp
5 files changed, 351 insertions(+), 351 deletions(-)


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

diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
deleted file mode 100644
index 16fb67c..000
--- a/manifests/role/parsoid.pp
+++ /dev/null
@@ -1,351 +0,0 @@
-# vim: set ts=4 et sw=4:
-class role::parsoid::common {
-package { [
-'nodejs',
-'npm',
-'build-essential',
-]: ensure => present,
-}
-
-file { '/var/lib/parsoid':
-ensure => directory,
-owner  => parsoid,
-group  => wikidev,
-mode   => '2775',
-}
-
-file { '/usr/bin/parsoid':
-ensure => present,
-owner  => root,
-group  => root,
-mode   => '0555',
-source => 'puppet:///modules/parsoid/parsoid',
-}
-
-ferm::service { 'parsoid':
-proto => 'tcp',
-port  => '8000',
-}
-}
-
-class role::parsoid::production {
-system::role { 'role::parsoid::production':
-description => 'Parsoid server'
-}
-
-include role::parsoid::common
-include standard
-include lvs::realserver
-include base::firewall
-
-package { 'parsoid/deploy':
-provider => 'trebuchet',
-}
-
-group { 'parsoid':
-ensure => present,
-name   => 'parsoid',
-system => true,
-}
-
-user { 'parsoid':
-gid=> 'parsoid',
-home   => '/var/lib/parsoid',
-managehome => true,
-system => true,
-}
-
-file { '/var/lib/parsoid/deploy':
-ensure => link,
-target => '/srv/deployment/parsoid/deploy',
-}
-
-file { '/etc/init/parsoid.conf':
-ensure => present,
-owner  => root,
-group  => root,
-mode   => '0444',
-source => 'puppet:///modules/parsoid/parsoid.upstart',
-}
-
-file { '/var/log/parsoid':
-ensure => directory,
-owner  => parsoid,
-group  => parsoid,
-mode   => '0775',
-}
-
-$parsoid_log_file = '/var/log/parsoid/parsoid.log'
-#TODO: Should we explicitly set this to 
'/srv/deployment/parsoid/deploy/node_modules'
-#just like beta labs
-$parsoid_node_path = '/var/lib/parsoid/deploy/node_modules'
-$parsoid_settings_file = 
'/srv/deployment/parsoid/deploy/conf/wmf/localsettings.js'
-$parsoid_base_path = '/var/lib/parsoid/deploy/src'
-
-#TODO: Duplication of code from beta class, deduplicate somehow
-file { '/etc/default/parsoid':
-ensure  => present,
-owner   => root,
-group   => root,
-mode=> '0444',
-content => template('parsoid/parsoid.default.erb'),
-require => File['/var/log/parsoid'],
-}
-
-file { '/etc/logrotate.d/parsoid':
-ensure  => present,
-owner   => root,
-group   => root,
-mode=> '0444',
-content => template('parsoid/parsoid.logrotate.erb'),
-}
-
-cron { 'parsoid-hourly-logrot':
-ensure  => present,
-command => '/usr/sbin/logrotate /etc/logrotate.d/parsoid',
-user=> 'root',
-hour=> '*',
-minute  => '12',
-require => File['/etc/logrotate.d/parsoid'],
-}
-
-service { 'parsoid':
-ensure => running,
-hasstatus  => true,
-hasrestart => true,
-provider   => 'upstart',
-subscribe  => [
-File['/etc/default/parsoid'],
-File['/etc/init/parsoid.conf'],
-],
-require=> Package['parsoid/deploy'],
-}
-
-monitoring::service { 'parsoid':
-description   => 'Parsoid',
-check_command => 'check_http_on_port!8000',
-}
-# until logging is handled differently, rt 6851
-nrpe::monitor_service { 'parsoid_disk_space':
-description  => 'parsoid disk space',
-nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 40% -c 3% -l 
-e',
-critical => true,
-}
-
-# Monitor TCP Connection States
-diamond::collector { 'TcpConnStates':
-source => 'puppet:///modules/diamond/collector/tcpconnstates.py',
-}
-}
-
-class role::parsoid::beta {
-system::role { 'role::parsoid::beta':
-d

[MediaWiki-commits] [Gerrit] parsoid: create module, move files and templates there - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: parsoid: create module, move files and templates there
..

parsoid: create module, move files and templates there

- create a module for parsoid
- move files from files/misc to module
- move templates from templates/misc to module

No (other) changes intended.

Change-Id: Ie5786cf75d3b9110265d065eb32c70aa1178aef8
---
M manifests/role/parsoid.pp
R modules/parsoid/files/parsoid
R modules/parsoid/files/parsoid.upstart
R modules/parsoid/files/parsoid_testing.systemd.service
R modules/parsoid/files/parsoid_testing.update_parsoid.sh
R modules/parsoid/files/ruthenium.nginx.conf
R modules/parsoid/templates/parsoid.default.erb
R modules/parsoid/templates/parsoid.logrotate.erb
R modules/parsoid/templates/parsoid.vcl.erb
9 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/269602/1

diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 463c18e..16fb67c 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -19,7 +19,7 @@
 owner  => root,
 group  => root,
 mode   => '0555',
-source => 'puppet:///files/misc/parsoid',
+source => 'puppet:///modules/parsoid/parsoid',
 }
 
 ferm::service { 'parsoid':
@@ -65,7 +65,7 @@
 owner  => root,
 group  => root,
 mode   => '0444',
-source => 'puppet:///files/misc/parsoid.upstart',
+source => 'puppet:///modules/parsoid/parsoid.upstart',
 }
 
 file { '/var/log/parsoid':
@@ -88,7 +88,7 @@
 owner   => root,
 group   => root,
 mode=> '0444',
-content => template('misc/parsoid.default.erb'),
+content => template('parsoid/parsoid.default.erb'),
 require => File['/var/log/parsoid'],
 }
 
@@ -97,7 +97,7 @@
 owner   => root,
 group   => root,
 mode=> '0444',
-content => template('misc/parsoid.logrotate.erb'),
+content => template('parsoid/parsoid.logrotate.erb'),
 }
 
 cron { 'parsoid-hourly-logrot':
@@ -191,7 +191,7 @@
 owner  => root,
 group  => root,
 mode   => '0444',
-source => 'puppet:///files/misc/parsoid.upstart',
+source => 'puppet:///modules/parsoid/parsoid.upstart',
 }
 
 $parsoid_log_file = '/data/project/parsoid/parsoid.log'
@@ -220,7 +220,7 @@
 owner   => root,
 group   => root,
 mode=> '0444',
-content => template('misc/parsoid.default.erb'),
+content => template('parsoid/parsoid.default.erb'),
 require => File['/data/project/parsoid'],
 }
 
@@ -229,7 +229,7 @@
 owner   => root,
 group   => root,
 mode=> '0444',
-content => template('misc/parsoid.logrotate.erb'),
+content => template('parsoid/parsoid.logrotate.erb'),
 }
 
 service { 'parsoid':
@@ -290,7 +290,7 @@
 }
 
 file { '/lib/systemd/system/parsoid.service':
-source => 'puppet:///files/misc/parsoid_testing.systemd.service',
+source => 'puppet:///modules/parsoid/parsoid_testing.systemd.service',
 owner  => 'root',
 group  => 'root',
 mode   => '0444',
@@ -306,7 +306,7 @@
 }
 
 file { '/usr/local/bin/update_parsoid.sh':
-source => 'puppet:///files/misc/parsoid_testing.update_parsoid.sh',
+source => 
'puppet:///modules/parsoid/parsoid_testing.update_parsoid.sh',
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
diff --git a/files/misc/parsoid b/modules/parsoid/files/parsoid
similarity index 100%
rename from files/misc/parsoid
rename to modules/parsoid/files/parsoid
diff --git a/files/misc/parsoid.upstart b/modules/parsoid/files/parsoid.upstart
similarity index 100%
rename from files/misc/parsoid.upstart
rename to modules/parsoid/files/parsoid.upstart
diff --git a/files/misc/parsoid_testing.systemd.service 
b/modules/parsoid/files/parsoid_testing.systemd.service
similarity index 100%
rename from files/misc/parsoid_testing.systemd.service
rename to modules/parsoid/files/parsoid_testing.systemd.service
diff --git a/files/misc/parsoid_testing.update_parsoid.sh 
b/modules/parsoid/files/parsoid_testing.update_parsoid.sh
similarity index 100%
rename from files/misc/parsoid_testing.update_parsoid.sh
rename to modules/parsoid/files/parsoid_testing.update_parsoid.sh
diff --git a/files/misc/ruthenium.nginx.conf 
b/modules/parsoid/files/ruthenium.nginx.conf
similarity index 100%
rename from files/misc/ruthenium.nginx.conf
rename to modules/parsoid/files/ruthenium.nginx.conf
diff --git a/templates/misc/parsoid.default.erb 
b/modules/parsoid/templates/parsoid.default.erb
similarity index 100%
rename from templates/misc/parsoid.default.erb
rename to modules/parsoid/templates/parsoid.default.erb
diff --git a

[MediaWiki-commits] [Gerrit] Another new cdh change fix for old role - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Another new cdh change fix for old role
..


Another new cdh change fix for old role

Change-Id: Ieb6e14123784bcd9e0ad691f6955740db6ac0f77
---
M manifests/role/analytics/oozie.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/analytics/oozie.pp 
b/manifests/role/analytics/oozie.pp
index 1acd108..8723a80 100644
--- a/manifests/role/analytics/oozie.pp
+++ b/manifests/role/analytics/oozie.pp
@@ -52,7 +52,7 @@
 }
 # Make sure mysql-server is installed before
 # MySQL Oozie database class is applied.
-Package['mysql-server'] -> Class['cdh::oozie::database::mysql']
+# Package['mysql-server'] -> Class['cdh::oozie::database::mysql']
 
 class { 'cdh::oozie::server':
 jdbc_password   => $jdbc_password,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb6e14123784bcd9e0ad691f6955740db6ac0f77
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Another new cdh change fix for old role - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Another new cdh change fix for old role
..

Another new cdh change fix for old role

Change-Id: Ieb6e14123784bcd9e0ad691f6955740db6ac0f77
---
M manifests/role/analytics/oozie.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/269601/1

diff --git a/manifests/role/analytics/oozie.pp 
b/manifests/role/analytics/oozie.pp
index 1acd108..8723a80 100644
--- a/manifests/role/analytics/oozie.pp
+++ b/manifests/role/analytics/oozie.pp
@@ -52,7 +52,7 @@
 }
 # Make sure mysql-server is installed before
 # MySQL Oozie database class is applied.
-Package['mysql-server'] -> Class['cdh::oozie::database::mysql']
+# Package['mysql-server'] -> Class['cdh::oozie::database::mysql']
 
 class { 'cdh::oozie::server':
 jdbc_password   => $jdbc_password,

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

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

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

[MediaWiki-commits] [Gerrit] Do not delete the translation which was once published - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Do not delete the translation which was once published
..

Do not delete the translation which was once published

If the translation in progress was once published, deleting it should move
it to published status.

There is no UX change. If the translator deletes it from 'In progress'
dashboard, it get deleted as usual, but clicking 'Published' tab
in dashboard will show it there.

Bug: T123902
Change-Id: Icfa258cb7f35805a8c93a6acb3860fc2c6002a7e
---
M api/ApiContentTranslationDelete.php
1 file changed, 13 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/00/269600/1

diff --git a/api/ApiContentTranslationDelete.php 
b/api/ApiContentTranslationDelete.php
index 337f9d5..ae22595 100644
--- a/api/ApiContentTranslationDelete.php
+++ b/api/ApiContentTranslationDelete.php
@@ -22,16 +22,23 @@
$params['to'],
$params['sourcetitle']
);
-   $translation = $translation->translation;
-   $translationId = $translation['id'];
+
+   $translationId = $translation->translation['id'];
if ( $translationId === null ||
-   $translator->getGlobalUserId() !== intval( 
$translation['lastUpdatedTranslator'] ) ) {
+   $translator->getGlobalUserId() !== intval( 
$translation->translation['lastUpdatedTranslator'] ) ) {
// Translation does not exist or belong to another 
translator
$this->dieUsageMsg( array( 'invalidtitle', 
$params['sourcetitle'] ) );
}
-   ContentTranslation\Translator::removeTranslation( 
$translationId );
-   ContentTranslation\Translation::delete( $translationId );
-   ContentTranslation\Draft::delete( $translationId );
+
+   if ( $translation->translation['targetURL'] !== null ) {
+   // Translation was once published. Don't delete, move 
it to published status.
+   $translation->translation['status'] = 'published';
+   $translation->update();
+   } else {
+   ContentTranslation\Translator::removeTranslation( 
$translationId );
+   ContentTranslation\Translation::delete( $translationId 
);
+   ContentTranslation\Draft::delete( $translationId );
+   }
$result = array(
'result' => 'success'
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfa258cb7f35805a8c93a6acb3860fc2c6002a7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Update contribution_post hook to filter contributions for Co... - change (wikimedia...crm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Update contribution_post hook to filter contributions for 
Completed status
..

Update contribution_post hook to filter contributions for Completed status

Store latest contribution total from the latest completed contribution

See the test to see expected result - basically Refunded are ignored when 
calculating
last donation details

Bug: T124834

Change-Id: I098950695075bd86da4ab13314a4b155c943a2e6
---
M sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 92 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/99/269599/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
index 712fad0..32e739a 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
@@ -97,7 +97,39 @@
 $this->assertEquals($transaction2['trxn_id'], 'my_special_ref');
 }
 
-/**
+  /**
+   * Check that marking a contribution as refunded updates custom data 
appropriately.
+   */
+  public function testMarkRefundCheckCustomData() {
+civicrm_api3('contribution', 'create', array(
+  'contact_id' => $this->contact_id,
+  'financial_type_id' => 'Cash',
+  'total_amount' => 50,
+  'contribution_source' => 'USD 50',
+  'receive_date' => '2014-11-01',
+));
+wmf_civicrm_mark_refund( $this->original_contribution_id, 'refund', false, 
'2015-09-09', 'my_special_ref');
+$contact = civicrm_api3('Contact', 'getsingle', array(
+  'id' => $this->contact_id,
+  'return' => array(
+wmf_civicrm_get_custom_field_name('lifetime_usd_total'),
+wmf_civicrm_get_custom_field_name('last_donation_date'),
+wmf_civicrm_get_custom_field_name('last_donation_amount'),
+wmf_civicrm_get_custom_field_name('last_donation_usd'),
+wmf_civicrm_get_custom_field_name('is_2014_donor'),
+wmf_civicrm_get_custom_field_name('is_' . date('Y') . '_donor'),
+  ),
+));
+$this->assertEquals(50.00, 
$contact[wmf_civicrm_get_custom_field_name('lifetime_usd_total')]);
+$this->assertEquals(50.00, 
$contact[wmf_civicrm_get_custom_field_name('last_donation_usd')]);
+$this->assertEquals(50, 
$contact[wmf_civicrm_get_custom_field_name('last_donation_amount')]);
+$this->assertEquals('2014-11-01 00:00:00', 
$contact[wmf_civicrm_get_custom_field_name('last_donation_date')]);
+$this->assertEquals(TRUE, 
$contact[wmf_civicrm_get_custom_field_name('is_2014_donor')]);
+$this->assertEquals(0, $contact[wmf_civicrm_get_custom_field_name('is_' . 
date('Y') . '_donor')]);
+  }
+
+
+  /**
  * Make a refund with type set to "chargeback"
  */
 public function testMarkRefundWithType() {
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index dba4378..e7d355f 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2082,25 +2082,31 @@
// FIXME: if this is an edit, we should review all contributions
$wmf_donor = array();
$contribution_date = new DateTime( $receive_date );
+$isNegative = 
CRM_Contribute_BAO_Contribution::isContributionStatusNegative($contribution->contribution_status_id);
$fiscal_year = intval( $contribution_date->format( 'Y' ) );
if ( intval( $contribution_date->format( 'm' ) ) < 7 ) {
$fiscal_year = $fiscal_year - 1;
}
if ( $fiscal_year >= WMF_MIN_ROLLUP_YEAR && $fiscal_year <= 
WMF_MAX_ROLLUP_YEAR ) {
-   $wmf_donor["is_{$fiscal_year}_donor"] = true;
+  if (!$isNegative) {
+$wmf_donor["is_{$fiscal_year}_donor"] = TRUE;
+  }
+  else {
+$wmf_donor["is_{$fiscal_year}_donor"] = civicrm_api3('Contribution', 
'getcount', array(
+  'contact_id' => $contact_id,
+  'contribution_status_id' => 'Completed',
+  'receive_date' => array('BETWEEN' => array($fiscal_year . '-07-01', 
$fiscal_year +1 . '-06-30')),
+));
+  }
}
+
// Update the latest donation data.
// If this is an edit, first check if it's the latest
$latest = true;
-   if ( $op === 'edit' ) {
-   $sql = << '{$contribution_date->format( 'Y-m-d H:i:s' )}'
-LIMIT 1
-EOS;
-   $dao = CRM_Core_DAO::executeQuery( $sql );
-   if ( $dao->fetch() ) {
+
+   if ( $op === 'edit' ) {
+  $latestDate = 
wmf_civicrm_most_recent_completed_contributio

[MediaWiki-commits] [Gerrit] Fresh translation after deletion should have correct author ... - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Fresh translation after deletion should have correct author and 
dates
..

Fresh translation after deletion should have correct author and dates

The started-by and started-date fields for this translation were not
updated in these cases.

Bug: T125959
Change-Id: I91658e6720e1dddf94ac5caa7da406d091a2ee48
---
M includes/Translation.php
1 file changed, 14 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/98/269598/1

diff --git a/includes/Translation.php b/includes/Translation.php
index 66db0cc..a4cb45e 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -42,14 +42,11 @@
$this->translation['id'] = (int)$dbw->insertId();
}
 
-   public function update() {
+   public function update( $freshTranslation = false ) {
$dbw = Database::getConnection( DB_MASTER );
 
$values = array(
-   'translation_source_title' => 
$this->translation['sourceTitle'],
'translation_target_title' => 
$this->translation['targetTitle'],
-   'translation_source_language' => 
$this->translation['sourceLanguage'],
-   'translation_target_language' => 
$this->translation['targetLanguage'],
'translation_source_revision_id' => 
$this->translation['sourceRevisionId'],
'translation_source_url' => 
$this->translation['sourceURL'],
'translation_status' => $this->translation['status'],
@@ -63,6 +60,11 @@
$values['translation_target_revision_id'] = 
$this->translation['targetRevisionId'];
}
 
+   if ( $freshTranslation === true ) {
+   $values['translation_start_timestamp'] = 
$dbw->timestamp();
+   $values['translation_started_by'] = 
$this->translation['startedTranslator'];
+   }
+
$dbw->update(
'cx_translations',
$values,
@@ -72,6 +74,8 @@
}
 
public function save() {
+   $freshTranslation = false;
+
$existingTranslation = Translation::find(
$this->translation['sourceLanguage'],
$this->translation['targetLanguage'],
@@ -81,8 +85,13 @@
if ( $existingTranslation === null ) {
$this->create();
} else {
+   if ( $existingTranslation->translation['status'] === 
'deleted' ) {
+   // Existing translation is deleted, so this is 
a fresh start of same
+   // language pair and source title.
+   $freshTranslation = true;
+   }
$this->translation['id'] = 
$existingTranslation->getTranslationId();
-   $this->update();
+   $this->update( $freshTranslation );
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91658e6720e1dddf94ac5caa7da406d091a2ee48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

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

[MediaWiki-commits] [Gerrit] Fix unit test in PHP 5.5 - change (mediawiki...CodeReview)

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review.

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

Change subject: Fix unit test in PHP 5.5
..

Fix unit test in PHP 5.5

Not sure how the hell it works in other environments.
Also, @group CodeReview while I'm at it.

Change-Id: I95aebb08c85bc992e330379e151dcf2fbc27a9c4
---
M tests/CodeReviewApiTest.php
M tests/CodeReviewTest.php
M tests/DiffHighlighterTest.php
3 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeReview 
refs/changes/97/269597/1

diff --git a/tests/CodeReviewApiTest.php b/tests/CodeReviewApiTest.php
index abafe5d..300642b 100644
--- a/tests/CodeReviewApiTest.php
+++ b/tests/CodeReviewApiTest.php
@@ -5,6 +5,7 @@
  * Broken as of 2011-09-02.
  *
  * @group medium
+ * @group CodeReview
  */
 class CodeReviewApiTest extends ApiTestCase {
 
diff --git a/tests/CodeReviewTest.php b/tests/CodeReviewTest.php
index 85ba38d..c32cf18 100644
--- a/tests/CodeReviewTest.php
+++ b/tests/CodeReviewTest.php
@@ -1,5 +1,8 @@
  'hashar',
'date'   => '15 august 2011',
'msg'=> 'dumb revision message',
-   'paths'  => array( '/dev/null' ),
+   'paths'  => array( array( 'path' => '/dev/null' ) ),
)
);
 
diff --git a/tests/DiffHighlighterTest.php b/tests/DiffHighlighterTest.php
index 96aa0b8..0ac0706 100644
--- a/tests/DiffHighlighterTest.php
+++ b/tests/DiffHighlighterTest.php
@@ -1,5 +1,8 @@
 https://gerrit.wikimedia.org/r/269597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95aebb08c85bc992e330379e151dcf2fbc27a9c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] NPM: Use /tmp/cache/npm as the NPM cache directory - change (mediawiki/vagrant)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: NPM: Use /tmp/cache/npm as the NPM cache directory
..

NPM: Use /tmp/cache/npm as the NPM cache directory

NPM's cache directory used to be in /vagrant - the partition mounted
from the host. However, that exposes the npm install procedure to all of
the usual host-guest-mounting problems (most notably device-busy ones on
NFS since npm uses the cache dir aggressively), which do not really make
sense to deal with because:
- there is really no need to preserve its contents between vagrant
  machine rebuilds
- we already nuke the cache directory before a git-update in order to
  prevent various npm-cache weirdness (such as mpn OOM'ing when trying
  to update the cache for a git-versioned module)

Conclusion: make the cache directory transient, pay the start-up
overhead price and enjoy life :)

Bug: T126416
Change-Id: I9e541e32797e3130b9847a9aa8c10fcd3e8e2bcf
---
M puppet/modules/npm/manifests/init.pp
1 file changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/96/269596/1

diff --git a/puppet/modules/npm/manifests/init.pp 
b/puppet/modules/npm/manifests/init.pp
index 25dcb1d..3e48f97 100644
--- a/puppet/modules/npm/manifests/init.pp
+++ b/puppet/modules/npm/manifests/init.pp
@@ -6,10 +6,10 @@
 #
 # [*cache_dir*]
 #   Npm cache directory (npm_config_cache).
-#   Default '/vagrant/cache/npm'
+#   Default '/tmp/cache/npm'
 #
 class npm (
-$cache_dir   = '/vagrant/cache/npm',
+$cache_dir   = '/tmp/cache/npm',
 ) {
 
 include ::apt
@@ -61,8 +61,15 @@
 ],
 }
 
+exec { 'npm_set_cache_dir':
+command => "/bin/mkdir -p ${cache_dir} && /bin/chmod -R 0777 
${cache_dir}",
+user=> 'root',
+group   => 'root',
+}
+
 env::var { 'NPM_CONFIG_CACHE':
-value => $cache_dir,
+value   => $cache_dir,
+require => Exec['npm_set_cache_dir'],
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Fix EventRelayerGroup constructor - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Fix EventRelayerGroup constructor
..


Fix EventRelayerGroup constructor

Bug: T126371
Change-Id: Iaffb3854f1ab7b03ce24563054bd1ba5f55bbf2c
---
M includes/EventRelayerGroup.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/EventRelayerGroup.php b/includes/EventRelayerGroup.php
index 45e9be9..3af756d 100644
--- a/includes/EventRelayerGroup.php
+++ b/includes/EventRelayerGroup.php
@@ -18,7 +18,7 @@
/**
 * @param Config $config
 */
-   protected function __constuct( Config $config ) {
+   protected function __construct( Config $config ) {
$this->configByChannel = $config->get( 'EventRelayerConfig' );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] WIP: Fix CentralAuth issues - change (mediawiki/vagrant)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: WIP: Fix CentralAuth issues
..

WIP: Fix CentralAuth issues

* Runs migratePass0 as needed to keep track of users
  that need to be attached.

TODO: Make sure all the users are actually attached.  I think
this might require setting the email.

Change-Id: I30d78e1dfc7923872824852379596959cfbe43fe
---
M puppet/hieradata/common.yaml
M puppet/modules/mediawiki/manifests/wiki.pp
M puppet/modules/role/manifests/centralauth.pp
A 
puppet/modules/role/templates/centralauth/is-centralauth-migratePass0-needed.bash.erb
4 files changed, 44 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/95/269595/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 5ebfa1c..7a3bc30 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -259,6 +259,7 @@
 
 role::centralauth::db_host: "%{hiera('mysql::grant_host_name')}"
 role::centralauth::db_user: "%{hiera('mediawiki::multiwiki::db_user')}"
+role::centralauth::wiki_admin_user: "%{hiera('mediawiki::admin_user')}"
 
 role::commons::upload_dir: "%{hiera('mwv::files_dir')}/commonsimages"
 
diff --git a/puppet/modules/mediawiki/manifests/wiki.pp 
b/puppet/modules/mediawiki/manifests/wiki.pp
index 93050dc..8c17fe2 100644
--- a/puppet/modules/mediawiki/manifests/wiki.pp
+++ b/puppet/modules/mediawiki/manifests/wiki.pp
@@ -35,7 +35,9 @@
 #   Password for MySQL account (example: 'secret123').
 #
 # [*admin_user*]
-#   User name for the initial admin account (example: 'admin').
+#   User name for the initial admin account ($::mediawiki::admin_user).
+#   Changing this is not recommended, and can slow provisioning
+#   if CentralAuth is enabled.
 #
 # [*admin_pass*]
 #   Initial password for admin account (example: 'secret123').
diff --git a/puppet/modules/role/manifests/centralauth.pp 
b/puppet/modules/role/manifests/centralauth.pp
index 5037823..2bc15d5 100644
--- a/puppet/modules/role/manifests/centralauth.pp
+++ b/puppet/modules/role/manifests/centralauth.pp
@@ -16,9 +16,13 @@
 # [*db_user*]
 #   Database user used for CentralAuth database
 #
+# [*wiki_admin_user*]
+#   Admin user name for the wikis
+#
 class role::centralauth(
 $db_host,
 $db_user,
+$wiki_admin_user,
 ){
 require ::role::mediawiki
 include ::role::antispoof
@@ -31,6 +35,8 @@
 $loginwiki = 'login'
 $alt_testwiki = 'centralauthtest'
 $selenium_user = regsubst($::browsertests::selenium_user, '_', ' ')
+
+$canonical_admin_user = inline_template('<%= 
@wiki_admin_user[0].capitalize + @wiki_admin_user[1..-1] %>')
 
 mediawiki::extension { 'CentralAuth':
 needs_update  => true,
@@ -87,6 +93,28 @@
 
 mediawiki::wiki{ [ $loginwiki, $alt_testwiki ]: }
 
+file { '/usr/local/bin/is-centralauth-migratePass0-needed':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0755',
+content => 
template('role/centralauth/is-centralauth-migratePass0-needed.bash.erb'),
+}
+
+# Make sure CentralAuth knows about all local users
+# To avoid running this every time, we check whether it knows
+# about Admin users on all wikis.  If someone changes Wiki[admin_user],
+# this will run every time.
+mediawiki::maintenance { "Pass 0 of CentralAuth":
+command => '/usr/local/bin/foreachwiki 
extensions/CentralAuth/maintenance/migratePass0.php',
+unless  => '/usr/local/bin/is-centralauth-migratePass0-needed',
+require => [
+File['/usr/local/bin/is-centralauth-migratePass0-needed'],
+Mysql::Sql['Create CentralAuth tables'],
+Mysql::Sql['Create CentralAuth spoofuser table'],
+]
+}
+
 role::centralauth::migrate_user { [ 'Admin', $selenium_user ]: }
 
 # Environment variables used by browser tests
diff --git 
a/puppet/modules/role/templates/centralauth/is-centralauth-migratePass0-needed.bash.erb
 
b/puppet/modules/role/templates/centralauth/is-centralauth-migratePass0-needed.bash.erb
new file mode 100644
index 000..043abb2
--- /dev/null
+++ 
b/puppet/modules/role/templates/centralauth/is-centralauth-migratePass0-needed.bash.erb
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Exits with status 0 iff migratePass0.php was already run (and no new
+# wikis have been enabled since)
+
+alldbs_out=$(alldbs)
+expected_count=$(echo "$alldbs_out"|wc -l)
+
+alldbs_comma=$(echo "$alldbs_out"|xargs|sed "s/ /', '/g")
+$sql="SELECT COUNT(*) FROM centralauth.localnames WHERE ln_name = '<%= 
@canonical_admin_user %>' AND ln_wiki IN ('$alldbs_comma');"
+
+actual_count=$(echo "$sql"|mysql --skip-column-names)
+[ $expected_count -eq $actual_count ]

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

Gerrit-MessageType: newchang

[MediaWiki-commits] [Gerrit] Fix EventRelayerGroup constructor - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Fix EventRelayerGroup constructor
..

Fix EventRelayerGroup constructor

Bug: T126371
Change-Id: Iaffb3854f1ab7b03ce24563054bd1ba5f55bbf2c
---
M includes/EventRelayerGroup.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/269594/1

diff --git a/includes/EventRelayerGroup.php b/includes/EventRelayerGroup.php
index 45e9be9..3af756d 100644
--- a/includes/EventRelayerGroup.php
+++ b/includes/EventRelayerGroup.php
@@ -18,7 +18,7 @@
/**
 * @param Config $config
 */
-   protected function __constuct( Config $config ) {
+   protected function __construct( Config $config ) {
$this->configByChannel = $config->get( 'EventRelayerConfig' );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaffb3854f1ab7b03ce24563054bd1ba5f55bbf2c
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] Update VE core submodule to wmf/1.27.0-wmf.13 HEAD (96e75cd) - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update VE core submodule to wmf/1.27.0-wmf.13 HEAD (96e75cd)
..

Update VE core submodule to wmf/1.27.0-wmf.13 HEAD (96e75cd)

New changes:
0e15e59 Edit mode switch: Show popup next to VE switch button
fb9e683 ext.visualEditor.desktopArticleTarget.init: Depend on mediawiki.user too

Change-Id: Id4ee4c9ccf2d6875ed10c25daabc1ca309ab5b44
---
M extensions/VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/93/269593/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index b2ad016..96e75cd 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit b2ad016ef0ea37124dacc41a744e193be7c9bfd6
+Subproject commit 96e75cd4ea2bb1c9d5bdf2a2074ba38c4ec020bb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4ee4c9ccf2d6875ed10c25daabc1ca309ab5b44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.13
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to wmf/1.27.0-wmf.12 HEAD (3b59d17) - change (mediawiki/core)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Update VE core submodule to wmf/1.27.0-wmf.12 HEAD (3b59d17)
..

Update VE core submodule to wmf/1.27.0-wmf.12 HEAD (3b59d17)

New changes:
3b59d17 ext.visualEditor.desktopArticleTarget.init: Depend on mediawiki.user too

Change-Id: If55172edd10c496878ed9b92b6ac506e0c73c5c0
---
M extensions/VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/269592/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index c2dfa0b..3b59d17 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit c2dfa0bf331b787159e371ae7115d4513f054817
+Subproject commit 3b59d1765df1877dc4fc6376605b0724d64a4c72

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If55172edd10c496878ed9b92b6ac506e0c73c5c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Edit mode switch: Show popup next to VE switch button - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Edit mode switch: Show popup next to VE switch button
..


Edit mode switch: Show popup next to VE switch button

Only show if the user came from VE.

Change-Id: Ic362ba534d135fca5516c8ba401f6b2a22886ff1
(cherry picked from commit 80124c88a6feb2f4cbfc50a8a0bba0a436d638d8)
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
8 files changed, 74 insertions(+), 8 deletions(-)

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



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index f04fdfb..e7b7fad 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -563,6 +563,7 @@
$preferences['visualeditor-editor'] = $api;
$preferences['visualeditor-hidebetawelcome'] = $api;
$preferences['visualeditor-hidetabdialog'] = $api;
+   $preferences['visualeditor-hidesourceswitchpopup'] = $api;
$preferences['visualeditor-hideusered'] = $api;
$preferences['visualeditor-findAndReplace-findText'] = $api;
$preferences['visualeditor-findAndReplace-replaceText'] = $api;
diff --git a/extension.json b/extension.json
index dc94409..b7bd5e2 100644
--- a/extension.json
+++ b/extension.json
@@ -1039,6 +1039,9 @@
"visualeditor-mweditmodesource-warning-cancel",
"visualeditor-mweditmodesource-warning-switch",

"visualeditor-mweditmodesource-warning-switch-discard",
+   "visualeditor-mweditmodeve-popup-body",
+   "visualeditor-mweditmodeve-popup-title",
+   "visualeditor-mweditmodeve-showagain",
"visualeditor-mweditmodeve-title",
"visualeditor-mweditmodeve-tool",
"visualeditor-mweditmodeve-warning",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 5f072ee..9fe9535 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -261,6 +261,9 @@
"visualeditor-mweditmodesource-warning-cancel": "Cancel",
"visualeditor-mweditmodesource-warning-switch": "Keep changes",
"visualeditor-mweditmodesource-warning-switch-discard": "Discard 
changes",
+   "visualeditor-mweditmodeve-popup-body": "You can switch back to visual 
editing at any time by clicking on this icon.",
+   "visualeditor-mweditmodeve-popup-title": "You have switched to source 
editing",
+   "visualeditor-mweditmodeve-showagain": "Don't show this message again",
"visualeditor-mweditmodeve-title": "Switch to visual editing?",
"visualeditor-mweditmodeve-tool": "Switch to visual editing",
"visualeditor-mweditmodeve-warning": "You are switching to visual 
editing.\nDo you want to continue?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 1ae7f5a..abfc44a 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -272,6 +272,9 @@
"visualeditor-mweditmodesource-warning-cancel": "Label for the cancel 
button on the confirmation dialog for switching to source 
editing.\n{{Identical|Cancel}}",
"visualeditor-mweditmodesource-warning-switch": "Label for the keep 
changes button on the confirmation dialog for switching to source editing.",
"visualeditor-mweditmodesource-warning-switch-discard": "Label for the 
discard changes button on the confirmation dialog for switching to source 
editing.",
+   "visualeditor-mweditmodeve-popup-body": "Body text of popup shown after 
switching to source mode from visual mode",
+   "visualeditor-mweditmodeve-popup-title": "Title of popup shown after 
switching to source mode from visual mode",
+   "visualeditor-mweditmodeve-showagain": "Label for checkbox to not show 
the 'switched to visual mode' popup again",
"visualeditor-mweditmodeve-title": "Title of dialog to confirm 
switching to visual mode.",
"visualeditor-mweditmodeve-tool": "Label for tool that changes edit 
mode to visual editing.",
"visualeditor-mweditmodeve-warning": "Warning message show before 
changing edit mode to visual editing. It may allow the user to keep the changes 
or to start source editing from scratch using the message 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch}} and 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch-discard}}.",
diff --git a/modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css 
b/mod

[MediaWiki-commits] [Gerrit] ext.visualEditor.desktopArticleTarget.init: Depend on mediaw... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ext.visualEditor.desktopArticleTarget.init: Depend on 
mediawiki.user too
..


ext.visualEditor.desktopArticleTarget.init: Depend on mediawiki.user too

Change-Id: I8df684ae582a2caef051a04ee99b9f518ecf567a
(cherry picked from commit 2837cfb40025d3772d8798ba59c7700326493e1c)
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index dc94409..454f8cf 100644
--- a/extension.json
+++ b/extension.json
@@ -270,6 +270,7 @@
"mediawiki.page.startup",
"mediawiki.Title",
"mediawiki.Uri",
+   "mediawiki.user",
"mediawiki.util",
"mediawiki.api.options",
"user.options",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8df684ae582a2caef051a04ee99b9f518ecf567a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.13
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ext.visualEditor.desktopArticleTarget.init: Depend on mediaw... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: ext.visualEditor.desktopArticleTarget.init: Depend on 
mediawiki.user too
..


ext.visualEditor.desktopArticleTarget.init: Depend on mediawiki.user too

Change-Id: I8df684ae582a2caef051a04ee99b9f518ecf567a
(cherry picked from commit 2837cfb40025d3772d8798ba59c7700326493e1c)
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 814fb52..a2a25a6 100644
--- a/extension.json
+++ b/extension.json
@@ -270,6 +270,7 @@
"mediawiki.page.startup",
"mediawiki.Title",
"mediawiki.Uri",
+   "mediawiki.user",
"mediawiki.util",
"mediawiki.api.options",
"user.options",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8df684ae582a2caef051a04ee99b9f518ecf567a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove CORS & CSP Support - change (maps/tilerator)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Remove CORS & CSP Support
..

Remove CORS & CSP Support

From my understanding, there is no point to support
CORS and CSP settings in the app that is designed
for admin-only usage.

Change-Id: Id2fefdc1388b577165677cbcee816bfc28ab4664
---
M app.js
1 file changed, 3 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/maps/tilerator 
refs/changes/91/269591/1

diff --git a/app.js b/app.js
index 0e5a230..f866804 100644
--- a/app.js
+++ b/app.js
@@ -92,19 +92,9 @@
 
 // set the CORS and CSP headers
 app.all('*', function(req, res, next) {
-if(app.conf.cors !== false) {
-res.header('access-control-allow-origin', app.conf.cors);
-res.header('access-control-allow-headers', 'accept, 
x-requested-with, content-type');
-res.header('access-control-expose-headers', 'etag');
-}
-if(app.conf.csp !== false) {
-res.header('x-xss-protection', '1; mode=block');
-res.header('x-content-type-options', 'nosniff');
-res.header('x-frame-options', 'SAMEORIGIN');
-res.header('content-security-policy', app.conf.csp);
-res.header('x-content-security-policy', app.conf.csp);
-res.header('x-webkit-csp', app.conf.csp);
-}
+//
+// Tilerator is an admin app, there is no point to set app.conf.cors 
and app.conf.csp
+//
 sUtil.initAndLogRequest(req, app);
 next();
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2fefdc1388b577165677cbcee816bfc28ab4664
Gerrit-PatchSet: 1
Gerrit-Project: maps/tilerator
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] VE: Fix i18n names broken during migration - change (mediawiki...Citoid)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: VE: Fix i18n names broken during migration
..

VE: Fix i18n names broken during migration

Change-Id: I67e6e072b4134b4e2f92f0eeae5fec1030470ac0
(cherry picked from commit 76aee1c98f5e1eb37defdb474a562f54b2379e7d)
---
M modules/ve.ui.CiteFromIdInspectorTool.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/90/269590/1

diff --git a/modules/ve.ui.CiteFromIdInspectorTool.js 
b/modules/ve.ui.CiteFromIdInspectorTool.js
index 1887fee..28d6f8d 100644
--- a/modules/ve.ui.CiteFromIdInspectorTool.js
+++ b/modules/ve.ui.CiteFromIdInspectorTool.js
@@ -56,8 +56,8 @@
ve.ui.CiteFromIdInspectorTool = function VeUiCiteFromIdInspectorTool() {
ve.ui.CiteFromIdInspectorTool.super.apply( this, arguments );
ve.ui.MWEducationPopupTool.call( this, {
-   title: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-title' ),
-   text: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-text' )
+   title: ve.msg( 
'cite-ve-dialogbutton-citation-educationpopup-title' ),
+   text: ve.msg( 
'cite-ve-dialogbutton-citation-educationpopup-text' )
} );
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67e6e072b4134b4e2f92f0eeae5fec1030470ac0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: wmf/1.27.0-wmf.13
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 

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

[MediaWiki-commits] [Gerrit] VE: Fix i18n names broken during migration - change (mediawiki...Citoid)

[jenkins-bot (Code Review)]

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

Change subject: VE: Fix i18n names broken during migration
..


VE: Fix i18n names broken during migration

Change-Id: I67e6e072b4134b4e2f92f0eeae5fec1030470ac0
---
M modules/ve.ui.CiteFromIdInspectorTool.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve.ui.CiteFromIdInspectorTool.js 
b/modules/ve.ui.CiteFromIdInspectorTool.js
index 1887fee..28d6f8d 100644
--- a/modules/ve.ui.CiteFromIdInspectorTool.js
+++ b/modules/ve.ui.CiteFromIdInspectorTool.js
@@ -56,8 +56,8 @@
ve.ui.CiteFromIdInspectorTool = function VeUiCiteFromIdInspectorTool() {
ve.ui.CiteFromIdInspectorTool.super.apply( this, arguments );
ve.ui.MWEducationPopupTool.call( this, {
-   title: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-title' ),
-   text: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-text' )
+   title: ve.msg( 
'cite-ve-dialogbutton-citation-educationpopup-title' ),
+   text: ve.msg( 
'cite-ve-dialogbutton-citation-educationpopup-text' )
} );
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67e6e072b4134b4e2f92f0eeae5fec1030470ac0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Try to make MW->VE switching fail less badly - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Try to make MW->VE switching fail less badly
..

Try to make MW->VE switching fail less badly

* Try to hide loading bar on failure
* Don't set wgAction back to 'view' if we're dropping the user back to the
  wikitext editor

I'm tired, don't have good commit message ideas, and this commit is probably
wrong anyway. Advise against merging.

Bug: T125580
Change-Id: I13058ae131a1dda3b172e78d9b143d70831c47f1
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
2 files changed, 12 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/89/269589/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 5882c3d..b8665a1 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
@@ -33,6 +33,7 @@
function showLoading() {
var $content, contentRect, offsetTop, windowHeight, top, 
bottom, middle;
 
+   $( 'html' ).addClass( 've-activated ve-loading' );
if ( !init.$loading ) {
init.$loading = $(
'' +
@@ -77,6 +78,7 @@
}
 
function hideLoading() {
+   $( 'html' ).removeClass( 've-activated ve-loading' );
if ( init.$loading ) {
init.$loading.detach();
}
@@ -202,13 +204,18 @@
modified
);
} )
-   .done( function () {
-   incrementLoadingProgress();
-   } );
+   .then(
+   function () {
+   incrementLoadingProgress();
+   },
+   function () {
+   hideLoading();
+   resetLoadingProgress();
+   }
+   );
 
setEditorPreference( 'visualeditor' );
 
-   $( 'html' ).addClass( 've-activated ve-loading' );
showLoading();
incrementLoadingProgress();
active = true;
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 49bbf47..49cdcc6 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1066,7 +1066,7 @@
if ( 'vesection' in uri.query ) {
delete uri.query.vesection;
}
-   if ( 'action' in uri.query ) {
+   if ( 'action' in uri.query && $( '#wpTextbox1' ).length === 0 ) 
{
delete uri.query.action;
mw.config.set( 'wgAction', 'view' );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13058ae131a1dda3b172e78d9b143d70831c47f1
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] Add php55 and hhvm tests for all extensions that have php53 ... - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Add php55 and hhvm tests for all extensions that have php53 
tests
..


Add php55 and hhvm tests for all extensions that have php53 tests

Change-Id: Ia9aa3627850cff2a033856f6014ca63ba1eb0858
---
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
2 files changed, 33 insertions(+), 7 deletions(-)

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



diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 7246f7f..07fe6da 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -130,6 +130,23 @@
 'phplint or a composer-* job'
 % (name, pipeline))
 
+def assertProjectHasPhp53TestAnd55(self, name, definition, pipeline):
+has_53 = False
+for job in definition:
+if 'testextension-php53' in job:
+has_53 = True
+break
+if not has_53:
+self.assertFalse(has_53)
+return
+for job in definition:
+if 'testextension-php55' in job:
+self.assertTrue(True)
+return
+
+self.assertTrue(False, 'Project %s pipeline %s must have a '
+'php55 test job' % (name, pipeline))
+
 def test_repos_have_required_jobs(self):
 repos = {
 'mediawiki/core$': [
@@ -138,7 +155,8 @@
 ],
 'mediawiki/extensions/\w+$': [
 self.assertProjectHasComposerValidate,
-self.assertProjectHasPhplint
+self.assertProjectHasPhplint,
+self.assertProjectHasPhp53TestAnd55
 ],
 'mediawiki/skins/': [
 self.assertProjectHasComposerValidate,
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 977d062..1655579 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1193,21 +1193,22 @@
  - php53lint
  - php55lint
  # Extensions tests with core+vendor
- #- 'mwext-{name}-testextension-hhvm'
  - 'mwext-{name}-testextension-php53'
+ - 'mwext-{name}-testextension-php55'
+ - 'mwext-{name}-testextension-hhvm'
  - php-composer-validate
 gate-and-submit:
  - mediawiki-gate
  - php53lint
  - php55lint
  # Extensions tests with core+vendor
- #- 'mwext-{name}-testextension-hhvm'
  - 'mwext-{name}-testextension-php53'
+ - 'mwext-{name}-testextension-php55'
+ - 'mwext-{name}-testextension-hhvm'
  - php-composer-validate
 experimental:
   - 'mediawiki-extensions-hhvm'
   - mediawiki-extensions-qunit
-  - 'mwext-{name}-testextension-hhvm'
   - mwext-testextension-hhvm
   - mwext-testextension-php53-composer
   - mwext-testextension-hhvm-composer
@@ -1223,6 +1224,7 @@
  - php53lint
  - php55lint
  - mwext-testextension-php53-composer
+ - mwext-testextension-php55-composer
  - mwext-testextension-hhvm-composer
  - php-composer-validate
 gate-and-submit:
@@ -1230,6 +1232,7 @@
  - php53lint
  - php55lint
  - mwext-testextension-php53-composer
+ - mwext-testextension-php55-composer
  - mwext-testextension-hhvm-composer
  - php-composer-validate
 experimental:
@@ -1247,6 +1250,8 @@
  - php55lint
  # Extensions tests with core+vendor
  - mwext-testextension-php53
+ - mwext-testextension-php55
+ - mwext-testextension-hhvm
  - php-composer-validate
 gate-and-submit:
  - mediawiki-gate
@@ -1254,11 +1259,12 @@
  - php55lint
  # Extensions tests with core+vendor
  - mwext-testextension-php53
+ - mwext-testextension-php55
+ - mwext-testextension-hhvm
  - php-composer-validate
 experimental:
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-qunit
-  - mwext-testextension-hhvm
   - mwext-testextension-php53-composer
   - mwext-testextension-hhvm-composer
   - npm
@@ -3707,12 +3713,14 @@
   - jsonlint
   - php53lint
 test:
-  #- mwext-MobileFrontend-testextension-hhvm
+  - mwext-MobileFrontend-testextension-hhvm
   - mwext-MobileFrontend-testextension-php53
+  - mwext-MobileFrontend-testextension-php55
 gate-and-submit:
   - mediawiki-gate
-  #- mwext-MobileFrontend-testextension-hhvm
+  - mwext-MobileFrontend-testextension-hhvm
   - mwext-MobileFrontend-testextension-php53
+  - mwext-MobileFrontend-testextension-php55
 postmerge:
   - mwext-MobileFrontend-publish
   - mwext-MobileFrontend-doxygen-publish

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9aa3627850cff2a033856f6014ca63ba1eb0858
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-R

[MediaWiki-commits] [Gerrit] Edit mode switch: Show popup next to VE switch button - change (mediawiki...VisualEditor)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Edit mode switch: Show popup next to VE switch button
..

Edit mode switch: Show popup next to VE switch button

Only show if the user came from VE.

Change-Id: Ic362ba534d135fca5516c8ba401f6b2a22886ff1
(cherry picked from commit 80124c88a6feb2f4cbfc50a8a0bba0a436d638d8)
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
8 files changed, 74 insertions(+), 8 deletions(-)


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

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index f04fdfb..e7b7fad 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -563,6 +563,7 @@
$preferences['visualeditor-editor'] = $api;
$preferences['visualeditor-hidebetawelcome'] = $api;
$preferences['visualeditor-hidetabdialog'] = $api;
+   $preferences['visualeditor-hidesourceswitchpopup'] = $api;
$preferences['visualeditor-hideusered'] = $api;
$preferences['visualeditor-findAndReplace-findText'] = $api;
$preferences['visualeditor-findAndReplace-replaceText'] = $api;
diff --git a/extension.json b/extension.json
index dc94409..b7bd5e2 100644
--- a/extension.json
+++ b/extension.json
@@ -1039,6 +1039,9 @@
"visualeditor-mweditmodesource-warning-cancel",
"visualeditor-mweditmodesource-warning-switch",

"visualeditor-mweditmodesource-warning-switch-discard",
+   "visualeditor-mweditmodeve-popup-body",
+   "visualeditor-mweditmodeve-popup-title",
+   "visualeditor-mweditmodeve-showagain",
"visualeditor-mweditmodeve-title",
"visualeditor-mweditmodeve-tool",
"visualeditor-mweditmodeve-warning",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 5f072ee..9fe9535 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -261,6 +261,9 @@
"visualeditor-mweditmodesource-warning-cancel": "Cancel",
"visualeditor-mweditmodesource-warning-switch": "Keep changes",
"visualeditor-mweditmodesource-warning-switch-discard": "Discard 
changes",
+   "visualeditor-mweditmodeve-popup-body": "You can switch back to visual 
editing at any time by clicking on this icon.",
+   "visualeditor-mweditmodeve-popup-title": "You have switched to source 
editing",
+   "visualeditor-mweditmodeve-showagain": "Don't show this message again",
"visualeditor-mweditmodeve-title": "Switch to visual editing?",
"visualeditor-mweditmodeve-tool": "Switch to visual editing",
"visualeditor-mweditmodeve-warning": "You are switching to visual 
editing.\nDo you want to continue?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 1ae7f5a..abfc44a 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -272,6 +272,9 @@
"visualeditor-mweditmodesource-warning-cancel": "Label for the cancel 
button on the confirmation dialog for switching to source 
editing.\n{{Identical|Cancel}}",
"visualeditor-mweditmodesource-warning-switch": "Label for the keep 
changes button on the confirmation dialog for switching to source editing.",
"visualeditor-mweditmodesource-warning-switch-discard": "Label for the 
discard changes button on the confirmation dialog for switching to source 
editing.",
+   "visualeditor-mweditmodeve-popup-body": "Body text of popup shown after 
switching to source mode from visual mode",
+   "visualeditor-mweditmodeve-popup-title": "Title of popup shown after 
switching to source mode from visual mode",
+   "visualeditor-mweditmodeve-showagain": "Label for checkbox to not show 
the 'switched to visual mode' popup again",
"visualeditor-mweditmodeve-title": "Title of dialog to confirm 
switching to visual mode.",
"visualeditor-mweditmodeve-tool": "Label for tool that changes edit 
mode to visual editing.",
"visualeditor-mweditmodeve-warning": "Warning message show before 
changing edit mode to visual editing. It may allow the user to keep the changes 
or to start source editing from scratch using the message 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch}} and 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch-discard}}.",
diff --git a/modules/v

[MediaWiki-commits] [Gerrit] Ensure Adyen result switcher logs correct OID - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Ensure Adyen result switcher logs correct OID
..


Ensure Adyen result switcher logs correct OID

Use the order ID from the return URL parameters, not the order ID
in session, which may have changed if the user started another
donation attempt in the meantime.

Change-Id: I91742814416e3397f8bb53fa39ad75d9fdf9402d
---
M adyen_gateway/adyen.adapter.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 98c7ada..27965de 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -534,6 +534,12 @@
}
$this->logger->debug( 'Good signature' );
 
+   // Overwrite the order ID we have with the return data, in case 
the
+   // donor opened a second window.
+   $orderId = $response['merchantReference'];
+   $this->addRequestData( array(
+   'order_id' => $orderId,
+   ) );
$gateway_txn_id = isset( $response['pspReference'] ) ? 
$response['pspReference'] : '';
$this->transaction_response->setGatewayTransactionId( 
$gateway_txn_id );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91742814416e3397f8bb53fa39ad75d9fdf9402d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: XenoRyet 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update contribution_post hook to look at transaction totals - change (wikimedia...crm)

[Eileen (Code Review)]

Eileen has uploaded a new change for review.

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

Change subject: Update contribution_post hook to look at transaction totals
..

Update contribution_post hook to look at transaction totals

Bug: T124834
Change-Id: I2541860c6d9d6e1e861f32863e17b89b4007842d
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/87/269587/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index c7acd12..6007338 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2116,13 +2116,17 @@
}
// Get lifetime totals
$sql = <lifetime_usd_total;
+
+   if(($lifetimeTotal = CRM_Core_DAO::singleValueQuery($sql)) !== 
FALSE) {
+   $wmf_donor['lifetime_usd_total'] = $lifetimeTotal;
}
if ( !empty( $wmf_donor ) ) {
wmf_civicrm_set_custom_field_values(

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

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

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

[MediaWiki-commits] [Gerrit] Reducing new s2 master weight for reads - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Reducing new s2 master weight for reads
..


Reducing new s2 master weight for reads

Change-Id: Iabc8a15352912e9f2e5ea58486c72211d3136db0
---
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 51d2a6b..892b54d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -99,7 +99,7 @@
'db1073' => 500, # 2.8TB 160GB
),
's2' => array(
-   'db1018' => 100, # 1.4TB  64GB, master
+   'db1018' => 0,   # 1.4TB  64GB, master
 #  'db1024' => 0,   # 1.4TB  64GB
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabc8a15352912e9f2e5ea58486c72211d3136db0
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] Add @since to ParserOptions::newFromAnon - change (mediawiki/core)

[Code Review]

Gergő Tisza has uploaded a new change for review.

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

Change subject: Add @since to ParserOptions::newFromAnon
..

Add @since to ParserOptions::newFromAnon

Change-Id: I0e70904fb908fa9ed5c3c6fc30df9d02c742e29e
---
M includes/parser/ParserOptions.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/269586/1

diff --git a/includes/parser/ParserOptions.php 
b/includes/parser/ParserOptions.php
index 0e8d76d..49c6ce9 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -601,6 +601,7 @@
 
/**
 * Get a ParserOptions object for an anonymous user
+* @since 1.27
 * @return ParserOptions
 */
public static function newFromAnon() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e70904fb908fa9ed5c3c6fc30df9d02c742e29e
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] Reducing new s2 master weight for reads - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Reducing new s2 master weight for reads
..

Reducing new s2 master weight for reads

Change-Id: Iabc8a15352912e9f2e5ea58486c72211d3136db0
---
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/85/269585/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 51d2a6b..892b54d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -99,7 +99,7 @@
'db1073' => 500, # 2.8TB 160GB
),
's2' => array(
-   'db1018' => 100, # 1.4TB  64GB, master
+   'db1018' => 0,   # 1.4TB  64GB, master
 #  'db1024' => 0,   # 1.4TB  64GB
'db1021' => 0,   # 1.4TB  64GB, vslow, dump
'db1036' => 0,   # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabc8a15352912e9f2e5ea58486c72211d3136db0
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] Syncronize VisualEditor: 863a2c2..4a75152 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 863a2c2..4a75152
..


Syncronize VisualEditor: 863a2c2..4a75152

Change-Id: I7f28f38680254957b555ef5d5c331735329aefec
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 863a2c2..4a75152 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 863a2c297415bbe60eca4c802137d180dc4aab29
+Subproject commit 4a751524c423eafd578cf52ec96cfe0728da4b94

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f28f38680254957b555ef5d5c331735329aefec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Edit mode switch: Show popup next to VE switch button - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Edit mode switch: Show popup next to VE switch button
..


Edit mode switch: Show popup next to VE switch button

Only show if the user came from VE.

Change-Id: Ic362ba534d135fca5516c8ba401f6b2a22886ff1
---
M VisualEditor.hooks.php
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
8 files changed, 74 insertions(+), 8 deletions(-)

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



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 7885946..f6b9f5a 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -543,6 +543,7 @@
$preferences['visualeditor-editor'] = $api;
$preferences['visualeditor-hidebetawelcome'] = $api;
$preferences['visualeditor-hidetabdialog'] = $api;
+   $preferences['visualeditor-hidesourceswitchpopup'] = $api;
$preferences['visualeditor-hideusered'] = $api;
$preferences['visualeditor-findAndReplace-findText'] = $api;
$preferences['visualeditor-findAndReplace-replaceText'] = $api;
diff --git a/extension.json b/extension.json
index f109506..07fed3a 100644
--- a/extension.json
+++ b/extension.json
@@ -1020,6 +1020,9 @@
"visualeditor-mweditmodesource-warning-cancel",
"visualeditor-mweditmodesource-warning-switch",

"visualeditor-mweditmodesource-warning-switch-discard",
+   "visualeditor-mweditmodeve-popup-body",
+   "visualeditor-mweditmodeve-popup-title",
+   "visualeditor-mweditmodeve-showagain",
"visualeditor-mweditmodeve-title",
"visualeditor-mweditmodeve-tool",
"visualeditor-mweditmodeve-warning",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index ce513eb..e89ff4d 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -281,6 +281,9 @@
"visualeditor-mweditmodesource-warning-cancel": "Cancel",
"visualeditor-mweditmodesource-warning-switch": "Keep changes",
"visualeditor-mweditmodesource-warning-switch-discard": "Discard 
changes",
+   "visualeditor-mweditmodeve-popup-body": "You can switch back to visual 
editing at any time by clicking on this icon.",
+   "visualeditor-mweditmodeve-popup-title": "You have switched to source 
editing",
+   "visualeditor-mweditmodeve-showagain": "Don't show this message again",
"visualeditor-mweditmodeve-title": "Switch to visual editing?",
"visualeditor-mweditmodeve-tool": "Switch to visual editing",
"visualeditor-mweditmodeve-warning": "You are switching to visual 
editing.\nDo you want to continue?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index a174dfa..49a84f0 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -291,6 +291,9 @@
"visualeditor-mweditmodesource-warning-cancel": "Label for the cancel 
button on the confirmation dialog for switching to source 
editing.\n{{Identical|Cancel}}",
"visualeditor-mweditmodesource-warning-switch": "Label for the keep 
changes button on the confirmation dialog for switching to source editing.",
"visualeditor-mweditmodesource-warning-switch-discard": "Label for the 
discard changes button on the confirmation dialog for switching to source 
editing.",
+   "visualeditor-mweditmodeve-popup-body": "Body text of popup shown after 
switching to source mode from visual mode",
+   "visualeditor-mweditmodeve-popup-title": "Title of popup shown after 
switching to source mode from visual mode",
+   "visualeditor-mweditmodeve-showagain": "Label for checkbox to not show 
the 'switched to visual mode' popup again",
"visualeditor-mweditmodeve-title": "Title of dialog to confirm 
switching to visual mode.",
"visualeditor-mweditmodeve-tool": "Label for tool that changes edit 
mode to visual editing.",
"visualeditor-mweditmodeve-warning": "Warning message show before 
changing edit mode to visual editing. It may allow the user to keep the changes 
or to start source editing from scratch using the message 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch}} and 
{{msg-mw|Visualeditor-mweditmodesource-warning-switch-discard}}.",
diff --git a/modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css 
b/modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css
index 7f0c3

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 863a2c2..4a75152 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 863a2c2..4a75152
..

Syncronize VisualEditor: 863a2c2..4a75152

Change-Id: I7f28f38680254957b555ef5d5c331735329aefec
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/84/269584/1

diff --git a/VisualEditor b/VisualEditor
index 863a2c2..4a75152 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 863a2c297415bbe60eca4c802137d180dc4aab29
+Subproject commit 4a751524c423eafd578cf52ec96cfe0728da4b94

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f28f38680254957b555ef5d5c331735329aefec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Special:NewFiles: Allow filtering by change tags and display... - change (mediawiki/core)

[Code Review]

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

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

Change subject: Special:NewFiles: Allow filtering by change tags and display 
them
..

Special:NewFiles: Allow filtering by change tags and display them

Bug: T124214
Change-Id: I8933f5df72b34140b97d45b546e0d93a45f98a76
---
M includes/specials/SpecialNewimages.php
1 file changed, 47 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/269583/1

diff --git a/includes/specials/SpecialNewimages.php 
b/includes/specials/SpecialNewimages.php
index d67f0e9..0d70070 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -93,6 +93,7 @@
 
function __construct( IContextSource $context, $par = null ) {
$this->like = $context->getRequest()->getText( 'like' );
+   $this->tagfilter = $context->getRequest()->getText( 'tagfilter' 
);
$this->showBots = $context->getRequest()->getBool( 'showbots', 
0 );
$this->hidePatrolled = $context->getRequest()->getBool( 
'hidepatrolled', 0 );
if ( is_numeric( $par ) ) {
@@ -121,6 +122,43 @@
'ug_user = img_user'
)
);
+   }
+   }
+
+   $tables[] = 'logging';
+   $jconds['logging'] = array(
+   'INNER JOIN',
+   array(
+   'log_title = img_name',
+   'log_user = img_user',
+   'log_timestamp = img_timestamp'
+   )
+   );
+   $conds['log_namespace'] = NS_FILE;
+   $conds['log_type'] = 'upload';
+   ChangeTags::modifyDisplayQuery( $tables, $fields, $conds, 
$jconds, $options, $this->tagfilter );
+
+   if ( $this->tagfilter ) {
+   // If the 'change_tag' table has few tags on log 
events, it's faster to take them all first,
+   // then filter the ones matching the rest of the query, 
then filesort. Otherwise, if it has
+   // many tags on log events, it is faster to run the 
whole query with the correct order, then
+   // filter by tags. Unfortunately, MariaDB's optimizer 
gets this wrong most of the time, and in
+   // both cases too. So find out what is faster ourselves 
and bypass it.
+   $options[] = 'STRAIGHT_JOIN';
+   $dbr = wfGetDB( DB_SLAVE );
+   $hasFewTaggedLogEvents = $dbr->estimateRowCount(
+   'change_tag',
+   '*',
+   array( 'ct_log_id IS NOT NULL', 'ct_tag' => 
$this->tagfilter ),
+   __METHOD__
+   ) < 5;
+   if ( $hasFewTaggedLogEvents ) {
+   // Move 'change_tag' table to the beginning to 
query it first
+   array_unshift( $tables, 'change_tag', 'logging' 
);
+   $tables = array_values( array_unique( $tables ) 
);
+   $jconds['image'] = $jconds['logging'];
+   $jconds['logging'] = $jconds['change_tag'];
+   unset( $jconds['change_tag'] );
}
}
 
@@ -198,12 +236,13 @@
$title = Title::makeTitle( NS_FILE, $name );
$ul = Linker::link( $user->getUserpage(), $user->getName() );
$time = $this->getLanguage()->userTimeAndDate( 
$row->img_timestamp, $this->getUser() );
+   $tags = current( ChangeTags::formatSummaryRow( $row->ts_tags, 
'newfiles' ) );
 
$this->gallery->add(
$title,
-   "$ul\n"
-   . htmlspecialchars( $time )
-   . "\n"
+   "$ul\n"
+   . "" . htmlspecialchars( $time ) . "\n"
+   . ( $tags ? $tags . "\n" : '' )
);
}
 
@@ -224,6 +263,11 @@
'label-message' => 'newimages-hidepatrolled',
'name' => 'hidepatrolled',
),
+   'tagfilter' => array(
+   'type' => 'tagfilter',
+   'name' => 'tagfilter',
+   'label-raw' => $this->msg( 'tag-filter' 
)->parse(),
+   ),
'limit' => array(
'type' => 'hidden',

[MediaWiki-commits] [Gerrit] Add php55 and hhvm tests for all extensions that have php53 ... - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add php55 and hhvm tests for all extensions that have php53 
tests
..

Add php55 and hhvm tests for all extensions that have php53 tests

Change-Id: Ia9aa3627850cff2a033856f6014ca63ba1eb0858
---
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
2 files changed, 33 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/82/269582/1

diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 7246f7f..07fe6da 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -130,6 +130,23 @@
 'phplint or a composer-* job'
 % (name, pipeline))
 
+def assertProjectHasPhp53TestAnd55(self, name, definition, pipeline):
+has_53 = False
+for job in definition:
+if 'testextension-php53' in job:
+has_53 = True
+break
+if not has_53:
+self.assertFalse(has_53)
+return
+for job in definition:
+if 'testextension-php55' in job:
+self.assertTrue(True)
+return
+
+self.assertTrue(False, 'Project %s pipeline %s must have a '
+'php55 test job' % (name, pipeline))
+
 def test_repos_have_required_jobs(self):
 repos = {
 'mediawiki/core$': [
@@ -138,7 +155,8 @@
 ],
 'mediawiki/extensions/\w+$': [
 self.assertProjectHasComposerValidate,
-self.assertProjectHasPhplint
+self.assertProjectHasPhplint,
+self.assertProjectHasPhp53TestAnd55
 ],
 'mediawiki/skins/': [
 self.assertProjectHasComposerValidate,
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 977d062..1655579 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1193,21 +1193,22 @@
  - php53lint
  - php55lint
  # Extensions tests with core+vendor
- #- 'mwext-{name}-testextension-hhvm'
  - 'mwext-{name}-testextension-php53'
+ - 'mwext-{name}-testextension-php55'
+ - 'mwext-{name}-testextension-hhvm'
  - php-composer-validate
 gate-and-submit:
  - mediawiki-gate
  - php53lint
  - php55lint
  # Extensions tests with core+vendor
- #- 'mwext-{name}-testextension-hhvm'
  - 'mwext-{name}-testextension-php53'
+ - 'mwext-{name}-testextension-php55'
+ - 'mwext-{name}-testextension-hhvm'
  - php-composer-validate
 experimental:
   - 'mediawiki-extensions-hhvm'
   - mediawiki-extensions-qunit
-  - 'mwext-{name}-testextension-hhvm'
   - mwext-testextension-hhvm
   - mwext-testextension-php53-composer
   - mwext-testextension-hhvm-composer
@@ -1223,6 +1224,7 @@
  - php53lint
  - php55lint
  - mwext-testextension-php53-composer
+ - mwext-testextension-php55-composer
  - mwext-testextension-hhvm-composer
  - php-composer-validate
 gate-and-submit:
@@ -1230,6 +1232,7 @@
  - php53lint
  - php55lint
  - mwext-testextension-php53-composer
+ - mwext-testextension-php55-composer
  - mwext-testextension-hhvm-composer
  - php-composer-validate
 experimental:
@@ -1247,6 +1250,8 @@
  - php55lint
  # Extensions tests with core+vendor
  - mwext-testextension-php53
+ - mwext-testextension-php55
+ - mwext-testextension-hhvm
  - php-composer-validate
 gate-and-submit:
  - mediawiki-gate
@@ -1254,11 +1259,12 @@
  - php55lint
  # Extensions tests with core+vendor
  - mwext-testextension-php53
+ - mwext-testextension-php55
+ - mwext-testextension-hhvm
  - php-composer-validate
 experimental:
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-qunit
-  - mwext-testextension-hhvm
   - mwext-testextension-php53-composer
   - mwext-testextension-hhvm-composer
   - npm
@@ -3707,12 +3713,14 @@
   - jsonlint
   - php53lint
 test:
-  #- mwext-MobileFrontend-testextension-hhvm
+  - mwext-MobileFrontend-testextension-hhvm
   - mwext-MobileFrontend-testextension-php53
+  - mwext-MobileFrontend-testextension-php55
 gate-and-submit:
   - mediawiki-gate
-  #- mwext-MobileFrontend-testextension-hhvm
+  - mwext-MobileFrontend-testextension-hhvm
   - mwext-MobileFrontend-testextension-php53
+  - mwext-MobileFrontend-testextension-php55
 postmerge:
   - mwext-MobileFrontend-publish
   - mwext-MobileFrontend-doxygen-publish

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9aa3627850cff2a033856f6014ca63ba1eb0858
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Ow

[MediaWiki-commits] [Gerrit] Updating new master on codfw configuration too (just in case) - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Updating new master on codfw configuration too (just in case)
..


Updating new master on codfw configuration too (just in case)

Bug: T125215
Change-Id: I928fcf1f734be85293d6a8bb9a8beb9ca0395c6e
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 0c6f814..0733994 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2070' => 100,
),
's2' => array(
-   'db1024' => 0,   # 1.4TB  64GB
+   'db1018' => 0,   # 1.4TB  64GB
'db2017' => 100,
'db2035' => 100,
'db2041' => 100,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I928fcf1f734be85293d6a8bb9a8beb9ca0395c6e
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] Updating new master on codfw configuration too (just in case) - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: Updating new master on codfw configuration too (just in case)
..

Updating new master on codfw configuration too (just in case)

Bug: T125215
Change-Id: I928fcf1f734be85293d6a8bb9a8beb9ca0395c6e
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 0c6f814..0733994 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2070' => 100,
),
's2' => array(
-   'db1024' => 0,   # 1.4TB  64GB
+   'db1018' => 0,   # 1.4TB  64GB
'db2017' => 100,
'db2035' => 100,
'db2041' => 100,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I928fcf1f734be85293d6a8bb9a8beb9ca0395c6e
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] Fix backwards output in migrateAccount - change (mediawiki...CentralAuth)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

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

Change subject: Fix backwards output in migrateAccount
..

Fix backwards output in migrateAccount

Change-Id: I81764696d2277c0d11d4440aa484a2c5ca24f354
---
M maintenance/migrateAccount.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/80/269580/1

diff --git a/maintenance/migrateAccount.php b/maintenance/migrateAccount.php
index 36505c4..05e26c9 100644
--- a/maintenance/migrateAccount.php
+++ b/maintenance/migrateAccount.php
@@ -225,10 +225,10 @@
wfTimestamp( TS_DB ),
$this->total,
$this->total / $delta,
-   $this->partial,
-   $this->total > 0 ? ( $this->partial / $this->total * 
100.0 ) : 0,
$this->migrated,
-   $this->total > 0 ? ( $this->migrated / $this->total * 
100.0 ) : 0
+   $this->total > 0 ? ( $this->migrated / $this->total * 
100.0 ) : 0,
+   $this->partial,
+   $this->total > 0 ? ( $this->partial / $this->total * 
100.0 ) : 0
) );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81764696d2277c0d11d4440aa484a2c5ca24f354
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] Don't try to tell the server to set preferences to their cur... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Don't try to tell the server to set preferences to their 
current values
..


Don't try to tell the server to set preferences to their current values

It's rather pointless.

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

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 01cc770..2341b3b 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
@@ -250,7 +250,7 @@
$.cookie( 'VEE', editor, { path: '/', expires: 30 } );
if ( mw.user.isAnon() ) {
return $.Deferred().resolve();
-   } else {
+   } else if ( mw.user.options.get( 'visualeditor-editor' ) !== 
editor ) {
return new mw.Api().saveOption( 'visualeditor-editor', 
editor ).then( function () {
mw.user.options.set( 'visualeditor-editor', 
editor );
} );

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 829b2cd..863a2c2 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 829b2cd..863a2c2
..

Syncronize VisualEditor: 829b2cd..863a2c2

Change-Id: I4874d4a16070b3c0ef29fc6af3a27204ad99137a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/79/269579/1

diff --git a/VisualEditor b/VisualEditor
index 829b2cd..863a2c2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 829b2cd430ec51ff24196abbf65f7815243ff0f5
+Subproject commit 863a2c297415bbe60eca4c802137d180dc4aab29

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4874d4a16070b3c0ef29fc6af3a27204ad99137a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 829b2cd..863a2c2 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 829b2cd..863a2c2
..


Syncronize VisualEditor: 829b2cd..863a2c2

Change-Id: I4874d4a16070b3c0ef29fc6af3a27204ad99137a
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 829b2cd..863a2c2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 829b2cd430ec51ff24196abbf65f7815243ff0f5
+Subproject commit 863a2c297415bbe60eca4c802137d180dc4aab29

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4874d4a16070b3c0ef29fc6af3a27204ad99137a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Introduce `transitions` on mediawiki.ui buttons - change (mediawiki/core)

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: Introduce `transitions` on mediawiki.ui buttons
..

Introduce `transitions` on mediawiki.ui buttons

Following OOjs UI implementation and applying slight transitions on
mediawiki.ui buttons for better user experience.

Change-Id: Iaf85de479a8d29a715d16320d01ecc9584df8e46
---
M resources/src/mediawiki.less/mediawiki.ui/variables.less
M resources/src/mediawiki.ui/components/buttons.less
2 files changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/269578/1

diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less 
b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index 507109a..b447c9b 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -76,3 +76,11 @@
 // Form input sizes
 @checkboxSize: 2em;
 @radioSize: 2em;
+
+/* Animation & Transition */
+// Transitions `@trs`
+@trs-base: @trsdu-base; // Transition Timing falls back to default `ease`
+@trs-long: @trsdu-long;
+// Transitions > Durations `@trsdu`
+@trsdu-base: 0.1s;
+@trsdu-long: 0.25s;
diff --git a/resources/src/mediawiki.ui/components/buttons.less 
b/resources/src/mediawiki.ui/components/buttons.less
index 4ffaeee..fd27cd5 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -58,6 +58,13 @@
// Interaction styling
cursor: pointer;
 
+   .transition(
+   background-color @trs-base,
+   color @trs-base,
+   border-color @trs-base,
+   box-shadow @trs-base
+   );
+
&:disabled {
text-shadow: none;
cursor: default;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf85de479a8d29a715d16320d01ecc9584df8e46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Set $wgPageLanguageUseDB = true for testwiki - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Set $wgPageLanguageUseDB = true for testwiki
..


Set $wgPageLanguageUseDB = true for testwiki

Also add pagelang right to all users, to allow for proper testing of the
feature.

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

Approvals:
  Catrope: Looks good to me, approved
  Florianschmidtwelzow: Looks good to me, but someone else must approve
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7ad13c0..4fa8e6c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8270,6 +8270,7 @@
'user' => array(
'upload_by_url' => true, // For wider testing
'upload' => true, // Exception to T14556, used for 
testing of upload tools
+   'pagelang' => true, // testing of T69223
),
'templateeditor' => array( 'templateeditor' => true, 
'tboverride' => true, ), // T61084
'sysop' => array(
@@ -10591,6 +10592,11 @@
'testwiki' => 3600,
 ),
 
+'wgPageLanguageUseDB' => array(
+   'default' => false,
+   'testwiki' => true,
+),
+
 'wgShowExceptionDetails' => array(
'default' => false,
'testwiki' => true,

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

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

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

[MediaWiki-commits] [Gerrit] Add php55 phpunit jobs for MediaWiki core and gate extensions - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Add php55 phpunit jobs for MediaWiki core and gate extensions
..


Add php55 phpunit jobs for MediaWiki core and gate extensions

Change-Id: Id859912506d77928b2f31404bfedec531c009bb8
---
M zuul/layout.yaml
1 file changed, 9 insertions(+), 4 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 82292a7..977d062 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -650,6 +650,9 @@
 # Release branches do not support hhvm.
 branch: (?!REL1_23|REL1_24|fundraising/REL.*)
 
+  - name: ^.*php55.*$
+branch: (?!REL1_2[3-6]$)
+
   # Jobs testing multiple extensions together
   #
   # TODO stop triggering php53 jobs for the wmf branches
@@ -1283,11 +1286,13 @@
 test:
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-qunit
+  - mediawiki-extensions-php55
 php53:
   - mediawiki-extensions-php53
 gate-and-submit:
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-php53
+  - mediawiki-extensions-php55
   - mediawiki-extensions-qunit
 
   # Template for MediaWiki extensions.
@@ -1542,7 +1547,8 @@
   - mediawiki-core-php55lint
   - mediawiki-phpunit-hhvm
   - mediawiki-phpunit-parsertests-hhvm
-  #- mediawiki-phpunit-php53 (disabled, slow, Icac172b16)
+  - mediawiki-phpunit-php55
+  - mediawiki-phpunit-parsertests-php55
   - mediawiki-core-qunit
   - php-composer-package-validate
 php53:
@@ -1561,6 +1567,8 @@
   - mediawiki-phpunit-hhvm-composer
   - mediawiki-phpunit-php53
   - mediawiki-phpunit-parsertests-php53
+  - mediawiki-phpunit-php55
+  - mediawiki-phpunit-parsertests-php55
   - mediawiki-core-qunit
   - php-composer-package-validate
 postmerge:
@@ -1573,9 +1581,6 @@
   - mediawiki-phpunit-hhvm-composer
   # will replace mediawiki-phpunit-php53 for branches not using vendor, 
currently not used as the composer part is covered by the hhvm variant
   - mediawiki-phpunit-php53-composer
-  - mediawiki-phpunit-php55
-  - mediawiki-phpunit-parsertests-php55
-  - mediawiki-extensions-php55
 
   - name: mediawiki/debian
 experimental:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id859912506d77928b2f31404bfedec531c009bb8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Align mixin whitespace to CSS/Less coding guidelines - change (mediawiki/core)

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review.

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

Change subject: Align mixin whitespace to CSS/Less coding guidelines
..

Align mixin whitespace to CSS/Less coding guidelines

Aligning mixin whitespace to CSS/Less coding guidelines. Also fix some minor
inconsistencies and add browser support comments.

Change-Id: I50841e6062e59513def49719dc7a04956002de0e
---
M resources/src/mediawiki.less/mediawiki.mixins.animation.less
M resources/src/mediawiki.less/mediawiki.mixins.less
M resources/src/mediawiki.less/mediawiki.mixins.rotation.less
3 files changed, 37 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/269577/1

diff --git a/resources/src/mediawiki.less/mediawiki.mixins.animation.less 
b/resources/src/mediawiki.less/mediawiki.mixins.animation.less
index ec3cddc..fd615b7 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.animation.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.animation.less
@@ -1,12 +1,12 @@
-.animation (...) {
-   -webkit-animation: @arguments;
-   -moz-animation: @arguments;
-   -o-animation: @arguments;
-   animation: @arguments;
+.animation( ... ) {
+   -webkit-animation: @arguments; // Chrome 4-42, Safari 4-8, Opera 15-29, 
Android 2.1-4.4.4
+   -moz-animation: @arguments; // Firefox 5-15
+   -o-animation: @arguments; // Opera 12.1
+   animation: @arguments; // Chrome 43+, Firefox 16+, IE 10+, Edge 12+, 
Safari 9+, Opera 30+, iOS 9+, Android 47+
 }
 
-.transform-rotate (@deg) {
-   -webkit-transform: rotate(@deg);
-   -moz-transform: rotate(@deg);
-   transform: rotate(@deg);
+.transform-rotate( @deg ) {
+   -webkit-transform: rotate( @deg );
+   -moz-transform: rotate( @deg );
+   transform: rotate( @deg );
 }
\ No newline at end of file
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less 
b/resources/src/mediawiki.less/mediawiki.mixins.less
index f6c407a..99b9e03 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -8,22 +8,22 @@
 //
 // See  for more information about how to write 
mixins.
 
-.background-image(@url) {
-   background-image: e('/* @embed */') url(@url);
+.background-image( @url ) {
+   background-image: e( '/* @embed */' ) url( @url );
 }
 
 // Deprecated in MW 1.27
-.background-size(@width, @height) {
+.background-size( @width, @height ) {
// Vendor prefix is added to support Android 2
-webkit-background-size: @width @height;
background-size: @width @height;
 }
 
-.vertical-gradient(@startColor: gray, @endColor: white, @startPos: 0, @endPos: 
100%) {
+.vertical-gradient( @startColor: gray, @endColor: white, @startPos: 0, 
@endPos: 100% ) {
background-color: @endColor;
-   background-image: -moz-linear-gradient( top, @startColor @startPos, 
@endColor @endPos ); // Firefox 3.6+
background-image: -webkit-gradient( linear, left top, left bottom, 
color-stop( @startPos, @startColor ), color-stop( @endPos, @endColor ) ); // 
Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient( top, @startColor @startPos, 
@endColor @endPos ); // Safari 5.1+, Chrome 10+
+   background-image: -moz-linear-gradient( top, @startColor @startPos, 
@endColor @endPos ); // Firefox 3.6+
background-image: linear-gradient( @startColor @startPos, @endColor 
@endPos ); // Standard
 }
 
@@ -35,48 +35,48 @@
 //
 // We do not embed the fallback image on the assumption that the gain for old 
browsers
 // is not worth the harm done to modern ones.
-.background-image-svg(@svg, @fallback) {
-   background-image: url(@fallback);
-   background-image: linear-gradient(transparent, transparent), e('/* 
@embed */') url(@svg);
+.background-image-svg( @svg, @fallback ) {
+   background-image: url( @fallback );
+   background-image: linear-gradient( transparent, transparent ), e( '/* 
@embed */' ) url( @svg );
// Do not serve SVG to Opera 12, bad rendering with border-radius or 
background-size (T87504)
-   background-image: -o-linear-gradient(transparent, transparent), 
url(@fallback);
+   background-image: -o-linear-gradient( transparent, transparent ), url( 
@fallback );
 }
 
-.list-style-image(@url) {
-   list-style-image: e('/* @embed */') url(@url);
+.list-style-image( @url ) {
+   list-style-image: e( '/* @embed */' ) url( @url );
 }
 
-.list-style-image-svg(@svg, @fallback) {
-   list-style-image: e('/* @embed */') url(@svg);
+.list-style-image-svg( @svg, @fallback ) {
+   list-style-image: e( '/* @embed */' ) url( @svg );
/* Fallback to PNG bullet for IE 8 and below using CSS hack */
-   list-style-image: e('/* @embed */') url(@fallback) e('\9');
+   list-style-image: e( '/* @embed */' ) url( @fallback ) e( '\9' );
 }
 

[MediaWiki-commits] [Gerrit] Add php55 phpunit jobs for MediaWiki core and gate extensions - change (integration/config)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add php55 phpunit jobs for MediaWiki core and gate extensions
..

Add php55 phpunit jobs for MediaWiki core and gate extensions

Change-Id: Id859912506d77928b2f31404bfedec531c009bb8
---
M zuul/layout.yaml
1 file changed, 9 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/76/269576/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 82292a7..977d062 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -650,6 +650,9 @@
 # Release branches do not support hhvm.
 branch: (?!REL1_23|REL1_24|fundraising/REL.*)
 
+  - name: ^.*php55.*$
+branch: (?!REL1_2[3-6]$)
+
   # Jobs testing multiple extensions together
   #
   # TODO stop triggering php53 jobs for the wmf branches
@@ -1283,11 +1286,13 @@
 test:
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-qunit
+  - mediawiki-extensions-php55
 php53:
   - mediawiki-extensions-php53
 gate-and-submit:
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-php53
+  - mediawiki-extensions-php55
   - mediawiki-extensions-qunit
 
   # Template for MediaWiki extensions.
@@ -1542,7 +1547,8 @@
   - mediawiki-core-php55lint
   - mediawiki-phpunit-hhvm
   - mediawiki-phpunit-parsertests-hhvm
-  #- mediawiki-phpunit-php53 (disabled, slow, Icac172b16)
+  - mediawiki-phpunit-php55
+  - mediawiki-phpunit-parsertests-php55
   - mediawiki-core-qunit
   - php-composer-package-validate
 php53:
@@ -1561,6 +1567,8 @@
   - mediawiki-phpunit-hhvm-composer
   - mediawiki-phpunit-php53
   - mediawiki-phpunit-parsertests-php53
+  - mediawiki-phpunit-php55
+  - mediawiki-phpunit-parsertests-php55
   - mediawiki-core-qunit
   - php-composer-package-validate
 postmerge:
@@ -1573,9 +1581,6 @@
   - mediawiki-phpunit-hhvm-composer
   # will replace mediawiki-phpunit-php53 for branches not using vendor, 
currently not used as the composer part is covered by the hhvm variant
   - mediawiki-phpunit-php53-composer
-  - mediawiki-phpunit-php55
-  - mediawiki-phpunit-parsertests-php55
-  - mediawiki-extensions-php55
 
   - name: mediawiki/debian
 experimental:

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

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

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

[MediaWiki-commits] [Gerrit] VE: Fix i18n names broken during migration - change (mediawiki...Cite)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: VE: Fix i18n names broken during migration
..

VE: Fix i18n names broken during migration

Bug: T126373
Change-Id: I682bdaa71bc9a8675c79bae0b2f54955de207945
(cherry picked from commit eb58f79f8d8fd500b6f7d4f55725f0930c979614)
---
M modules/ve-cite/ve.ui.MWReferencesListContextItem.js
M modules/ve-cite/ve.ui.MWReferencesListDialog.js
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite 
refs/changes/75/269575/1

diff --git a/modules/ve-cite/ve.ui.MWReferencesListContextItem.js 
b/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
index 325fc9e..02b1d82 100644
--- a/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
+++ b/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
@@ -49,8 +49,8 @@
var group = this.model.getAttribute( 'refGroup' );
 
return group ?
-   ve.msg( 
'visualeditor-dialog-referenceslist-contextitem-description-named', group ) :
-   ve.msg( 
'visualeditor-dialog-referenceslist-contextitem-description-general' );
+   ve.msg( 
'cite-ve-dialog-referenceslist-contextitem-description-named', group ) :
+   ve.msg( 
'cite-ve-dialog-referenceslist-contextitem-description-general' );
 };
 
 /* Registration */
diff --git a/modules/ve-cite/ve.ui.MWReferencesListDialog.js 
b/modules/ve-cite/ve.ui.MWReferencesListDialog.js
index 9b24340..c7cb90d 100644
--- a/modules/ve-cite/ve.ui.MWReferencesListDialog.js
+++ b/modules/ve-cite/ve.ui.MWReferencesListDialog.js
@@ -39,12 +39,12 @@
 ve.ui.MWReferencesListDialog.static.actions = [
{
action: 'apply',
-   label: OO.ui.deferMsg( 'cite-ve-dialog-action-apply' ),
+   label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
flags: [ 'progressive', 'primary' ],
modes: 'edit'
},
{
-   label: OO.ui.deferMsg( 'cite-ve-dialog-action-cancel' ),
+   label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
flags: [ 'safe', 'back' ],
modes: 'edit'
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I682bdaa71bc9a8675c79bae0b2f54955de207945
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: wmf/1.27.0-wmf.13
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 

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

[MediaWiki-commits] [Gerrit] VE: Fix i18n names broken during migration - change (mediawiki...Cite)

[jenkins-bot (Code Review)]

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

Change subject: VE: Fix i18n names broken during migration
..


VE: Fix i18n names broken during migration

Bug: T126373
Change-Id: I682bdaa71bc9a8675c79bae0b2f54955de207945
---
M modules/ve-cite/ve.ui.MWReferencesListContextItem.js
M modules/ve-cite/ve.ui.MWReferencesListDialog.js
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/ve-cite/ve.ui.MWReferencesListContextItem.js 
b/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
index 325fc9e..02b1d82 100644
--- a/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
+++ b/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
@@ -49,8 +49,8 @@
var group = this.model.getAttribute( 'refGroup' );
 
return group ?
-   ve.msg( 
'visualeditor-dialog-referenceslist-contextitem-description-named', group ) :
-   ve.msg( 
'visualeditor-dialog-referenceslist-contextitem-description-general' );
+   ve.msg( 
'cite-ve-dialog-referenceslist-contextitem-description-named', group ) :
+   ve.msg( 
'cite-ve-dialog-referenceslist-contextitem-description-general' );
 };
 
 /* Registration */
diff --git a/modules/ve-cite/ve.ui.MWReferencesListDialog.js 
b/modules/ve-cite/ve.ui.MWReferencesListDialog.js
index 9b24340..c7cb90d 100644
--- a/modules/ve-cite/ve.ui.MWReferencesListDialog.js
+++ b/modules/ve-cite/ve.ui.MWReferencesListDialog.js
@@ -39,12 +39,12 @@
 ve.ui.MWReferencesListDialog.static.actions = [
{
action: 'apply',
-   label: OO.ui.deferMsg( 'cite-ve-dialog-action-apply' ),
+   label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
flags: [ 'progressive', 'primary' ],
modes: 'edit'
},
{
-   label: OO.ui.deferMsg( 'cite-ve-dialog-action-cancel' ),
+   label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
flags: [ 'safe', 'back' ],
modes: 'edit'
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I682bdaa71bc9a8675c79bae0b2f54955de207945
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix-up(?) for I33966cc28 - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Fix-up(?) for I33966cc28
..


Fix-up(?) for I33966cc28

We're not sure why I33966cc28 blanked values in
/usr/local/lib/mw-deployment-vars.sh, but the best guess we have is that the
require / include caused the classes to be evaluated in a different order. So
change the require to an include, and leave the dependency on scap implicit for
now.

Change-Id: I9fe789f8179182228444130635fbb2aab59c874a
---
M modules/mediawiki/manifests/mwrepl.pp
1 file changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/mediawiki/manifests/mwrepl.pp 
b/modules/mediawiki/manifests/mwrepl.pp
index 1d11deb..df006a1 100644
--- a/modules/mediawiki/manifests/mwrepl.pp
+++ b/modules/mediawiki/manifests/mwrepl.pp
@@ -5,8 +5,7 @@
 # configuration is in place.
 
 class mediawiki::mwrepl {
-require ::mediawiki::users
-include ::scap::scripts
+include ::mediawiki::users
 
 file { '/var/lib/hphpd':
 ensure => directory,
@@ -14,16 +13,18 @@
 group  => $::mediawiki::users::web,
 mode   => '0775',
 }
+
 file { '/var/lib/hphpd/hphpd.ini':
+source => 'puppet:///modules/mediawiki/hphpd.ini',
 owner  => 'root',
 group  => 'root',
 mode   => '0444',
-source => 'puppet:///modules/mediawiki/hphpd.ini',
 }
+
 file { '/usr/local/bin/mwrepl':
+source => 'puppet:///modules/mediawiki/mwrepl',
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => 'puppet:///modules/mediawiki/mwrepl',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fe789f8179182228444130635fbb2aab59c874a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Fix-up(?) for I33966cc28 - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Fix-up(?) for I33966cc28
..

Fix-up(?) for I33966cc28

We're not sure why I33966cc28 blanked values in
/usr/local/lib/mw-deployment-vars.sh, but the best guess we have is that the
require / include caused the classes to be evaluated in a different order. So
change the require to an include, and leave the dependency on scap implicit for
now.

Change-Id: I9fe789f8179182228444130635fbb2aab59c874a
---
M modules/mediawiki/manifests/mwrepl.pp
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/269574/1

diff --git a/modules/mediawiki/manifests/mwrepl.pp 
b/modules/mediawiki/manifests/mwrepl.pp
index 1d11deb..df006a1 100644
--- a/modules/mediawiki/manifests/mwrepl.pp
+++ b/modules/mediawiki/manifests/mwrepl.pp
@@ -5,8 +5,7 @@
 # configuration is in place.
 
 class mediawiki::mwrepl {
-require ::mediawiki::users
-include ::scap::scripts
+include ::mediawiki::users
 
 file { '/var/lib/hphpd':
 ensure => directory,
@@ -14,16 +13,18 @@
 group  => $::mediawiki::users::web,
 mode   => '0775',
 }
+
 file { '/var/lib/hphpd/hphpd.ini':
+source => 'puppet:///modules/mediawiki/hphpd.ini',
 owner  => 'root',
 group  => 'root',
 mode   => '0444',
-source => 'puppet:///modules/mediawiki/hphpd.ini',
 }
+
 file { '/usr/local/bin/mwrepl':
+source => 'puppet:///modules/mediawiki/mwrepl',
 owner  => 'root',
 group  => 'root',
 mode   => '0555',
-source => 'puppet:///modules/mediawiki/mwrepl',
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fe789f8179182228444130635fbb2aab59c874a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] VE: Fix i18n names broken during migration - change (mediawiki...Citoid)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: VE: Fix i18n names broken during migration
..

VE: Fix i18n names broken during migration

Change-Id: I67e6e072b4134b4e2f92f0eeae5fec1030470ac0
---
M modules/ve.ui.CiteFromIdInspectorTool.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Citoid 
refs/changes/73/269573/1

diff --git a/modules/ve.ui.CiteFromIdInspectorTool.js 
b/modules/ve.ui.CiteFromIdInspectorTool.js
index 1887fee..28d6f8d 100644
--- a/modules/ve.ui.CiteFromIdInspectorTool.js
+++ b/modules/ve.ui.CiteFromIdInspectorTool.js
@@ -56,8 +56,8 @@
ve.ui.CiteFromIdInspectorTool = function VeUiCiteFromIdInspectorTool() {
ve.ui.CiteFromIdInspectorTool.super.apply( this, arguments );
ve.ui.MWEducationPopupTool.call( this, {
-   title: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-title' ),
-   text: ve.msg( 
'visualeditor-dialogbutton-citation-educationpopup-text' )
+   title: ve.msg( 
'cite-ve-dialogbutton-citation-educationpopup-title' ),
+   text: ve.msg( 
'cite-ve-dialogbutton-citation-educationpopup-text' )
} );
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67e6e072b4134b4e2f92f0eeae5fec1030470ac0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Remove translations of messages since moved to Cite/Citoid - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Remove translations of messages since moved to Cite/Citoid
..

Remove translations of messages since moved to Cite/Citoid

Change-Id: I692f03b374ec28ec6d81aab2d2d6fcd7705cedc5
---
M modules/ve-mw/i18n/af.json
M modules/ve-mw/i18n/as.json
M modules/ve-mw/i18n/ast.json
M modules/ve-mw/i18n/be.json
M modules/ve-mw/i18n/bg.json
M modules/ve-mw/i18n/ca.json
M modules/ve-mw/i18n/ce.json
M modules/ve-mw/i18n/el.json
M modules/ve-mw/i18n/es.json
M modules/ve-mw/i18n/et.json
M modules/ve-mw/i18n/eu.json
M modules/ve-mw/i18n/fa.json
M modules/ve-mw/i18n/fi.json
M modules/ve-mw/i18n/hi.json
M modules/ve-mw/i18n/hu.json
M modules/ve-mw/i18n/id.json
M modules/ve-mw/i18n/ilo.json
M modules/ve-mw/i18n/kk-cyrl.json
M modules/ve-mw/i18n/km.json
M modules/ve-mw/i18n/ko.json
M modules/ve-mw/i18n/krc.json
M modules/ve-mw/i18n/ksh.json
M modules/ve-mw/i18n/lki.json
M modules/ve-mw/i18n/mk.json
M modules/ve-mw/i18n/ml.json
M modules/ve-mw/i18n/ms.json
M modules/ve-mw/i18n/olo.json
M modules/ve-mw/i18n/pa.json
M modules/ve-mw/i18n/ps.json
M modules/ve-mw/i18n/pt-br.json
M modules/ve-mw/i18n/roa-tara.json
M modules/ve-mw/i18n/sah.json
M modules/ve-mw/i18n/sco.json
M modules/ve-mw/i18n/sq.json
M modules/ve-mw/i18n/sr-ec.json
M modules/ve-mw/i18n/tr.json
M modules/ve-mw/i18n/vi.json
M modules/ve-mw/i18n/yi.json
M modules/ve-mw/i18n/yue.json
M modules/ve-mw/i18n/zh-hant.json
40 files changed, 0 insertions(+), 105 deletions(-)


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

diff --git a/modules/ve-mw/i18n/af.json b/modules/ve-mw/i18n/af.json
index 012e870..113bc79 100644
--- a/modules/ve-mw/i18n/af.json
+++ b/modules/ve-mw/i18n/af.json
@@ -120,8 +120,6 @@
"visualeditor-dialog-reference-title": "Verwysing",
"visualeditor-dialog-reference-useexisting-label": "Gebruik 'n 
bestaande verwysing",
"visualeditor-dialog-reference-useexisting-tool": "Hergebruik",
-   "visualeditor-dialog-referenceslist-contextitem-description-general": 
"Lys van algemene bronne",
-   "visualeditor-dialog-referenceslist-contextitem-description-named": 
"Lys van bronne vir groep \"$1\"",
"visualeditor-dialog-referenceslist-title": "Lys van verwysings",
"visualeditor-dialog-template-title": "Sjabloon",
"visualeditor-dialog-transclusion-add-content": "Voeg inhoud by",
diff --git a/modules/ve-mw/i18n/as.json b/modules/ve-mw/i18n/as.json
index d811c76..d76a64d 100644
--- a/modules/ve-mw/i18n/as.json
+++ b/modules/ve-mw/i18n/as.json
@@ -140,8 +140,6 @@
"visualeditor-dialog-reference-useexisting-full-label": "এই পৃষ্ঠাত থকা 
এটা উদ্ধৃতি পুনৰ ব্যৱহাৰ কৰক",
"visualeditor-dialog-reference-useexisting-label": "এটা ইতিমধ্যে থকা 
তথ্যসূত্ৰ ব্যৱহাৰ কৰক",
"visualeditor-dialog-reference-useexisting-tool": "পুনৰ্ব্যৱহাৰ কৰক",
-   "visualeditor-dialog-referenceslist-contextitem-description-general": 
"সাধাৰণ তথ্যসূত্ৰসমূহৰ তালিকা",
-   "visualeditor-dialog-referenceslist-contextitem-description-named": 
"\"$1\" গোটৰ বাবে তথ্যসূত্ৰৰ তালিকা",
"visualeditor-dialog-referenceslist-title": "তথ্যসূত্ৰৰ তালিকা",
"visualeditor-dialog-template-title": "সাঁচ",
"visualeditor-dialog-transclusion-add-content": "সমল যোগ কৰক",
@@ -171,8 +169,6 @@
"visualeditor-dialog-transclusion-required-parameter-is-blank": "$1 
{{PLURAL:$2|পাৰামিটাৰ|পাৰামিটাৰসমূহ}} পূৰণ নকৰাকৈ আপুনি আগুৱাব বুলি নিশ্চিতনে?",
"visualeditor-dialog-transclusion-single-mode": "বিকল্পসমূহ লুকুৱাওক",
"visualeditor-dialog-transclusion-title": "অন্তৰ্ভুক্ত কৰক",
-   "visualeditor-dialogbutton-citation-educationpopup-title": 
"উদ্ধৃতিসমূহ",
-   "visualeditor-dialogbutton-citation-educationpopup-text": "তথ্যৰ উৎস 
যোগ দি আপোনাৰ সমল উন্নত কৰে। আপুনি কিতাপ, বাতৰি কাকত আৰু ৱেবছাইটৰ উদ্ধৃতি দিব 
পাৰে।",
"visualeditor-dialogbutton-media-tooltip": "মিডিয়া",
"visualeditor-dialogbutton-meta-tooltip": "পৃষ্ঠা ছেটিং",
"visualeditor-dialogbutton-reference-full-label": "প্ৰাথমিক ৰূপ",
diff --git a/modules/ve-mw/i18n/ast.json b/modules/ve-mw/i18n/ast.json
index 7604572..fe0f6ee 100644
--- a/modules/ve-mw/i18n/ast.json
+++ b/modules/ve-mw/i18n/ast.json
@@ -179,8 +179,6 @@
"visualeditor-dialog-reference-useexisting-full-label": "Reutilizar una 
cita que yá esiste nesta páxina",
"visualeditor-dialog-reference-useexisting-label": "Usar una referencia 
esistente",
"visualeditor-dialog-reference-useexisting-tool": "Reutilizar",
-   "visualeditor-dialog-referenceslist-contextitem-description-general": 
"Llista de referencies xenerales",
-   "visualeditor-dialog-referenceslist-contextitem-description-named": 
"Llista de referencies del grupu «$1»",
"visualeditor-dialog-referenceslist-title": "Llista de referencies",
   

[MediaWiki-commits] [Gerrit] Provide low-resolution NetSpeed option in Special:MobileOptions - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Provide low-resolution NetSpeed option in Special:MobileOptions
..


Provide low-resolution NetSpeed option in Special:MobileOptions

After chatting with Ori,
given the images saving in bytes, the lower fully loaded time
(35s to 22s) and the fact the code is written let's make
this an available option to our users.

On long term it's probably a better option than disabling images altogether
(We may want to remove the image disabling feature if we see a drop in usage
as a result of this new option)
Have okayed with Jon Katz and Nirzar.

Change-Id: I1fe8538eb679fb7397f482407ba88c4286174e39
---
M i18n/en.json
M i18n/qqq.json
M includes/MobileContext.php
M includes/specials/SpecialMobileOptions.php
4 files changed, 27 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 755b5f5..f62a46d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -246,6 +246,7 @@
"mobile-frontend-nearby-title": "Nearby",
"mobile-frontend-nearby-sectiontext": "Near the topic of this page",
"mobile-frontend-news-items": "In the news",
+   "mobile-frontend-low-res-explain": "Receive content optimised for a 
slow connection.",
"mobile-frontend-opt-in-explain": "By joining the beta, you will get 
access to the latest experimental features which may be subject to software 
defects.",
"mobile-frontend-overlay-close": "Close",
"mobile-frontend-overlay-continue": "Continue",
@@ -297,6 +298,7 @@
"mobile-frontend-search-submit": "Go",
"mobile-frontend-settings-images-explain": "Load all image content that 
appears in a page.",
"mobile-frontend-settings-beta": "Beta",
+   "mobile-frontend-settings-lowres": "Data saving",
"mobile-frontend-settings-site-description": "{{SITENAME}} is available 
in $1 {{PLURAL:$1|language|languages}}. All available versions are listed 
below",
"mobile-frontend-settings-site-header": "{{SITENAME}} Languages",
"mobile-frontend-sign-in-error-heading": "Whoops",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1f9b628..291edeb 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -244,6 +244,7 @@
"mobile-frontend-nearby-title": "Title of 
[[Special:Nearby]].\n{{Identical|Nearby}}",
"mobile-frontend-nearby-sectiontext": "Name of the link, which links 
the user to [[Special:Nearby]] if the article has coordinates.",
"mobile-frontend-news-items": "The title that will appear before the 
element with the mf-itn selector.",
+   "mobile-frontend-low-res-explain": "Used as description for the \"Data 
saving\" setting in [[Special:MobileOptions]].",
"mobile-frontend-opt-in-explain": "Used as description for the \"Beta\" 
in [[Special:MobileOptions]], if the beta is not enabled.",
"mobile-frontend-overlay-close": "Text for the button in an overlay 
that, when clicked, dismisses the overlay.\n{{Identical|Close}}",
"mobile-frontend-overlay-continue": "Text for the button in an overlay 
that, when clicked, continues to the next screen or 
step.\n{{Identical|Continue}}",
@@ -295,6 +296,7 @@
"mobile-frontend-search-submit": "Label for the button near the search 
box.\n{{Identical|Go}}",
"mobile-frontend-settings-images-explain": "Short description on 
[[Special:MobileOptions]], that the user can enable or disable images with this 
option.",
"mobile-frontend-settings-beta": "Text for beta on settings 
page.\n{{Identical|Beta}}",
+   "mobile-frontend-settings-lowres": "Text for data saving option on 
settings page.",
"mobile-frontend-settings-site-description": "Shown on 
[[Special:MobileOptions]]. Parameters:\n* $1 - the number of other language 
versions for this wiki",
"mobile-frontend-settings-site-header": "Heading for the 
Special:MobileOptions/Language page - only visible to non JavaScript users",
"mobile-frontend-sign-in-error-heading": "Heading for when an error 
occurred. You can translate \"Error\" instead.",
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 66c19a0..90d9a96 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -198,6 +198,17 @@
}
 
/**
+* Set NetSpeed designation.
+* @param string $value of net speed. Currently accepts 
self::NETSPEED_FAST
+*  or self::NETSPEED_SLOW
+*/
+   public function setNetSpeed( $value ) {
+   $this->netSpeed = $value;
+   $this->getRequest()->response()
+   ->setCookie( 'NetSpeed', $this->netSpeed, 0, array( 
'prefix' => '' ) );
+   }
+
+   /**
 * Whether the user is allowed to upload
 * @return boolean
 */
diff --git a/includes/specials/SpecialMobileOptions.php 
b/includes/s

[MediaWiki-commits] [Gerrit] VE: Fix i18n names broken during migration - change (mediawiki...Cite)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: VE: Fix i18n names broken during migration
..

VE: Fix i18n names broken during migration

Change-Id: I682bdaa71bc9a8675c79bae0b2f54955de207945
---
M modules/ve-cite/ve.ui.MWReferencesListContextItem.js
M modules/ve-cite/ve.ui.MWReferencesListDialog.js
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite 
refs/changes/71/269571/1

diff --git a/modules/ve-cite/ve.ui.MWReferencesListContextItem.js 
b/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
index 325fc9e..02b1d82 100644
--- a/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
+++ b/modules/ve-cite/ve.ui.MWReferencesListContextItem.js
@@ -49,8 +49,8 @@
var group = this.model.getAttribute( 'refGroup' );
 
return group ?
-   ve.msg( 
'visualeditor-dialog-referenceslist-contextitem-description-named', group ) :
-   ve.msg( 
'visualeditor-dialog-referenceslist-contextitem-description-general' );
+   ve.msg( 
'cite-ve-dialog-referenceslist-contextitem-description-named', group ) :
+   ve.msg( 
'cite-ve-dialog-referenceslist-contextitem-description-general' );
 };
 
 /* Registration */
diff --git a/modules/ve-cite/ve.ui.MWReferencesListDialog.js 
b/modules/ve-cite/ve.ui.MWReferencesListDialog.js
index 9b24340..c7cb90d 100644
--- a/modules/ve-cite/ve.ui.MWReferencesListDialog.js
+++ b/modules/ve-cite/ve.ui.MWReferencesListDialog.js
@@ -39,12 +39,12 @@
 ve.ui.MWReferencesListDialog.static.actions = [
{
action: 'apply',
-   label: OO.ui.deferMsg( 'cite-ve-dialog-action-apply' ),
+   label: OO.ui.deferMsg( 'visualeditor-dialog-action-apply' ),
flags: [ 'progressive', 'primary' ],
modes: 'edit'
},
{
-   label: OO.ui.deferMsg( 'cite-ve-dialog-action-cancel' ),
+   label: OO.ui.deferMsg( 'visualeditor-dialog-action-cancel' ),
flags: [ 'safe', 'back' ],
modes: 'edit'
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I682bdaa71bc9a8675c79bae0b2f54955de207945
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] Remove ob_start() from docroot/noc/conf/highlight.php - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Remove ob_start() from docroot/noc/conf/highlight.php
..


Remove ob_start() from docroot/noc/conf/highlight.php

Remove output buffering with compression from
docroot/noc/conf/highlight.php. HHVM doesn't implement the ob_gzhandler
function () and the
utility of buffering and compressing in PHP vs letting Apache handle
this is dubious.

Change-Id: I720bb618751fa45410aaf3624e2e9b0a2b8a73a6
---
M docroot/noc/conf/highlight.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docroot/noc/conf/highlight.php b/docroot/noc/conf/highlight.php
index 6b48b3c..7ebb597 100644
--- a/docroot/noc/conf/highlight.php
+++ b/docroot/noc/conf/highlight.php
@@ -35,7 +35,6 @@
 }
 // Don't run if executing unit tests
 if ( PHP_SAPI !== 'cli' ) {
-   ob_start( 'ob_gzhandler' );
header( 'Content-Type: text/html; charset=utf-8' );
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I720bb618751fa45410aaf3624e2e9b0a2b8a73a6
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Better mediawiki REPL - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Better mediawiki REPL
..


Better mediawiki REPL

This sets up the hhvm interactive mode to be used as a repl to help
debugging. Because the repl is always run as the mediawiki web user
shell users don't have their own configuration file. This works
around that limitation by storing per-user configuration files in
/var/lib/hphpd/.hphpd.ini all owned by the mediawiki web
user.

Change-Id: I33966cc28a62d48642f3e8d875558c6e24205ba4
---
A modules/mediawiki/files/hphpd.ini
A modules/mediawiki/files/mwrepl
M modules/mediawiki/manifests/init.pp
A modules/mediawiki/manifests/mwrepl.pp
4 files changed, 71 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/mediawiki/files/hphpd.ini 
b/modules/mediawiki/files/hphpd.ini
new file mode 100644
index 000..235bcfe
--- /dev/null
+++ b/modules/mediawiki/files/hphpd.ini
@@ -0,0 +1,3 @@
+hhvm.macros[0][name] = startup
+hhvm.macros[0][cmds][] = continue
+
diff --git a/modules/mediawiki/files/mwrepl b/modules/mediawiki/files/mwrepl
new file mode 100755
index 000..0d7f1f9
--- /dev/null
+++ b/modules/mediawiki/files/mwrepl
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Shell wrapper for interactive hhvm for use with multiversion mediawiki
+# This script belongs in /usr/local/bin/ and should be in PATH.
+. /etc/profile.d/mediawiki.sh
+
+# Use the source version of the script if the source directory is present.
+# This only matters if the source dir is shared or when run on the deployment 
server.
+if [ -d "$MEDIAWIKI_STAGING_DIR" ]; then
+   MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE=$MEDIAWIKI_STAGING_DIR
+else
+   MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE=$MEDIAWIKI_DEPLOYMENT_DIR
+fi
+
+usage() {
+   echo Error: $*
+   echo Usage:
+   echo -e "\t$0 "
+   echo
+   exit 1
+}
+
+if [[ $# -gt 1 ]]; then
+   usage "Too many arguments"
+elif [[ $# -eq 0 ]]; then
+   WIKI=testwiki
+else
+   WIKI=$1
+fi
+
+if [ "$(whoami)" != "$MEDIAWIKI_WEB_USER" ] ; then
+   HPHPD_INI="${HPHPD_INI_DIR:=/var/lib/hphpd}/$(whoami).hphpd.ini"
+   if [ ! -f "$HPHPD_INI" ]; then
+   sudo -u "$MEDIAWIKI_WEB_USER" cp "$HPHPD_INI_DIR/hphpd.ini" 
"$HPHPD_INI"
+   fi
+   sudo -u "$MEDIAWIKI_WEB_USER" hhvm -a --debug-config "$HPHPD_INI" 
"$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" commandLine.inc 
"--wiki=$WIKI"
+else
+   hhvm -a "$MEDIAWIKI_DEPLOYMENT_DIR_DIR_USE/multiversion/MWScript.php" 
commandLine.inc "--wiki=$WIKI"
+fi
diff --git a/modules/mediawiki/manifests/init.pp 
b/modules/mediawiki/manifests/init.pp
index 6d69848..b491380 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -25,6 +25,7 @@
 include ::mediawiki::users
 include ::mediawiki::syslog
 include ::mediawiki::php
+include ::mediawiki::mwrepl
 
 if os_version('ubuntu >= trusty') {
 include ::mediawiki::hhvm
diff --git a/modules/mediawiki/manifests/mwrepl.pp 
b/modules/mediawiki/manifests/mwrepl.pp
new file mode 100644
index 000..1d11deb
--- /dev/null
+++ b/modules/mediawiki/manifests/mwrepl.pp
@@ -0,0 +1,29 @@
+# == Class: mediawiki::mwrepl
+#
+# 'mwrepl' is a command line REPL, read-eval-print-loop, utility. This
+# module ensures that mwrepl is installed, and that the per-user 
+# configuration is in place.
+
+class mediawiki::mwrepl {
+require ::mediawiki::users
+include ::scap::scripts
+
+file { '/var/lib/hphpd':
+ensure => directory,
+owner  => $::mediawiki::users::web,
+group  => $::mediawiki::users::web,
+mode   => '0775',
+}
+file { '/var/lib/hphpd/hphpd.ini':
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+source => 'puppet:///modules/mediawiki/hphpd.ini',
+}
+file { '/usr/local/bin/mwrepl':
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+source => 'puppet:///modules/mediawiki/mwrepl',
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33966cc28a62d48642f3e8d875558c6e24205ba4
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Get rid of $wg = $wmg for BetaFeatures - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Get rid of $wg = $wmg for BetaFeatures
..


Get rid of $wg = $wmg for BetaFeatures

Bug: T119117
Change-Id: I1cb7d96e0585c40cf33b816d2633498267456813
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7574b43..4889209 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1871,9 +1871,6 @@
 
 if ( $wmgUseBetaFeatures ) {
wfLoadExtension( 'BetaFeatures' );
-   if ( $wmgBetaFeaturesWhitelist ) {
-   $wgBetaFeaturesWhitelist = $wmgBetaFeaturesWhitelist;
-   }
 }
 
 if ( $wmgUseCommonsMetadata ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 04af127..72678a2 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12177,7 +12177,7 @@
 // at which point the feature should be un-deployed.
 //
 // DO NOT add entries here without OK from Greg Grossmeier or James Forrester.
-'wmgBetaFeaturesWhitelist' => array(
+'wgBetaFeaturesWhitelist' => array(
'default' => array(
'visualeditor-enable',  // VisualEditor – 
on-going (special permission)
'wikibase-otherprojects',   // ! 2015-02-27 - 
Wikidata other projects sidebar

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

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

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

[MediaWiki-commits] [Gerrit] Add Recherche: to wgContentNamespaces on fr.wikiversity - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Add Recherche: to wgContentNamespaces on fr.wikiversity
..


Add Recherche: to wgContentNamespaces on fr.wikiversity

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 6bc45ee..9371e35 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10727,6 +10727,7 @@
'+fawikisource' => array( 102 ),
'+frrwiki' => array( 106 ), // T40023
'+frwikisource' => array( 102 ),
+   '+frwikiversity' => array( 104 ), // T125948
'+frwiktionary' => array( 106 ), // T97228
'+hewikisource' => array( 100, 106, 108, 110 ), // T98709
'+hrwiki' => array( 102 ), // T42732

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2caef8fa693fddc59bcf54419a42daf2edae73a3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ruthenium: puppetize script to update parsoid + restart serv... - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: ruthenium: puppetize script to update parsoid + restart services
..


ruthenium: puppetize script to update parsoid + restart services

Used to be on /home/parsoid-rt/update_code.sh on ruthenium before
reimage and I saved it in /home/ssastry/bin/update_code.sh after reimage.
But, on mutante's advice, moving this to /usr/local/bin.

Updated previously granted access to use this script.

Change-Id: Ie4f8b5a5481fb1bdb82de99d762bdc31c07ec27e
---
A files/misc/parsoid_testing.update_parsoid.sh
M manifests/role/parsoid.pp
M modules/admin/data/data.yaml
3 files changed, 27 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/misc/parsoid_testing.update_parsoid.sh 
b/files/misc/parsoid_testing.update_parsoid.sh
new file mode 100644
index 000..f473f82
--- /dev/null
+++ b/files/misc/parsoid_testing.update_parsoid.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+set -u
+
+echo 'Updating deploy repo checkout ...'
+cd /usr/lib/parsoid
+git pull
+echo 'Updating parsoid repo checkout ...'
+cd src
+git pull
+git log -n 1
+cd ..
+echo 'Restarting parsoid ...'
+service parsoid restart
+echo 'Restarting parsoid-rt testreduce clients ...'
+service parsoid-rt-client restart
+echo 'All done!'
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index bbeb9d1..463c18e 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -305,6 +305,13 @@
 before => Service['parsoid'],
 }
 
+file { '/usr/local/bin/update_parsoid.sh':
+source => 'puppet:///files/misc/parsoid_testing.update_parsoid.sh',
+owner  => 'root',
+group  => 'root',
+mode   => '0555',
+}
+
 # Use this parsoid instance for parsoid rt-testing
 file { '/usr/lib/parsoid/src/localsettings.js':
 source => 
'puppet:///modules/testreduce/parsoid-rt-client.rttest.localsettings.js',
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 39265c9..7b9dfb2 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -27,7 +27,7 @@
 members: [ssastry, cscott, arlolra]
 privileges: ['ALL = NOPASSWD: /usr/sbin/service parsoid *',
  'ALL = NOPASSWD: /usr/sbin/service parsoid-rt-client restart',
- 'ALL = (parsoid-rt) NOPASSWD: 
/home/parsoid-rt/update-code.sh']
+ 'ALL = (parsoid) NOPASSWD: /usr/local/bin/update_parsoid.sh']
   gerrit-root:
 gid: 703
 description: manage gerrit server
@@ -475,7 +475,7 @@
'ALL = NOPASSWD: /usr/sbin/service parsoid-vd *',
'ALL = NOPASSWD: /usr/sbin/service parsoid-vd-client *',
'ALL = NOPASSWD: /usr/sbin/service diffservice *',
-   'ALL = (parsoid-rt) NOPASSWD: /home/parsoid-rt/update-code.sh',
+   'ALL = (parsoid) NOPASSWD: /usr/local/bin/update_parsoid.sh',
'ALL = NOPASSWD: /bin/journalctl *']
 users:
   rush:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4f8b5a5481fb1bdb82de99d762bdc31c07ec27e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Set nlwiki collation to uca-nl - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Set nlwiki collation to uca-nl
..


Set nlwiki collation to uca-nl

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 04386e9..285b6d1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13394,6 +13394,7 @@
'iswiktionary' => 'identity', // T32722
'ltwiki' => 'uca-lt', // T123627
'lvwiki' => 'uca-lv', // T67003
+   'nlwiki' => 'uca-nl', // T125774
'plwiki' => 'uca-pl', // T44413
'plwikisource' => 'uca-pl', // T86821
'plwikivoyage' => 'uca-pl', // T47968

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcceaa47f884696e99abd7c2c2552a9f9d7df3a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix issues with incorrect HTML->plaintext and double escaping - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Fix issues with incorrect HTML->plaintext and double escaping
..


Fix issues with incorrect HTML->plaintext and double escaping

This was improved by 1a3b1cfb7c9eeacf534c418ae7c1b81be3a9b869 , but
there were still a few issues.

* We were using the wrong parameters for html_entity_decode
  (default ENT_COMPAT, which doesn't decode single quotes).
  HHVM was hiding this issues, since it wrongly decoded them anyway.

  But when you debug through with Zend, it's a different story...

  It now uses ENT_QUOTES, which decodes all quotes, instead.

  I fixed the HHVM bug at https://reviews.facebook.net/D53871
  (pending review).

  This broke our HTML -> plaintext conversion (used for topic titles
  as part of notification generation) under Zend.

* wfEscapeWikitext -> parse would work, except if the truncation
  happened at the wrong point.  It could break the HTML entity in half,
  which means the user sees something like:

  The topic "Rename: Adrines {{..." was renamed to "RenameD: Adrines 
{...".

  Changed all to use plaintextParam instead of escaping earlier
  (wfEscapeWikiText after truncation probably also would have worked,
  not tested).

I'll submit a followup to introduce topic-title-plaintext rather than
call htmlToPlaintext in multiple places.

Merge at the same time as Ifc6f0c25ecd6a0a6d84481e18b512cf0af09d22f
(in the Thanks extension).

Bug: T120291
Change-Id: If829deba8577cbe37178d630fb932a299a163193
---
M includes/Conversion/Utils.php
M includes/Notifications/FlowPresentationModel.php
M includes/Notifications/MentionPresentationModel.php
M includes/Notifications/NewTopicPresentationModel.php
M includes/Notifications/PostEditedPresentationModel.php
M includes/Notifications/PostReplyPresentationModel.php
M includes/Notifications/TopicRenamedPresentationModel.php
7 files changed, 12 insertions(+), 11 deletions(-)

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



diff --git a/includes/Conversion/Utils.php b/includes/Conversion/Utils.php
index ab8c642..6406db1 100644
--- a/includes/Conversion/Utils.php
+++ b/includes/Conversion/Utils.php
@@ -70,7 +70,7 @@
/** @var Language $wgLang */
global $wgLang;
 
-   $plain = trim( html_entity_decode( strip_tags( $html ) ) );
+   $plain = trim( html_entity_decode( strip_tags( $html ), 
ENT_QUOTES ) );
 
if ( $truncateLength === null ) {
return $plain;
diff --git a/includes/Notifications/FlowPresentationModel.php 
b/includes/Notifications/FlowPresentationModel.php
index 66f94ca..b18a71a 100644
--- a/includes/Notifications/FlowPresentationModel.php
+++ b/includes/Notifications/FlowPresentationModel.php
@@ -124,11 +124,11 @@
 
protected function getTopicTitle( $extraParamName = 'topic-title' ) {
$topicTitle = $this->event->getExtraParam( $extraParamName );
-   return $this->formatTopicTitle( $topicTitle );
+   return $this->truncateTopicTitle( $topicTitle );
}
 
-   protected function formatTopicTitle( $topicTitle ) {
-   return $this->language->truncate( wfEscapeWikiText( $topicTitle 
), self::SECTION_TITLE_RECOMMENDED_LENGTH );
+   protected function truncateTopicTitle( $topicTitle ) {
+   return $this->language->truncate( $topicTitle, 
self::SECTION_TITLE_RECOMMENDED_LENGTH );
}
 
protected function isUserTalkPage() {
diff --git a/includes/Notifications/MentionPresentationModel.php 
b/includes/Notifications/MentionPresentationModel.php
index ac8263a..027089c 100644
--- a/includes/Notifications/MentionPresentationModel.php
+++ b/includes/Notifications/MentionPresentationModel.php
@@ -34,7 +34,7 @@
$msg = parent::getHeaderMessage();
$msg->params( $this->getTruncatedTitleText( 
$this->event->getTitle(), true) );
$msg->params( $this->getViewingUserForGender() );
-   $msg->params( $this->getTopicTitle() );
+   $msg->plaintextParams( $this->getTopicTitle() );
return $msg;
}
 
diff --git a/includes/Notifications/NewTopicPresentationModel.php 
b/includes/Notifications/NewTopicPresentationModel.php
index 862059a..9c46fc4 100644
--- a/includes/Notifications/NewTopicPresentationModel.php
+++ b/includes/Notifications/NewTopicPresentationModel.php
@@ -63,7 +63,7 @@
} else {
$msg = parent::getHeaderMessage();
$msg->params( $this->getTruncatedTitleText( 
$this->event->getTitle(), true) );
-   $msg->params( $this->getTopicTitle() );
+   $msg->plaintextParams( $this->getTopicTitle() );
return $msg;
}
}
diff --git a/includes/Noti

[MediaWiki-commits] [Gerrit] Increase completion suggester replicas for busy wikis - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Increase completion suggester replicas for busy wikis
..


Increase completion suggester replicas for busy wikis

Also tweak the test that checks index/replica counts to be
a little more like how the config would be loaded in prod.

Bug: T125667
Change-Id: Idd54a83f33ff90fd183586d46daeff8ca31109b8
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 34 insertions(+), 10 deletions(-)

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



diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index a553014..53dc64d 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -5,7 +5,7 @@
 
 class cirrusTests extends PHPUnit_Framework_TestCase {
public function testClusterConfigurationForProdTestwiki() {
-   $config = $this->loadCirrusConfig( 'production', 'testwiki', 
'wiki', 'en', 'wikipedia' );
+   $config = $this->loadCirrusConfig( 'production', 'testwiki', 
'wiki' );
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster', 
$config );
@@ -24,7 +24,7 @@
}
 
public function testClusterConfigurationForProdEnwiki() {
-   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki', 'en', 'wikipedia' );
+   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki' );
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster', 
$config );
@@ -49,7 +49,7 @@
}
 
public function testLanguageMatrix() {
-   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki', 'en', 'wikipedia' );
+   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki' );
$allDbs = DBList::getall();
 
foreach( $config['wgCirrusSearchLanguageToWikiMap'] as $lang => 
$wiki ) {
@@ -77,10 +77,11 @@
return $wgConf;
}
 
-   private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix, 
$lang, $site ) {
+   private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) {
$wmfConfigDir = __DIR__ . "/../wmf-config";
$wgConf = $this->loadWgConf( $wmfRealm );
 
+   list( $site, $lang ) = $wgConf->siteFromDB( $wgDBname );
$globals = $wgConf->getAll( $wgDBname, $dbSuffix, array(
'lang' => $lang,
'docRoot' => '/dev/null',
@@ -143,8 +144,26 @@
$wikis = array_unique( $wikis );
$indexTypes = array( 'content', 'general', 'titlesuggest' );
$clusters = array( 'eqiad' => 31, 'codfw' => 24 );
+
+   // restrict wgConf to only the settings we care about
+   $wgConf->settings = array(
+   'shards' => $shards,
+   'replicas' => $replicas,
+   );
$tests = array();
foreach ( $wikis as $wiki ) {
+   list( $site, $lang ) = $wgConf->siteFromDB( $wiki );
+   foreach ( $wgConf->suffixes as $altSite => $suffix ) {
+   if ( substr( $wiki, -strlen( $suffix ) ) === 
$suffix ) {
+   break;
+   }
+   }
+   $config = $wgConf->getAll( $wiki, $suffix, array(
+   'lang' => $lang,
+   'docRoot' => '/dev/null',
+   'site' => $site,
+   'stdlogo' => 'file://dev/null',
+   ) );
foreach ( $indexTypes as $indexType ) {
foreach ( $clusters as $clusterName => 
$numServers ) {
// wikidata doesn't have completion 
suggester
@@ -155,8 +174,8 @@
$wiki,
$indexType,
$numServers,
-   self::resolveClusterConfig( 
self::resolveConfig( $shards, $wiki ), $clusterName ),
-   self::resolveClusterConfig( 
self::resolveConfig( $replicas, $wiki ), $clusterName ),
+   self::resolveClusterConfig( 
$config['shards'], $clusterName ),
+   self::resolveClusterConfig( 
$config

[MediaWiki-commits] [Gerrit] Update archaic chargeback import logic - change (wikimedia...crm)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Update archaic chargeback import logic
..

Update archaic chargeback import logic

Just use mark_refund - we haven't been zeroing out amounts or messing
with the source column for years.

Bug: T124842
Change-Id: Ib6ae6a412c97ac7825f4c2aa4114e7e299f00765
---
M sites/all/modules/offline2civicrm/import_chargebacks.drush.inc
1 file changed, 5 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/70/269570/1

diff --git a/sites/all/modules/offline2civicrm/import_chargebacks.drush.inc 
b/sites/all/modules/offline2civicrm/import_chargebacks.drush.inc
index 7686aa0..1ff094a 100644
--- a/sites/all/modules/offline2civicrm/import_chargebacks.drush.inc
+++ b/sites/all/modules/offline2civicrm/import_chargebacks.drush.inc
@@ -61,42 +61,12 @@
 
   print "\tCharging back $contribution_id\n";
 
-  $contribution = civicrm_api("Contribution", "Get", array(
-"version" => "3",
-"id" => $contribution_id
-  ));
-
-  if(!WMFCiviAPICheck::check_api_contribution($contribution, 
$contribution_id)){
-watchdog('offline2civicrm', "Contribution (id: $contribution_id) could not 
be loaded via CiviCRM API: " .
-  print_r($contribution, TRUE), NULL, WATCHDOG_ERROR);
-return false;
+  try {
+wmf_civicrm_mark_refund( $contribution_id, 'chargeback', true );
+watchdog('offline2civicrm', "Updated contribution $contribution_id", NULL, 
WATCHDOG_INFO);
+  } catch ( WmfException $e ) {
+   watchdog('offline2civicrm', "Cannot charge back contribution 
$contribution_id: {$e->getMessage()})", array(), WATCHDOG_ERROR);
   }
-
-  $contribution_flat = WMFCiviAPICheck::check_api_simplify($contribution, 
$contribution_id);
-
-  if($contribution_flat === false){
-watchdog('offline2civicrm', "Contribution could not be extracted from API 
response: " .
-  print_r($contribution, TRUE), NULL, WATCHDOG_ERROR);
-return false;
-  }
-
-  $contribution = $contribution_flat;
-
-  if(substr($contribution["contribution_source"], 0, 3) == "RFD"){
-  // the contribution has already been charged back or refunded
-  return true;
-  }
-
-  $contribution["total_amount"] = "0.00";
-  $contribution["net_amount"] = "0.00";
-  $contribution["contribution_source"] = "RFD CHARGEDBACK (" . 
$contribution["contribution_source"] . ")";
-
-  $updated = civicrm_api("Contribution", "Update", array_merge($contribution, 
array('version' => '3',)));
-
-  watchdog('offline2civicrm', "Updated contribution: " . print_r($updated, 
true), NULL, WATCHDOG_INFO);
-
-  return true;
-
 }
 
 function _offline2civicrm_import_chargebacks_globalcollect($filename){

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

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

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

[MediaWiki-commits] [Gerrit] Reduce Kafka timeouts - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Reduce Kafka timeouts
..


Reduce Kafka timeouts

Change-Id: I421c901f05673d8ee4eb65bf7c7d198308a36e3d
Depends-On: I8f01fa61d916aeaa831a84e12b6fae08d04ca046
Bug: T125084
---
M wmf-config/logging.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index 83e1075..40db3a3 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -190,6 +190,8 @@
'alias' => array(),
'swallowExceptions' => true,
'logExceptions' => 
'wfDebugLogFile',
+   'sendTimeout' => 0.01,
+   'recvTimeout' => 0.5,
)
),
'formatter' => 'avro'

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

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

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

[MediaWiki-commits] [Gerrit] Add list-user-databases command - change (labs/toollabs)

[Tim Landscheidt (Code Review)]

Tim Landscheidt has submitted this change and it was merged.

Change subject: Add list-user-databases command
..


Add list-user-databases command

Bug: T91231
Change-Id: I951bce6043f78d33d5fd409fee855fc5bb34abc9
---
M configure.ac
M debian/changelog
M debian/control
M debian/misctools.install
M debian/misctools.manpages
M misctools/.gitignore
M misctools/Makefile.am
A misctools/list-user-databases
A misctools/list-user-databases.1.in
9 files changed, 91 insertions(+), 4 deletions(-)

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



diff --git a/configure.ac b/configure.ac
index e9d6ed1..5041f1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@
  jobutils/man/jsub.1
  misctools/Makefile
  misctools/become.1
+ misctools/list-user-databases.1
  misctools/toolwatcher.8
  src/Makefile
  src/take.1
diff --git a/debian/changelog b/debian/changelog
index 963902f..dab1b44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 toollabs (1.9~dev) unstable; urgency=medium
 
+  * list-user-databases: List all databases a user has access to. [Tim
+Landscheidt]
   * Add bash-completion config for `become`. [Bryan Davis]
   * Fix test suite's check for empty directory. [Tim Landscheidt]
   * Don't call log-command-invocation when testing jsub. [Bryan Davis]
diff --git a/debian/control b/debian/control
index 09d4a57..f773c97 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@
 
 Package: misctools
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, python, python-mysql.connector
 Description: Miscellaneous Labs-specific tools
  Miscellaneous Labs-specific Tools used on Tool Labs
 
@@ -21,4 +21,3 @@
 Description: Set of utilities to use on wikimedia bots and tools cluster
  This package will install jstart (jsub) and jstop, the Tool Labs (more)
  user-friendly wrappers to submit jobs to the gridengine
-
diff --git a/debian/misctools.install b/debian/misctools.install
index 213a4d6..397be31 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,4 +1,5 @@
 usr/bin/become
+usr/bin/list-user-databases
 usr/bin/take
 usr/bin/webservice
 usr/sbin/toolwatcher
diff --git a/debian/misctools.manpages b/debian/misctools.manpages
index 3006130..e198cda 100644
--- a/debian/misctools.manpages
+++ b/debian/misctools.manpages
@@ -1,3 +1,4 @@
 debian/tmp/usr/share/man/man1/become.1
+debian/tmp/usr/share/man/man1/list-user-databases.1
 debian/tmp/usr/share/man/man1/take.1
 debian/tmp/usr/share/man/man8/toolwatcher.8
diff --git a/misctools/.gitignore b/misctools/.gitignore
index 797feb9..c4d5659 100644
--- a/misctools/.gitignore
+++ b/misctools/.gitignore
@@ -1,4 +1,5 @@
 /Makefile
 /Makefile.in
 /become.1
+/list-user-databases.1
 /toolwatcher.8
diff --git a/misctools/Makefile.am b/misctools/Makefile.am
index 4c24594..1fae8ac 100644
--- a/misctools/Makefile.am
+++ b/misctools/Makefile.am
@@ -1,3 +1,3 @@
-man_MANS = become.1 toolwatcher.8
-bin_SCRIPTS = become webservice
+man_MANS = become.1 list-user-databases.1 toolwatcher.8
+bin_SCRIPTS = become list-user-databases webservice
 sbin_SCRIPTS = toolwatcher
diff --git a/misctools/list-user-databases b/misctools/list-user-databases
new file mode 100755
index 000..cc9f374
--- /dev/null
+++ b/misctools/list-user-databases
@@ -0,0 +1,62 @@
+#!/usr/bin/python
+
+import ConfigParser
+import argparse
+import os
+import re
+
+import mysql.connector
+
+# Servers to search databases on.
+DATABASE_SERVERS = ('c1.labsdb', 'c2.labsdb', 'c3.labsdb', 'tools.labsdb')
+
+if __name__ == '__main__':
+# Get list of defaults files to extract user information from.
+parser = argparse.ArgumentParser(description='List databases owned by 
users, given by the credentials files.')
+parser.add_argument('mycnffilenames',
+metavar='MYCNFFILENAME',
+nargs='+',
+help='name of MySQL defaults file')
+args = parser.parse_args()
+
+for mycnffilename in args.mycnffilenames:
+c = ConfigParser.ConfigParser()
+c.read(mycnffilename)
+username = c.get('client', 'user').strip("'")
+password = c.get('client', 'password').strip("'")
+databases_found = []
+for server in DATABASE_SERVERS:
+conn = mysql.connector.connect(user=username,
+   password=password,
+   host=server,
+   database='mysql')
+cur = conn.cursor()
+cur.execute('SHOW GRANTS')
+database_patterns = []
+for (grantstatement, ) in cur.fetchall():
+# Ignore general grants for replica views.
+if 

[MediaWiki-commits] [Gerrit] Test HTML stripping in production mobile beta - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Test HTML stripping in production mobile beta
..


Test HTML stripping in production mobile beta

Allow testing of beta in production to see how it compares with
beta cluster and if any patterns emerge.

Also get a sense of whether global graph is impacted.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9110841..1d10314 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13855,6 +13855,14 @@
'wikivoyage' => array( 'h2', 'h3', 'h4', 'h5', 'h6' ), // T110436, 
T110837
 ),
 
+'wgMFRemovableClasses' => array(
+   'default' => array(
+   'base' => array(),
+   'beta' => array( '.navbox' ),
+   'HTML' => array(),
+   ),
+),
+
 // Formerly known as $wgMFAnonymousEditing
 'wmgMFEditorOptions' => array(
'default' => array( 'anonymousEditing' => true, ), // T93210

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

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

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

[MediaWiki-commits] [Gerrit] Remove unnecessary keys from Globalcollect refunds - change (wikimedia...crm)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Remove unnecessary keys from Globalcollect refunds
..

Remove unnecessary keys from Globalcollect refunds

No longer need to set refund ID to bogus RFD prefixed thing. The
other keys have been ignored by the refund queue consumer all along.

Bug: T124842
Change-Id: Ie7ff2b8aed7ec8f15324802828a9cf07dcd5bb99
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/69/269569/1

diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module 
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index 4716005..afd992d 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -1044,15 +1044,11 @@
 
   if (wr1_is_negative_txn($wr1)) {
 $send_message = array(
-  'gateway_refund_id' => 'RFD' . $real_oid, //after intense 
deliberation, we don't actually care what this is at all.
   'gateway_parent_id' => $real_oid, //gateway transaction ID
   'gross_currency' => wr1_currency($wr1), //currency code
   'gross' => wr1_amount($wr1) / 100, //amount
   'date' => wr1_date_to_timestamp($wr1), //timestamp
   'gateway' => 'globalcollect', //lcase
-  'gateway_account' => $wr1['gateway_account'], //from DI. ?
-  'payment_method' => '', //Argh. Not telling you.
-  'payment_submethod' => '', //Still not telling you.
   'type' => wr1_get_negative_type($wr1), //refund or chargeback
 );
 echo print_r($send_message, true);

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

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

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

[MediaWiki-commits] [Gerrit] Increase completion suggester replicas for busy wikis - change (operations/mediawiki-config)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Increase completion suggester replicas for busy wikis
..

Increase completion suggester replicas for busy wikis

Also tweak the test that checks index/replica counts to be
a little more like how the config would be loaded in prod.

Bug: T125667
Change-Id: Idd54a83f33ff90fd183586d46daeff8ca31109b8
---
M tests/cirrusTest.php
M wmf-config/InitialiseSettings.php
2 files changed, 34 insertions(+), 10 deletions(-)


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

diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index a553014..53dc64d 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -5,7 +5,7 @@
 
 class cirrusTests extends PHPUnit_Framework_TestCase {
public function testClusterConfigurationForProdTestwiki() {
-   $config = $this->loadCirrusConfig( 'production', 'testwiki', 
'wiki', 'en', 'wikipedia' );
+   $config = $this->loadCirrusConfig( 'production', 'testwiki', 
'wiki' );
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster', 
$config );
@@ -24,7 +24,7 @@
}
 
public function testClusterConfigurationForProdEnwiki() {
-   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki', 'en', 'wikipedia' );
+   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki' );
$this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster', 
$config );
@@ -49,7 +49,7 @@
}
 
public function testLanguageMatrix() {
-   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki', 'en', 'wikipedia' );
+   $config = $this->loadCirrusConfig( 'production', 'enwiki', 
'wiki' );
$allDbs = DBList::getall();
 
foreach( $config['wgCirrusSearchLanguageToWikiMap'] as $lang => 
$wiki ) {
@@ -77,10 +77,11 @@
return $wgConf;
}
 
-   private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix, 
$lang, $site ) {
+   private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) {
$wmfConfigDir = __DIR__ . "/../wmf-config";
$wgConf = $this->loadWgConf( $wmfRealm );
 
+   list( $site, $lang ) = $wgConf->siteFromDB( $wgDBname );
$globals = $wgConf->getAll( $wgDBname, $dbSuffix, array(
'lang' => $lang,
'docRoot' => '/dev/null',
@@ -143,8 +144,26 @@
$wikis = array_unique( $wikis );
$indexTypes = array( 'content', 'general', 'titlesuggest' );
$clusters = array( 'eqiad' => 31, 'codfw' => 24 );
+
+   // restrict wgConf to only the settings we care about
+   $wgConf->settings = array(
+   'shards' => $shards,
+   'replicas' => $replicas,
+   );
$tests = array();
foreach ( $wikis as $wiki ) {
+   list( $site, $lang ) = $wgConf->siteFromDB( $wiki );
+   foreach ( $wgConf->suffixes as $altSite => $suffix ) {
+   if ( substr( $wiki, -strlen( $suffix ) ) === 
$suffix ) {
+   break;
+   }
+   }
+   $config = $wgConf->getAll( $wiki, $suffix, array(
+   'lang' => $lang,
+   'docRoot' => '/dev/null',
+   'site' => $site,
+   'stdlogo' => 'file://dev/null',
+   ) );
foreach ( $indexTypes as $indexType ) {
foreach ( $clusters as $clusterName => 
$numServers ) {
// wikidata doesn't have completion 
suggester
@@ -155,8 +174,8 @@
$wiki,
$indexType,
$numServers,
-   self::resolveClusterConfig( 
self::resolveConfig( $shards, $wiki ), $clusterName ),
-   self::resolveClusterConfig( 
self::resolveConfig( $replicas, $wiki ), $clusterName ),
+   self::resolveClusterConfig( 
$config['shards'], $clusterName ),
+ 

[MediaWiki-commits] [Gerrit] Don't require gateway_refund_id - change (wikimedia...crm)

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Don't require gateway_refund_id
..

Don't require gateway_refund_id

Some gateways don't give us a distinct ID, and mark_refund no longer
needs to create a second contribution in most cases.

Bug: T124842
Change-Id: I1be0baf3cf37b2a087a6e781d45aadabc1310939
---
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/67/269567/1

diff --git a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module 
b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
index 61702ef..8fec9ce 100644
--- a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
+++ b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
@@ -120,7 +120,7 @@
   }
 
   // Sanity checking :)
-  $required_fields = array( "gateway_refund_id", "gateway_parent_id", 
"gross_currency", "gross", "date", "gateway",
+  $required_fields = array( "gateway_parent_id", "gross_currency", "gross", 
"date", "gateway",
 "type",
   );
   foreach( $required_fields as $field_name ) {
@@ -132,7 +132,7 @@
 
   $gateway = strtoupper($body['gateway']);
   $parentTxn = $body['gateway_parent_id'];
-  $refundTxn = $body['gateway_refund_id'];
+  $refundTxn = isset( $body['gateway_refund_id'] ) ? 
$body['gateway_refund_id'] : null;
 
   if ( $body['gross'] < 0 ) {
 $body['gross'] = abs( $body['gross'] );

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

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

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

[MediaWiki-commits] [Gerrit] Remove return true from hook handlers, not needed anymore - change (mediawiki...GeoData)

[jenkins-bot (Code Review)]

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

Change subject: Remove return true from hook handlers, not needed anymore
..


Remove return true from hook handlers, not needed anymore

Change-Id: Idbf9e2837e7361ad97125d0297f73af70ec029c3
---
M includes/Hooks.php
1 file changed, 3 insertions(+), 29 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index ff7fbbc..bcf382f 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -23,7 +23,6 @@
 *
 * @param DatabaseUpdater $updater
 * @throws MWException
-* @return bool
 */
public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater ) {
global $wgGeoDataBackend;
@@ -47,7 +46,6 @@
default:
throw new MWException( 'GeoData extension 
currently supports only MySQL and SQLite' );
}
-   return true;
}
 
public static function upgradeToDecimal( DatabaseUpdater $updater ) {
@@ -71,11 +69,9 @@
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList
 *
 * @param array $files
-* @return bool
 */
public static function onUnitTestsList( &$files ) {
$files[] = dirname( __DIR__ ) . '/tests';
-   return true;
}
 
/**
@@ -83,15 +79,12 @@
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/ParserFirstCallInit
 *
 * @param Parser $parser
-* @return bool
 */
public static function onParserFirstCallInit( &$parser ) {
$parser->setFunctionHook( 'coordinates',
array( new CoordinatesParserFunction( $parser ), 
'coordinates' ),
Parser::SFH_OBJECT_ARGS
);
-
-   return true;
}
 
/**
@@ -102,13 +95,10 @@
 * @param User $user
 * @param string $reason
 * @param int $id
-* @return bool
 */
public static function onArticleDeleteComplete( &$article, User &$user, 
$reason, $id ) {
$dbw = wfGetDB( DB_MASTER );
$dbw->delete( 'geo_tags', array( 'gt_page_id' => $id ), 
__METHOD__ );
-
-   return true;
}
 
/**
@@ -116,7 +106,6 @@
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/LinksUpdate
 *
 * @param LinksUpdate $linksUpdate
-* @return bool
 */
public static function onLinksUpdate( &$linksUpdate ) {
$out = $linksUpdate->getParserOutput();
@@ -135,8 +124,6 @@
}
 
self::doLinksUpdate( $data, $linksUpdate->mId );
-
-   return true;
}
 
private static function getCoordinatesIfFile( Title $title ) {
@@ -214,7 +201,6 @@
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/FileUpload
 *
 * @param LocalFile $file
-* @return bool
 */
public static function onFileUpload( LocalFile $file ) {
$wp = WikiPage::factory( $file->getTitle() );
@@ -226,7 +212,6 @@
$lu = new LinksUpdate( $file->getTitle(), $pout );
self::onLinksUpdate( $lu );
}
-   return true;
}
 
/**
@@ -235,8 +220,6 @@
 *
 * @param OutputPage $out
 * @param ParserOutput $po
-*
-* @return bool
 */
public static function onOutputPageParserOutput( OutputPage &$out, 
ParserOutput $po ) {
global $wgGeoDataInJS;
@@ -244,7 +227,7 @@
if ( $wgGeoDataInJS && isset( $po->geoData ) ) {
$coord = $po->geoData->getPrimary();
if ( !$coord ) {
-   return true;
+   return;
}
$result = array();
foreach ( $wgGeoDataInJS as $param ) {
@@ -256,8 +239,6 @@
$out->addJsConfigVars( 'wgCoordinates', $result 
);
}
}
-
-   return true;
}
 
/**
@@ -265,13 +246,11 @@
 * Adds our stuff to CirrusSearch/Elasticsearch schema
 *
 * @param array $config
-*
-* @return bool
 */
public static function onCirrusSearchMappingConfig( array &$config ) {
global $wgGeoDataUseCirrusSearch, $wgGeoDataBackend, 
$wgGeoDataCoordinatesCompression;
if ( !$wgGeoDataUseCirrusSearch && $wgGeoDataBackend != 
'elastic' ) {
-   return true;
+   return;
}
$pageConfig = $config['page'];
 
@@ -298,7 +277,6 @@
  

[MediaWiki-commits] [Gerrit] Provide low-resolution NetSpeed option in Special:MobileOptions - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Provide low-resolution NetSpeed option in Special:MobileOptions
..

Provide low-resolution NetSpeed option in Special:MobileOptions

After chatting with Ori,
given the images saving in bytes, the lower fully loaded time
(35s to 22s) and the fact the code is written let's make
this an available option to our users.

On long term it's probably a better option than disabling images altogether
(We may want to remove the image disabling feature if we see a drop in usage
as a result of this new option)
Have okayed with Jon Katz and Nirzar.

Change-Id: I1fe8538eb679fb7397f482407ba88c4286174e39
---
M i18n/en.json
M i18n/qqq.json
M includes/MobileContext.php
M includes/specials/SpecialMobileOptions.php
4 files changed, 28 insertions(+), 0 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 755b5f5..578c040 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -246,6 +246,7 @@
"mobile-frontend-nearby-title": "Nearby",
"mobile-frontend-nearby-sectiontext": "Near the topic of this page",
"mobile-frontend-news-items": "In the news",
+   "mobile-frontend-low-res-explain": "Receive lower resolution images to 
save on bandwidth on a slow connection.",
"mobile-frontend-opt-in-explain": "By joining the beta, you will get 
access to the latest experimental features which may be subject to software 
defects.",
"mobile-frontend-overlay-close": "Close",
"mobile-frontend-overlay-continue": "Continue",
@@ -297,6 +298,7 @@
"mobile-frontend-search-submit": "Go",
"mobile-frontend-settings-images-explain": "Load all image content that 
appears in a page.",
"mobile-frontend-settings-beta": "Beta",
+   "mobile-frontend-settings-lowres": "Low-resolution images",
"mobile-frontend-settings-site-description": "{{SITENAME}} is available 
in $1 {{PLURAL:$1|language|languages}}. All available versions are listed 
below",
"mobile-frontend-settings-site-header": "{{SITENAME}} Languages",
"mobile-frontend-sign-in-error-heading": "Whoops",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1f9b628..66c01fc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -244,6 +244,7 @@
"mobile-frontend-nearby-title": "Title of 
[[Special:Nearby]].\n{{Identical|Nearby}}",
"mobile-frontend-nearby-sectiontext": "Name of the link, which links 
the user to [[Special:Nearby]] if the article has coordinates.",
"mobile-frontend-news-items": "The title that will appear before the 
element with the mf-itn selector.",
+   "mobile-frontend-low-res-explain": "Used as description for the 
\"low-resolution images\" setting in [[Special:MobileOptions]].",
"mobile-frontend-opt-in-explain": "Used as description for the \"Beta\" 
in [[Special:MobileOptions]], if the beta is not enabled.",
"mobile-frontend-overlay-close": "Text for the button in an overlay 
that, when clicked, dismisses the overlay.\n{{Identical|Close}}",
"mobile-frontend-overlay-continue": "Text for the button in an overlay 
that, when clicked, continues to the next screen or 
step.\n{{Identical|Continue}}",
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 66c19a0..2d0b81b 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -198,6 +198,20 @@
}
 
/**
+* Set NetSpeed designation.
+* @param boolean [$isFast] whether net speed should be fast or slow
+*/
+   public function setNetSpeed( $isFast=false ) {
+   if ( $isFast ) {
+   $this->netSpeed = self::NETSPEED_FAST;
+   } else {
+   $this->netSpeed = self::NETSPEED_SLOW;
+   }
+   $this->getRequest()->response()
+   ->setCookie( 'NetSpeed', $this->netSpeed, 0, array( 
'prefix' => '' ) );
+   }
+
+   /**
 * Whether the user is allowed to upload
 * @return boolean
 */
diff --git a/includes/specials/SpecialMobileOptions.php 
b/includes/specials/SpecialMobileOptions.php
index 2da4b37..ad6d033 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -114,6 +114,13 @@
'id' => 'enable-images-toggle',
);
 
+   $options['lowres'] = array(
+   'checked' => $context->getNetSpeed() === 
MobileContext::NETSPEED_SLOW ? 'checked' : '',
+   'label' => $this->msg( 
'mobile-frontend-settings-lowres' )->parse(),
+   'description' =>  $this->msg( 
'mobile-frontend-low-res-explain' )->parse(),
+   'name' => 'enableLowResImages',
+   );

[MediaWiki-commits] [Gerrit] s2-master now points to db1018 (instead of db1024) - change (operations/dns)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: s2-master now points to db1018 (instead of db1024)
..


s2-master now points to db1018 (instead of db1024)

After the s2-master has been switchover'd, point the dns entry to
the right host.
I am unsure how many services dependen on this (it should be no
one), only a pure help for humans, but this should be deployed
shortly after db1018 has been correctly promoted.

Bug: T125215
Change-Id: I6b6539996d4c6259714e4919e126720af0afbf0b
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index 4b85cae..e5242e6 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -37,7 +37,7 @@
 udplog  1H  IN CNAMEfluorine.eqiad.wmnet.
 deployment  1H  IN CNAMEmira.codfw.wmnet.
 s1-master   5M  IN CNAMEdb1052.eqiad.wmnet.
-s2-master   5M  IN CNAMEdb1024.eqiad.wmnet.
+s2-master   5M  IN CNAMEdb1018.eqiad.wmnet.
 s3-master   5M  IN CNAMEdb1038.eqiad.wmnet.
 s4-master   5M  IN CNAMEdb1040.eqiad.wmnet.
 s5-master   5M  IN CNAMEdb1058.eqiad.wmnet.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b6539996d4c6259714e4919e126720af0afbf0b
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
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] Add a keystone v3 call to determine role membership. - change (mediawiki...OpenStackManager)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Add a keystone v3 call to determine role membership.
..

Add a keystone v3 call to determine role membership.

This is much faster than the old v2-based process.

Depends-on: Id27639fb6928c9d565ad44aa6997929c44e2bf27
Bug: T115029
Change-Id: I6d11951937316877c883f1c2bb9c08087a814ddd
---
M OpenStackManager.php
M nova/OpenStackNovaController.php
M nova/OpenStackNovaRole.php
3 files changed, 44 insertions(+), 15 deletions(-)


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

diff --git a/OpenStackManager.php b/OpenStackManager.php
index e35bed1..28f009f 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -72,6 +72,7 @@
 
 // Keystone identity URI
 $wgOpenStackManagerNovaIdentityURI = 'http://localhost:5000/v2.0';
+$wgOpenStackManagerNovaIdentityV3URI = 'http://localhost:5000/v3';
 
 // SSH key storage location, ldap or nova
 $wgOpenStackManagerNovaKeypairStorage = 'ldap';
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index b297c5e..26b9e08 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -396,6 +396,31 @@
}
 
/**
+* @return array of arrays: role ID => role Names
+*/
+   function getRoleAssignmentsForProject( $projectid ) {
+   $admintoken = $this->_getAdminToken();
+   $headers = array( "X-Auth-Token: $admintoken" );
+
+   $assignments = array();
+
+   $ret = $this->restCall( 'identityv3', 
"/role_assignments?scope.project.id=$projectid", 'GET', array(), $headers );
+   $role_assignments = self::_get_property( $ret['body'], 
'role_assignments' );
+   if ( !$role_assignments ) {
+   return $assignments;
+   }
+   foreach ( $role_assignments as $assignment ) {
+   $role = self::_get_property( $assignment, 'role' );
+   $roleid = self::_get_property( $role, 'id' );
+   $user = self::_get_property( $assignment, 'user' );
+   $userid = self::_get_property( $user, 'id' );
+   $assignments[$roleid][] = $userid;
+   }
+   return $assignments;
+   }
+
+
+   /**
 * @return array role IDs => role Names
 */
function getRolesForProjectAndUser( $projectid, $userid ) {
@@ -1024,6 +1049,7 @@
function restCall( $service, $path, $method, $data = array(), 
$authHeaders='', $retrying=false ) {
global $wgAuth;
global $wgOpenStackManagerNovaIdentityURI;
+   global $wgOpenStackManagerNovaIdentityV3URI;
global $wgMemc;
 
if ( $authHeaders ) {
@@ -1037,6 +1063,8 @@
 
if ( $service === 'identity' ) {
$endpointURL = $wgOpenStackManagerNovaIdentityURI;
+   } elseif ( $service === 'identityv3' ) {
+   $endpointURL = $wgOpenStackManagerNovaIdentityV3URI;
} else {
$endpoints = $this->getEndpoints( $service );
foreach ( $endpoints as $endpoint ) {
diff --git a/nova/OpenStackNovaRole.php b/nova/OpenStackNovaRole.php
index 6d6d805..5166300 100644
--- a/nova/OpenStackNovaRole.php
+++ b/nova/OpenStackNovaRole.php
@@ -40,24 +40,24 @@
 */
function loadMembers() {
global $wgMemc;
-   $controller = OpenstackNovaProject::getController();
 
$roleid = $this->roleid;
-   $key = wfMemcKey( 'openstackmanager', "role-$roleid-members", 
$this->project->projectname );
-   $this->members = $wgMemc->get( $key );
 
-   if ( ! is_array( $this->members ) ) {
-   $this->members = array();
+   # This caches assignment for all roles in project, not just 
this one.  Should
+   #  save us a bit of time if we check another role later.
+   $key = wfMemcKey( 'openstackmanager', "role-assignments", 
$this->project->getId() );
+   $this->members = array();
+   $assignments = $wgMemc->get( $key );
 
-   # This isn't great -- Keystone doesn't have an API to 
list
-   #  members of a given role so we have to check 
potential members one by one
-   foreach ( $this->project->getMemberIds() as $userid ) {
-   $roles = 
$controller->getRolesForProjectAndUser( $this->project->getId(), $userid );
-   if ( in_array( $this->roleid, array_keys( 
$roles ) ) ) {
-   $this->members[] = 
$this->project->memberForUid( $userid );
- 

[MediaWiki-commits] [Gerrit] Added a v3 call to get projects for a given user. - change (mediawiki...OpenStackManager)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Added a v3 call to get projects for a given user.
..

Added a v3 call to get projects for a given user.

Depends-on: Id27639fb6928c9d565ad44aa6997929c44e2bf27
Bug: T115029
Change-Id: I081bc67ce1db128c8675879761341786c7ae717f
---
M nova/OpenStackNovaController.php
M nova/OpenStackNovaUser.php
2 files changed, 26 insertions(+), 11 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager 
refs/changes/65/269565/1

diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index 26b9e08..76dcd37 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -396,7 +396,30 @@
}
 
/**
-* @return array of arrays: role ID => role Names
+* @return array of projects ids
+*/
+   function getProjectsForUser( $userid ) {
+   $admintoken = $this->_getAdminToken();
+   $headers = array( "X-Auth-Token: $admintoken" );
+
+   $projects = array();
+   $ret = $this->restCall( 'identityv3', 
"/role_assignments?user.id=$userid", 'GET', array(), $headers );
+   $role_assignments = self::_get_property( $ret['body'], 
'role_assignments' );
+   if ( !$role_assignments ) {
+   return $projects;
+   }
+   foreach ( $role_assignments as $assignment ) {
+   $scope = self::_get_property( $assignment, 'scope' );
+   $project = self::_get_property( $scope, 'project' );
+   $projectid = self::_get_property( $project, 'id' );
+
+   $projects[] = $projectid;
+   }
+   return array_unique( $projects );
+   }
+
+   /**
+* @return array of arrays:  role ID => role Names
 */
function getRoleAssignmentsForProject( $projectid ) {
$admintoken = $this->_getAdminToken();
diff --git a/nova/OpenStackNovaUser.php b/nova/OpenStackNovaUser.php
index b4ae407..0e7a97f 100644
--- a/nova/OpenStackNovaUser.php
+++ b/nova/OpenStackNovaUser.php
@@ -159,16 +159,8 @@
 * @return array
 */
function getProjects() {
-   global $wgAuth;
-   global $wgOpenStackManagerLDAPProjectBaseDN;
-
-   $projects = array();
-   $allprojects = OpenStackNovaProject::getAllProjects();
-   foreach ( $allprojects as $project ) {
-   if ( in_array( $this->getUsername(), 
$project->getMembers() ) ) {
-   $projects[] = $project->getId();
-   }
-   }
+   $controller = OpenStackNovaProject::getController();
+   $projects = $controller->getProjectsForUser( $this->getUid() ) ;
return $projects;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I081bc67ce1db128c8675879761341786c7ae717f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 

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