[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Split common pre-setup code out of WebStart/doMaintenance

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373174 )

Change subject: Split common pre-setup code out of WebStart/doMaintenance
..


Split common pre-setup code out of WebStart/doMaintenance

Introduce PreConfigSetup.php, which is common file-scope code run before
LocalSettings.php.

I'm not maintaining autoload.ide.php since it supports closed source
software which I don't have, and it apparently needs significant work to
make it not be weird and hacky.

Change-Id: I44ac69b6b00a51d015546b9766d89d1c59749334
---
A includes/PreConfigSetup.php
M includes/WebStart.php
M maintenance/doMaintenance.php
3 files changed, 56 insertions(+), 45 deletions(-)

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



diff --git a/includes/PreConfigSetup.php b/includes/PreConfigSetup.php
new file mode 100644
index 000..bda7886
--- /dev/null
+++ b/includes/PreConfigSetup.php
@@ -0,0 +1,54 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ *
+ * @file
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+   // Not an entry point
+   exit( 1 );
+}
+
+// Grab profiling functions
+require_once "$IP/includes/profiler/ProfilerFunctions.php";
+
+// Start the autoloader, so that extensions can derive classes from core files
+require_once "$IP/includes/AutoLoader.php";
+
+// Load up some global defines.
+require_once "$IP/includes/Defines.php";
+
+// Start the profiler
+$wgProfiler = [];
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+   require "$IP/StartProfiler.php";
+}
+
+// Load default settings
+require_once "$IP/includes/DefaultSettings.php";
+
+// Load global functions
+require_once "$IP/includes/GlobalFunctions.php";
+
+// Load composer's autoloader if present
+if ( is_readable( "$IP/vendor/autoload.php" ) ) {
+   require_once "$IP/vendor/autoload.php";
+}
diff --git a/includes/WebStart.php b/includes/WebStart.php
index e281b6f..8a58e6f 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -59,31 +59,7 @@
$IP = realpath( '.' ) ?: dirname( __DIR__ );
 }
 
-# Grab profiling functions
-require_once "$IP/includes/profiler/ProfilerFunctions.php";
-
-# Start the autoloader, so that extensions can derive classes from core files
-require_once "$IP/includes/AutoLoader.php";
-
-# Load up some global defines.
-require_once "$IP/includes/Defines.php";
-
-# Start the profiler
-$wgProfiler = [];
-if ( file_exists( "$IP/StartProfiler.php" ) ) {
-   require "$IP/StartProfiler.php";
-}
-
-# Load default settings
-require_once "$IP/includes/DefaultSettings.php";
-
-# Load global functions
-require_once "$IP/includes/GlobalFunctions.php";
-
-# Load composer's autoloader if present
-if ( is_readable( "$IP/vendor/autoload.php" ) ) {
-   require_once "$IP/vendor/autoload.php";
-}
+require_once "$IP/includes/PreConfigSetup.php";
 
 # Assert that composer dependencies were successfully loaded
 # Purposely no leading \ due to it breaking HHVM RepoAuthorative mode
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 53a317a..e87e024 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -55,26 +55,7 @@
 // to $maintenance->mSelf. Keep that here for b/c
 $self = $maintenance->getName();
 
-# Start the autoloader, so that extensions can derive classes from core files
-require_once "$IP/includes/AutoLoader.php";
-# Grab profiling functions
-require_once "$IP/includes/profiler/ProfilerFunctions.php";
-
-# Start the profiler
-$wgProfiler = [];
-if ( file_exists( "$IP/StartProfiler.php" ) ) {
-   require "$IP/StartProfiler.php";
-}
-
-// Some other requires
-require_once "$IP/includes/Defines.php";
-require_once "$IP/includes/DefaultSettings.php";
-require_once "$IP/includes/GlobalFunctions.php";
-
-# Load composer's autoloader if present
-if ( is_readable( "$IP/vendor/autoload.php" ) ) {
-   require_once "$IP/vendor/autoload.php";
-}
+require_once "$IP/includes/PreConfigSetup.php";
 
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
# Use a callback function to configure MediaWiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44ac69b6b00a51d015546b9766d89d1c59749334
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Remove hardcoded cxserver /translate API url

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373178 )

Change subject: Remove hardcoded cxserver /translate API url
..

Remove hardcoded cxserver /translate API url

Use the sitemapper module for doing cxserver request.

We need move these methods from mw.cx.ui.TranslationView to a better
place as next step.

Change-Id: Idf2bd169f2bd9b890472c8615fb0a775469e60b4
---
M modules/ui/mw.cx.ui.TranslationView.js
1 file changed, 76 insertions(+), 6 deletions(-)


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

diff --git a/modules/ui/mw.cx.ui.TranslationView.js 
b/modules/ui/mw.cx.ui.TranslationView.js
index 59e04c0..eebe74f 100644
--- a/modules/ui/mw.cx.ui.TranslationView.js
+++ b/modules/ui/mw.cx.ui.TranslationView.js
@@ -1,4 +1,5 @@
 'use strict';
+
 /**
  * TranslationView
  *
@@ -366,14 +367,83 @@
 
 };
 
+/**
+ * Translate and adapt the given source section
+ * @param {string} source Source html content
+ * @return {jQuery.Promise}
+ */
 mw.cx.ui.TranslationView.prototype.translate = function ( source ) {
-   return $.ajax( {
-   method: 'POST',
-   contentType: 'application/x-www-form-urlencoded',
-   // TODO hardcoded
-   url: 'http://localhost:8080/v1/translate/en/es/Apertium',
-   data: { html: source }
+   var translateURL;
+
+   translateURL = this.config.siteMapper.getCXServerUrl( 
'/translate/$from/$to', {
+   $from: this.config.sourceLanguage,
+   $to: this.config.targetLanguage
+   // $provider: this.provider // TOOD: Pass the MT provider, else 
default will be used
} );
+
+   return this.getCXServerToken().then( function ( token ) {
+   return $.ajax( {
+   type: 'post',
+   url: translateURL,
+   headers: {
+   Authorization: token
+   },
+   data: { html: source }
+   } );
+   } );
+};
+
+mw.cx.ui.TranslationView.static.cxserverToken = {
+   expires: undefined,
+   jwt: undefined,
+   promise: undefined
+};
+
+/**
+ * Fetch token for authentication with cxserver.
+ *
+ * @return {jQuery.Promise}
+ */
+mw.cx.ui.TranslationView.prototype.getCXServerToken = function () {
+   var now = Math.floor( Date.now() / 1000 ),
+   cxserverToken = mw.cx.ui.TranslationView.static.cxserverToken;
+
+   // If request in progress, wait for it
+   if ( cxserverToken.promise ) {
+   return cxserverToken.promise;
+   }
+
+   // Return cached token if fresh and not expiring soon.
+   // And hope that client clock is at correct time.
+   if (
+   cxserverToken.expires !== undefined &&
+   cxserverToken.expires + 5 < now
+   ) {
+   return $.Deferred().resolve( cxserverToken.jwt );
+   }
+
+   // (Re-)fetch cxserver token
+   cxserverToken.promise = ( new mw.Api() )
+   .postWithToken( 'csrf', {
+   action: 'cxtoken'
+   } )
+   .always( function () {
+   cxserverToken.promise = undefined;
+   } )
+   .then( function ( response ) {
+   cxserverToken.jwt = response.jwt;
+   cxserverToken.expires = response.exp;
+
+   return response.jwt;
+   },
+   // Not all MT services require token, so let the caller try
+   // with empty token to see if it fails.
+   function () {
+   return $.Deferred().resolve( '' );
+   }
+   );
+
+   return cxserverToken.promise;
 };
 
 mw.cx.ui.TranslationView.prototype.showCategories = function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf2bd169f2bd9b890472c8615fb0a775469e60b4
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] mediawiki...codesniffer[master]: Require only one class/interface/trait per file

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372916 )

Change subject: Require only one class/interface/trait per file
..


Require only one class/interface/trait per file

This is in preparation of PSR-4 compliance.

In a few places our test suite uses multiple classes in the same file,
so just list those errors in the .expect file since it's not worth
fixing them.

Bug: T173798
Change-Id: I385b8758cc15171ed925df417304669bb6b0f9e6
---
M MediaWiki/Tests/files/Commenting/commenting_function.php.expect
M MediaWiki/Tests/files/Usage/extend_class_usage.php.expect
M MediaWiki/Tests/files/WhiteSpace/space_before_class_brace.php.expect
M MediaWiki/ruleset.xml
4 files changed, 60 insertions(+), 32 deletions(-)

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



diff --git a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect 
b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
index 46f702c..43aa70d 100644
--- a/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
+++ b/MediaWiki/Tests/files/Commenting/commenting_function.php.expect
@@ -1,32 +1,37 @@
-  5 | ERROR | [ ] Missing function doc comment
-|   | 
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
-  9 | ERROR | [ ] Missing function doc comment
-|   | 
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
- 16 | ERROR | [ ] Missing @return tag in function comment
-|   | (MediaWiki.Commenting.FunctionComment.MissingReturn)
- 22 | ERROR | [x] Expected 1 spaces after parameter name; 2 found
-|   | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
- 23 | ERROR | [x] Expected 1 spaces after parameter name; 3 found
-|   | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
- 31 | ERROR | [x] Short type of "bool" should be used for @param tag
-|   | (MediaWiki.Commenting.FunctionComment.NotShortBoolParam)
- 32 | ERROR | [x] Short type of "int" should be used for @param tag
-|   | (MediaWiki.Commenting.FunctionComment.NotShortIntParam)
- 33 | ERROR | [x] Short type of "bool" should be used for @return tag
-|   | (MediaWiki.Commenting.FunctionComment.NotShortBoolReturn)
- 40 | ERROR | [x] Short type of "int" should be used for @return tag
-|   | (MediaWiki.Commenting.FunctionComment.NotShortIntReturn)
- 49 | ERROR | [ ] Missing @return tag in function comment
-|   | (MediaWiki.Commenting.FunctionComment.MissingReturn)
- 59 | ERROR | [ ] Missing parameter comment
-|   | (MediaWiki.Commenting.FunctionComment.MissingParamComment)
- 59 | ERROR | [x] Short type of "bool" should be used for @param tag
-|   | (MediaWiki.Commenting.FunctionComment.NotShortBoolParam)
- 60 | ERROR | [ ] Missing parameter comment
-|   | (MediaWiki.Commenting.FunctionComment.MissingParamComment)
- 60 | ERROR | [x] Short type of "int" should be used for @param tag
-|   | (MediaWiki.Commenting.FunctionComment.NotShortIntParam)
- 61 | ERROR | [x] Short type of "bool" should be used for @return tag
-|   | (MediaWiki.Commenting.FunctionComment.NotShortBoolReturn)
-
+   5 | ERROR | [ ] Missing function doc comment
+ |   | 
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
+   9 | ERROR | [ ] Missing function doc comment
+ |   | 
(MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic)
+  16 | ERROR | [ ] Missing @return tag in function comment
+ |   | (MediaWiki.Commenting.FunctionComment.MissingReturn)
+  22 | ERROR | [x] Expected 1 spaces after parameter name; 2 found
+ |   | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
+  23 | ERROR | [x] Expected 1 spaces after parameter name; 3 found
+ |   | (MediaWiki.Commenting.FunctionComment.SpacingAfterParamName)
+  31 | ERROR | [x] Short type of "bool" should be used for @param tag
+ |   | (MediaWiki.Commenting.FunctionComment.NotShortBoolParam)
+  32 | ERROR | [x] Short type of "int" should be used for @param tag
+ |   | (MediaWiki.Commenting.FunctionComment.NotShortIntParam)
+  33 | ERROR | [x] Short type of "bool" should be used for @return
+ |   | tag
+ |   | (MediaWiki.Commenting.FunctionComment.NotShortBoolReturn)
+  40 | ERROR | [x] Short type of "int" should be used for @return tag
+ |   | (MediaWiki.Commenting.FunctionComment.NotShortIntReturn)
+  49 | ERROR | [ ] Missing @return tag in function comment
+ |   | (MediaWiki.Commenting.FunctionComment.MissingReturn)
+  59 | ERROR | [ ] Missing parameter comment
+ |   | (MediaWiki.Commenting.FunctionComment.MissingParamComment)
+  59 | ERROR | [x] Short type of "bool" should be used 

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Make it easier to figure out which test failed

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372915 )

Change subject: Make it easier to figure out which test failed
..


Make it easier to figure out which test failed

Setting a string key results in output like:
 MediaWikiStandardTest::testFile with data set
 "space_before_class_brace.php"

See 


Change-Id: Ia2094447b784945d5aa1195e4a541e124cf3f6ad
---
M MediaWiki/Tests/MediaWikiStandardTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index 2ceb11e..4d0398f 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -65,7 +65,7 @@
if ( substr( $file, -4 ) !== '.php' ) {
continue;
}
-   $tests[] = [
+   $tests[$dir->getFilename()] = [
$file,
$standard,
"$file.expect"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2094447b784945d5aa1195e4a541e124cf3f6ad
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/tools/codesniffer
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: shiladsen shell: try RSA key instead, add expiry

[Jeremyb (Code Review)]

Jeremyb has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373177 )

Change subject: shiladsen shell: try RSA key instead, add expiry
..

shiladsen shell: try RSA key instead, add expiry

Bug: T171988
Change-Id: Ibe9d0e6c9898ceea1a0004a23dc7565194a58337
---
M modules/admin/data/data.yaml
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/373177/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 5437e15..033b5b4 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2542,9 +2542,11 @@
 name: shiladsen
 realname: Shilad Sen
 ssh_keys:
-  - ssh-dss 
B3NzaC1kc3MAAACBAKBspbywXptKB4djp8jYjfk0fAQUAhsEM03zvRhuCpIwB5BYQl2mIeIwADHqM5DA0plGtFZLLwZvFR/LpHIiK3zcDuvz5N6LBkTulKQ5TrjnMkAeTk1SA900u6jCoKitF7j6ZO3Q4diLgFSY5F4EJI80GiWkOx+JAnzhS3kHbkibFQDzFcnzFRA7bawBb0ZVhCYDU2v+2wAAAIBzWSGg2rEvV0UT+cDzGZMl6LGWT+3oC1pJviW8vilOhIKvdbXYeQeGpqpJjxZToN/5Ok+P0kAMNTacdPWyYiDDepb+zgB9tbW+DPB3HgH2y6u7SMNWnOXK+C9VAT62LEX4zQsD41NC3kMijDjLuAzAkyKPAVmgtFWCXpYDDU/+zgAAAIAW66EVt/6tp7o6GlfU3TS3JnYLA3cFzWqmbuHuV2dFhW3h7OAbmCRivhOVuhJuu56C/AJeKdGzIA10p/eo39YXUX3iOjUTO8/YFFAAnh9m4Fb1YDTMG3JzwBi8jT6r8iOm9414ITX48y9zzD3smXku3o3At/w5Up6rl/lDeywI4g==
 a558989@600308a4c4c6
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDrSCbT7GL3eYqdIISBaajhusTPvXhd/sK3ANdU46qzIbvRADGJjB1/OAIbq8NlWChv8RV2ahA409tphVJl2cKmu6a8++V4s1K73yLuASJR3t5q6M3vfZqHEncR6nPLc6aO5S8Vc76cV4DFFfeW83M5F4d43AvunRnzXakFODdWwwFtyqRHyc5eHUf++X2E8ghZ66MKOQ+9Q0RoBL+9d2vQvk5IFDR7FahIFX8eR5jNIQOQ9nf517IDQ8c2dt5+3MrZC+rux384txKsFV3ytJmctxlqaDJeLFRHweumNrE8pSYif+MfZNM6QLPW8kSjifZBekrWL2smdk5RncORbd5j
 a558989@600308a4c4c6
 uid: 10339
 email: shi...@gmail.com
+expiry_date: 2017-11-30
+expiry_contact: ahalfa...@wikimedia.org
 
 ldap_only_users:
   abartov:

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: CRM-20658: Fatal error on Dedupe rule for > 1 match

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373176 )

Change subject: CRM-20658: Fatal error on Dedupe rule for > 1 match
..

CRM-20658: Fatal error on Dedupe rule for > 1 match

Bug: T160571
Change-Id: Ib735f997952c9edf5393464255da3e228e837ce7
---
M CRM/Dedupe/BAO/RuleGroup.php
1 file changed, 18 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/76/373176/1

diff --git a/CRM/Dedupe/BAO/RuleGroup.php b/CRM/Dedupe/BAO/RuleGroup.php
index 5e4096a..87861b9 100644
--- a/CRM/Dedupe/BAO/RuleGroup.php
+++ b/CRM/Dedupe/BAO/RuleGroup.php
@@ -229,20 +229,35 @@
   $fieldWeight = array_keys($tableQueries);
   $fieldWeight = $fieldWeight[0];
   $query = array_shift($tableQueries);
+  $dupeWeightClause = 'ON DUPLICATE KEY UPDATE weight = weight + 
VALUES(weight)';
 
   if ($searchWithinDupes) {
 // get prepared to search within already found dupes if 
$searchWithinDupes flag is set
 $dao->query("DROP TEMPORARY TABLE IF EXISTS dedupe_copy");
 $dao->query("CREATE TEMPORARY TABLE dedupe_copy SELECT * FROM 
dedupe WHERE weight >= {$weightSum}");
-$dao->free();
 
 preg_match($patternColumn, $query, $matches);
-$query = str_replace(' WHERE ', str_replace('column', $matches[1], 
$dupeCopyJoin), $query);
+$count = substr_count($query, ' WHERE ');
+if ($count == 2 && strpos($query, 'UNION') !== FALSE) {
+  //Create second copy as single temp table cannot be referred 
twice in a single query.
+  $dao->query("CREATE TEMPORARY TABLE dedupe_copy_2 SELECT * FROM 
dedupe WHERE weight >= {$weightSum}");
+  $dupeCopyJoins = array($dupeCopyJoin, str_replace('dedupe_copy', 
'dedupe_copy_2', $dupeCopyJoin));
+  $queryArray = explode('UNION', $query);
+  foreach ($queryArray as $key => $value) {
+$queryArray[$key] = str_replace(' WHERE ', 
str_replace('column', $matches[1], $dupeCopyJoins[$key]), $queryArray[$key]);
+  }
+  $query = implode(' UNION ', $queryArray);
+  $dupeWeightClause = str_replace('weight', 'dedupe.weight', 
$dupeWeightClause);
+}
+else {
+  $query = str_replace(' WHERE ', str_replace('column', 
$matches[1], $dupeCopyJoin), $query);
+}
+$dao->free();
   }
   $searchWithinDupes = 1;
 
   // construct and execute the intermediate query
-  $query = "{$insertClause} {$query} {$groupByClause} ON DUPLICATE KEY 
UPDATE weight = weight + VALUES(weight)";
+  $query = "{$insertClause} {$query} {$groupByClause} 
{$dupeWeightClause}";
   $dao->query($query);
 
   // FIXME: we need to be more acurate with affected rows, especially 
for insert vs duplicate insert.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib735f997952c9edf5393464255da3e228e837ce7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
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] wikidata...gui[master]: ignore intelij idea project files

[Yurik (Code Review)]

Yurik has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373175 )

Change subject: ignore intelij idea project files
..

ignore intelij idea project files

Change-Id: Ifb072e558ae9affb7a6551220b9f5570a65e7611
---
M .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 6e0167e..3433e74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 build
 .idea
 package-lock.json
+*.iml

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb072e558ae9affb7a6551220b9f5570a65e7611
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
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] mediawiki/core[master]: Split common pre-setup code out of WebStart/doMaintenance

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373174 )

Change subject: Split common pre-setup code out of WebStart/doMaintenance
..

Split common pre-setup code out of WebStart/doMaintenance

Introduce PreConfigSetup.php, which is common file-scope code run before
LocalSettings.php.

I'm not maintaining autoload.ide.php since it supports closed source
software which I don't have, and it apparently needs significant work to
make it not be weird and hacky.

Change-Id: I44ac69b6b00a51d015546b9766d89d1c59749334
---
A includes/PreConfigSetup.php
M includes/WebStart.php
M maintenance/doMaintenance.php
3 files changed, 58 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/373174/1

diff --git a/includes/PreConfigSetup.php b/includes/PreConfigSetup.php
new file mode 100644
index 000..823c821
--- /dev/null
+++ b/includes/PreConfigSetup.php
@@ -0,0 +1,56 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ *
+ * @file
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+   // Not an entry point
+   exit( 1 );
+}
+
+// Grab profiling functions
+require_once "$IP/includes/profiler/ProfilerFunctions.php";
+
+// Start the autoloader, so that extensions can derive classes from core files
+require_once "$IP/includes/AutoLoader.php";
+
+// Load up some global defines.
+require_once "$IP/includes/Defines.php";
+
+// Start the profiler
+$wgProfiler = [];
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+   require "$IP/StartProfiler.php";
+}
+
+// Load default settings
+require_once "$IP/includes/DefaultSettings.php";
+
+// Load global functions
+require_once "$IP/includes/GlobalFunctions.php";
+
+// Load composer's autoloader if present
+if ( is_readable( "$IP/vendor/autoload.php" ) ) {
+   require_once "$IP/vendor/autoload.php";
+}
+
+
diff --git a/includes/WebStart.php b/includes/WebStart.php
index e281b6f..8a58e6f 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -59,31 +59,7 @@
$IP = realpath( '.' ) ?: dirname( __DIR__ );
 }
 
-# Grab profiling functions
-require_once "$IP/includes/profiler/ProfilerFunctions.php";
-
-# Start the autoloader, so that extensions can derive classes from core files
-require_once "$IP/includes/AutoLoader.php";
-
-# Load up some global defines.
-require_once "$IP/includes/Defines.php";
-
-# Start the profiler
-$wgProfiler = [];
-if ( file_exists( "$IP/StartProfiler.php" ) ) {
-   require "$IP/StartProfiler.php";
-}
-
-# Load default settings
-require_once "$IP/includes/DefaultSettings.php";
-
-# Load global functions
-require_once "$IP/includes/GlobalFunctions.php";
-
-# Load composer's autoloader if present
-if ( is_readable( "$IP/vendor/autoload.php" ) ) {
-   require_once "$IP/vendor/autoload.php";
-}
+require_once "$IP/includes/PreConfigSetup.php";
 
 # Assert that composer dependencies were successfully loaded
 # Purposely no leading \ due to it breaking HHVM RepoAuthorative mode
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 53a317a..e87e024 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -55,26 +55,7 @@
 // to $maintenance->mSelf. Keep that here for b/c
 $self = $maintenance->getName();
 
-# Start the autoloader, so that extensions can derive classes from core files
-require_once "$IP/includes/AutoLoader.php";
-# Grab profiling functions
-require_once "$IP/includes/profiler/ProfilerFunctions.php";
-
-# Start the profiler
-$wgProfiler = [];
-if ( file_exists( "$IP/StartProfiler.php" ) ) {
-   require "$IP/StartProfiler.php";
-}
-
-// Some other requires
-require_once "$IP/includes/Defines.php";
-require_once "$IP/includes/DefaultSettings.php";
-require_once "$IP/includes/GlobalFunctions.php";
-
-# Load composer's autoloader if present
-if ( is_readable( "$IP/vendor/autoload.php" ) ) {
-   require_once "$IP/vendor/autoload.php";
-}
+require_once "$IP/includes/PreConfigSetup.php";
 
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
# Use a callback function to configure MediaWiki

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44ac69b6b00a51d015546b9766d89d1c59749334
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Towards CRM-20155 clean up form code in order to consolidate...

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373173 )

Change subject: Towards CRM-20155 clean up form code in order to consolidate 
function use.
..

Towards CRM-20155 clean up form code in order to consolidate function use.

PR https://github.com/civicrm/civicrm-core/pull/10890

The code in the Find and Merge Duplicate Contacts form has mystified me for 
along time. As a step towards extracting
dedupe code into separate extension/s I have gone through & tidied up the 
finding of duplicates to re-use a function
used elsewhere rather than duplicate it on the form. In the process I tried, 
and failed, to come up with
a rationale for the duplicate form catching represented in setting form 
properties.

Note that I made the  parameter explicit. I am expecting this to be a URL 
paramter in the future
(currently deploying that to our site as such in the context of being able to 
find matches for specfic contacts.
I felt making it explicit now would aid in not missing instances of it when 
patching later

Change-Id: I694d71570db9f70406c30769b5ee9457305c25c8
---
M CRM/Contact/Form/Task/Merge.php
M CRM/Contact/Page/DedupeFind.php
M CRM/Dedupe/Merger.php
3 files changed, 41 insertions(+), 71 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/73/373173/1

diff --git a/CRM/Contact/Form/Task/Merge.php b/CRM/Contact/Form/Task/Merge.php
index d0f0abd..9bbdf4e 100644
--- a/CRM/Contact/Form/Task/Merge.php
+++ b/CRM/Contact/Form/Task/Merge.php
@@ -33,7 +33,6 @@
 
 /**
  * This class provides the functionality to Merge contacts.
- *
  */
 class CRM_Contact_Form_Task_Merge extends CRM_Contact_Form_Task {
 
diff --git a/CRM/Contact/Page/DedupeFind.php b/CRM/Contact/Page/DedupeFind.php
index 012529f..5b09ef6 100644
--- a/CRM/Contact/Page/DedupeFind.php
+++ b/CRM/Contact/Page/DedupeFind.php
@@ -61,7 +61,19 @@
 $action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 0);
 $context = CRM_Utils_Request::retrieve('context', 'String', $this);
 $limit = CRM_Utils_Request::retrieve('limit', 'Integer', $this);
-$rgid = CRM_Utils_Request::retrieve('rgid', 'Positive');
+$rgid = CRM_Utils_Request::retrieve('rgid', 'Positive', $this);
+$cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, FALSE, 0);
+// Using a placeholder for criteria as it is intended to be able to pass 
this later.
+$criteria = array();
+$isConflictMode = ($context == 'conflicts');
+if ($cid) {
+  $this->_cid = $cid;
+}
+if ($gid) {
+  $this->_gid = $gid;
+}
+$this->_rgid = $rgid;
+
 $urlQry = array(
   'reset' => 1,
   'rgid' => $rgid,
@@ -78,14 +90,14 @@
 if ($action & CRM_Core_Action::RENEW) {
   // empty cache
   if ($rgid) {
-CRM_Core_BAO_PrevNextCache::deleteItem(NULL, 
CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid));
+CRM_Core_BAO_PrevNextCache::deleteItem(NULL, 
CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, $criteria));
   }
   $urlQry['action'] = 'update';
   
CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', 
$urlQry));
 }
 elseif ($action & CRM_Core_Action::MAP) {
   // do a batch merge if requested
-  $result = CRM_Dedupe_Merger::batchMerge($rgid, $gid, 'safe', 75);
+  $result = CRM_Dedupe_Merger::batchMerge($rgid, $gid, 'safe', 75, 2, 
$criteria);
 
   $skippedCount = CRM_Utils_Request::retrieve('skipped', 'Positive', 
$this, FALSE, 0);
   $skippedCount = $skippedCount + count($result['skipped']);
@@ -123,18 +135,17 @@
 if ($action & CRM_Core_Action::UPDATE ||
   $action & CRM_Core_Action::BROWSE
 ) {
-  $cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this, FALSE, 0);
   $this->action = CRM_Core_Action::UPDATE;
 
   $urlQry['snippet'] = 4;
-  if ($context == 'conflicts') {
+  if ($isConflictMode) {
 $urlQry['selected'] = 1;
   }
 
   $this->assign('sourceUrl', 
CRM_Utils_System::url('civicrm/ajax/dedupefind', $urlQry, FALSE, NULL, FALSE));
 
   //reload from cache table
-  $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid);
+  $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, 
$criteria);
 
   $stats = CRM_Dedupe_Merger::getMergeStatsMsg($cacheKeyString);
   if ($stats) {
@@ -142,80 +153,37 @@
 // reset so we not displaying same message again
 CRM_Dedupe_Merger::resetMergeStats($cacheKeyString);
   }
-  $join = CRM_Dedupe_Merger::getJoinOnDedupeTable();
-  $where = "de.id IS NULL";
-  if ($context == 'conflicts') {
-$where .= " AND pn.is_selected = 1";
-  }
-  $this->_mainContacts = 
CRM_Core_BAO_PrevNextCache::retrieve($cacheKeyString, $join, $where);
+
+  $this->_mainContacts = CRM_Dedupe_Merger::getDuplicatePairs($rgid, 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add a log channel for LoginNotify

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373172 )

Change subject: Add a log channel for LoginNotify
..

Add a log channel for LoginNotify

Bug: T173888
Change-Id: I1e521bd92ff7d87e4380a9e65a28bf9e319a0de1
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 93037ca..89ddca8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5205,7 +5205,8 @@
'DBTransaction' => 'debug',
'DBReplication' => 'warning',
'DBConnection' => 'error',
-   'DBQuery' => 'warning'
+   'DBQuery' => 'warning',
+   'LoginNotify' => 'debug',
],
 
'+private' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e521bd92ff7d87e4380a9e65a28bf9e319a0de1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] operations/mediawiki-config[master]: WIP (DO NOT MERGE): pagePreviews: remove invalidated popup s...

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373171 )

Change subject: WIP (DO NOT MERGE): pagePreviews: remove invalidated popup 
sampling rate variables
..

WIP (DO NOT MERGE): pagePreviews: remove invalidated popup sampling rate 
variables

The page preview sampling rate configurations for the schema and
anonymous users no longer seems necessary after 100% roll-out.

Bug: T171853
Change-Id: Icf87741cc8f03a4dd947b659422e7856c56de44f
---
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 41 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index c20bd91..e37538c 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -560,9 +560,6 @@
],
 
// To allow us to test EventLogging in the beta cluster we log 
all events
-   'wgPopupsSchemaSamplingRate' => [
-   'default' => 1,
-   ],
'wgPopupsStatsvSamplingRate' => [
'default' => 1,
],
@@ -579,9 +576,6 @@
],
'wmgPopupsBetaFeature' => [
'default' => false,
-   ],
-   'wgPopupsAnonsEnabledSamplingRate' => [
-   'default' => 1,
],
 
'wmgUseCollaborationKit' => [
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 93037ca..c3302b0 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13572,20 +13572,6 @@
'Special:CiteThisPage',
],
 ],
-'wgPopupsAnonsEnabledSamplingRate' => [
-   'default' => 0,
-   'sewikimedia' => 1, // T68374
-
-   // T136602: Make Page Previews enabled by default for 90% of anon users 
for
-   // the stage 0 wikis.
-   'pp_stage0' => 0.9,
-
-   // T162672: Make Page Previews enabled by default for the stage 1 wikis.
-   'pp_stage1' => 1,
-
-   'enwiki' => 0,
-   'dewiki' => 0,
-],
 
 'wmgPopupsBetaFeature' => [
'default' => true,
@@ -13610,27 +13596,6 @@
 
'enwiki' => true,
'dewiki' => true,
-],
-
-   // Careful! This value should not be increased without coordination 
with the
-   // Operations and/or Analytics teams. At the very least, be mindful of 
the
-   // current rate of Popups events being logged:
-   // 
https://grafana.wikimedia.org/dashboard/db/eventlogging-schema?var-schema=Popups
-'wgPopupsSchemaSamplingRate' => [
-   'default' => 0.000,
-
-   'pp_stage0' => 0.001,
-
-   // T171325: Increase the per-session sampling rate of the Page Previews
-   // EventLogging instrumentation to 1% of all distinct browser sessions 
so
-   // that analysis of the stage 0 test can be completed in a reasonable 
amount
-   // of time.
-   'itwiki' => 0.01,
-   'huwiki' => 0.01,
-   'ruwiki' => 0.01,
-
-   'enwiki' => 0,
-   'dewiki' => 0,
 ],
 
 'wgPopupsStatsvSamplingRate' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf87741cc8f03a4dd947b659422e7856c56de44f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Log the heck out of everything

[MaxSem (Code Review)]

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373170 )

Change subject: Log the heck out of everything
..

Log the heck out of everything

Bug: T173888
Change-Id: I6cd0a8f953fd823d33bba60df3b9dcfe51d4b4a3
---
M includes/LoginNotify.php
1 file changed, 38 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify 
refs/changes/70/373170/1

diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index 91a1938..df8217a 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -134,11 +134,16 @@
 */
private function isKnownSystemFast( User $user, WebRequest $request ) {
$result = $this->userIsInCookie( $user, $request );
-   if ( $result === self::USER_KNOWN ) {
-   return $result;
+
+   if ( $result !== self::USER_KNOWN ) {
+   $result = $this->mergeResults( $result, 
$this->userIsInCache( $user, $request ) );
}
 
-   $result = $this->mergeResults( $result, $this->userIsInCache( 
$user, $request ) );
+   $this->log->debug( 'Checking cookies and cache for {user}: 
{result}', [
+   'function' => __METHOD__,
+   'user' => $user->getName(),
+   'result' => $result,
+   ] );
 
return $result;
}
@@ -408,6 +413,13 @@
public function setCurrentAddressAsKnown( User $user ) {
$this->cacheLoginIP( $user );
$this->setLoginCookie( $user );
+
+   $this->log->debug( 'Recording user {user} as known',
+   [
+   'function' => __METHOD__,
+   'user' => $user->getName(),
+   ]
+   );
}
 
/**
@@ -456,10 +468,13 @@
 
// FIXME, does this really make sense?
if ( $cookie === '' ) {
-   return self::USER_NO_INFO;
+   $result = self::USER_NO_INFO;
+   } else {
+   list( $userKnown, ) = $this->checkAndGenerateCookie( 
$user, $cookie );
+   $result = $userKnown ? self::USER_KNOWN : 
self::USER_NOT_KNOWN;
}
-   list( $userKnown, ) = $this->checkAndGenerateCookie( $user, 
$cookie );
-   return $userKnown ? self::USER_KNOWN : self::USER_NOT_KNOWN;
+
+   return $result;
}
 
/**
@@ -665,6 +680,14 @@
'extra' => $extra,
'agent' => $user,
] );
+
+   $this->log->info( 'Sending a {type} notification to {user}',
+   [
+   'function' => __METHOD__,
+   'type' => $type,
+   'user' => $user->getName(),
+   ]
+   );
}
 
/**
@@ -788,6 +811,15 @@
]
);
JobQueueGroup::singleton()->lazyPush( $job );
+
+   $this->log->debug( 'Login {status}, creating a job to verify 
{user}, result so far: {result}',
+   [
+   'function' => __METHOD__,
+   'status' => $type,
+   'user' => $user->getName(),
+   'result' => $resultSoFar,
+   ]
+   );
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cd0a8f953fd823d33bba60df3b9dcfe51d4b4a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
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] mediawiki...Cargo[master]: Replace deprecated UnknownAction with $wgActions

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373168 )

Change subject: Replace deprecated UnknownAction with $wgActions
..


Replace deprecated UnknownAction with $wgActions

Change-Id: I3f8906335de314d1b57bc894c274bc0f09a41773
---
M Cargo.php
M CargoPageValuesAction.php
M CargoRecreateDataAction.php
M extension.json
4 files changed, 21 insertions(+), 33 deletions(-)

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



diff --git a/Cargo.php b/Cargo.php
index e5e5508..f99caea 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -56,9 +56,7 @@
 // 'SkinTemplateNavigation' replaced 'SkinTemplateTabs' in the Vector skin
 $wgHooks['SkinTemplateTabs'][] = 'CargoRecreateDataAction::displayTab';
 $wgHooks['SkinTemplateNavigation'][] = 'CargoRecreateDataAction::displayTab2';
-$wgHooks['UnknownAction'][] = 'CargoRecreateDataAction::show';
 $wgHooks['BaseTemplateToolbox'][] = 'CargoPageValuesAction::addLink';
-$wgHooks['UnknownAction'][] = 'CargoPageValuesAction::show';
 $wgHooks['SkinTemplateNavigation'][] = 'CargoHooks::addPurgeCacheTab';
 $wgHooks['PageForms::TemplateFieldStart'][] = 
'CargoHooks::addTemplateFieldStart';
 $wgHooks['PageForms::TemplateFieldEnd'][] = 'CargoHooks::addTemplateFieldEnd';
@@ -158,6 +156,10 @@
 $wgAutoloadClasses['CargoDrilldownHierarchy'] = $dir . 
'/drilldown/CargoDrilldownHierarchy.php';
 $wgSpecialPages['Drilldown'] = 'CargoDrilldown';
 
+// Actions
+$wgActions['recreatedata'] = 'CargoRecreateDataAction';
+$wgActions['pagevalues'] = 'CargoPageValuesAction';
+
 // User rights
 $wgAvailableRights[] = 'recreatecargodata';
 $wgGroupPermissions['sysop']['recreatecargodata'] = true;
diff --git a/CargoPageValuesAction.php b/CargoPageValuesAction.php
index fec6771..693943b 100644
--- a/CargoPageValuesAction.php
+++ b/CargoPageValuesAction.php
@@ -6,7 +6,7 @@
  * @ingroup Cargo
  */
 
-class CargoPageValuesAction {
+class CargoPageValuesAction extends Action {
/**
 * Return the name of the action this object responds to
 * @return String lowercase
@@ -20,16 +20,10 @@
 * to the context output.
 * $this->getOutput(), etc.
 */
-   public static function show( $action, Article $article ) {
-   $title = $article->getTitle();
-
-   if ( $action == 'pagevalues' ) {
-   $pageValuesPage = new CargoPageValues( $title );
-   $pageValuesPage->execute();
-   return false;
-   }
-
-   return true;
+   public function show() {
+   $title = $this->page->getTitle();
+   $pageValuesPage = new CargoPageValues( $title );
+   $pageValuesPage->execute();
}
 
/**
diff --git a/CargoRecreateDataAction.php b/CargoRecreateDataAction.php
index cbabf5e..be5a22f 100644
--- a/CargoRecreateDataAction.php
+++ b/CargoRecreateDataAction.php
@@ -16,16 +16,12 @@
}
 
/**
-* The main action entry point. Do all output for display and send it 
to the context
-* output.
+* The main action entry point. Do all output for display and send it
+* to the context output.
 * $this->getOutput(), etc.
-*
-* @param string $action
-* @param Article $article
-* @return boolean
 */
-   public static function show( $action, Article $article ) {
-   $title = $article->getTitle();
+   public function show() {
+   $title = $this->page->getTitle();
 
// These tabs should only exist for template pages, that
// either call (or called) #cargo_declare, or call
@@ -33,16 +29,12 @@
list( $tableName, $isDeclared ) = 
CargoUtils::getTableNameForTemplate( $title );
 
if ( $tableName == '' ) {
-   return true;
+   // @TODO - display an error message here.
+   return;
}
 
-   if ( $action == 'recreatedata' ) {
-   $recreateDataPage = new CargoRecreateData( $title, 
$tableName, $isDeclared );
-   $recreateDataPage->execute();
-   return false;
-   }
-
-   return true;
+   $recreateDataPage = new CargoRecreateData( $title, $tableName, 
$isDeclared );
+   $recreateDataPage->execute();
}
 
/**
diff --git a/extension.json b/extension.json
index 442d6f6..c20b440 100755
--- a/extension.json
+++ b/extension.json
@@ -227,6 +227,10 @@
"localBasePath": "",
"remoteExtPath": "Cargo"
},
+   "Actions": {
+   "recreatedata": "CargoRecreateDataAction",
+   "pagevalues": "CargoPageValuesAction"
+   },
"Hooks": {
"ParserFirstCallInit": [

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Replace deprecated UnknownAction with $wgActions

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373168 )

Change subject: Replace deprecated UnknownAction with $wgActions
..

Replace deprecated UnknownAction with $wgActions

Change-Id: I3f8906335de314d1b57bc894c274bc0f09a41773
---
M Cargo.php
M CargoPageValuesAction.php
M CargoRecreateDataAction.php
M extension.json
4 files changed, 21 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/68/373168/2

diff --git a/Cargo.php b/Cargo.php
index e5e5508..f99caea 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -56,9 +56,7 @@
 // 'SkinTemplateNavigation' replaced 'SkinTemplateTabs' in the Vector skin
 $wgHooks['SkinTemplateTabs'][] = 'CargoRecreateDataAction::displayTab';
 $wgHooks['SkinTemplateNavigation'][] = 'CargoRecreateDataAction::displayTab2';
-$wgHooks['UnknownAction'][] = 'CargoRecreateDataAction::show';
 $wgHooks['BaseTemplateToolbox'][] = 'CargoPageValuesAction::addLink';
-$wgHooks['UnknownAction'][] = 'CargoPageValuesAction::show';
 $wgHooks['SkinTemplateNavigation'][] = 'CargoHooks::addPurgeCacheTab';
 $wgHooks['PageForms::TemplateFieldStart'][] = 
'CargoHooks::addTemplateFieldStart';
 $wgHooks['PageForms::TemplateFieldEnd'][] = 'CargoHooks::addTemplateFieldEnd';
@@ -158,6 +156,10 @@
 $wgAutoloadClasses['CargoDrilldownHierarchy'] = $dir . 
'/drilldown/CargoDrilldownHierarchy.php';
 $wgSpecialPages['Drilldown'] = 'CargoDrilldown';
 
+// Actions
+$wgActions['recreatedata'] = 'CargoRecreateDataAction';
+$wgActions['pagevalues'] = 'CargoPageValuesAction';
+
 // User rights
 $wgAvailableRights[] = 'recreatecargodata';
 $wgGroupPermissions['sysop']['recreatecargodata'] = true;
diff --git a/CargoPageValuesAction.php b/CargoPageValuesAction.php
index fec6771..693943b 100644
--- a/CargoPageValuesAction.php
+++ b/CargoPageValuesAction.php
@@ -6,7 +6,7 @@
  * @ingroup Cargo
  */
 
-class CargoPageValuesAction {
+class CargoPageValuesAction extends Action {
/**
 * Return the name of the action this object responds to
 * @return String lowercase
@@ -20,16 +20,10 @@
 * to the context output.
 * $this->getOutput(), etc.
 */
-   public static function show( $action, Article $article ) {
-   $title = $article->getTitle();
-
-   if ( $action == 'pagevalues' ) {
-   $pageValuesPage = new CargoPageValues( $title );
-   $pageValuesPage->execute();
-   return false;
-   }
-
-   return true;
+   public function show() {
+   $title = $this->page->getTitle();
+   $pageValuesPage = new CargoPageValues( $title );
+   $pageValuesPage->execute();
}
 
/**
diff --git a/CargoRecreateDataAction.php b/CargoRecreateDataAction.php
index cbabf5e..be5a22f 100644
--- a/CargoRecreateDataAction.php
+++ b/CargoRecreateDataAction.php
@@ -16,16 +16,12 @@
}
 
/**
-* The main action entry point. Do all output for display and send it 
to the context
-* output.
+* The main action entry point. Do all output for display and send it
+* to the context output.
 * $this->getOutput(), etc.
-*
-* @param string $action
-* @param Article $article
-* @return boolean
 */
-   public static function show( $action, Article $article ) {
-   $title = $article->getTitle();
+   public function show() {
+   $title = $this->page->getTitle();
 
// These tabs should only exist for template pages, that
// either call (or called) #cargo_declare, or call
@@ -33,16 +29,12 @@
list( $tableName, $isDeclared ) = 
CargoUtils::getTableNameForTemplate( $title );
 
if ( $tableName == '' ) {
-   return true;
+   // @TODO - display an error message here.
+   return;
}
 
-   if ( $action == 'recreatedata' ) {
-   $recreateDataPage = new CargoRecreateData( $title, 
$tableName, $isDeclared );
-   $recreateDataPage->execute();
-   return false;
-   }
-
-   return true;
+   $recreateDataPage = new CargoRecreateData( $title, $tableName, 
$isDeclared );
+   $recreateDataPage->execute();
}
 
/**
diff --git a/extension.json b/extension.json
index 442d6f6..c20b440 100755
--- a/extension.json
+++ b/extension.json
@@ -227,6 +227,10 @@
"localBasePath": "",
"remoteExtPath": "Cargo"
},
+   "Actions": {
+   "recreatedata": "CargoRecreateDataAction",
+   "pagevalues": "CargoPageValuesAction"
+   },
"Hooks": {
"ParserFirstCallInit": [
 

[MediaWiki-commits] [Gerrit] labs/striker[master]: Add privacy warnings to account creation

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373169 )

Change subject: Add privacy warnings to account creation
..

Add privacy warnings to account creation

Clearly warn users that their email address and IP address may be
exposed when creating an LDAP account. The email address warning is
already present on the wizard step where it is collected, but this makes
that warning more prominent. The IP address exposure warning is new.

Bug: T173845
Change-Id: Iaae028871d6aed4a8f9c610c8c33a1302d0e1c3b
---
M striker/templates/register/base.html
1 file changed, 21 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/striker 
refs/changes/69/373169/1

diff --git a/striker/templates/register/base.html 
b/striker/templates/register/base.html
index ecc3006..566e0f9 100644
--- a/striker/templates/register/base.html
+++ b/striker/templates/register/base.html
@@ -60,18 +60,33 @@
 
 
   {% block left-col %}
-  
-
-  {% bootstrap_icon "info-sign" %} {% trans "About Toolforge accounts" 
%}
+  
+
+  
+{% bootstrap_icon "info-sign" %} {% trans "About Toolforge 
accounts" %}
+  
+  
+{% blocktrans %}Toolforge shares an account 
system with many other technical tools used by Wikimedians. The https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol/;>LDAP
 user account used here also works with https://wikitech.wikimedia.org/;>Wikitech, https://gerrit.wikimedia.org/;>Gerrit, https://phabricator.wikimedia.org/;>Phabricator, and other tools 
designed to help our technical contributors build and maintain software. These 
accounts are separate from the https://meta.wikimedia.org/wiki/Help:Unified_login;>Wikimedia unified 
accounts that are used by most https://meta.wikimedia.org/wiki/Wikimedia_wikis;>Wikimedia wikis.{% 
endblocktrans %}
+  
 
-
-  {% blocktrans %}Toolforge shares an account system 
with many other technical tools used by Wikimedians. The https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol/;>LDAP
 user account used here also works with https://wikitech.wikimedia.org/;>Wikitech, https://gerrit.wikimedia.org/;>Gerrit, https://phabricator.wikimedia.org/;>Phabricator, and other tools 
designed to help our technical contributors build and maintain software. These 
accounts are separate from the https://meta.wikimedia.org/wiki/Help:Unified_login;>Wikimedia unified 
accounts that are used by most https://meta.wikimedia.org/wiki/Wikimedia_wikis;>Wikimedia wikis.{% 
endblocktrans %}
+
+  
+{% bootstrap_icon "alert" %} {% trans "Privacy notices" %}
+  
+  
+{% blocktrans %}Creating and using an LDAP account will expose some
+information to other Cloud Services users:{% endblocktrans %}
+
+  {% blocktrans %}The email address you associate with your 
LDAP account will be publically visible.{% endblocktrans 
%}
+  {% blocktrans %}Your IP address will be 
recorded and may be visible to other users of Cloud VPS and 
Toolforge when you connect to virtual machines using SSH.{% endblocktrans 
%}
+
 
   
-  {% endblock %}
 
+{% endblock %}
   
 
+
 {% endblock %}
 
 {% block js %}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaae028871d6aed4a8f9c610c8c33a1302d0e1c3b
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add list for wikis that would have categories dumped into RDF

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373167 )

Change subject: Add list for wikis that would have categories dumped into RDF
..

Add list for wikis that would have categories dumped into RDF

Bug: T173892
Change-Id: I271a7712e5ff4cb855d38d9eec9f910878a90b0b
---
A dblists/categories-rdf.dblist
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/dblists/categories-rdf.dblist b/dblists/categories-rdf.dblist
new file mode 100644
index 000..286f697
--- /dev/null
+++ b/dblists/categories-rdf.dblist
@@ -0,0 +1,2 @@
+testwiki
+test2wiki

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Setting namecheap/comodo CAA records

[BBlack (Code Review)]

BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372900 )

Change subject: Setting namecheap/comodo CAA records
..


Setting namecheap/comodo CAA records

policy.wikimedia.org will allow namecheap/comodo to issue certificates
for policy.wikimedia.org only via CAA record

Bug: T173787
Change-Id: I3d961abe468ed734aade22726672fc22618ffe96
---
M templates/wikimedia.org
1 file changed, 21 insertions(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 14bc593..bbe2f95 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -71,6 +71,27 @@
 wikimedia.org.  5M  IN TYPE257 \# 25 
0009697373756577696C64676C6F62616C7369676E2E636F6D
 wikimedia.org.  5M  IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
 
+; CAA for policy.wikimedia.org
+; policy is operated by a third party which uses Namecheap/Comodo to issue DV 
certs on our behalf
+; we're also keeping all the base domain records here, as a Just In Case of 
any confusion on policy or wildcards/subdomains.
+; data below is:
+; 0 issue "digicert.com"
+; 0 issue "globalsign.com"
+; 0 issue "letsencrypt.org"
+; 0 issue "comodoca.com"
+; 0 issue "namecheap.com"
+; 0 issuewild "digicert.com"
+; 0 issuewild "globalsign.com"
+; 0 iodef "mailto:dns-ad...@wikimedia.org;
+policy  5M  IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
+policy  5M  IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
+policy  5M  IN TYPE257 \# 22 
000569737375656C657473656E63727970742E6F7267
+policy  5M  IN TYPE257 \# 19 00056973737565636F6D6F646F63612E636F6D
+policy  5M  IN TYPE257 \# 20 000569737375656E616D6563686561702E636F6D
+policy  5M  IN TYPE257 \# 23 
0009697373756577696C6464696769636572742E636F6D
+policy  5M  IN TYPE257 \# 25 
0009697373756577696C64676C6F62616C7369676E2E636F6D
+policy  5M  IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
+
 dumps   1H  IN CNAME dataset1001
 
 lists   5M  IN A208.80.154.21

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d961abe468ed734aade22726672fc22618ffe96
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Platonides 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: Slaporte 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: wikimedia.org CAA: split issue-vs-issuewild, document clearer

[BBlack (Code Review)]

BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373163 )

Change subject: wikimedia.org CAA: split issue-vs-issuewild, document clearer
..


wikimedia.org CAA: split issue-vs-issuewild, document clearer

Change-Id: I1c1eff183f10ad486e919312af0551c29c2ddc8a
---
M templates/wikimedia.org
1 file changed, 12 insertions(+), 4 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index a8a29a4..14bc593 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -55,12 +55,20 @@
 
 donate  5M  IN TXT  "v=spf1 ip4:91.198.174.0/24 ip4:208.80.152.0/22 
ip6:2620:0:860::/46 include:_spf.google.com ip4:74.121.51.111 ~all"
 
-; CAA records
-; issue globalsign.com, issue digicert.com, issue letsencrypt.org, iodef 
mailto:dns-ad...@wikimedia.org
-; cf. https://sslmate.com/labs/caa/
-wikimedia.org.  5M  IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
+
+; CAA records for wikimedia.org - all types for globalsign and digicert, 
non-wildcard for LE
+; cf. https://sslmate.com/labs/caa/, data below is:
+; 0 issue "digicert.com"
+; 0 issue "globalsign.com"
+; 0 issue "letsencrypt.org"
+; 0 issuewild "digicert.com"
+; 0 issuewild "globalsign.com"
+; 0 iodef "mailto:dns-ad...@wikimedia.org;
 wikimedia.org.  5M  IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
+wikimedia.org.  5M  IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
 wikimedia.org.  5M  IN TYPE257 \# 22 
000569737375656C657473656E63727970742E6F7267
+wikimedia.org.  5M  IN TYPE257 \# 23 
0009697373756577696C6464696769636572742E636F6D
+wikimedia.org.  5M  IN TYPE257 \# 25 
0009697373756577696C64676C6F62616C7369676E2E636F6D
 wikimedia.org.  5M  IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
 
 dumps   1H  IN CNAME dataset1001

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c1eff183f10ad486e919312af0551c29c2ddc8a
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373166 )

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

Update VE core submodule to master (94532edbf)

New changes:
1a726e3ed VisualDiff: Show internal list remove-inserts
94532edbf Update OOjs UI to v0.22.5

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


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

diff --git a/lib/ve b/lib/ve
index 6111ca5..94532ed 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 6111ca575375b26620d87d616382f9cb6d492d80
+Subproject commit 94532edbf9c215beac5fa7ff65f198dfb7199a5e

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename IP::isValidBlock to isValidRange, depracating the former

[MusikAnimal (Code Review)]

MusikAnimal has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373165 )

Change subject: Rename IP::isValidBlock to isValidRange, depracating the former
..

Rename IP::isValidBlock to isValidRange, depracating the former

This is to remove confusion with the MediaWiki Block class.

All instances of isValidBlock within MediaWiki core have been updated.

Usage of this function will be more widespread with this patch:
https://gerrit.wikimedia.org/r/#/c/349457/

Change-Id: Ice1bdae3d16cf365da14c6df0e8d91d2b914e067
---
M RELEASE-NOTES-1.30
M includes/Block.php
M includes/libs/IP.php
M tests/phpunit/includes/libs/IPTest.php
4 files changed, 38 insertions(+), 23 deletions(-)


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

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 13a9f4e..ec256ce 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -157,6 +157,7 @@
 * Article::viewRedirect() is deprecated.
 * DeprecatedGlobal no longer supports passing in a direct value, it requires a
   callable factory function or a class name.
+* IP::isValidBlock() is deprecated. Use the equivalent IP::isValidRange().
 * The $parserMemc global, wfGetParserCacheStorage(), and 
ParserCache::singleton()
   are all deprecated. The main ParserCache instance should be obtained from
   MediaWikiServices instead. Access to the underlying BagOStuff is possible
diff --git a/includes/Block.php b/includes/Block.php
index 5066038..05e97b9 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1354,7 +1354,7 @@
self::TYPE_IP
];
 
-   } elseif ( IP::isValidBlock( $target ) ) {
+   } elseif ( IP::isValidRange( $target ) ) {
# Can't create a User from an IP range
return [ IP::sanitizeRange( $target ), self::TYPE_RANGE 
];
}
diff --git a/includes/libs/IP.php b/includes/libs/IP.php
index b22f06d..96b247a 100644
--- a/includes/libs/IP.php
+++ b/includes/libs/IP.php
@@ -23,14 +23,14 @@
 
 use IPSet\IPSet;
 
-// Some regex definition to "play" with IP address and IP address blocks
+// Some regex definition to "play" with IP address and IP address ranges
 
 // An IPv4 address is made of 4 bytes from x00 to xFF which is d0 to d255
 define( 'RE_IP_BYTE', '(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|0?[0-9]?[0-9])' );
 define( 'RE_IP_ADD', RE_IP_BYTE . '\.' . RE_IP_BYTE . '\.' . RE_IP_BYTE . '\.' 
. RE_IP_BYTE );
-// An IPv4 block is an IP address and a prefix (d1 to d32)
+// An IPv4 range is an IP address and a prefix (d1 to d32)
 define( 'RE_IP_PREFIX', '(3[0-2]|[12]?\d)' );
-define( 'RE_IP_BLOCK', RE_IP_ADD . '\/' . RE_IP_PREFIX );
+define( 'RE_IP_RANGE', RE_IP_ADD . '\/' . RE_IP_PREFIX );
 
 // An IPv6 address is made up of 8 words (each x to x).
 // However, the "::" abbreviation can be used on consecutive x words.
@@ -47,8 +47,8 @@
RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){7}' .
')'
 );
-// An IPv6 block is an IP address and a prefix (d1 to d128)
-define( 'RE_IPV6_BLOCK', RE_IPV6_ADD . '\/' . RE_IPV6_PREFIX );
+// An IPv6 range is an IP address and a prefix (d1 to d128)
+define( 'RE_IPV6_RANGE', RE_IPV6_ADD . '\/' . RE_IPV6_PREFIX );
 // For IPv6 canonicalization (NOT for strict validation; these are quite lax!)
 define( 'RE_IPV6_GAP', ':(?:0+:)*(?::(?:0+:)*)?' );
 define( 'RE_IPV6_V4_PREFIX', '0*' . RE_IPV6_GAP . '(?::)?' );
@@ -64,7 +64,7 @@
 
 /**
  * A collection of public static functions to play with IP address
- * and IP blocks.
+ * and IP ranges.
  */
 class IP {
/** @var IPSet */
@@ -118,16 +118,30 @@
}
 
/**
-* Validate an IP Block (valid address WITH a valid prefix).
+* Validate an IP range (valid address with a valid CIDR prefix).
 * SIIT IPv4-translated addresses are rejected.
 * @note canonicalize() tries to convert translated addresses to IPv4.
 *
-* @param string $ipblock
+* @deprecated since 1.30. Use the equivalent IP::isValidRange().
+* @param string $ipRange
 * @return bool True if it is valid
 */
-   public static function isValidBlock( $ipblock ) {
-   return ( preg_match( '/^' . RE_IPV6_BLOCK . '$/', $ipblock )
-   || preg_match( '/^' . RE_IP_BLOCK . '$/', $ipblock ) );
+   public static function isValidBlock( $ipRange ) {
+   return self::isValidRange( $ipRange );
+   }
+
+   /**
+* Validate an IP range (valid address with a valid CIDR prefix).
+* SIIT IPv4-translated addresses are rejected.
+* @note canonicalize() tries to convert translated addresses to IPv4.
+*
+* @param string $ipRange
+* @return bool True if it is valid
+* @since 1.30
+*/
+   public static function isValidRange( 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] icons: Remove 'wikitrail' icon, renamed in...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373162 )

Change subject: [BREAKING CHANGE] icons: Remove 'wikitrail' icon, renamed in 
v0.20.1
..


[BREAKING CHANGE] icons: Remove 'wikitrail' icon, renamed in v0.20.1

Change-Id: I7635187698046eda96405a1e11672687938d9b62
---
M src/themes/wikimediaui/icons-location.json
1 file changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/src/themes/wikimediaui/icons-location.json 
b/src/themes/wikimediaui/icons-location.json
index 58feb23..4ca6635 100644
--- a/src/themes/wikimediaui/icons-location.json
+++ b/src/themes/wikimediaui/icons-location.json
@@ -34,11 +34,6 @@
"mapTrail": { "file": {
"ltr": "images/icons/mapTrail-ltr.svg",
"rtl": "images/icons/mapTrail-rtl.svg"
-   } },
-   "wikitrail": { "file": {
-   "ltr": "images/icons/mapTrail-ltr.svg",
-   "rtl": "images/icons/mapTrail-rtl.svg"
-   }, "deprecated": "Renamed to 'mapTrail' since v0.20.1."
-   }
+   } }
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7635187698046eda96405a1e11672687938d9b62
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: EditPage: Remove temporary OOUI page class name

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373164 )

Change subject: EditPage: Remove temporary OOUI page class name
..

EditPage: Remove temporary OOUI page class name

Follow-up to I2b468c8b84, broken out for simplicity.

Change-Id: I16578dafafbcf7df909ceb89cd64d5b40a82
---
M includes/EditPage.php
M resources/Resources.php
D resources/src/mediawiki.action/mediawiki.action.edit.styles.css
A resources/src/mediawiki.action/mediawiki.action.edit.styles.less
4 files changed, 58 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/373164/1

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 0e1438f..72a072d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2658,8 +2658,7 @@
$wgOut->addHTML( Html::openElement(
'form',
[
-   // Keep mw-editform-ooui class for 
backwards-compatibility temporarily
-   'class' => 'mw-editform mw-editform-ooui',
+   'class' => 'mw-editform',
'id' => self::EDITFORM_ID,
'name' => self::EDITFORM_ID,
'method' => 'post',
diff --git a/resources/Resources.php b/resources/Resources.php
index 4a7f3e4..004c13b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1428,7 +1428,7 @@
],
'mediawiki.action.edit.styles' => [
'targets' => [ 'desktop', 'mobile' ],
-   'styles' => 
'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
+   'styles' => 
'resources/src/mediawiki.action/mediawiki.action.edit.styles.less',
],
'mediawiki.action.edit.collapsibleFooter' => [
'scripts' => 
'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css 
b/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
deleted file mode 100644
index 7b6aaa8..000
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
- * Styles for elements of the editing form.
- */
-
-/* General layout */
-#wpTextbox1 {
-   margin: 0;
-   display: block;
-   /* Ensure the textarea is not higher than browser's viewport on small 
screens */
-   max-height: 100vh;
-   /* But don't let it collapse into nothingness on really tiny screens */
-   min-height: 5em;
-}
-
-/*
- * Add a bit of margin space between the preview and the toolbar.
- * This replaces the ugly  we used to insert into the page source
- */
-#wikiPreview.ontop {
-   margin-bottom: 1em;
-}
-
-/* Adjustments to edit form elements */
-#editpage-copywarn {
-   font-size: 0.9em;
-}
-
-.mw-editform-ooui #wpSummaryWidget {
-   display: block;
-   margin-bottom: 1em;
-   max-width: none;
-}
-
-.mw-editform-ooui #editpage-copywarn {
-   line-height: 1.26;
-}
-
-.mw-editform-ooui #wpSummaryLabel {
-   margin: 0;
-}
-
-.mw-editform-ooui .editCheckboxes .oo-ui-fieldLayout {
-   margin-right: 1em;
-}
-
-.mw-editform-ooui .editHelp {
-   margin-left: 0.5em;
-   vertical-align: middle;
-}
-
-.mw-editform-ooui .editHelp a {
-   font-weight: bold;
-}
-
-.mw-editform-ooui .editOptions {
-   border-radius: 0 0 2px 2px;
-}
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less 
b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
new file mode 100644
index 000..dc6a366
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
@@ -0,0 +1,56 @@
+/*!
+ * Styles for elements of the editing form.
+ */
+
+/*
+ * Add a bit of margin space between the preview and the toolbar.
+ * This replaces the ugly  we used to insert into the page source
+ */
+#wikiPreview.ontop {
+   margin-bottom: 1em;
+}
+
+.mw-editform {
+   /* General layout */
+   #wpTextbox1 {
+   margin: 0;
+   display: block;
+   /* Ensure the textarea is not higher than browser's viewport on 
small screens */
+   max-height: 100vh;
+   /* But don't let it collapse into nothingness on really tiny 
screens */
+   min-height: 5em;
+   }
+
+   /* Adjustments to edit form elements */
+   #editpage-copywarn {
+   font-size: 0.9em;
+   line-height: 1.26;
+   }
+
+   #wpSummaryWidget {
+   display: block;
+   margin-bottom: 1em;
+   max-width: none;
+   }
+
+   #wpSummaryLabel {
+   margin: 0;
+   }
+
+   .editCheckboxes .oo-ui-fieldLayout {
+   margin-right: 1em;
+   }
+
+   .editHelp {
+

[MediaWiki-commits] [Gerrit] operations/dns[master]: wikimedia.org CAA: split issue-vs-issuewild, document clearer

[BBlack (Code Review)]

BBlack has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373163 )

Change subject: wikimedia.org CAA: split issue-vs-issuewild, document clearer
..

wikimedia.org CAA: split issue-vs-issuewild, document clearer

Change-Id: I1c1eff183f10ad486e919312af0551c29c2ddc8a
---
M templates/wikimedia.org
1 file changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/63/373163/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index a8a29a4..2ba287e 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -55,13 +55,15 @@
 
 donate  5M  IN TXT  "v=spf1 ip4:91.198.174.0/24 ip4:208.80.152.0/22 
ip6:2620:0:860::/46 include:_spf.google.com ip4:74.121.51.111 ~all"
 
-; CAA records
-; issue globalsign.com, issue digicert.com, issue letsencrypt.org, iodef 
mailto:dns-ad...@wikimedia.org
+
+; CAA records for wikimedia.org - all types for globalsign and digicert, 
non-wildcard for LE
 ; cf. https://sslmate.com/labs/caa/
-wikimedia.org.  5M  IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
-wikimedia.org.  5M  IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
-wikimedia.org.  5M  IN TYPE257 \# 22 
000569737375656C657473656E63727970742E6F7267
-wikimedia.org.  5M  IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
+wikimedia.org.  5M  IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
 ; 0 issue "digicert.com"
+wikimedia.org.  5M  IN TYPE257 \# 21 
00056973737565676C6F62616C7369676E2E636F6D ; 0 issue "globalsign.com"
+wikimedia.org.  5M  IN TYPE257 \# 22 
000569737375656C657473656E63727970742E6F7267   ; 0 issue "letsencrypt.org"
+wikimedia.org.  5M  IN TYPE257 \# 23 
0009697373756577696C6464696769636572742E636F6D ; 0 issuewild "digicert.com"
+wikimedia.org.  5M  IN TYPE257 \# 25 
0009697373756577696C64676C6F62616C7369676E2E636F6D ; 0 issuewild 
"globalsign.com"
+wikimedia.org.  5M  IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267 ; 0 
iodef "mailto:dns-ad...@wikimedia.org;
 
 dumps   1H  IN CNAME dataset1001
 

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] icons: Remove 'caret' icons, deprecated in...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351661 )

Change subject: [BREAKING CHANGE] icons: Remove 'caret' icons, deprecated in 
v0.21.3
..


[BREAKING CHANGE] icons: Remove 'caret' icons, deprecated in v0.21.3

Change-Id: Ia9954834c355608deafa256bcbffb0ab1011dcfc
---
M src/themes/apex/icons-movement.json
M src/themes/wikimediaui/icons-movement.json
2 files changed, 0 insertions(+), 32 deletions(-)

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



diff --git a/src/themes/apex/icons-movement.json 
b/src/themes/apex/icons-movement.json
index 8110a36..5ecee27 100644
--- a/src/themes/apex/icons-movement.json
+++ b/src/themes/apex/icons-movement.json
@@ -10,22 +10,6 @@
"ltr": "images/icons/arrow-rtl.svg",
"rtl": "images/icons/arrow-ltr.svg"
} },
-   "caretNext": {
-   "file": {
-   "ltr": "images/icons/move-rtl.svg",
-   "rtl": "images/icons/move-ltr.svg"
-   },
-   "deprecated": "Replaced since v0.21.3, use 'next' 
instead."
-   },
-   "caretLast": {
-   "file": {
-   "ltr": "images/icons/move-ltr.svg",
-   "rtl": "images/icons/move-rtl.svg"
-   },
-   "deprecated": "Replaced since v0.21.3, use 'previous' 
instead."
-   },
-   "caretDown": { "file": "images/icons/expand.svg", "deprecated": 
"Replaced since v0.21.3, use 'expand' instead." },
-   "caretUp": { "file": "images/icons/collapse.svg", "deprecated": 
"Replaced since v0.21.3, use 'collapse' instead." },
"collapse": { "file": "images/icons/collapse.svg" },
"downTriangle": { "file": "images/icons/downTriangle.svg" },
"draggable": { "file": "images/icons/draggable.svg" },
diff --git a/src/themes/wikimediaui/icons-movement.json 
b/src/themes/wikimediaui/icons-movement.json
index baa79e5..7ba002a 100644
--- a/src/themes/wikimediaui/icons-movement.json
+++ b/src/themes/wikimediaui/icons-movement.json
@@ -30,22 +30,6 @@
"ltr": "images/icons/arrow-rtl.svg",
"rtl": "images/icons/arrow-ltr.svg"
} },
-   "caretNext": {
-   "file": {
-   "ltr": "images/icons/move-rtl.svg",
-   "rtl": "images/icons/move-ltr.svg"
-   },
-   "deprecated": "Replaced since v0.21.3, use 'next' 
instead."
-   },
-   "caretLast": {
-   "file": {
-   "ltr": "images/icons/move-ltr.svg",
-   "rtl": "images/icons/move-rtl.svg"
-   },
-   "deprecated": "Replaced since v0.21.3, use 'previous' 
instead."
-   },
-   "caretDown": { "file": "images/icons/expand.svg", "deprecated": 
"Replaced since v0.21.3, use 'expand' instead." },
-   "caretUp": { "file": "images/icons/collapse.svg", "deprecated": 
"Replaced since v0.21.3, use 'collapse' instead." },
"collapse": { "file": "images/icons/collapse.svg" },
"downTriangle": { "file": "images/icons/downTriangle.svg" },
"draggable": { "file": "images/icons/draggable.svg" },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9954834c355608deafa256bcbffb0ab1011dcfc
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Empty tags are omitted from summary output

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370697 )

Change subject: Empty tags are omitted from summary output
..


Empty tags are omitted from summary output

Given we remove nodes from the output, it's highly possible
we may end up with stray empty elements. These can be discarded.

Change-Id: I28e6c6518036daa331dd181f437e4997903a3f21
---
M lib/transformations/summarize.js
M test/lib/transformations/summarize.js
2 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/lib/transformations/summarize.js b/lib/transformations/summarize.js
index 7668c07..8c78d2e 100644
--- a/lib/transformations/summarize.js
+++ b/lib/transformations/summarize.js
@@ -15,5 +15,6 @@
 rmElementsWithSelector(doc, '.mw-ref');
 rmElementsWithSelector(doc, '.noexcerpts');
 rmElementsWithSelector(doc, 'math');
+rmElementsWithSelector(doc, 'span:empty,b:empty,i:empty,p:empty');
 return doc.body.innerHTML;
 };
diff --git a/test/lib/transformations/summarize.js 
b/test/lib/transformations/summarize.js
index 43a2914..47f0745 100644
--- a/test/lib/transformations/summarize.js
+++ b/test/lib/transformations/summarize.js
@@ -8,6 +8,11 @@
 describe('summarize', () => {
 it('matches the spec', () => {
 const testCases = [
+// Should flatten empty nodes
+[
+'f',
+'f'
+],
 // Should flatten links
 [
 'This is some content with a link.',
@@ -31,7 +36,7 @@
 // math tags are stripped but any math images are shown
 [
 'The Planck–Einstein relation connects the particulate 
photon energy E with its associated wave 
frequency f:\n\nhttp://www.w3.org/1998/Math/MathML\;>\n  \n
\n  \nE\n=\n
h\nf\n  \n\n{\\displaystyle E=hf}\n  
\nhttps://wikimedia.org/api/rest_v1/media/math/render/svg/f39fac3593bb1e2dec0282c112c4dff7a99007f6\;
 class=\"mwe-math-fallback-image-inline\" aria-hidden=\"true\" 
style=\"vertical-align: -0.671ex; width:7.533ex; 
height:2.509ex;\">',
-'The Planck–Einstein relation connects the particulate 
photon energy E with its associated wave 
frequency f:\n\nhttps://wikimedia.org/api/rest_v1/media/math/render/svg/f39fac3593bb1e2dec0282c112c4dff7a99007f6\;
 class=\"mwe-math-fallback-image-inline\" aria-hidden=\"true\" 
style=\"vertical-align: -0.671ex; width:7.533ex; 
height:2.509ex;\">'
+'The Planck–Einstein relation connects the particulate 
photon energy E with its associated wave 
frequency f:\n\nhttps://wikimedia.org/api/rest_v1/media/math/render/svg/f39fac3593bb1e2dec0282c112c4dff7a99007f6\;
 class=\"mwe-math-fallback-image-inline\" aria-hidden=\"true\" 
style=\"vertical-align: -0.671ex; width:7.533ex; 
height:2.509ex;\">'
 ]
 ];
 testCases.forEach((test) => {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28e6c6518036daa331dd181f437e4997903a3f21
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] icons: Remove 'wikitrail' icon, renamed in...

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373162 )

Change subject: [BREAKING CHANGE] icons: Remove 'wikitrail' icon, renamed in 
v0.20.1
..

[BREAKING CHANGE] icons: Remove 'wikitrail' icon, renamed in v0.20.1

Change-Id: I7635187698046eda96405a1e11672687938d9b62
---
M src/themes/wikimediaui/icons-location.json
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/62/373162/1

diff --git a/src/themes/wikimediaui/icons-location.json 
b/src/themes/wikimediaui/icons-location.json
index 58feb23..b3da3cb 100644
--- a/src/themes/wikimediaui/icons-location.json
+++ b/src/themes/wikimediaui/icons-location.json
@@ -34,11 +34,6 @@
"mapTrail": { "file": {
"ltr": "images/icons/mapTrail-ltr.svg",
"rtl": "images/icons/mapTrail-rtl.svg"
-   } },
-   "wikitrail": { "file": {
-   "ltr": "images/icons/mapTrail-ltr.svg",
-   "rtl": "images/icons/mapTrail-rtl.svg"
-   }, "deprecated": "Renamed to 'mapTrail' since v0.20.1."
}
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Make font in language selector smaller

[Petar.petkovic (Code Review)]

Petar.petkovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373161 )

Change subject: Make font in language selector smaller
..

Make font in language selector smaller

Change font size for language names in language selector,
making it smaller, from 18px to 16px.

Bug: T173403
Change-Id: Ide4b1f5912c2d07ca98e4895c33f832370360485
---
M modules/dashboard/styles/ext.cx.dashboard.less
M modules/dashboard/styles/ext.cx.lists.common.less
2 files changed, 5 insertions(+), 11 deletions(-)


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

diff --git a/modules/dashboard/styles/ext.cx.dashboard.less 
b/modules/dashboard/styles/ext.cx.dashboard.less
index 0207add..07277b3 100644
--- a/modules/dashboard/styles/ext.cx.dashboard.less
+++ b/modules/dashboard/styles/ext.cx.dashboard.less
@@ -120,16 +120,6 @@
background-color: @colorGray14;
 }
 
-.translation-source-language-filter,
-.translation-target-language-filter {
-   background-color: @colorGray15;
-   font-size: 1em;
-
-   option {
-   font-size: 1em;
-   }
-}
-
 .translation-filter {
.mw-ui-one-whole;
 
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index 0b69ba7..2bba7c9 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -81,9 +81,13 @@
 
.translation-source-language-filter,
.translation-target-language-filter {
+   background-color: @colorGray15;
+
max-height: 34px;
padding: 8px;
-   line-height: 1;
+
+   font-size: 16px;
+   line-height: 1.125;
 
overflow: hidden;
text-overflow: ellipsis;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide4b1f5912c2d07ca98e4895c33f832370360485
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove two deprecated functions and one depreciated variable...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372113 )

Change subject: Remove two deprecated functions and one depreciated variable in 
a function call within Parser.php
..


Remove two deprecated functions and one depreciated variable in a function call 
within Parser.php

* Parser::getRandomString() (deprecated in 1.26) was removed.
* Parser::uniqPrefix() (deprecated in 1.26) was removed.
* Parser::extractTagsAndParams() now only accepts three arguments.  The fourth, 
$uniq_prefix was deprecated in 1.26 and has now been removed.

Bug: T61113
Change-Id: I7333fff4eb8b9a754b4596992f2a69bbdaac664d
---
M RELEASE-NOTES-1.30
M includes/parser/Parser.php
2 files changed, 5 insertions(+), 28 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 473ac84..13a9f4e 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -186,6 +186,10 @@
 * MWMemcached and MemCachedClientforWiki classes (deprecated in 1.27) were 
removed.
   The MemcachedClient class should be used instead.
 * EditPage::isOouiEnabled() is deprecated and will always return true.
+* Parser::getRandomString() (deprecated in 1.26) was removed.
+* Parser::uniqPrefix() (deprecated in 1.26) was removed.
+* Parser::extractTagsAndParams() now only accepts three arguments.  The fourth,
+  $uniq_prefix was deprecated in 1.26 and has now been removed.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 5ef0032..3f0e38f 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -737,17 +737,6 @@
}
 
/**
-* Get a random string
-*
-* @return string
-* @deprecated since 1.26; use wfRandomString() instead.
-*/
-   public static function getRandomString() {
-   wfDeprecated( __METHOD__, '1.26' );
-   return wfRandomString( 16 );
-   }
-
-   /**
 * Set the current user.
 * Should only be used when doing pre-save transform.
 *
@@ -755,17 +744,6 @@
 */
public function setUser( $user ) {
$this->mUser = $user;
-   }
-
-   /**
-* Accessor for mUniqPrefix.
-*
-* @return string
-* @deprecated since 1.26; use Parser::MARKER_PREFIX instead.
-*/
-   public function uniqPrefix() {
-   wfDeprecated( __METHOD__, '1.26' );
-   return self::MARKER_PREFIX;
}
 
/**
@@ -973,14 +951,9 @@
 * @param array $elements List of element names. Comments are always 
extracted.
 * @param string $text Source text string.
 * @param array &$matches Out parameter, Array: extracted tags
-* @param string|null $uniq_prefix
 * @return string Stripped text
-* @since 1.26 The uniq_prefix argument is deprecated.
 */
-   public static function extractTagsAndParams( $elements, $text, 
&$matches, $uniq_prefix = null ) {
-   if ( $uniq_prefix !== null ) {
-   wfDeprecated( __METHOD__ . ' called with $prefix 
argument', '1.26' );
-   }
+   public static function extractTagsAndParams( $elements, $text, 
&$matches ) {
static $n = 1;
$stripped = '';
$matches = [];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7333fff4eb8b9a754b4596992f2a69bbdaac664d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matthewrbowker 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Matthewrbowker 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Minimize vertical space

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373160 )

Change subject: RCFilters: Minimize vertical space
..

RCFilters: Minimize vertical space

Bug: T173265
Change-Id: I38821571450c59b18c753c8b20ad9f19f01b6276
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
3 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/60/373160/1

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index d5528e1..c667bac 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -31,8 +31,7 @@
}
 
.rcfilters-head {
-   min-height: 220px;
-   margin-top: 1em;
+   min-height: 200px;
 
&:not( .mw-rcfilters-ui-ready ) {
opacity: 0.5;
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
index 31f3f1d..0c8bc58 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
@@ -13,7 +13,7 @@
 
&-newChanges {
min-height: 34px;
-   margin: 10px 0;
+   margin: 8px 0;
text-align: center;
}
 
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index 87d09e0..a89b69c 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -1,5 +1,4 @@
 .mw-rcfilters-ui-filterWrapperWidget {
-   margin-top: 1em;
width: 100%;
// Make sure this uses the interface direction, not the content 
direction
direction: ltr;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.22.5

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373153 )

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


Update OOjs UI to v0.22.5

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

Depends-On: Icf08f8c12d91b74425df319e69df22330c7088a9
Change-Id: Ia3ba4989c573de8b458c209560f6658b8324b548
---
M composer.json
M resources/lib/oojs-ui/i18n/en.json
M resources/lib/oojs-ui/i18n/ja.json
A resources/lib/oojs-ui/i18n/kab.json
M resources/lib/oojs-ui/i18n/li.json
M resources/lib/oojs-ui/i18n/nn.json
M resources/lib/oojs-ui/i18n/qqq.json
A resources/lib/oojs-ui/i18n/skr-arab.json
M resources/lib/oojs-ui/i18n/yue.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-core.js.map
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-toolbars.js.map
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-widgets.js.map
M resources/lib/oojs-ui/oojs-ui-wikimediaui.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/oojs-ui-windows.js.map
27 files changed, 157 insertions(+), 115 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3ba4989c573de8b458c209560f6658b8324b548
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[wmf/1.30.0-wmf.15]: Fix up 11f4a97ba6bcd0c1de

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373157 )

Change subject: Fix up 11f4a97ba6bcd0c1de
..


Fix up 11f4a97ba6bcd0c1de

CategoryManager is a member variable. Also explicitly define the
haveParserMigrationExt member variable too.

Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
(cherry picked from commit 139a8aafeae7ee61da557d5e8028ae2b0c44e5f9)
---
M includes/LintErrorsPager.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/includes/LintErrorsPager.php b/includes/LintErrorsPager.php
index 5dc792d..068ef94 100644
--- a/includes/LintErrorsPager.php
+++ b/includes/LintErrorsPager.php
@@ -45,6 +45,11 @@
private $linkRenderer;
 
/**
+* @var bool
+*/
+   private $haveParserMigrationExt;
+
+   /**
 * @var int|null
 */
private $namespace;
@@ -98,7 +103,7 @@
$row->linter_cat = $this->categoryId;
$lintError = Database::makeLintError( $row );
if ( $this->haveParserMigrationExt &&
-   $categoryManager->needsParserMigrationEdit( $name )
+   $this->categoryManager->needsParserMigrationEdit( $name 
)
) {
$editAction = 'parsermigration-edit';
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.22.5

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373152 )

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


Update OOjs UI to v0.22.5

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

Change-Id: Icf08f8c12d91b74425df319e69df22330c7088a9
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/i18n/en.json
M oojs/oojs-ui/i18n/ja.json
A oojs/oojs-ui/i18n/kab.json
M oojs/oojs-ui/i18n/li.json
M oojs/oojs-ui/i18n/nn.json
M oojs/oojs-ui/i18n/qqq.json
A oojs/oojs-ui/i18n/skr-arab.json
M oojs/oojs-ui/i18n/yue.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Element.php
M oojs/oojs-ui/php/Tag.php
M oojs/oojs-ui/php/Widget.php
M oojs/oojs-ui/php/layouts/PanelLayout.php
M oojs/oojs-ui/php/mixins/ButtonElement.php
M oojs/oojs-ui/php/mixins/FlaggedElement.php
M oojs/oojs-ui/php/mixins/GroupElement.php
M oojs/oojs-ui/php/widgets/ButtonInputWidget.php
M oojs/oojs-ui/php/widgets/ButtonWidget.php
M oojs/oojs-ui/php/widgets/CheckboxInputWidget.php
M oojs/oojs-ui/php/widgets/ProgressBarWidget.php
M oojs/oojs-ui/php/widgets/RadioInputWidget.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
26 files changed, 145 insertions(+), 78 deletions(-)

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



diff --git a/composer.json b/composer.json
index 2dcfd8d..53ee081 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"monolog/monolog": "1.22.1",
"mustangostang/spyc": "0.6.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.22.4",
+   "oojs/oojs-ui": "0.22.5",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
diff --git a/composer.lock b/composer.lock
index 355956c..0bb1173 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "301c4a097e044e617ab5b804f5b99a22",
+"content-hash": "8e3ab52a0544abb4d7450ab1ae3c1374",
 "packages": [
 {
 "name": "composer/semver",
@@ -516,16 +516,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.22.4",
+"version": "v0.22.5",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7"
+"reference": "5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/bb1b15c47835468f133a56aa56a721f8793c61f7;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d;,
+"reference": "5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d",
 "shasum": ""
 },
 "require": {
@@ -534,7 +534,7 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.10.0",
+"mediawiki/mediawiki-codesniffer": "0.11.0",
 "phpunit/phpunit": "4.8.21"
 },
 "type": "library",
@@ -591,7 +591,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-08-01T19:55:30+00:00"
+"time": "2017-08-22T21:02:41+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index f37cf29..bcb7a6c 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2326,17 +2326,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.22.4",
-"version_normalized": "0.22.4.0",
+"version": "v0.22.5",
+"version_normalized": "0.22.5.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7"
+"reference": "5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/bb1b15c47835468f133a56aa56a721f8793c61f7;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7",
+"url": 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Add Portuguese to on this day endpoint.

[Mhurd (Code Review)]

Mhurd has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373159 )

Change subject: Add Portuguese to on this day endpoint.
..

Add Portuguese to on this day endpoint.

Change-Id: Ifc3716e80f8ddb2d30a2778b84a30c9cd5672501
---
M lib/feed/on-this-day.languages.js
1 file changed, 24 insertions(+), 0 deletions(-)


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

diff --git a/lib/feed/on-this-day.languages.js 
b/lib/feed/on-this-day.languages.js
index 499e506..06226a9 100644
--- a/lib/feed/on-this-day.languages.js
+++ b/lib/feed/on-this-day.languages.js
@@ -106,6 +106,30 @@
 listElementSelector: 'body > ul li'
 },
 yearListElementRegEx : /^\s*(\d+)\s*(f\.Kr\.)?\s*–\s(.+)/i
+},
+
+pt: {
+monthNames : [
+'de janeiro', 'de fevereiro', 'de março', 'de abril', 'de maio', 
'de junho',
+'de julho', 'de agosto', 'de setembro', 'de outubro', 'de 
novembro', 'de dezembro'
+],
+dayPage : {
+// https://pt.wikipedia.org/wiki/15_de_maio
+nameFormatter : (monthName, dayNumber) => 
`${dayNumber}_${monthName}`,
+headingIds: {
+births: ['Nascimentos'],
+deaths: ['Mortes', 'Falecimentos'],
+events: ['Eventos', 'Eventos_hist.C3.B3ricos'],
+holidays: ['Feriados_e_eventos_c.C3.ADclicos']
+}
+},
+selectedPage : {
+// https://pt.wikipedia.org/wiki/Wikipédia:Efemérides/15_de_maio
+nameFormatter : (monthName, dayNumber) =>
+`Wikipédia:Efemérides/${dayNumber}_${monthName}`,
+listElementSelector: 'body > ul li'
+},
+yearListElementRegEx : 
/^\s*(\d+)\s*(a\.C\.)?\s*[\u002D\u2013\u2014\u2212]\s(.+)/i
 }
 };
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Truncate long saved query titles

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373158 )

Change subject: RCFilters: Truncate long saved query titles
..

RCFilters: Truncate long saved query titles

Bug: T171901
Change-Id: Ibb03d3aafe4b3b083a5da064f2a2e809ecd108ad
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/373158/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index 076636c..f3e1351 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -42,6 +42,10 @@
color: #222; // Base10
font-weight: bold;
margin-left: 1em;
+   width: ~'calc( 100% - 10em )';
+   overflow: hidden;
+   text-overflow: ellipsis;
+   white-space: nowrap;
}
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[wmf/1.30.0-wmf.15]: Fix up 11f4a97ba6bcd0c1de

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373157 )

Change subject: Fix up 11f4a97ba6bcd0c1de
..

Fix up 11f4a97ba6bcd0c1de

CategoryManager is a member variable. Also explicitly define the
haveParserMigrationExt member variable too.

Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
(cherry picked from commit 139a8aafeae7ee61da557d5e8028ae2b0c44e5f9)
---
M includes/LintErrorsPager.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter 
refs/changes/57/373157/1

diff --git a/includes/LintErrorsPager.php b/includes/LintErrorsPager.php
index 5dc792d..068ef94 100644
--- a/includes/LintErrorsPager.php
+++ b/includes/LintErrorsPager.php
@@ -45,6 +45,11 @@
private $linkRenderer;
 
/**
+* @var bool
+*/
+   private $haveParserMigrationExt;
+
+   /**
 * @var int|null
 */
private $namespace;
@@ -98,7 +103,7 @@
$row->linter_cat = $this->categoryId;
$lintError = Database::makeLintError( $row );
if ( $this->haveParserMigrationExt &&
-   $categoryManager->needsParserMigrationEdit( $name )
+   $this->categoryManager->needsParserMigrationEdit( $name 
)
) {
$editAction = 'parsermigration-edit';
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: All media should scale in gallery

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372431 )

Change subject: All media should scale in gallery
..


All media should scale in gallery

Change-Id: Ic9f2bb7252e7a57bbba8a3c5bed9fe11c2348933
---
M lib/ext/Gallery/modes.js
1 file changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/lib/ext/Gallery/modes.js b/lib/ext/Gallery/modes.js
index a2d3862..8fdca5b 100644
--- a/lib/ext/Gallery/modes.js
+++ b/lib/ext/Gallery/modes.js
@@ -77,7 +77,7 @@
return coreutil.format('%dx%dpx', opts.imageWidth, opts.imageHeight);
 };
 
-Traditional.prototype.scaleImage = function(opts, wrapper) {
+Traditional.prototype.scaleMedia = function(opts, wrapper) {
return opts.imageWidth;
 };
 
@@ -115,7 +115,7 @@
 };
 
 Traditional.prototype.line = function(opts, doc, ul, o) {
-   var width = this.scaleImage(opts, o.thumb);
+   var width = this.scaleMedia(opts, o.thumb);
var height = opts.imageHeight;
 
var box = doc.createElement('li');
@@ -168,17 +168,17 @@
return coreutil.format('x%dpx', Math.trunc(opts.imageHeight * 
this.scale));
 };
 
-Packed.prototype.scaleImage = function(opts, wrapper) {
-   var img = wrapper.querySelector('img');
-   if (img) {
-   var width = parseInt(img.getAttribute('width'), 10);
+Packed.prototype.scaleMedia = function(opts, wrapper) {
+   var elt = wrapper.querySelector('img, video');
+   if (elt) {
+   var width = parseInt(elt.getAttribute('width'), 10);
if (Number.isNaN(width)) {
width = opts.imageWidth;
} else {
width = Math.trunc(width / this.scale);
}
-   img.setAttribute('width', width);
-   img.setAttribute('height', opts.imageHeight);
+   elt.setAttribute('width', width);
+   elt.setAttribute('height', opts.imageHeight);
return width;
} else {
return opts.imageWidth;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9f2bb7252e7a57bbba8a3c5bed9fe11c2348933
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Fix up 11f4a97ba6bcd0c1de

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373156 )

Change subject: Fix up 11f4a97ba6bcd0c1de
..


Fix up 11f4a97ba6bcd0c1de

CategoryManager is a member variable. Also explicitly define the
haveParserMigrationExt member variable too.

Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
---
M includes/LintErrorsPager.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/includes/LintErrorsPager.php b/includes/LintErrorsPager.php
index 5dc792d..068ef94 100644
--- a/includes/LintErrorsPager.php
+++ b/includes/LintErrorsPager.php
@@ -45,6 +45,11 @@
private $linkRenderer;
 
/**
+* @var bool
+*/
+   private $haveParserMigrationExt;
+
+   /**
 * @var int|null
 */
private $namespace;
@@ -98,7 +103,7 @@
$row->linter_cat = $this->categoryId;
$lintError = Database::makeLintError( $row );
if ( $this->haveParserMigrationExt &&
-   $categoryManager->needsParserMigrationEdit( $name )
+   $this->categoryManager->needsParserMigrationEdit( $name 
)
) {
$editAction = 'parsermigration-edit';
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Fix up 11f4a97ba6bcd0c1de

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373156 )

Change subject: Fix up 11f4a97ba6bcd0c1de
..

Fix up 11f4a97ba6bcd0c1de

CategoryManager is a member variable. Also explicitly define the
haveParserMigrationExt member variable too.

Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
---
M includes/LintErrorsPager.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter 
refs/changes/56/373156/1

diff --git a/includes/LintErrorsPager.php b/includes/LintErrorsPager.php
index 5dc792d..068ef94 100644
--- a/includes/LintErrorsPager.php
+++ b/includes/LintErrorsPager.php
@@ -45,6 +45,11 @@
private $linkRenderer;
 
/**
+* @var bool
+*/
+   private $haveParserMigrationExt;
+
+   /**
 * @var int|null
 */
private $namespace;
@@ -98,7 +103,7 @@
$row->linter_cat = $this->categoryId;
$lintError = Database::makeLintError( $row );
if ( $this->haveParserMigrationExt &&
-   $categoryManager->needsParserMigrationEdit( $name )
+   $this->categoryManager->needsParserMigrationEdit( $name 
)
) {
$editAction = 'parsermigration-edit';
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aa77e5c1819a80ba18f67c0f65b2d47dbaa0303
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
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] operations/puppet[production]: openstack: glance set db params as variables

[Rush (Code Review)]

Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373154 )

Change subject: openstack: glance set db params as variables
..


openstack: glance set db params as variables

Bug: T171494
Change-Id: Ib15aa4ad3fa2e5b6ce86354260188f5e65404f85
---
M modules/profile/manifests/openstack/base/glance.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/profile/manifests/openstack/base/glance.pp 
b/modules/profile/manifests/openstack/base/glance.pp
index 30b0e3d..93ce8f5 100644
--- a/modules/profile/manifests/openstack/base/glance.pp
+++ b/modules/profile/manifests/openstack/base/glance.pp
@@ -23,10 +23,10 @@
 nova_controller_ip  => $nova_controller_ip,
 keystone_admin_uri  => $keystone_admin_uri,
 keystone_public_uri => $keystone_public_uri,
-db_user => db_user,
-db_pass => db_pass,
-db_name => db_name,
-db_host => db_host,
+db_user => $db_user,
+db_pass => $db_pass,
+db_name => $db_name,
+db_host => $db_host,
 ldap_user_pass  => $ldap_user_pass,
 nova_controller_standby => $nova_controller_standby,
 glance_data => $glance_data,

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Add ability to find duplicates for selected contacts.

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373155 )

Change subject: Add ability to find duplicates for selected contacts.
..

Add ability to find duplicates for selected contacts.

Notes:

- This is not in my mind a final implementation. I wish to merge to core as 
part of
extracting the code to an extension & version iteration & hence some choices 
may not
be permanent
- In the extension context the addition of the task may be by hook rather than
adding to the array. I could not see any reason for the weird CONST numbering 
scheme in core
for the task list & ignored it.
- I wanted to confirm whether it is necessary to extend the task class
which seems unwieldly to me & so have done this just extending CRM_Core_Form.
-It occurs to me there are 2 separate actions we are interested in
  1) select a bunch of contacts & find all the matches for them (based on either
default rule or selecting a rule).
  2) dedupe the contacts selected against each other.

The patch here adds an action to contact search results (Find duplicates for 
these contacts)
that uses the default rule to find all matches for selected contacts. This is 
the simpler
option of those listed. Implementing 2 will require some more work on the 
cacheKey mechanism
since we are trying to by-pass the rules.

Normally I would try to focus on what I can get into core first but in this case
I'm looking for a user win & to explore the code more to plan the next step
upstream, which will involve refactoring.

Bug: T151270

Change-Id: I2da53510e879c6260be8cee4a455d4a0a2d54693
---
A CRM/Contact/Form/Task/FindDuplicates.php
M CRM/Contact/Form/Task/Merge.php
M CRM/Contact/Page/AJAX.php
M CRM/Contact/Page/DedupeFind.php
M CRM/Contact/Task.php
5 files changed, 87 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/55/373155/1

diff --git a/CRM/Contact/Form/Task/FindDuplicates.php 
b/CRM/Contact/Form/Task/FindDuplicates.php
new file mode 100644
index 000..a3c3c37
--- /dev/null
+++ b/CRM/Contact/Form/Task/FindDuplicates.php
@@ -0,0 +1,73 @@
+http://civicrm.org/licensing|
+ ++
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2017
+ */
+
+/**
+ * This class provides the functionality to find potential matches.
+ */
+class CRM_Contact_Form_Task_FindDuplicates extends CRM_Core_Form {
+
+  /**
+   * Selected contact ids.
+   *
+   * @var array
+   */
+  public $_contactIds = array();
+
+  /**
+   * Build all the data structures needed to build the form.
+   */
+  public function preProcess() {
+ CRM_Contact_Form_Task::preProcessCommon($this);
+ $contactType = CRM_Core_DAO::singleValueQuery(
+   'SELECT GROUP_CONCAT(DISTINCT contact_type) FROM civicrm_contact WHERE 
id IN (' . implode($this->_contactIds). ')'
+ );
+
+ try {
+   $rule_group_id = civicrm_api3('RuleGroup', 'getvalue', array(
+ 'contact_type' => $contactType,
+ 'used' => 'Unsupervised',
+ 'return' => 'id',
+ 'options' => array('limit' => 1),
+   ));
+ }
+ catch (CiviCRM_API3_Exception $e) {
+   CRM_Core_Error::statusBounce(ts('It was not possible to identify a 
default rule that was applicable to all selected contacts. You must choose only 
one contact type. You chose %1', array($contactType)));
+ }
+
CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/contact/dedupefind', 
array(
+  'reset' => 1,
+  'action' => 'update',
+  'rgid' => $rule_group_id,
+  'criteria' => json_encode(array('contact_id' => array('IN' => 
$this->_contactIds))),
+)));
+  }
+}
\ No newline at end of file
diff --git a/CRM/Contact/Form/Task/Merge.php b/CRM/Contact/Form/Task/Merge.php
index d0f0abd..9bbdf4e 100644
--- a/CRM/Contact/Form/Task/Merge.php
+++ b/CRM/Contact/Form/Task/Merge.php
@@ -33,7 +33,6 @@
 
 /**
  * This class provides the functionality to Merge contacts.
- *
  */
 class CRM_Contact_Form_Task_Merge extends CRM_Contact_Form_Task {
 
diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index cfdff39..8185937 100644
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -649,13 +649,15 @@
 
 $gid = CRM_Utils_Request::retrieve('gid', 'Positive');
 $rgid = CRM_Utils_Request::retrieve('rgid', 'Positive');
+$null = NULL;
+$criteria = json_decode(CRM_Utils_Request::retrieve('criteria', 'String', 
$null, FALSE, '{}'), TRUE);
 $selected= isset($_REQUEST['selected']) ? 
CRM_Utils_Type::escape($_REQUEST['selected'], 'Integer') : 0;
 if ($rowCount < 0) {
   $rowCount = 0;
 }
 
 $whereClause = $orderByClause = '';
-$cacheKeyString   = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid);
+$cacheKeyString   = CRM_Dedupe_Merger::getMergeCacheKeyString($rgid, $gid, 
$criteria);
   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: glance set db params as variables

[Rush (Code Review)]

Rush has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373154 )

Change subject: openstack: glance set db params as variables
..

openstack: glance set db params as variables

Bug: T171494
Change-Id: Ib15aa4ad3fa2e5b6ce86354260188f5e65404f85
---
M modules/profile/manifests/openstack/base/glance.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/373154/1

diff --git a/modules/profile/manifests/openstack/base/glance.pp 
b/modules/profile/manifests/openstack/base/glance.pp
index 30b0e3d..93ce8f5 100644
--- a/modules/profile/manifests/openstack/base/glance.pp
+++ b/modules/profile/manifests/openstack/base/glance.pp
@@ -23,10 +23,10 @@
 nova_controller_ip  => $nova_controller_ip,
 keystone_admin_uri  => $keystone_admin_uri,
 keystone_public_uri => $keystone_public_uri,
-db_user => db_user,
-db_pass => db_pass,
-db_name => db_name,
-db_host => db_host,
+db_user => $db_user,
+db_pass => $db_pass,
+db_name => $db_name,
+db_host => $db_host,
 ldap_user_pass  => $ldap_user_pass,
 nova_controller_standby => $nova_controller_standby,
 glance_data => $glance_data,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.14]: Fix typo in the notification message

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372902 )

Change subject: Fix typo in the notification message
..


Fix typo in the notification message

Change-Id: I329847d1c08fdd4dadc69ac60b9cbde2db773b3d
(cherry picked from commit 7a85836fb7afd6017d38d83420a13e65525af8e4)
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index f72b7f1..e236635 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,6 +16,6 @@
"notification-loginnotify-login-success-email-subject": "Login to 
{{SITENAME}} as $1 from a computer you have not recently used",
"notification-header-login-success": "Someone (probably 
{{GENDER:$1|you}}) recently logged in to your account from a new device. If 
this was you, then you can disregard this message. If it wasn't you, then it's 
recommended that you change your password, and check your account activity.",
"notification-new-bundled-header-login-fail": "There {{PLURAL:$1|has 
been '''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to 
your account from a new device since the last time you logged in. If it wasn't 
you, please make sure your account has a strong password.",
-   "notification-known-header-login-fail": "There have been 
{{PLURAL:$1|has been '''a failed attempt'''|have been '''$1 failed 
attempts'''}} to log in to your account since the last time you logged in. If 
it wasn't you, please make sure your account has a strong password.",
+   "notification-known-header-login-fail": "There {{PLURAL:$1|has been 
'''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to your 
account since the last time you logged in. If it wasn't you, please make sure 
your account has a strong password.",
"notification-new-unbundled-header-login-fail": "There {{PLURAL:$1|has 
been '''a failed attempt'''|have been '''multiple failed attempts'''}} to log 
in to your account from a new device. Please make sure your account has a 
strong password."
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I329847d1c08fdd4dadc69ac60b9cbde2db773b3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[wmf/1.30.0-wmf.14]: Remove aborting of BeforePageDisplay hook

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372593 )

Change subject: Remove aborting of BeforePageDisplay hook
..


Remove aborting of BeforePageDisplay hook

This caused random extensions to not be able to load any ResourceLoader
modules (or do other things) on a random subset of pages and wikis.

Follows-up 29770a3.

Bug: T173411
Change-Id: I8dfc1085cb7d902f9e9be8a71324dc4cd850a500
(cherry picked from commit 55f075bf11326bb29b162c958de8b3eef2073068)
---
M includes/PopupsHooks.php
1 file changed, 2 insertions(+), 5 deletions(-)

Approvals:
  Thcipriani: Looks good to me, approved
  Pmiazga: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jdlrobson: Looks good to me, but someone else must approve



diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index d56bec5..ff6e952 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -108,27 +108,24 @@
 *
 * @param OutputPage &$out The Output page object
 * @param Skin &$skin  object that will be used to generate the 
page
-* @return bool
 */
public static function onBeforePageDisplay( OutputPage &$out, Skin 
&$skin ) {
$context = MediaWikiServices::getInstance()->getService( 
'Popups.Context' );
if ( $context->isTitleBlacklisted( $out->getTitle() ) ) {
-   return false;
+   return;
}
 
if ( !$context->areDependenciesMet() ) {
$logger = $context->getLogger();
$logger->error( 'Popups requires the PageImages and 
TextExtracts extensions. '
. 'If Beta mode is on it requires also 
BetaFeatures extension' );
-   return true;
+   return;
}
 
$user = $out->getUser();
if ( !$context->isBetaFeatureEnabled() || 
$context->shouldSendModuleToUser( $user ) ) {
$out->addModules( [ 'ext.popups' ] );
}
-
-   return true;
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8dfc1085cb7d902f9e9be8a71324dc4cd850a500
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: glance as module/profile/role for deployments

[Rush (Code Review)]

Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373150 )

Change subject: openstack: glance as module/profile/role for deployments
..


openstack: glance as module/profile/role for deployments

Bug: T171494
Change-Id: Ie250ee4889cd144293c4339b42f01eb16f933ed6
---
M hieradata/codfw/profile/openstack/labtest.yaml
A hieradata/codfw/profile/openstack/labtest/glance.yaml
M hieradata/codfw/profile/openstack/labtestn.yaml
A hieradata/codfw/profile/openstack/labtestn/glance.yaml
A hieradata/common/profile/openstack/base/glance.yaml
M hieradata/common/profile/openstack/base/keystone.yaml
M hieradata/eqiad/profile/openstack/main.yaml
A hieradata/eqiad/profile/openstack/main/glance.yaml
D modules/openstack/manifests/glance/service.pp
R modules/openstack2/files/liberty/glance/policy.json
A modules/openstack2/manifests/glance/image_sync.pp
A modules/openstack2/manifests/glance/monitor.pp
A modules/openstack2/manifests/glance/service.pp
R modules/openstack2/templates/liberty/glance/glance-api.conf.erb
R modules/openstack2/templates/liberty/glance/glance-registry.conf.erb
A modules/profile/manifests/openstack/base/glance.pp
A modules/profile/manifests/openstack/labtest/glance.pp
A modules/profile/manifests/openstack/labtestn/glance.pp
A modules/profile/manifests/openstack/main/glance.pp
D modules/role/manifests/labs/openstack/glance/server.pp
M modules/role/manifests/labs/openstack/nova/controller.pp
M modules/role/manifests/wmcs/openstack/labtest/control.pp
M modules/role/manifests/wmcs/openstack/labtestn/control.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
24 files changed, 302 insertions(+), 165 deletions(-)

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



diff --git a/hieradata/codfw/profile/openstack/labtest.yaml 
b/hieradata/codfw/profile/openstack/labtest.yaml
index 6be5986..3e698ce 100644
--- a/hieradata/codfw/profile/openstack/labtest.yaml
+++ b/hieradata/codfw/profile/openstack/labtest.yaml
@@ -1,5 +1,6 @@
 profile::openstack::labtest::version: 'liberty'
 profile::openstack::labtest::nova_controller: 
'labtestcontrol2001.wikimedia.org'
+profile::openstack::labtest::nova_controller_standby: ''
 profile::openstack::labtest::rabbit_monitor_user: 'monitoring'
 profile::openstack::labtest::rabbit_file_handles: 8192
 profile::openstack::labtest::osm_host: 'labtestwikitech.wikimedia.org'
diff --git a/hieradata/codfw/profile/openstack/labtest/glance.yaml 
b/hieradata/codfw/profile/openstack/labtest/glance.yaml
new file mode 100644
index 000..0ab782e
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtest/glance.yaml
@@ -0,0 +1 @@
+profile::openstack::labtest::glance::db_host: 
'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/codfw/profile/openstack/labtestn.yaml 
b/hieradata/codfw/profile/openstack/labtestn.yaml
index 4fdb9ac..0aeb103 100644
--- a/hieradata/codfw/profile/openstack/labtestn.yaml
+++ b/hieradata/codfw/profile/openstack/labtestn.yaml
@@ -1,5 +1,6 @@
 profile::openstack::labtestn::version: 'liberty'
 profile::openstack::labtestn::nova_controller: 
'labtestcontrol2003.wikimedia.org'
+profile::openstack::labtestn::nova_controller_standby: ''
 profile::openstack::labtestn::rabbit_monitor_user: 'monitoring'
 profile::openstack::labtestn::rabbit_file_handles: 8192
 profile::openstack::labtestn::osm_host: 'labtestnwikitech.wikimedia.org'
diff --git a/hieradata/codfw/profile/openstack/labtestn/glance.yaml 
b/hieradata/codfw/profile/openstack/labtestn/glance.yaml
new file mode 100644
index 000..71fbc32
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtestn/glance.yaml
@@ -0,0 +1 @@
+profile::openstack::labtestn::glance::db_host: 
'labtestcontrol2003.wikimedia.org'
diff --git a/hieradata/common/profile/openstack/base/glance.yaml 
b/hieradata/common/profile/openstack/base/glance.yaml
new file mode 100644
index 000..31fd0a4
--- /dev/null
+++ b/hieradata/common/profile/openstack/base/glance.yaml
@@ -0,0 +1,4 @@
+profile::openstack::base::glance::db_user: 'glance'
+profile::openstack::base::glance::db_name: 'glance'
+profile::openstack::base::glance::data_dir: '/srv/glance'
+profile::openstack::base::glance::image_dir: '/srv/glance/images'
diff --git a/hieradata/common/profile/openstack/base/keystone.yaml 
b/hieradata/common/profile/openstack/base/keystone.yaml
index 3041820..28a02e6 100644
--- a/hieradata/common/profile/openstack/base/keystone.yaml
+++ b/hieradata/common/profile/openstack/base/keystone.yaml
@@ -2,4 +2,5 @@
 profile::openstack::base::keystone::db_user: 'keystone'
 profile::openstack::base::keystone::auth_protocol: 'http'
 profile::openstack::base::keystone::auth_port: '35357'
+profile::openstack::base::keystone::public_port: '5000'
 profile::openstack::base::keystone::wiki_status_page_prefix: 'Nova_Resource:'
diff --git a/hieradata/eqiad/profile/openstack/main.yaml 
b/hieradata/eqiad/profile/openstack/main.yaml
index 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.22.5

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373153 )

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

Update OOjs UI to v0.22.5

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

Change-Id: Ia3ba4989c573de8b458c209560f6658b8324b548
---
M composer.json
M resources/lib/oojs-ui/i18n/en.json
M resources/lib/oojs-ui/i18n/ja.json
A resources/lib/oojs-ui/i18n/kab.json
M resources/lib/oojs-ui/i18n/li.json
M resources/lib/oojs-ui/i18n/nn.json
M resources/lib/oojs-ui/i18n/qqq.json
A resources/lib/oojs-ui/i18n/skr-arab.json
M resources/lib/oojs-ui/i18n/yue.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-core.js.map
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-toolbars.js.map
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-widgets.js.map
M resources/lib/oojs-ui/oojs-ui-wikimediaui.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/oojs-ui-windows.js.map
27 files changed, 157 insertions(+), 115 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/373153/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3ba4989c573de8b458c209560f6658b8324b548
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] mediawiki/core[master]: EditPage: Remove legacy non-OOUI render mode

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366872 )

Change subject: EditPage: Remove legacy non-OOUI render mode
..


EditPage: Remove legacy non-OOUI render mode

Mostly remove it at least. Some things from the transition are still
left around:

* EditPage::isOouiEnabled() will now always return true and is soft
  deprecated as some extensions are using it to detect whether in OOUI
  mode.
* EditPage::getCheckboxes() is left around since getCheckboxesOOUI()
  calls it. Someone else will need to disentangle that.
* The "mw-editform-ooui" class is kept as some on-wiki JavaScript uses
  it to detect whether running in the OOUI mode.
* CSS is still using the .mw-editform-ooui class. It should be
  transitioned to use .mw-editform in a follow-up.

Other cleanup:
* mediawiki.action.edit now directly depends upon oojs-ui-core instead
  of transitively via mediawiki.widgets.visibleByteLimit. As a result, the
  mw.loader.using call was removed from the JavaScript file.

Bug: T172315
Change-Id: I2b468c8b846db015b5a1e3d2500abb8ea252c442
---
M RELEASE-NOTES-1.30
M includes/DefaultSettings.php
M includes/EditPage.php
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.js
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
M resources/src/mediawiki.action/mediawiki.action.edit.styles.css
7 files changed, 78 insertions(+), 245 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index ae16779..473ac84 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -37,6 +37,8 @@
   This PHP extension was deprecated in PHP 5.5 and removed in PHP 7.0. 
MediaWiki
   auto-selects the 'mysqli' driver since MediaWiki 1.22, except if explicitly
   requested through the configuration parameter $wgDBservers.
+* $wgOOUIEditPage was removed, as it is now the default. This was documented 
as a
+  temporary variable during the migration period.
 
 === New features in 1.30 ===
 * (T37247) Output from Parser::parse() will now be wrapped in a div with
@@ -183,6 +185,7 @@
   RunningStat\RunningStat should be used instead.
 * MWMemcached and MemCachedClientforWiki classes (deprecated in 1.27) were 
removed.
   The MemcachedClient class should be used instead.
+* EditPage::isOouiEnabled() is deprecated and will always return true.
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2613889..d07136b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3236,14 +3236,6 @@
 $wgUseMediaWikiUIEverywhere = false;
 
 /**
- * Temporary variable that determines whether the EditPage class should use 
OOjs UI or not.
- * This will be removed later and OOjs UI will become the only option.
- *
- * @since 1.29
- */
-$wgOOUIEditPage = true;
-
-/**
  * Whether to label the store-to-database-and-show-to-others button in the 
editor
  * as "Save page"/"Save changes" if false (the default) or, if true, instead as
  * "Publish page"/"Publish changes".
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 914e7aa..0e1438f 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -414,11 +414,6 @@
private $isOldRev = false;
 
/**
-* @var bool Whether OOUI should be enabled here
-*/
-   private $oouiEnabled = false;
-
-   /**
 * @param Article $article
 */
public function __construct( Article $article ) {
@@ -431,8 +426,6 @@
 
$handler = ContentHandler::getForModelID( $this->contentModel );
$this->contentFormat = $handler->getDefaultFormat();
-
-   $this->oouiEnabled = $this->context->getConfig()->get( 
'OOUIEditPage' );
}
 
/**
@@ -485,10 +478,11 @@
 
/**
 * Check if the edit page is using OOUI controls
-* @return bool
+* @return bool Always true
+* @deprecated since 1.30
 */
public function isOouiEnabled() {
-   return $this->oouiEnabled;
+   return true;
}
 
/**
@@ -857,9 +851,6 @@
 */
public function importFormData( &$request ) {
global $wgContLang, $wgUser;
-
-   # Allow users to change the mode for testing
-   $this->oouiEnabled = $request->getFuzzyBool( 'ooui', 
$this->oouiEnabled );
 
# Section edit can come from either the form or a link
$this->section = $request->getVal( 'wpSection', 
$request->getVal( 'section' ) );
@@ -2667,7 +2658,8 @@
$wgOut->addHTML( Html::openElement(
'form',
[
-  

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.22.5

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373152 )

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

Update OOjs UI to v0.22.5

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

Change-Id: Icf08f8c12d91b74425df319e69df22330c7088a9
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/i18n/en.json
M oojs/oojs-ui/i18n/ja.json
A oojs/oojs-ui/i18n/kab.json
M oojs/oojs-ui/i18n/li.json
M oojs/oojs-ui/i18n/nn.json
M oojs/oojs-ui/i18n/qqq.json
A oojs/oojs-ui/i18n/skr-arab.json
M oojs/oojs-ui/i18n/yue.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Element.php
M oojs/oojs-ui/php/Tag.php
M oojs/oojs-ui/php/Widget.php
M oojs/oojs-ui/php/layouts/PanelLayout.php
M oojs/oojs-ui/php/mixins/ButtonElement.php
M oojs/oojs-ui/php/mixins/FlaggedElement.php
M oojs/oojs-ui/php/mixins/GroupElement.php
M oojs/oojs-ui/php/widgets/ButtonInputWidget.php
M oojs/oojs-ui/php/widgets/ButtonWidget.php
M oojs/oojs-ui/php/widgets/CheckboxInputWidget.php
M oojs/oojs-ui/php/widgets/ProgressBarWidget.php
M oojs/oojs-ui/php/widgets/RadioInputWidget.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
26 files changed, 145 insertions(+), 78 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/52/373152/1

diff --git a/composer.json b/composer.json
index 2dcfd8d..53ee081 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"monolog/monolog": "1.22.1",
"mustangostang/spyc": "0.6.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.22.4",
+   "oojs/oojs-ui": "0.22.5",
"oyejorge/less.php": "1.7.0.14",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.4.1",
diff --git a/composer.lock b/composer.lock
index 355956c..0bb1173 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"content-hash": "301c4a097e044e617ab5b804f5b99a22",
+"content-hash": "8e3ab52a0544abb4d7450ab1ae3c1374",
 "packages": [
 {
 "name": "composer/semver",
@@ -516,16 +516,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.22.4",
+"version": "v0.22.5",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7"
+"reference": "5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/bb1b15c47835468f133a56aa56a721f8793c61f7;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d;,
+"reference": "5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d",
 "shasum": ""
 },
 "require": {
@@ -534,7 +534,7 @@
 },
 "require-dev": {
 "jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.10.0",
+"mediawiki/mediawiki-codesniffer": "0.11.0",
 "phpunit/phpunit": "4.8.21"
 },
 "type": "library",
@@ -591,7 +591,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-08-01T19:55:30+00:00"
+"time": "2017-08-22T21:02:41+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index f37cf29..bcb7a6c 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2326,17 +2326,17 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.22.4",
-"version_normalized": "0.22.4.0",
+"version": "v0.22.5",
+"version_normalized": "0.22.5.0",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7"
+"reference": "5ebb89bc94cf1d15772bfd624cc5c96ebbeafd7d"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/bb1b15c47835468f133a56aa56a721f8793c61f7;,
-"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7",
+"url": 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Disable wikitext editor on non-wikitext content models

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373076 )

Change subject: Disable wikitext editor on non-wikitext content models
..


Disable wikitext editor on non-wikitext content models

Do not allow editing via JavaScript on non-wikitext content models
For these pages ?action=edit will be used

Bug: T173800
Change-Id: Ic62a0c1397ab8a6a59e5382c2999b63b3c60a19f
---
M includes/skins/SkinMinerva.php
M resources/skins.minerva.editor/init.js
2 files changed, 18 insertions(+), 3 deletions(-)

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



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index d108b48..ade588c 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -19,6 +19,9 @@
const OPTION_BACK_TO_TOP = 'backToTop';
const OPTION_TOGGLING = 'toggling';
const OPTIONS_MOBILE_BETA = 'beta';
+   /** @const LEAD_SECTION_NUMBER integer which corresponds to the lead 
section
+ in editing mode */
+   const LEAD_SECTION_NUMBER = 0;
 
/** @var string $skinname Name of this skin */
public $skinname = 'minerva';
@@ -1063,6 +1066,13 @@
 * @return array A map compatible with BaseTemplate#makeListItem
 */
protected function createEditPageAction() {
+   $title = $this->getTitle();
+   $editArgs = [ 'action' => 'edit' ];
+   if ( $title->isWikitextPage() ) {
+   // If the content model is wikitext we'll default to 
editing the lead section.
+   // Full wikitext editing is not possible via the api 
and hard on mobile devices.
+   $editArgs['section'] = self::LEAD_SECTION_NUMBER;
+   }
return [
'id' => 'ca-edit',
'text' => '',
@@ -1070,7 +1080,7 @@
'class' => MobileUI::iconClass( 'edit-enabled', 
'element' ),
'links' => [
'edit' => [
-   'href' => 
$this->getTitle()->getLocalURL( [ 'action' => 'edit', 'section' => 0 ] )
+   'href' => $title->getLocalURL( 
$editArgs )
],
],
'is_js_only' => false
@@ -1240,7 +1250,7 @@
if ( !$title->isTalkPage() ) {
$title = $title->getTalkPage();
}
-   return $title->getContentModel() === CONTENT_MODEL_WIKITEXT;
+   return $title->isWikitextPage();
}
 
/**
diff --git a/resources/skins.minerva.editor/init.js 
b/resources/skins.minerva.editor/init.js
index c6b5b6d..862180b 100644
--- a/resources/skins.minerva.editor/init.js
+++ b/resources/skins.minerva.editor/init.js
@@ -24,6 +24,7 @@
popup = M.require( 'mobile.startup/toast' ),
// FIXME: Disable on IE < 10 for time being
blacklisted = /MSIE \d\./.test( navigator.userAgent ),
+   contentModel = mw.config.get( 'wgPageContentModel' ),
isEditingSupported = router.isSupported() && !blacklisted,
// FIXME: Use currentPage.getId()
isNewPage = currentPage.options.id === 0,
@@ -345,7 +346,11 @@
} );
}
 
-   if ( !isEditingSupported ) {
+   if ( contentModel !== 'wikitext' ) {
+   // Only load the wikitext editor on wikitext. Otherwise we'll 
rely on the fallback behaviour
+   // (You can test this on MediaWiki:Common.css) ?action=edit url 
(T173800)
+   return;
+   } else if ( !isEditingSupported ) {
// Editing is disabled (or browser is blacklisted)
$caEdit.removeClass( 'hidden' );
showSorryToast( mw.msg( 'mobile-frontend-editor-unavailable' ) 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic62a0c1397ab8a6a59e5382c2999b63b3c60a19f
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Change print wordmark margin bottom to 20px from 10px

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373141 )

Change subject: Change print wordmark margin bottom to 20px from 10px
..


Change print wordmark margin bottom to 20px from 10px

Per T169826#3542839.

Bug: T169826
Change-Id: I8658814988c15e48ca90875d33327a48ee8b7ca1
---
M print.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/print.less b/print.less
index d770e3f..55d49fa 100644
--- a/print.less
+++ b/print.less
@@ -18,7 +18,7 @@
height: ~'@{printLogoHeight}px';
left: -px;
line-height: 0;  // line-height is needed for 
correctly displaying the size of the content box.
-   margin-bottom: 10px;
+   margin-bottom: 20px;
position: absolute;
width: ~'@{printLogoWidth}px';
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8658814988c15e48ca90875d33327a48ee8b7ca1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Adjust TOC print styles

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373120 )

Change subject: Adjust TOC print styles
..


Adjust TOC print styles

* Font size shrunk and declared in `pt`
* `margin` adjustment
* `page-break-before` now uses `avoid`

Bug: T173767
Change-Id: Ieeabc22079978cdf1f8484f3ac9961d990901336
---
M print.less
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/print.less b/print.less
index d770e3f..1957008 100644
--- a/print.less
+++ b/print.less
@@ -142,8 +142,8 @@
 
// Using #toc rather than .toc to override default print style
#toc {
-   page-break-before: always;
-   page-break-after: always;
+   page-break-before: avoid;
+   page-break-after: avoid;
background: none;
border: 0;
display: block;
@@ -156,7 +156,7 @@
> ul {
 
> li {
-   margin-bottom: 20px;
+   margin-bottom: 4px;
font-weight: bold;
 
> ul {
@@ -184,7 +184,7 @@
li.toclevel-1 {
> a {
font-weight: bold;
-   font-size: 16px;
+   font-size: 10pt;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieeabc22079978cdf1f8484f3ac9961d990901336
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.22.5

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373151 )

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


Update OOjs UI to v0.22.5

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

Change-Id: Icf08f8c12d91b74425df319e69df22330c7088a9
---
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M lib/oojs-ui/i18n/en.json
M lib/oojs-ui/i18n/ja.json
A lib/oojs-ui/i18n/kab.json
M lib/oojs-ui/i18n/li.json
M lib/oojs-ui/i18n/nn.json
M lib/oojs-ui/i18n/qqq.json
A lib/oojs-ui/i18n/skr-arab.json
M lib/oojs-ui/i18n/yue.json
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-toolbars.js.map
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-widgets.js.map
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.22.5

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373151 )

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

Update OOjs UI to v0.22.5

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

Change-Id: Icf08f8c12d91b74425df319e69df22330c7088a9
---
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
M lib/oojs-ui/i18n/en.json
M lib/oojs-ui/i18n/ja.json
A lib/oojs-ui/i18n/kab.json
M lib/oojs-ui/i18n/li.json
M lib/oojs-ui/i18n/nn.json
M lib/oojs-ui/i18n/qqq.json
A lib/oojs-ui/i18n/skr-arab.json
M lib/oojs-ui/i18n/yue.json
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-toolbars.js.map
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-widgets.js.map
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: glance as module/profile/role for deployments

[Rush (Code Review)]

Rush has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373150 )

Change subject: openstack: glance as module/profile/role for deployments
..

openstack: glance as module/profile/role for deployments

Bug: T171494
Change-Id: Ie250ee4889cd144293c4339b42f01eb16f933ed6
---
M hieradata/codfw/profile/openstack/labtest.yaml
A hieradata/codfw/profile/openstack/labtest/glance.yaml
M hieradata/codfw/profile/openstack/labtestn.yaml
A hieradata/codfw/profile/openstack/labtestn/glance.yaml
A hieradata/common/profile/openstack/base/glance.yaml
M hieradata/common/profile/openstack/base/keystone.yaml
M hieradata/eqiad/profile/openstack/main.yaml
A hieradata/eqiad/profile/openstack/main/glance.yaml
D modules/openstack/manifests/glance/service.pp
R modules/openstack2/files/liberty/glance/policy.json
A modules/openstack2/manifests/glance/image_sync.pp
A modules/openstack2/manifests/glance/monitor.pp
A modules/openstack2/manifests/glance/service.pp
R modules/openstack2/templates/liberty/glance/glance-api.conf.erb
R modules/openstack2/templates/liberty/glance/glance-registry.conf.erb
A modules/profile/manifests/openstack/base/glance.pp
A modules/profile/manifests/openstack/labtest/glance.pp
A modules/profile/manifests/openstack/labtestn/glance.pp
A modules/profile/manifests/openstack/main/glance.pp
D modules/role/manifests/labs/openstack/glance/server.pp
M modules/role/manifests/labs/openstack/nova/controller.pp
M modules/role/manifests/wmcs/openstack/labtest/control.pp
M modules/role/manifests/wmcs/openstack/labtestn/control.pp
M modules/role/manifests/wmcs/openstack/main/control.pp
24 files changed, 314 insertions(+), 165 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/373150/1

diff --git a/hieradata/codfw/profile/openstack/labtest.yaml 
b/hieradata/codfw/profile/openstack/labtest.yaml
index 6be5986..3e698ce 100644
--- a/hieradata/codfw/profile/openstack/labtest.yaml
+++ b/hieradata/codfw/profile/openstack/labtest.yaml
@@ -1,5 +1,6 @@
 profile::openstack::labtest::version: 'liberty'
 profile::openstack::labtest::nova_controller: 
'labtestcontrol2001.wikimedia.org'
+profile::openstack::labtest::nova_controller_standby: ''
 profile::openstack::labtest::rabbit_monitor_user: 'monitoring'
 profile::openstack::labtest::rabbit_file_handles: 8192
 profile::openstack::labtest::osm_host: 'labtestwikitech.wikimedia.org'
diff --git a/hieradata/codfw/profile/openstack/labtest/glance.yaml 
b/hieradata/codfw/profile/openstack/labtest/glance.yaml
new file mode 100644
index 000..0ab782e
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtest/glance.yaml
@@ -0,0 +1 @@
+profile::openstack::labtest::glance::db_host: 
'labtestcontrol2001.wikimedia.org'
diff --git a/hieradata/codfw/profile/openstack/labtestn.yaml 
b/hieradata/codfw/profile/openstack/labtestn.yaml
index 4fdb9ac..0aeb103 100644
--- a/hieradata/codfw/profile/openstack/labtestn.yaml
+++ b/hieradata/codfw/profile/openstack/labtestn.yaml
@@ -1,5 +1,6 @@
 profile::openstack::labtestn::version: 'liberty'
 profile::openstack::labtestn::nova_controller: 
'labtestcontrol2003.wikimedia.org'
+profile::openstack::labtestn::nova_controller_standby: ''
 profile::openstack::labtestn::rabbit_monitor_user: 'monitoring'
 profile::openstack::labtestn::rabbit_file_handles: 8192
 profile::openstack::labtestn::osm_host: 'labtestnwikitech.wikimedia.org'
diff --git a/hieradata/codfw/profile/openstack/labtestn/glance.yaml 
b/hieradata/codfw/profile/openstack/labtestn/glance.yaml
new file mode 100644
index 000..71fbc32
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtestn/glance.yaml
@@ -0,0 +1 @@
+profile::openstack::labtestn::glance::db_host: 
'labtestcontrol2003.wikimedia.org'
diff --git a/hieradata/common/profile/openstack/base/glance.yaml 
b/hieradata/common/profile/openstack/base/glance.yaml
new file mode 100644
index 000..31fd0a4
--- /dev/null
+++ b/hieradata/common/profile/openstack/base/glance.yaml
@@ -0,0 +1,4 @@
+profile::openstack::base::glance::db_user: 'glance'
+profile::openstack::base::glance::db_name: 'glance'
+profile::openstack::base::glance::data_dir: '/srv/glance'
+profile::openstack::base::glance::image_dir: '/srv/glance/images'
diff --git a/hieradata/common/profile/openstack/base/keystone.yaml 
b/hieradata/common/profile/openstack/base/keystone.yaml
index 3041820..28a02e6 100644
--- a/hieradata/common/profile/openstack/base/keystone.yaml
+++ b/hieradata/common/profile/openstack/base/keystone.yaml
@@ -2,4 +2,5 @@
 profile::openstack::base::keystone::db_user: 'keystone'
 profile::openstack::base::keystone::auth_protocol: 'http'
 profile::openstack::base::keystone::auth_port: '35357'
+profile::openstack::base::keystone::public_port: '5000'
 profile::openstack::base::keystone::wiki_status_page_prefix: 'Nova_Resource:'
diff --git a/hieradata/eqiad/profile/openstack/main.yaml 
b/hieradata/eqiad/profile/openstack/main.yaml
index 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: two new ldap users sharvaniharan and Cooltey

[RobH (Code Review)]

RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373148 )

Change subject: two new ldap users sharvaniharan and Cooltey
..

two new ldap users sharvaniharan and Cooltey

Adding in two new engineers, Cooltey Feng and Sharvani Haran (LDAP users
Cooltey and Sharvaniharan) recently started on the Android app team.
they'll be granted the wmf flag after merge of this patchset

Bug:T173874
Change-Id: I459661bc702ae94b847c8c317909457e0c947f62
---
M modules/admin/data/data.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/373148/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 5437e15..611dc10 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2710,3 +2710,11 @@
 ensure: present
 realname: Zachary McCune
 email: zmcc...@wikimedia.org
+  cooltey:
+ensure: present
+realname: Cooltey Feng
+email: cf...@wikimedia.org
+  sharvaniharan:
+ensure: present
+realname: Sharvani Haran
+email: sha...@wikimedia.org
\ No newline at end of file

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid DB replication waits for farm cross-wiki redirects

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373147 )

Change subject: Avoid DB replication waits for farm cross-wiki redirects
..

Avoid DB replication waits for farm cross-wiki redirects

This previously only worked if $wgLocalVirtualHosts was set, which
was too specific to check and not used by WMF. Use the more generic
WikiMap class.

Two methods have been added there to do the work of enumerating
canonical wiki farm URLs and checking them against a given URL.

Bug: T172357
Change-Id: Id2415bab5d7f5a08b9f536858c32d329138384a2
---
M includes/MediaWiki.php
M includes/WikiMap.php
M tests/phpunit/includes/WikiMapTest.php
3 files changed, 127 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/373147/1

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 10b9e2b..7b59ee9 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -607,7 +607,7 @@
$request->wasPosted() &&
$output->getRedirect() &&
$lbFactory->hasOrMadeRecentMasterChanges( INF )
-   ) ? self::getUrlDomainDistance( $output->getRedirect(), 
$context ) : false;
+   ) ? self::getUrlDomainDistance( $output->getRedirect() ) : 
false;
 
$allowHeaders = !( $output->isDisabled() || headers_sent() );
if ( $urlDomainDistance === 'local' || $urlDomainDistance === 
'remote' ) {
@@ -676,34 +676,14 @@
 
/**
 * @param string $url
-* @param IContextSource $context
 * @return string Either "local", "remote" if in the farm, "external" 
otherwise
 */
-   private static function getUrlDomainDistance( $url, IContextSource 
$context ) {
-   static $relevantKeys = [ 'host' => true, 'port' => true ];
-
-   $infoCandidate = wfParseUrl( $url );
-   if ( $infoCandidate === false ) {
-   return 'external';
-   }
-
-   $infoCandidate = array_intersect_key( $infoCandidate, 
$relevantKeys );
-   $clusterHosts = array_merge(
-   // Local wiki host (the most common case)
-   [ $context->getConfig()->get( 'CanonicalServer' ) ],
-   // Any local/remote wiki virtual hosts for this wiki 
farm
-   $context->getConfig()->get( 'LocalVirtualHosts' )
-   );
-
-   foreach ( $clusterHosts as $i => $clusterHost ) {
-   $parseUrl = wfParseUrl( $clusterHost );
-   if ( !$parseUrl ) {
-   continue;
-   }
-   $infoHost = array_intersect_key( $parseUrl, 
$relevantKeys );
-   if ( $infoCandidate === $infoHost ) {
-   return ( $i === 0 ) ? 'local' : 'remote';
-   }
+   private static function getUrlDomainDistance( $url ) {
+   $clusterWiki = WikiMap::getWikiFromUrl( $url );
+   if ( $clusterWiki === wfWikiID() ) {
+   return 'local'; // the current wiki
+   } elseif ( $clusterWiki !== false ) {
+   return 'remote'; // another wiki in this cluster/farm
}
 
return 'external';
diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 6a532e5..2e10f9f 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -20,8 +20,10 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
- * Helper tools for dealing with other wikis.
+ * Helper tools for dealing with other locally-hosted wikis.
  */
 class WikiMap {
 
@@ -81,7 +83,7 @@
 * @return WikiReference|null WikiReference object or null if the wiki 
was not found
 */
private static function getWikiWikiReferenceFromSites( $wikiID ) {
-   $siteLookup = 
\MediaWiki\MediaWikiServices::getInstance()->getSiteLookup();
+   $siteLookup = MediaWikiServices::getInstance()->getSiteLookup();
$site = $siteLookup->getSite( $wikiID );
 
if ( !$site instanceof MediaWikiSite ) {
@@ -174,4 +176,67 @@
 
return false;
}
+
+   /**
+* Get canonical server info for all local wikis in the map that have 
one
+*
+* @return array Map of (local wiki ID => map of (url,parts))
+* @since 1.30
+*/
+   public static function getCanonicalServerInfoForAllWikis() {
+   $cache = 
MediaWikiServices::getInstance()->getLocalServerObjectCache();
+
+   return $cache->getWithSetCallback(
+   $cache->makeGlobalKey( 'wikimap', 'canonical-urls' ),
+   $cache::TTL_DAY,
+   function () {
+   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Provide the WikimediaUI LESS config vars for all ...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372904 )

Change subject: resources: Provide the WikimediaUI LESS config vars for all 
OOjs UI users
..


resources: Provide the WikimediaUI LESS config vars for all OOjs UI users

Bug: T123359
Change-Id: I11677b9bacdbba9e17574891ca30428051b13606
---
M maintenance/resources/update-oojs-ui.sh
M resources/Resources.php
A resources/lib/oojs-ui/wikimedia-ui-base.less
3 files changed, 158 insertions(+), 1 deletion(-)

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



diff --git a/maintenance/resources/update-oojs-ui.sh 
b/maintenance/resources/update-oojs-ui.sh
index bfa359f..799af4c 100755
--- a/maintenance/resources/update-oojs-ui.sh
+++ b/maintenance/resources/update-oojs-ui.sh
@@ -59,6 +59,7 @@
 cp ./node_modules/oojs-ui/src/themes/wikimediaui/*.json 
"$REPO_DIR/$TARGET_DIR/themes/wikimediaui"
 cp -R ./node_modules/oojs-ui/dist/themes/apex/images 
"$REPO_DIR/$TARGET_DIR/themes/apex"
 cp ./node_modules/oojs-ui/src/themes/apex/*.json 
"$REPO_DIR/$TARGET_DIR/themes/apex"
+cp ./node_modules/oojs-ui/dist/wikimedia-ui-base.less "$REPO_DIR/$TARGET_DIR"
 
 # Clean up temporary area
 rm -rf "$NPM_DIR"
diff --git a/resources/Resources.php b/resources/Resources.php
index 89eab94..e6ade6a 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2695,7 +2695,10 @@
// This contains only the styles required by core widgets.
'oojs-ui-core.styles' => [
'class' => 'ResourceLoaderOOUIFileModule',
-   'styles' => 'resources/src/oojs-ui-local.css', // HACK, see 
inside the file
+   'styles' => [
+   'resources/lib/oojs-ui/wikimedia-ui-base.less', // 
Providing Wikimedia UI LESS variables to all
+   'resources/src/oojs-ui-local.css', // HACK, see inside 
the file
+   ],
'themeStyles' => 'core',
'targets' => [ 'desktop', 'mobile' ],
],
diff --git a/resources/lib/oojs-ui/wikimedia-ui-base.less 
b/resources/lib/oojs-ui/wikimedia-ui-base.less
new file mode 100644
index 000..d450dbc
--- /dev/null
+++ b/resources/lib/oojs-ui/wikimedia-ui-base.less
@@ -0,0 +1,153 @@
+/**
+ * WikimediaUI Base v0.9.2
+ * Wikimedia Foundation user interface base variables
+ */
+
+/* Colors */
+// WikimediaUI (WMUI) color palette
+@wmui-color-base0:#000;// = HSB 0°, 0%, 0%
+@wmui-color-base10:   #222;// = HSB 0°, 0%, 13%
+@wmui-color-base20:   #54595d; // = HSB 207°, 10%, 36%; WCAG 2.0 level AAA 
7.09:1 contrast ratio on `#fff`
+@wmui-color-base30:   #72777d; // = HSB 210°, 9%, 49%; WCAG 2.0 level AA at 
4.52:1 contrast ratio on `#fff`
+@wmui-color-base50:   #a2a9b1; // = HSB 212°, 8%, 69%
+@wmui-color-base70:   #c8ccd1; // = HSB 213°, 4%, 82%
+@wmui-color-base80:   #eaecf0; // = HSB 220°, 3%, 94%
+@wmui-color-base90:   #f8f9fa; // = HSB 210°, 1%, 98%
+@wmui-color-base100:  #fff;// = HSB 0°, 0%, 100%
+
+@wmui-color-accent30: #2a4b8d; // = HSB 220°, 70%, 55%
+@wmui-color-accent50: #36c;// = HSB 220°, 75%, 80%
+@wmui-color-accent90: #eaf3ff; // = HSB 214°, 8%, 100%
+
+@wmui-color-red30:#b32424; // = HSB 360°, 80%, 70%
+@wmui-color-red50:#d33;// = HSB 360°, 77%, 87%
+@wmui-color-red90:#fee7e6; // = HSB 3°, 9%, 100%
+
+@wmui-color-yellow30: #ac6600; // = HSB 36°, 100%, 67%
+@wmui-color-yellow50: #fc3;// = HSB 45°, 80%, 100%
+@wmui-color-yellow90: #fef6e7; // = HSB 39°, 9%, 100%
+
+@wmui-color-green30:  #14866d; // = HSB 167°, 85%, 53%
+@wmui-color-green50:  #00af89; // = HSB 167°, 100%, 69%
+@wmui-color-green90:  #d5fdf4; // = HSB 166°, 16%, 99%
+
+// Background Colors
+@background-color-base:   @wmui-color-base100;
+@background-color-code:   @wmui-color-base90;
+// 'Framed' UI elements (Framed Buttons, Dropdowns, ToggleSwitches...)
+@background-color-framed: @wmui-color-base90;
+@background-color-framed--hover: @wmui-color-base100;
+@background-color-framed--active: @wmui-color-base70;
+// Tabs Navigation Background Color
+@background-color-tabs:   @wmui-color-base80;
+// Highlight Colors, RGBA Colors include hex fallback on `#fff` for IE 6/7/8
+@background-color-highlight:  rgba( 255, 182, 13, 0.4 );
+@background-color-highlight--fallback: #ffe29e;
+
+// Foreground Colors
+@color-base:  @wmui-color-base10;
+@color-base--hover:   #444;
+@color-base--active:  @wmui-color-base0;
+@color-base--inverted:@wmui-color-base100;
+@color-base--emphasized:  @wmui-color-base0;
+@color-base--subtle:  @wmui-color-base30;
+@color-base--disabled:@wmui-color-base30;
+@color-filled--disabled:  @color-base--inverted;
+@color-placeholder:   @wmui-color-base30;
+// Primary 'Progressive' Color, Background Color and states
+@background-color-primary:@wmui-color-accent90;
+@background-color-primary--hover: 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resources: Consolidate on the WikimediaUI “erroneous” color ...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372907 )

Change subject: resources: Consolidate on the WikimediaUI “erroneous” color 
value
..


resources: Consolidate on the WikimediaUI “erroneous” color value

“Erroneous” color was updated to `#d33` in WikimediaUI color palette to
ensure WCAG 2.0 level AA conformance with both white and black.

Replacing all occurences of `#f00` and `#c00` to reflect color palette
change with the following caveats and exceptions:

- MW config styles are not amended, as it is out of scope and all
  boundaries and applications of WikimediaUI are yet to be defined;

- oldshared.css is excluded, as WikimediaUI isn't touching old skins; &

- errorbox with its current background is getting a lowered textual
  contrast but we still provide enough contrast for text size and bolded
  font, and this needs to be seen as intermediate standardization step.

Bug: T152025
Change-Id: Iba3362abaa1702599f0d68860f579aea2114801c
---
M resources/src/jquery/jquery.badge.css
M resources/src/mediawiki.legacy/shared.css
M resources/src/mediawiki.less/mediawiki.ui/variables.less
M resources/src/mediawiki.special/mediawiki.special.apisandbox.css
M resources/src/mediawiki/htmlform/styles.css
M resources/src/mediawiki/mediawiki.apihelp.css
6 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/resources/src/jquery/jquery.badge.css 
b/resources/src/jquery/jquery.badge.css
index 8e0e512..2dbd4a5 100644
--- a/resources/src/jquery/jquery.badge.css
+++ b/resources/src/jquery/jquery.badge.css
@@ -32,5 +32,5 @@
 }
 
 .mw-badge-important {
-   background-color: #c00;
+   background-color: #d33;
 }
diff --git a/resources/src/mediawiki.legacy/shared.css 
b/resources/src/mediawiki.legacy/shared.css
index 1efcdd0..fbc9816 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -153,7 +153,7 @@
 
 .unpatrolled {
font-weight: bold;
-   color: #f00;
+   color: #d33;
 }
 
 div.patrollink {
@@ -389,7 +389,7 @@
 }
 
 .error {
-   color: #c00;
+   color: #d33;
 }
 
 .warning {
@@ -423,7 +423,7 @@
 }
 
 .errorbox {
-   color: #c00;
+   color: #d33;
border-color: #fac5c5;
background-color: #fae3e3;
 }
@@ -460,7 +460,7 @@
 
 /* Note on preview page */
 .previewnote {
-   color: #c00;
+   color: #d33;
margin-bottom: 1em;
 }
 
diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less 
b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index 0ad791b..0c897dc 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -41,7 +41,7 @@
 @colorButtonTextHighlight: @colorGray4;
 @colorButtonTextActive: @colorGray1;
 @colorDisabledText: @colorGray12;
-@colorErrorText: #c00;
+@colorErrorText: #d33;
 @colorWarningText: #705000;
 
 // UI colors
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.css 
b/resources/src/mediawiki.special/mediawiki.special.apisandbox.css
index 99d0222..750a567 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.css
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.css
@@ -101,7 +101,7 @@
 
 .apihelp-deprecated {
font-weight: bold;
-   color: #f00;
+   color: #d33;
 }
 
 .apihelp-deprecated-value .oo-ui-labelElement-label {
diff --git a/resources/src/mediawiki/htmlform/styles.css 
b/resources/src/mediawiki/htmlform/styles.css
index a36b379..0f331ee 100644
--- a/resources/src/mediawiki/htmlform/styles.css
+++ b/resources/src/mediawiki/htmlform/styles.css
@@ -9,7 +9,7 @@
 }
 
 .mw-htmlform-invalid-input td.mw-input input {
-   border-color: #f00;
+   border-color: #d33;
 }
 
 .mw-htmlform-flatlist div.mw-htmlform-flatlist-item {
diff --git a/resources/src/mediawiki/mediawiki.apihelp.css 
b/resources/src/mediawiki/mediawiki.apihelp.css
index bd4741d..7ef32ea 100644
--- a/resources/src/mediawiki/mediawiki.apihelp.css
+++ b/resources/src/mediawiki/mediawiki.apihelp.css
@@ -37,7 +37,7 @@
 .apihelp-flag-deprecated,
 .apihelp-flag-internal strong {
font-weight: bold;
-   color: #f00;
+   color: #d33;
 }
 
 .apihelp-deprecated-value {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3362abaa1702599f0d68860f579aea2114801c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Log HTTP error status codes for page save failures

[Mholloway (Code Review)]

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373146 )

Change subject: Log HTTP error status codes for page save failures
..

Log HTTP error status codes for page save failures

We are attempting to log errors when saving pages in HockeyApp in attempt
to debug remaining page save issues, but the logged errors currently
contain no useful information; the most we can deduce is that the server
returned an error response code.  This updates the logged exceptions to
include logging the actual response code.

Change-Id: I9f45f887c01245a7fa26b128268c7623339682f1
---
M app/src/main/java/org/wikipedia/dataclient/okhttp/HttpStatusException.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
2 files changed, 13 insertions(+), 1 deletion(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/dataclient/okhttp/HttpStatusException.java 
b/app/src/main/java/org/wikipedia/dataclient/okhttp/HttpStatusException.java
index 36c5ee0..1315978 100644
--- a/app/src/main/java/org/wikipedia/dataclient/okhttp/HttpStatusException.java
+++ b/app/src/main/java/org/wikipedia/dataclient/okhttp/HttpStatusException.java
@@ -2,6 +2,8 @@
 
 import android.support.annotation.NonNull;
 
+import org.wikipedia.crash.RemoteLogException;
+
 import java.io.IOException;
 
 import okhttp3.Response;
@@ -16,4 +18,8 @@
 public int code() {
 return code;
 }
+
+public static RemoteLogException toRemoteLogException(@NonNull 
HttpStatusException e) {
+return new RemoteLogException(Integer.toString(e.code()), e);
+}
 }
diff --git 
a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java 
b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
index c4ab2bb..c8aa581 100644
--- a/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
+++ b/app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
@@ -7,8 +7,10 @@
 import android.text.TextUtils;
 
 import org.wikipedia.WikipediaApp;
+import org.wikipedia.crash.RemoteLogException;
 import org.wikipedia.database.contract.PageImageHistoryContract;
 import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.dataclient.okhttp.HttpStatusException;
 import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory;
 import org.wikipedia.dataclient.okhttp.cache.DiskLruCacheUtil;
 import org.wikipedia.dataclient.okhttp.cache.SaveHeader;
@@ -145,7 +147,11 @@
 if (!ThrowableUtil.isOffline(e)) {
 // If it's anything but a transient network error, let's 
log it aggressively,
 // to make sure we've fixed any other errors with saving 
pages.
-L.logRemoteError(e);
+if (e instanceof HttpStatusException) {
+
L.logRemoteError(HttpStatusException.toRemoteLogException((HttpStatusException) 
e));
+} else {
+L.logRemoteError(e);
+}
 }
 dao.failDiskTransaction(row);
 continue;

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

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

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.22.5

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373145 )

Change subject: Tag v0.22.5
..


Tag v0.22.5

Change-Id: I18a6507effefc26a733ec2489573997c1cfe0cf1
---
M History.md
M package.json
2 files changed, 21 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index f427087..3c6eaec 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,24 @@
 # OOjs UI Release History
+## v0.22.5 / 2017-08-22
+### Features
+* Add `title` attribute to the 'remove' button in TagItemWidget (Moriel 
Schottlender)
+
+### Styles
+* WikimediaUI theme: Fix regression on disabled border (Volker E.)
+
+### Code
+* Align vars to WikimediaUI Base and remove them as OOjs UI vars (Volker E.)
+* DraggableElement: Make toggling draggability consistent (Bartosz Dziewoński)
+* Follow-up 022f532: Don't crash if TitledElement initializes before 
AccessKeyedElement (Roan Kattouw)
+* WikimediaUI theme: Make checkbox/radio code leaner (Volker E.)
+* WikimediaUI theme: Remove unnecessary selector in CheckboxInputWidget 
(Volker E.)
+* doc: Align code comment references to Phabricator tasks (Volker E.)
+* build: Upgrade devDependencies to latest and make pass (James D. Forrester)
+* build: Update mediawiki-codesniffer to v0.10.1 and fix issues (WMDE-Fisch)
+* build: Update mediawiki-codesniffer to v0.11.0 and fix issues (WMDE-Fisch)
+* tests: Prepare for qunit 2.x (James D. Forrester)
+
+
 ## v0.22.4 / 2017-08-01
 ### Features
 * CheckboxMultiselectInputWidget: setValue when CheckboxMultiselect changes 
(Prateek Saxena)
diff --git a/package.json b/package.json
index 7c8947f..a456388 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.22.4",
+  "version": "0.22.5",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18a6507effefc26a733ec2489573997c1cfe0cf1
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
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] operations/mediawiki-config[master]: Deploy CodeMirror to all non-RTL wikis

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373144 )

Change subject: Deploy CodeMirror to all non-RTL wikis
..


Deploy CodeMirror to all non-RTL wikis

Bug: T170966
Change-Id: Ic0fa135d634cd0bf4cdcc8dc87bf6f1825ea5b74
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2462d46..93037ca 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19373,9 +19373,8 @@
 ],
 
 'wmgUseCodeMirror' => [
-   'default' => false,
-   'simplewiki' => true,
-   'testwiki' => true, // T169284
+   'default' => true,
+   'rtl' => false, // T170001
 ],
 
 'wmgUseParserMigration' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0fa135d634cd0bf4cdcc8dc87bf6f1825ea5b74
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.22.5

[VolkerE (Code Review)]

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373145 )

Change subject: Tag v0.22.5
..

Tag v0.22.5

Change-Id: I18a6507effefc26a733ec2489573997c1cfe0cf1
---
M History.md
M package.json
2 files changed, 21 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/45/373145/1

diff --git a/History.md b/History.md
index f427087..3c6eaec 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,24 @@
 # OOjs UI Release History
+## v0.22.5 / 2017-08-22
+### Features
+* Add `title` attribute to the 'remove' button in TagItemWidget (Moriel 
Schottlender)
+
+### Styles
+* WikimediaUI theme: Fix regression on disabled border (Volker E.)
+
+### Code
+* Align vars to WikimediaUI Base and remove them as OOjs UI vars (Volker E.)
+* DraggableElement: Make toggling draggability consistent (Bartosz Dziewoński)
+* Follow-up 022f532: Don't crash if TitledElement initializes before 
AccessKeyedElement (Roan Kattouw)
+* WikimediaUI theme: Make checkbox/radio code leaner (Volker E.)
+* WikimediaUI theme: Remove unnecessary selector in CheckboxInputWidget 
(Volker E.)
+* doc: Align code comment references to Phabricator tasks (Volker E.)
+* build: Upgrade devDependencies to latest and make pass (James D. Forrester)
+* build: Update mediawiki-codesniffer to v0.10.1 and fix issues (WMDE-Fisch)
+* build: Update mediawiki-codesniffer to v0.11.0 and fix issues (WMDE-Fisch)
+* tests: Prepare for qunit 2.x (James D. Forrester)
+
+
 ## v0.22.4 / 2017-08-01
 ### Features
 * CheckboxMultiselectInputWidget: setValue when CheckboxMultiselect changes 
(Prateek Saxena)
diff --git a/package.json b/package.json
index 7c8947f..a456388 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.22.4",
+  "version": "0.22.5",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy CodeMirror to all non-RTL wikis

[Niharika29 (Code Review)]

Niharika29 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373144 )

Change subject: Deploy CodeMirror to all non-RTL wikis
..

Deploy CodeMirror to all non-RTL wikis

Bug: T170966
Change-Id: Ic0fa135d634cd0bf4cdcc8dc87bf6f1825ea5b74
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2462d46..93037ca 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19373,9 +19373,8 @@
 ],
 
 'wmgUseCodeMirror' => [
-   'default' => false,
-   'simplewiki' => true,
-   'testwiki' => true, // T169284
+   'default' => true,
+   'rtl' => false, // T170001
 ],
 
 'wmgUseParserMigration' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "registration: Only allow one extension to set a spec...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373143 )

Change subject: Revert "registration: Only allow one extension to set a 
specific config setting"
..


Revert "registration: Only allow one extension to set a specific config setting"

Breaks mergeMessageFileList which means scap can't run in beta.

This reverts commit 50d7546057c1089228a2a6d7d4a49d78d72887e3.

Change-Id: Idb65f1098abce28d49ebbcc8254c0976b6861c59
---
M includes/registration/ExtensionProcessor.php
M tests/phpunit/includes/registration/ExtensionProcessorTest.php
2 files changed, 2 insertions(+), 59 deletions(-)

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



diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index 14d8222..ce262bd 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -450,7 +450,7 @@
}
foreach ( $info['config'] as $key => $val ) {
if ( $key[0] !== '@' ) {
-   $this->addConfigGlobal( "$prefix$key", 
$val );
+   $this->globals["$prefix$key"] = $val;
}
}
}
@@ -478,24 +478,9 @@
if ( isset( $data['path'] ) && $data['path'] ) {
$value = "$dir/$value";
}
-   $this->addConfigGlobal( "$prefix$key", $value );
+   $this->globals["$prefix$key"] = $value;
}
}
-   }
-
-   /**
-* Helper function to set a value to a specific global, if it isn't set 
already.
-*
-* @param string $key The config key with the prefix and anything
-* @param mixed $value The value of the config
-*/
-   private function addConfigGlobal( $key, $value ) {
-   if ( array_key_exists( $key, $this->globals ) ) {
-   throw new RuntimeException(
-   "The configuration setting '$key' was already 
set by another extension,"
-   . " and cannot be set again." );
-   }
-   $this->globals[$key] = $value;
}
 
protected function extractServiceWiringFiles( $dir, array $info ) {
diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php 
b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index 5ef30e8..7b56def 100644
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -220,48 +220,6 @@
$this->assertEquals( 'somevalue', 
$extracted['globals']['egBar'] );
}
 
-   /**
-* @covers ExtensionProcessor::addConfigGlobal()
-* @expectedException RuntimeException
-*/
-   public function testDuplicateConfigKey1() {
-   $processor = new ExtensionProcessor;
-   $info = [
-   'config' => [
-   'Bar' => '',
-   ]
-   ] + self::$default;
-   $info2 = [
-   'config' => [
-   'Bar' => 'g',
-   ],
-   'name' => 'FooBar2',
-   ];
-   $processor->extractInfo( $this->dir, $info, 1 );
-   $processor->extractInfo( $this->dir, $info2, 1 );
-   }
-
-   /**
-* @covers ExtensionProcessor::addConfigGlobal()
-* @expectedException RuntimeException
-*/
-   public function testDuplicateConfigKey2() {
-   $processor = new ExtensionProcessor;
-   $info = [
-   'config' => [
-   'Bar' => [ 'value' => 'somevalue' ],
-   ]
-   ] + self::$default;
-   $info2 = [
-   'config' => [
-   'Bar' => [ 'value' => 'somevalue' ],
-   ],
-   'name' => 'FooBar2',
-   ];
-   $processor->extractInfo( $this->dir, $info, 2 );
-   $processor->extractInfo( $this->dir, $info2, 2 );
-   }
-
public static function provideExtractExtensionMessagesFiles() {
$dir = __DIR__ . '/FooBar/';
return [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb65f1098abce28d49ebbcc8254c0976b6861c59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Decrease border contrast on selected Vector tabs

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372200 )

Change subject: Decrease border contrast on selected Vector tabs
..


Decrease border contrast on selected Vector tabs

Decreasing border contrast on selected Vector tabs.

Bug: T173465
Change-Id: I46530c8cdf9161e527f421eeb8186a7695057361
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css 
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
index 571ced5..bfe62f3 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget-vector.css
@@ -6,7 +6,7 @@
  */
 
 .ve-activated .vectorTabs .selected {
-   box-shadow: inset 0 -1px 0 #a7d7f9;
+   box-shadow: inset 0 -1px 0 #e1f1fc;
 }
 
 .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46530c8cdf9161e527f421eeb8186a7695057361
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Pginer 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "registration: Only allow one extension to set a spec...

[Thcipriani (Code Review)]

Hello Paladox, Tim Starling, Reedy, Reception123, Florianschmidtwelzow, 
Legoktm, jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "registration: Only allow one extension to set a 
specific config setting"
..

Revert "registration: Only allow one extension to set a specific config setting"

Breaks mergeMessageFileList which means scap can't run in beta.

This reverts commit 50d7546057c1089228a2a6d7d4a49d78d72887e3.

Change-Id: Idb65f1098abce28d49ebbcc8254c0976b6861c59
---
M includes/registration/ExtensionProcessor.php
M tests/phpunit/includes/registration/ExtensionProcessorTest.php
2 files changed, 2 insertions(+), 59 deletions(-)


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

diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index 14d8222..ce262bd 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -450,7 +450,7 @@
}
foreach ( $info['config'] as $key => $val ) {
if ( $key[0] !== '@' ) {
-   $this->addConfigGlobal( "$prefix$key", 
$val );
+   $this->globals["$prefix$key"] = $val;
}
}
}
@@ -478,24 +478,9 @@
if ( isset( $data['path'] ) && $data['path'] ) {
$value = "$dir/$value";
}
-   $this->addConfigGlobal( "$prefix$key", $value );
+   $this->globals["$prefix$key"] = $value;
}
}
-   }
-
-   /**
-* Helper function to set a value to a specific global, if it isn't set 
already.
-*
-* @param string $key The config key with the prefix and anything
-* @param mixed $value The value of the config
-*/
-   private function addConfigGlobal( $key, $value ) {
-   if ( array_key_exists( $key, $this->globals ) ) {
-   throw new RuntimeException(
-   "The configuration setting '$key' was already 
set by another extension,"
-   . " and cannot be set again." );
-   }
-   $this->globals[$key] = $value;
}
 
protected function extractServiceWiringFiles( $dir, array $info ) {
diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php 
b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index 5ef30e8..7b56def 100644
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -220,48 +220,6 @@
$this->assertEquals( 'somevalue', 
$extracted['globals']['egBar'] );
}
 
-   /**
-* @covers ExtensionProcessor::addConfigGlobal()
-* @expectedException RuntimeException
-*/
-   public function testDuplicateConfigKey1() {
-   $processor = new ExtensionProcessor;
-   $info = [
-   'config' => [
-   'Bar' => '',
-   ]
-   ] + self::$default;
-   $info2 = [
-   'config' => [
-   'Bar' => 'g',
-   ],
-   'name' => 'FooBar2',
-   ];
-   $processor->extractInfo( $this->dir, $info, 1 );
-   $processor->extractInfo( $this->dir, $info2, 1 );
-   }
-
-   /**
-* @covers ExtensionProcessor::addConfigGlobal()
-* @expectedException RuntimeException
-*/
-   public function testDuplicateConfigKey2() {
-   $processor = new ExtensionProcessor;
-   $info = [
-   'config' => [
-   'Bar' => [ 'value' => 'somevalue' ],
-   ]
-   ] + self::$default;
-   $info2 = [
-   'config' => [
-   'Bar' => [ 'value' => 'somevalue' ],
-   ],
-   'name' => 'FooBar2',
-   ];
-   $processor->extractInfo( $this->dir, $info, 2 );
-   $processor->extractInfo( $this->dir, $info2, 2 );
-   }
-
public static function provideExtractExtensionMessagesFiles() {
$dir = __DIR__ . '/FooBar/';
return [

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Redo "Enable CodeMirror everywhere but RTL wikis and wikidata"

[Niharika29 (Code Review)]

Hello Florianschmidtwelzow, MaxSem, jenkins-bot, Kaldari,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Redo "Enable CodeMirror everywhere but RTL wikis and wikidata"
..

Redo "Enable CodeMirror everywhere but RTL wikis and wikidata"

This reverts commit ed93eb4587c992aae8fe91d5a9e091ae46a06fcf.

Change-Id: Ib9820dca2887f00d9f110074f9b84204884dfdc9
---
M wmf-config/InitialiseSettings.php
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index fab2d9d..2d9d8e2 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19334,9 +19334,10 @@
 ],
 
 'wmgUseCodeMirror' => [
-   'default' => false,
-   'simplewiki' => true,
-   'testwiki' => true, // T169284
+   'default' => true,
+   'rtl' => false,
+   'wikidatawiki' => false, // Didn't feel well when this was deployed
+   'testwikidatawiki' => false,
 ],
 
 'wmgUseParserMigration' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9820dca2887f00d9f110074f9b84204884dfdc9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Kaldari 
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] mediawiki...Vector[master]: Change print wordmark margin bottom to 20px from 10px

[Bmansurov (Code Review)]

Bmansurov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373141 )

Change subject: Change print wordmark margin bottom to 20px from 10px
..

Change print wordmark margin bottom to 20px from 10px

Per T169826#3542839.

Bug: T169826
Change-Id: I8658814988c15e48ca90875d33327a48ee8b7ca1
---
M print.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/41/373141/1

diff --git a/print.less b/print.less
index d770e3f..55d49fa 100644
--- a/print.less
+++ b/print.less
@@ -18,7 +18,7 @@
height: ~'@{printLogoHeight}px';
left: -px;
line-height: 0;  // line-height is needed for 
correctly displaying the size of the content box.
-   margin-bottom: 10px;
+   margin-bottom: 20px;
position: absolute;
width: ~'@{printLogoWidth}px';
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8658814988c15e48ca90875d33327a48ee8b7ca1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Recompile handlebars

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373140 )

Change subject: Recompile handlebars
..

Recompile handlebars

Change-Id: I5d9fed67fbb3c593d5959430c22caf42b413bf64
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/handlebars/compiled/flow_block_topic.handlebars.php 
b/handlebars/compiled/flow_block_topic.handlebars.php
index a79cea5..006d35f 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -87,7 +87,7 @@
 '.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isWatched']) && is_array($in)) ? 
$in['isWatched'] : null))) ? 'flow-watch-link-unwatch' : 
'flow-watch-link-watch').'"
 '.$sp.'   data-flow-api-handler="watchItem"
 '.$sp.'   data-flow-api-target="< .flow-topic-watchlist"
-'.$sp.'   
data-flow-api-method="POST">'.htmlentities((string)((isset($in['noop']) && 
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'
+'.$sp.'   
data-flow-api-method="POST">'.htmlentities((string)((isset($in['noop']) && 
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'
 '.$sp.'
 ';},'flow_moderation_actions_list' => function ($cx, $in, $sp) {return 
''.$sp.''.LCRun3::hbch($cx, 'ifCond', 
array(array(((isset($in['moderationType']) && is_array($in)) ? 
$in['moderationType'] : null),'===','topic'),array()), $in, false, 
function($cx, $in)use($sp){return ''.((LCRun3::ifvar($cx, 
((isset($in['actions']['edit']) && is_array($in['actions'])) ? 
$in['actions']['edit'] : null))) ? 
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx, ((isset($in['moderationIcons']) 
&& is_array($in)) ? $in['moderationIcons'] : null))) ? ' ' 
: '').''.LCRun3::ch($cx, 'l10n', array(array(LCRun3::ch($cx, 'concat', 
array(array('flow-topic-action-edit-title'),array()), 'raw')),array()), 
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'' : '').''.((LCRun3::ifvar($cx, 
((isset($in['links']['topic-history']) && is_array($in['links'])) ? 
$in['links']['topic-history'] : null))) ? 
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && 
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'
+'.$sp.'   
data-flow-api-method="POST">'.htmlentities((string)((isset($in['noop']) && 
is_array($in)) ? $in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 
'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.htmlentities((string)((isset($in['noop']) && is_array($in)) 
? $in['noop'] : null), ENT_QUOTES, 'UTF-8').'
 '.$sp.'
 ';},'flow_moderation_actions_list' => function ($cx, $in, $sp) {return 
''.$sp.''.LCRun3::hbch($cx, 'ifCond', 
array(array(((isset($in['moderationType']) && is_array($in)) ? 
$in['moderationType'] : null),'===','topic'),array()), $in, false, 
function($cx, $in)use($sp){return ''.((LCRun3::ifvar($cx, 
((isset($in['actions']['edit']) && is_array($in['actions'])) ? 
$in['actions']['edit'] : null))) ? 
''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 
$in['noop'] : null), ENT_QUOTES, 'UTF-8').''.((LCRun3::ifvar($cx, ((isset($in['moderationIcons']) 
&& is_array($in)) ? $in['moderationIcons'] : null))) ? ' ' 
: '').''.LCRun3::ch($cx, 'l10n', array(array(LCRun3::ch($cx, 'concat', 
array(array('flow-topic-action-edit-title'),array()), 'raw')),array()), 
'encq').''.htmlentities((string)((isset($in['noop']) && is_array($in)) ? 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Correct summary spec test

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373093 )

Change subject: Hygiene: Correct summary spec test
..


Hygiene: Correct summary spec test

The spec comment incorrectly says a link will be flattened but
the test was simplified to only test  retainment.

Change-Id: If75524cd95c4a117bd360e744d663ddc0d45957c
---
M test/lib/transformations/summarize.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/test/lib/transformations/summarize.js 
b/test/lib/transformations/summarize.js
index 43a2914..dab0048 100644
--- a/test/lib/transformations/summarize.js
+++ b/test/lib/transformations/summarize.js
@@ -18,7 +18,7 @@
 'This summary should be nice and clean (noexcerpts will be omitted).',
 'This summary should be nice and clean.'
 ],
-// sup elements are retained and links are flattened
+// sup elements are retained
 [
 'A googolplex is the number 10googol, or 
equivalently, 10(10100).',
 'A googolplex is the number 10googol, or 
equivalently, 10(10100).'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If75524cd95c4a117bd360e744d663ddc0d45957c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: WIP: Limit usage of global jQuery in preference of ES6

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373139 )

Change subject: WIP: Limit usage of global jQuery in preference of ES6
..

WIP: Limit usage of global jQuery in preference of ES6

* ESLint will now complain if you use global jQuery
* Object.assign used instead of $.extend
* global $ is now allowed inside initialisation scripts, tests
* it is also allowed View/OverlayManager which are in control of
rendering and state

TODO:
* Add polyfills for Object.assign
* Fix BackToTopOverlay FIXME in a patch before this
* Replace $.Deferred calls where possible
* Review/Reconsider usages of $.inArray and $.proxy and $.noop

Change-Id: Ia3a6a5d13df1a3f96121c6a755ac7822d77afcf6
---
M .eslintrc.json
M resources/mobile.abusefilter/AbuseFilterOverlay.js
M resources/mobile.backtotop/BackToTopOverlay.js
M resources/mobile.betaoptin/BetaOptinPanel.js
M resources/mobile.categories.overlays/CategoryAddOverlay.js
M resources/mobile.categories.overlays/CategoryGateway.js
M resources/mobile.categories.overlays/CategoryLookupInputWidget.js
M resources/mobile.categories.overlays/CategoryOverlay.js
M resources/mobile.editor.api/EditorGateway.js
M resources/mobile.editor.common/EditorOverlayBase.js
M resources/mobile.editor.overlay/EditorOverlay.js
M resources/mobile.editor.ve/VisualEditorOverlay.js
M resources/mobile.fontchanger/FontChanger.js
M resources/mobile.foreignApi/JSONPForeignApi.js
M resources/mobile.gallery/PhotoList.js
M resources/mobile.gallery/PhotoListGateway.js
M resources/mobile.gallery/test_PhotoListApiGateway.js
M resources/mobile.infiniteScroll/InfiniteScroll.js
M resources/mobile.issues/CleanupOverlay.js
M resources/mobile.languages.structured/LanguageOverlay.js
M resources/mobile.mediaViewer/ImageGateway.js
M resources/mobile.mediaViewer/ImageOverlay.js
M resources/mobile.nearby/Nearby.js
M resources/mobile.nearby/NearbyGateway.js
M resources/mobile.notifications.filter.overlay/NotificationsFilterOverlay.js
M resources/mobile.notifications.overlay/NotificationsOverlay.js
M resources/mobile.pagelist.scripts/WatchstarPageList.js
M resources/mobile.patrol.ajax/init.js
M resources/mobile.pointerOverlay/PointerOverlay.js
M resources/mobile.references.gateway/ReferencesHtmlScraperGateway.js
M resources/mobile.references.gateway/ReferencesMobileViewGateway.js
M resources/mobile.references/ReferencesDrawer.js
M resources/mobile.search.api/SearchGateway.js
M resources/mobile.search.util/extendSearchParams.js
M resources/mobile.search/SearchOverlay.js
M resources/mobile.special.mobileeditor.scripts/redirectmobileeditor.js
M resources/mobile.special.mobileoptions.scripts.fontchanger/init.js
M resources/mobile.special.mobileoptions.scripts/mobileoptions.js
M resources/mobile.special.nearby.scripts/nearby.js
M resources/mobile.special.uploads.scripts/uploads.js
M resources/mobile.special.userlogin.scripts/userlogin.js
M resources/mobile.startup/CtaDrawer.js
M resources/mobile.startup/Drawer.js
M resources/mobile.startup/Icon.js
M resources/mobile.startup/Overlay.js
M resources/mobile.startup/OverlayManager.js
M resources/mobile.startup/Page.js
M resources/mobile.startup/PageGateway.js
M resources/mobile.startup/PageList.js
M resources/mobile.startup/Skin.js
M resources/mobile.startup/View.js
M resources/mobile.startup/browser.js
M resources/mobile.startup/icons.js
M resources/mobile.startup/oo-extend.js
M resources/mobile.startup/time.js
M resources/mobile.startup/toast.js
M resources/mobile.startup/user.js
M resources/mobile.startup/util.js
M resources/mobile.talk.overlays/TalkOverlay.js
M resources/mobile.talk.overlays/TalkSectionAddOverlay.js
M resources/mobile.talk.overlays/TalkSectionOverlay.js
M resources/mobile.toggle/toggle.js
M resources/mobile.watchlist/WatchList.js
M resources/mobile.watchlist/WatchListGateway.js
M resources/mobile.watchstar/WatchstarGateway.js
M tests/qunit/mobile.editor.api/test_EditorGateway.js
M tests/qunit/mobile.editor.overlay/test_EditorOverlay.js
M tests/qunit/mobile.infiniteScroll/test_InfiniteScroll.js
M tests/qunit/mobile.languages.structured/test_util.js
M tests/qunit/mobile.mediaViewer/test_ImageOverlay.js
M tests/qunit/mobile.nearby/test_Nearby.js
M tests/qunit/mobile.nearby/test_NearbyGateway.js
M tests/qunit/mobile.pagelist.scripts/test_WatchstarPageList.js
M tests/qunit/mobile.references.gateway/test_ReferencesHtmlScraperGateway.js
M tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
M tests/qunit/mobile.references/test_ReferencesDrawer.js
M tests/qunit/mobile.search.api/test_SearchGateway.js
M tests/qunit/mobile.search.util/test_extendSearchParams.js
M tests/qunit/mobile.startup/test_Overlay.js
M tests/qunit/mobile.startup/test_OverlayManager.js
M tests/qunit/mobile.startup/test_Page.js
M tests/qunit/mobile.startup/test_PageGateway.js
M tests/qunit/mobile.startup/test_Skin.js
M tests/qunit/mobile.startup/test_View.js
M 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Hygiene: Use String.prototype.trim

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373138 )

Change subject: Hygiene: Use String.prototype.trim
..

Hygiene: Use String.prototype.trim

No need to use $.trim when we support ES5

Change-Id: Ifc9b17a25b6be9014c5b0ae24fae44561c5680f5
---
M tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js 
b/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
index 0d89040..df367ec 100644
--- a/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
+++ b/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
@@ -59,7 +59,7 @@
} );
 
assert.ok( overlay.$( '.add' ).length > 0, 'There is an "Add 
discussion" button' );
-   assert.strictEqual( $.trim( overlay.$( '.content-header' 
).text() ),
+   assert.strictEqual( overlay.$( '.content-header' 
).text().trim(),
mw.msg( 'mobile-frontend-talk-explained-empty' ),
'Check the header knows it is empty.' );
} );
@@ -75,7 +75,7 @@
'The text of the second item is the section heading.' );
assert.strictEqual( overlay.$( '.topic-title-list li a' ).data( 
'id' ), 50,
'The data id is set.' );
-   assert.strictEqual( $.trim( overlay.$( '.content-header' 
).text() ),
+   assert.strictEqual( overlay.$( '.content-header' 
).text().trim() ),
mw.msg( 'mobile-frontend-talk-explained' ),
'Check the header knows it is not empty.' );
} );

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group0 to 1.30.0-wmf.15

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373137 )

Change subject: Group0 to 1.30.0-wmf.15
..


Group0 to 1.30.0-wmf.15

Change-Id: Ib537fa949b797eabff42bac82e28bf80aed4db3d
---
M wikiversions.json
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/wikiversions.json b/wikiversions.json
index 844e4d8..03b73fc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -445,7 +445,7 @@
 "kywikiquote": "php-1.30.0-wmf.14",
 "kywiktionary": "php-1.30.0-wmf.14",
 "labswiki": "php-1.30.0-wmf.14",
-"labtestwiki": "php-1.30.0-wmf.14",
+"labtestwiki": "php-1.30.0-wmf.15",
 "ladwiki": "php-1.30.0-wmf.14",
 "lawiki": "php-1.30.0-wmf.14",
 "lawikibooks": "php-1.30.0-wmf.14",
@@ -487,7 +487,7 @@
 "maiwikimedia": "php-1.30.0-wmf.14",
 "map_bmswiki": "php-1.30.0-wmf.14",
 "mdfwiki": "php-1.30.0-wmf.14",
-"mediawikiwiki": "php-1.30.0-wmf.14",
+"mediawikiwiki": "php-1.30.0-wmf.15",
 "metawiki": "php-1.30.0-wmf.14",
 "mgwiki": "php-1.30.0-wmf.14",
 "mgwikibooks": "php-1.30.0-wmf.14",
@@ -760,9 +760,9 @@
 "tcywiki": "php-1.30.0-wmf.14",
 "techconductwiki": "php-1.30.0-wmf.14",
 "tenwiki": "php-1.30.0-wmf.14",
-"test2wiki": "php-1.30.0-wmf.14",
-"testwiki": "php-1.30.0-wmf.14",
-"testwikidatawiki": "php-1.30.0-wmf.14",
+"test2wiki": "php-1.30.0-wmf.15",
+"testwiki": "php-1.30.0-wmf.15",
+"testwikidatawiki": "php-1.30.0-wmf.15",
 "tetwiki": "php-1.30.0-wmf.14",
 "tewiki": "php-1.30.0-wmf.14",
 "tewikibooks": "php-1.30.0-wmf.14",
@@ -893,7 +893,7 @@
 "zawikiquote": "php-1.30.0-wmf.14",
 "zawiktionary": "php-1.30.0-wmf.14",
 "zeawiki": "php-1.30.0-wmf.14",
-"zerowiki": "php-1.30.0-wmf.14",
+"zerowiki": "php-1.30.0-wmf.15",
 "zh_classicalwiki": "php-1.30.0-wmf.14",
 "zh_min_nanwiki": "php-1.30.0-wmf.14",
 "zh_min_nanwikibooks": "php-1.30.0-wmf.14",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Group0 to 1.30.0-wmf.15

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373137 )

Change subject: Group0 to 1.30.0-wmf.15
..

Group0 to 1.30.0-wmf.15

Change-Id: Ib537fa949b797eabff42bac82e28bf80aed4db3d
---
M wikiversions.json
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 844e4d8..03b73fc 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -445,7 +445,7 @@
 "kywikiquote": "php-1.30.0-wmf.14",
 "kywiktionary": "php-1.30.0-wmf.14",
 "labswiki": "php-1.30.0-wmf.14",
-"labtestwiki": "php-1.30.0-wmf.14",
+"labtestwiki": "php-1.30.0-wmf.15",
 "ladwiki": "php-1.30.0-wmf.14",
 "lawiki": "php-1.30.0-wmf.14",
 "lawikibooks": "php-1.30.0-wmf.14",
@@ -487,7 +487,7 @@
 "maiwikimedia": "php-1.30.0-wmf.14",
 "map_bmswiki": "php-1.30.0-wmf.14",
 "mdfwiki": "php-1.30.0-wmf.14",
-"mediawikiwiki": "php-1.30.0-wmf.14",
+"mediawikiwiki": "php-1.30.0-wmf.15",
 "metawiki": "php-1.30.0-wmf.14",
 "mgwiki": "php-1.30.0-wmf.14",
 "mgwikibooks": "php-1.30.0-wmf.14",
@@ -760,9 +760,9 @@
 "tcywiki": "php-1.30.0-wmf.14",
 "techconductwiki": "php-1.30.0-wmf.14",
 "tenwiki": "php-1.30.0-wmf.14",
-"test2wiki": "php-1.30.0-wmf.14",
-"testwiki": "php-1.30.0-wmf.14",
-"testwikidatawiki": "php-1.30.0-wmf.14",
+"test2wiki": "php-1.30.0-wmf.15",
+"testwiki": "php-1.30.0-wmf.15",
+"testwikidatawiki": "php-1.30.0-wmf.15",
 "tetwiki": "php-1.30.0-wmf.14",
 "tewiki": "php-1.30.0-wmf.14",
 "tewikibooks": "php-1.30.0-wmf.14",
@@ -893,7 +893,7 @@
 "zawikiquote": "php-1.30.0-wmf.14",
 "zawiktionary": "php-1.30.0-wmf.14",
 "zeawiki": "php-1.30.0-wmf.14",
-"zerowiki": "php-1.30.0-wmf.14",
+"zerowiki": "php-1.30.0-wmf.15",
 "zh_classicalwiki": "php-1.30.0-wmf.14",
 "zh_min_nanwiki": "php-1.30.0-wmf.14",
 "zh_min_nanwikibooks": "php-1.30.0-wmf.14",

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

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

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

[MediaWiki-commits] [Gerrit] 3d2png/deploy[master]: Update 3d2png to 5922ac9

[MarkTraceur (Code Review)]

MarkTraceur has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373136 )

Change subject: Update 3d2png to 5922ac9
..


Update 3d2png to 5922ac9

List of changes:
xxx Update node module dependencies

Change-Id: I231e239491aa1fcf596dfe9774709a966e6744c3
---
M node_modules/ajv/dist/ajv.bundle.js
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/dist/nodent.min.js
M node_modules/ajv/dist/regenerator.min.js
M node_modules/ajv/lib/ajv.d.ts
M node_modules/ajv/lib/compile/formats.js
M node_modules/ajv/lib/dot/custom.jst
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/anyOf.js
M node_modules/ajv/lib/dotjs/constant.js
M node_modules/ajv/lib/dotjs/custom.js
M node_modules/ajv/lib/dotjs/dependencies.js
M node_modules/ajv/lib/dotjs/enum.js
M node_modules/ajv/lib/dotjs/format.js
M node_modules/ajv/lib/dotjs/items.js
M node_modules/ajv/lib/dotjs/multipleOf.js
M node_modules/ajv/lib/dotjs/not.js
M node_modules/ajv/lib/dotjs/oneOf.js
M node_modules/ajv/lib/dotjs/pattern.js
M node_modules/ajv/lib/dotjs/patternRequired.js
M node_modules/ajv/lib/dotjs/properties.js
M node_modules/ajv/lib/dotjs/ref.js
M node_modules/ajv/lib/dotjs/required.js
M node_modules/ajv/lib/dotjs/switch.js
M node_modules/ajv/lib/dotjs/uniqueItems.js
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/ajv/scripts/compile-dots.js
M node_modules/ajv/scripts/travis-gh-pages
M node_modules/aproba/index.js
M node_modules/aproba/package.json
D node_modules/are-we-there-yet/.npmignore
A node_modules/are-we-there-yet/CHANGES.md~
M node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml
A node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js
M node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js
A 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js
A 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js
A 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js
M node_modules/are-we-there-yet/node_modules/readable-stream/package.json
M node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js
A node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js
M node_modules/are-we-there-yet/node_modules/readable-stream/readable.js
M node_modules/are-we-there-yet/node_modules/readable-stream/transform.js
A node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js
M node_modules/are-we-there-yet/node_modules/readable-stream/writable.js
A node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore
A node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE
A 
node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js
A node_modules/are-we-there-yet/node_modules/string_decoder/package.json
M node_modules/are-we-there-yet/package.json
D node_modules/are-we-there-yet/test/lib/test-event.js
D node_modules/are-we-there-yet/test/tracker.js
D node_modules/are-we-there-yet/test/trackergroup.js
D node_modules/are-we-there-yet/test/trackerstream.js
M node_modules/async/apply.js
M node_modules/async/applyEach.js
M node_modules/async/applyEachSeries.js
M node_modules/async/asyncify.js
M node_modules/async/auto.js
M node_modules/async/autoInject.js
M node_modules/async/cargo.js
M node_modules/async/compose.js
M node_modules/async/concat.js
A node_modules/async/concatLimit.js
M node_modules/async/concatSeries.js
M node_modules/async/constant.js
M node_modules/async/detect.js
M node_modules/async/detectLimit.js
M node_modules/async/detectSeries.js
M node_modules/async/dir.js
M node_modules/async/dist/async.js
M node_modules/async/dist/async.min.js
M node_modules/async/doDuring.js
M node_modules/async/doUntil.js
M node_modules/async/doWhilst.js
M node_modules/async/during.js
M node_modules/async/each.js
M node_modules/async/eachLimit.js
M node_modules/async/eachOf.js
M node_modules/async/eachOfLimit.js
M node_modules/async/eachOfSeries.js
M node_modules/async/eachSeries.js
M node_modules/async/ensureAsync.js
M node_modules/async/every.js
M node_modules/async/everyLimit.js
M node_modules/async/everySeries.js
M node_modules/async/forever.js
M node_modules/async/groupBy.js
M node_modules/async/groupByLimit.js
M 

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Fix suggestionlist margin

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373102 )

Change subject: Fix suggestionlist margin
..


Fix suggestionlist margin

Fix margins on different suggestion list types,
e.g. margin between For later list and Suggested pages

Bug: T158750
Change-Id: Ib02f5cf1b335d74f1567792be1cd432e1ac39e98
---
M modules/dashboard/styles/ext.cx.suggestionlist.less
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Nikerabbit: Checked; Looks good to me, approved



diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index 9461e3d..08b295e 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -6,6 +6,7 @@
.mw-ui-item;
.mw-ui-one-whole;
padding: 0;
+   margin-bottom: 10px;
 }
 
 .cx-suggestionlist__public {
@@ -65,6 +66,7 @@
margin-bottom: 48px;
border-width: 1px 0;
border-radius: 0 0 @borderRadius @borderRadius;
+   margin-top: -10px;
padding: 20px;
font-weight: bold;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib02f5cf1b335d74f1567792be1cd432e1ac39e98
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add shiladsen shell account

[Herron (Code Review)]

Herron has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373115 )

Change subject: Add shiladsen shell account
..


Add shiladsen shell account

Add shiladsen to groups researchers, statistics-privatedata-users and
statistics-users.

Bug: T171988
Change-Id: Id95b7ff8b2553893408ca977866671fb0cfb070f
---
M modules/admin/data/data.yaml
1 file changed, 13 insertions(+), 3 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index fab540e..5437e15 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -120,7 +120,7 @@
   nikerabbit, nschaaf, dstrine, joewalsh, mpany, jsamra,
   jdittrich, chelsyx, ovasileva, mtizzoni, panisson, paolotti, 
ciro, debt,
   samwalton9, fdans, samtar, mlitn, shrlak, niharika29, goransm,
-  pmiazga, diego]
+  pmiazga, diego, shiladsen]
   ldap-admins:
 gid: 715
 description: ldap admins
@@ -189,7 +189,7 @@
   leila, ellery, nettrom, mforns, bmansurov, tbayer, joal,
   madhuvishy, tjones, legoktm, dcausse, bearloga, dpatrick, 
atgomez, dstrine,
   joewalsh, marktraceur, mtizzoni, panisson, paolotti, ciro, 
melodykramer,
-  fdans]
+  fdans, shiladsen]
   statistics-users:
 gid: 726
 description: Access statistics number crunching hosts. NO PRIVS.
@@ -200,7 +200,7 @@
   deskana, dduvall, nettrom, mforns, jkatz, ebernhardson,
   mlitn, tbayer, joal, kartik, nikerabbit, pcoombe,
   neilpquinn-wmf, maxsem, jminor, dpatrick, atgomez, dstrine,
-  ladsgroup, ovasileva]
+  ladsgroup, ovasileva, shiladsen]
   statistics-admins:
 posix_name: stats
 description: access files created by stats user cron jobs
@@ -2536,6 +2536,16 @@
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC/oA9hk3snx7Y66ZR3sEMukK6tOk4esFT02irhqB0jr9osstyZN9KhPVeWMzhip+93ToDzX+aDHeXqsu5grXsqGQZBZSU850GSNt0pgi8+4E1yGQngLNhFv+z7EemWUQH0XT4atoDXbmfXdRv6NpVlcr1vAPBQpjBZuFe5vaxLKRrhZpm+YNvl4RHdGbZorz6WI0NvzuOTerKUOyUZS/KQpT4FxlvVRoTIO3H05EtJEv3745rUH5wHCcyr7m9Hdsjh8RMrWF3okKLk9WOxQTesfvvstmu8GpBbauzmQYMKwRcKQqoc0/qo3ZGvwXPwrYjv4wpPZhDexjOfUPLGvtGf
 dsaeztrumper@dsaeztrumper
 uid: 17677
 email: di...@wikimedia.org
+  shiladsen:
+ensure: present
+gid: 500
+name: shiladsen
+realname: Shilad Sen
+ssh_keys:
+  - ssh-dss 
B3NzaC1kc3MAAACBAKBspbywXptKB4djp8jYjfk0fAQUAhsEM03zvRhuCpIwB5BYQl2mIeIwADHqM5DA0plGtFZLLwZvFR/LpHIiK3zcDuvz5N6LBkTulKQ5TrjnMkAeTk1SA900u6jCoKitF7j6ZO3Q4diLgFSY5F4EJI80GiWkOx+JAnzhS3kHbkibFQDzFcnzFRA7bawBb0ZVhCYDU2v+2wAAAIBzWSGg2rEvV0UT+cDzGZMl6LGWT+3oC1pJviW8vilOhIKvdbXYeQeGpqpJjxZToN/5Ok+P0kAMNTacdPWyYiDDepb+zgB9tbW+DPB3HgH2y6u7SMNWnOXK+C9VAT62LEX4zQsD41NC3kMijDjLuAzAkyKPAVmgtFWCXpYDDU/+zgAAAIAW66EVt/6tp7o6GlfU3TS3JnYLA3cFzWqmbuHuV2dFhW3h7OAbmCRivhOVuhJuu56C/AJeKdGzIA10p/eo39YXUX3iOjUTO8/YFFAAnh9m4Fb1YDTMG3JzwBi8jT6r8iOm9414ITX48y9zzD3smXku3o3At/w5Up6rl/lDeywI4g==
 a558989@600308a4c4c6
+uid: 10339
+email: shi...@gmail.com
+
 ldap_only_users:
   abartov:
 ensure: present

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id95b7ff8b2553893408ca977866671fb0cfb070f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Herron 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] 3d2png/deploy[master]: Update 3d2png to 5922ac9

[MarkTraceur (Code Review)]

MarkTraceur has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373136 )

Change subject: Update 3d2png to 5922ac9
..

Update 3d2png to 5922ac9

List of changes:
xxx Update node module dependencies

Change-Id: I231e239491aa1fcf596dfe9774709a966e6744c3
---
M node_modules/ajv/dist/ajv.bundle.js
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/dist/nodent.min.js
M node_modules/ajv/dist/regenerator.min.js
M node_modules/ajv/lib/ajv.d.ts
M node_modules/ajv/lib/compile/formats.js
M node_modules/ajv/lib/dot/custom.jst
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/anyOf.js
M node_modules/ajv/lib/dotjs/constant.js
M node_modules/ajv/lib/dotjs/custom.js
M node_modules/ajv/lib/dotjs/dependencies.js
M node_modules/ajv/lib/dotjs/enum.js
M node_modules/ajv/lib/dotjs/format.js
M node_modules/ajv/lib/dotjs/items.js
M node_modules/ajv/lib/dotjs/multipleOf.js
M node_modules/ajv/lib/dotjs/not.js
M node_modules/ajv/lib/dotjs/oneOf.js
M node_modules/ajv/lib/dotjs/pattern.js
M node_modules/ajv/lib/dotjs/patternRequired.js
M node_modules/ajv/lib/dotjs/properties.js
M node_modules/ajv/lib/dotjs/ref.js
M node_modules/ajv/lib/dotjs/required.js
M node_modules/ajv/lib/dotjs/switch.js
M node_modules/ajv/lib/dotjs/uniqueItems.js
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/ajv/scripts/compile-dots.js
M node_modules/ajv/scripts/travis-gh-pages
M node_modules/aproba/index.js
M node_modules/aproba/package.json
D node_modules/are-we-there-yet/.npmignore
A node_modules/are-we-there-yet/CHANGES.md~
M node_modules/are-we-there-yet/node_modules/readable-stream/.travis.yml
A node_modules/are-we-there-yet/node_modules/readable-stream/duplex-browser.js
M node_modules/are-we-there-yet/node_modules/readable-stream/duplex.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_duplex.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_passthrough.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_readable.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_transform.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/_stream_writable.js
M 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/BufferList.js
A 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/destroy.js
A 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream-browser.js
A 
node_modules/are-we-there-yet/node_modules/readable-stream/lib/internal/streams/stream.js
M node_modules/are-we-there-yet/node_modules/readable-stream/package.json
M node_modules/are-we-there-yet/node_modules/readable-stream/passthrough.js
A node_modules/are-we-there-yet/node_modules/readable-stream/readable-browser.js
M node_modules/are-we-there-yet/node_modules/readable-stream/readable.js
M node_modules/are-we-there-yet/node_modules/readable-stream/transform.js
A node_modules/are-we-there-yet/node_modules/readable-stream/writable-browser.js
M node_modules/are-we-there-yet/node_modules/readable-stream/writable.js
A node_modules/are-we-there-yet/node_modules/string_decoder/.npmignore
A node_modules/are-we-there-yet/node_modules/string_decoder/LICENSE
A 
node_modules/are-we-there-yet/node_modules/string_decoder/lib/string_decoder.js
A node_modules/are-we-there-yet/node_modules/string_decoder/package.json
M node_modules/are-we-there-yet/package.json
D node_modules/are-we-there-yet/test/lib/test-event.js
D node_modules/are-we-there-yet/test/tracker.js
D node_modules/are-we-there-yet/test/trackergroup.js
D node_modules/are-we-there-yet/test/trackerstream.js
M node_modules/async/apply.js
M node_modules/async/applyEach.js
M node_modules/async/applyEachSeries.js
M node_modules/async/asyncify.js
M node_modules/async/auto.js
M node_modules/async/autoInject.js
M node_modules/async/cargo.js
M node_modules/async/compose.js
M node_modules/async/concat.js
A node_modules/async/concatLimit.js
M node_modules/async/concatSeries.js
M node_modules/async/constant.js
M node_modules/async/detect.js
M node_modules/async/detectLimit.js
M node_modules/async/detectSeries.js
M node_modules/async/dir.js
M node_modules/async/dist/async.js
M node_modules/async/dist/async.min.js
M node_modules/async/doDuring.js
M node_modules/async/doUntil.js
M node_modules/async/doWhilst.js
M node_modules/async/during.js
M node_modules/async/each.js
M node_modules/async/eachLimit.js
M node_modules/async/eachOf.js
M node_modules/async/eachOfLimit.js
M node_modules/async/eachOfSeries.js
M node_modules/async/eachSeries.js
M node_modules/async/ensureAsync.js
M node_modules/async/every.js
M node_modules/async/everyLimit.js
M node_modules/async/everySeries.js
M node_modules/async/forever.js
M node_modules/async/groupBy.js
M node_modules/async/groupByLimit.js
M 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: registration: Only allow one extension to set a specific con...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348577 )

Change subject: registration: Only allow one extension to set a specific config 
setting
..


registration: Only allow one extension to set a specific config setting

ExtensionProcessor would previously just blindly overwrite duplicate
config settings, which ends up depending upon load order.

It's relatively hard to debug since it is silently overwritten. This now
throws exceptions in case of duplicate config settings.

This will also have some side-effects of catching people putting things
like "ResourceModules" in their "config" section when it should be a
top-level item.

Bug: T152929
Change-Id: Iaef32efab397e82ff70ddca8ac79c545c5b7d2bb
---
M includes/registration/ExtensionProcessor.php
M tests/phpunit/includes/registration/ExtensionProcessorTest.php
2 files changed, 59 insertions(+), 2 deletions(-)

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



diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index ce262bd..14d8222 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -450,7 +450,7 @@
}
foreach ( $info['config'] as $key => $val ) {
if ( $key[0] !== '@' ) {
-   $this->globals["$prefix$key"] = $val;
+   $this->addConfigGlobal( "$prefix$key", 
$val );
}
}
}
@@ -478,11 +478,26 @@
if ( isset( $data['path'] ) && $data['path'] ) {
$value = "$dir/$value";
}
-   $this->globals["$prefix$key"] = $value;
+   $this->addConfigGlobal( "$prefix$key", $value );
}
}
}
 
+   /**
+* Helper function to set a value to a specific global, if it isn't set 
already.
+*
+* @param string $key The config key with the prefix and anything
+* @param mixed $value The value of the config
+*/
+   private function addConfigGlobal( $key, $value ) {
+   if ( array_key_exists( $key, $this->globals ) ) {
+   throw new RuntimeException(
+   "The configuration setting '$key' was already 
set by another extension,"
+   . " and cannot be set again." );
+   }
+   $this->globals[$key] = $value;
+   }
+
protected function extractServiceWiringFiles( $dir, array $info ) {
if ( isset( $info['ServiceWiringFiles'] ) ) {
foreach ( $info['ServiceWiringFiles'] as $path ) {
diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php 
b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index 7b56def..5ef30e8 100644
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -220,6 +220,48 @@
$this->assertEquals( 'somevalue', 
$extracted['globals']['egBar'] );
}
 
+   /**
+* @covers ExtensionProcessor::addConfigGlobal()
+* @expectedException RuntimeException
+*/
+   public function testDuplicateConfigKey1() {
+   $processor = new ExtensionProcessor;
+   $info = [
+   'config' => [
+   'Bar' => '',
+   ]
+   ] + self::$default;
+   $info2 = [
+   'config' => [
+   'Bar' => 'g',
+   ],
+   'name' => 'FooBar2',
+   ];
+   $processor->extractInfo( $this->dir, $info, 1 );
+   $processor->extractInfo( $this->dir, $info2, 1 );
+   }
+
+   /**
+* @covers ExtensionProcessor::addConfigGlobal()
+* @expectedException RuntimeException
+*/
+   public function testDuplicateConfigKey2() {
+   $processor = new ExtensionProcessor;
+   $info = [
+   'config' => [
+   'Bar' => [ 'value' => 'somevalue' ],
+   ]
+   ] + self::$default;
+   $info2 = [
+   'config' => [
+   'Bar' => [ 'value' => 'somevalue' ],
+   ],
+   'name' => 'FooBar2',
+   ];
+   $processor->extractInfo( $this->dir, $info, 2 );
+   $processor->extractInfo( $this->dir, $info2, 2 );
+   }
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: add plugin to check for long running screens

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373135 )

Change subject: icinga: add plugin to check for long running screens
..

icinga: add plugin to check for long running screens

Bug: T165348
Change-Id: Ic72511092b685fd758f2c0f6d7410a715eed9ecc
---
A modules/icinga/files/check_long_screens
1 file changed, 64 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/373135/1

diff --git a/modules/icinga/files/check_long_screens 
b/modules/icinga/files/check_long_screens
new file mode 100755
index 000..df821ad
--- /dev/null
+++ b/modules/icinga/files/check_long_screens
@@ -0,0 +1,64 @@
+#!/bin/bash
+# icinga/nagios plugin to detect long-running screen sessions
+#
+# https://phabricator.wikimedia.org/T165348
+#
+# Daniel Zahn () - Wikimedia Foundation Inc.
+#
+
+set -eu
+usage() { echo "Usage: $0 -w  -c " 1>&2; exit 1; }
+
+declare -i WARN_TIME="60"
+declare -i CRIT_TIME="120"
+
+DEBUG=false
+
+while getopts "w:c:" o; do
+case "${o}" in
+w)
+   WARN_TIME=${OPTARG}
+   ;;
+c)
+   CRIT_TIME=${OPTARG}
+   ;;
+*)
+   usage
+   ;;
+esac
+done
+
+if [ $WARN_TIME == 0 ] || [ $CRIT_TIME == 0 ]; then
+usage
+fi
+
+SCREEN_PID=""
+RUN_TIME=0
+PGREP=$(which pgrep)
+PS=$(which ps)
+XARGS=$(which xargs)
+
+for SCREEN_PID in $(${PGREP} -f SCREEN)
+  do
+ RUN_TIME=$(${PS} -o etimes= -p ${SCREEN_PID} | ${XARGS})
+ if $DEBUG; then
+ echo "Found a screen with PID ${SCREEN_PID}. It's been running since 
${RUN_TIME} seconds."
+ fi
+ if [ $RUN_TIME -gt $CRIT_TIME ]; then
+ echo "CRIT: Long running screen session. (PID ${SCREEN_PID}, 
${RUN_TIME}s > ${CRIT_TIME}s)"
+ exit 2
+ fi
+ if [ $RUN_TIME -gt $WARN_TIME ]; then
+ echo "WARN: Long running screen session. (PID ${SCREEN_PID}, 
${RUN_TIME}s > ${WARN_TIME}s)"
+ exit 1
+ fi
+ if [ $RUN_TIME -le $WARN_TIME ] && [ $RUN_TIME -le $CRIT_TIME ] ; then
+ echo "OK: No long running screen sessions detected."
+ exit 0
+ fi
+done
+
+echo "UNKNOWN: something went wrong with the plugin. check $0"
+exit 3
+
+

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_29]: registration: Only allow one extension to set a specific con...

[Reception123 (Code Review)]

Reception123 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373134 )

Change subject: registration: Only allow one extension to set a specific config 
setting
..

registration: Only allow one extension to set a specific config setting

ExtensionProcessor would previously just blindly overwrite duplicate
config settings, which ends up depending upon load order.

It's relatively hard to debug since it is silently overwritten. This now
throws exceptions in case of duplicate config settings.

This will also have some side-effects of catching people putting things
like "ResourceModules" in their "config" section when it should be a
top-level item.

Bug: T152929
Change-Id: Iaef32efab397e82ff70ddca8ac79c545c5b7d2bb

Causing errors with the WikiForum extension and ConfirmEdit when using 1.29. 
Please backport

Change-Id: I0f437f2b26be0e24c660b10c325806eea1476461
---
M includes/registration/ExtensionProcessor.php
M tests/phpunit/includes/registration/ExtensionProcessorTest.php
2 files changed, 59 insertions(+), 2 deletions(-)


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

diff --git a/includes/registration/ExtensionProcessor.php 
b/includes/registration/ExtensionProcessor.php
index d14be3f..312e680 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -443,7 +443,7 @@
}
foreach ( $info['config'] as $key => $val ) {
if ( $key[0] !== '@' ) {
-   $this->globals["$prefix$key"] = $val;
+   $this->addConfigGlobal( "$prefix$key", 
$val );
}
}
}
@@ -471,11 +471,26 @@
if ( isset( $data['path'] ) && $data['path'] ) {
$value = "$dir/$value";
}
-   $this->globals["$prefix$key"] = $value;
+   $this->addConfigGlobal( "$prefix$key", $value );
}
}
}
 
+   /**
+* Helper function to set a value to a specific global, if it isn't set 
already.
+*
+* @param string $key The config key with the prefix and anything
+* @param mixed $value The value of the config
+*/
+   private function addConfigGlobal( $key, $value ) {
+   if ( array_key_exists( $key, $this->globals ) ) {
+   throw new RuntimeException(
+   "The configuration setting '$key' was already 
set by another extension,"
+   . " and cannot be set again." );
+   }
+   $this->globals[$key] = $value;
+   }
+
protected function extractServiceWiringFiles( $dir, array $info ) {
if ( isset( $info['ServiceWiringFiles'] ) ) {
foreach ( $info['ServiceWiringFiles'] as $path ) {
diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php 
b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index ebe0bde..503f698 100644
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -168,6 +168,48 @@
$this->assertEquals( 'somevalue', 
$extracted['globals']['egBar'] );
}
 
+   /**
+* @covers ExtensionProcessor::addConfigGlobal()
+* @expectedException RuntimeException
+*/
+   public function testDuplicateConfigKey1() {
+   $processor = new ExtensionProcessor;
+   $info = [
+   'config' => [
+   'Bar' => '',
+   ]
+   ] + self::$default;
+   $info2 = [
+   'config' => [
+   'Bar' => 'g',
+   ],
+   'name' => 'FooBar2',
+   ];
+   $processor->extractInfo( $this->dir, $info, 1 );
+   $processor->extractInfo( $this->dir, $info2, 1 );
+   }
+
+   /**
+* @covers ExtensionProcessor::addConfigGlobal()
+* @expectedException RuntimeException
+*/
+   public function testDuplicateConfigKey2() {
+   $processor = new ExtensionProcessor;
+   $info = [
+   'config' => [
+   'Bar' => [ 'value' => 'somevalue' ],
+   ]
+   ] + self::$default;
+   $info2 = [
+   'config' => [
+   'Bar' => [ 'value' => 'somevalue' ],
+   ],
+   'name' => 'FooBar2',
+   

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

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373131 )

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


Merge branch 'master' into deployment

And update vendor

9c67c29a2 Omnimail::omnigroupmember.get job: add slow download handling.
556ec49f5 CI: install CiviCRM with a fake sendmail
e66cf5f38 Update SmashPig library

Change-Id: Ie12fd395e24e6d6569aebee8d09d704e23935a8b
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
M vendor
2 files changed, 1 insertion(+), 175 deletions(-)

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



diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 2516fcc..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<<< HEAD   (4aa177 Merge branch 'master' into deployment)
-===
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'contact_id' => $this->contact_id,
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   }
-
-   public function tearDown() {
-   $this->cleanUpContact( $this->contact_id );
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Ingenico/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'5551212',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => 1501368968,
-   'email' => 
'dutch...@flying.net',
-   'first_name' => 'Arthur',
-

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update SmashPig for typo fix

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373132 )

Change subject: Update SmashPig for typo fix
..


Update SmashPig for typo fix

Change-Id: Ie843ed0a21fb8229650adf759eaeed984f1ffc4b
---
M composer/installed.json
M wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
M wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
3 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/composer/installed.json b/composer/installed.json
index 80d3591..77a0f4b 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1942,7 +1942,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "f7b8b3b1fcbe1bb8ece2de5968f653891661f1b9"
+"reference": "b1822378fb781a510058c9b620258e0fafedada4"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1960,7 +1960,7 @@
 "jakub-onderka/php-parallel-lint": "^0.9",
 "phpunit/phpunit": "^4.8"
 },
-"time": "2017-08-22T16:37:45+00:00",
+"time": "2017-08-22T18:13:48+00:00",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git 
a/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php 
b/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
index 5d03343..0ec05d2 100644
--- a/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
+++ b/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
@@ -120,9 +120,9 @@
protected function parseRefund( DOMElement $recordNode, $type ) {
$record = $this->xmlToArray( $recordNode, $this->refundMap );
$record['type'] = $type;
-   // FIXME: Transaction ID is the same as the parent transaction 
ID.
+   // FIXME: Refund ID is the same as the parent transaction ID.
// That's not helpful...
-   $record['gateway_txn_id'] = $record['gateway_parent_id'];
+   $record['gateway_refund_id'] = $record['gateway_parent_id'];
if ( $record['installment'] < 0 ) {
// Refunds have negative EffortID. Weird.
// TODO: for refunds of recurring payments, determine 
whether the
diff --git 
a/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php 
b/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
index 428dff5..e63f1a3 100644
--- a/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
+++ b/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
@@ -85,7 +85,7 @@
'date' => 1500942220,
'gross' => 100,
'gateway_parent_id' => '123456789',
-   'gateway_txn_id' => '123456789',
+   'gateway_refund_id' => '123456789',
'installment' => 1,
'gross_currency' => 'USD',
'type' => 'refund',
@@ -107,7 +107,7 @@
'date' => 1495023569,
'gross' => 200,
'gateway_parent_id' => '5167046621',
-   'gateway_txn_id' => '5167046621',
+   'gateway_refund_id' => '5167046621',
'installment' => 1,
'gross_currency' => 'USD',
'type' => 'chargeback',

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update SmashPig library

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373114 )

Change subject: Update SmashPig library
..


Update SmashPig library

Get the fix for WX audit refunds.

Bug: T173457
Change-Id: I8504fd5443548cd4c0da12221260c632324de01c
---
M composer.lock
M sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
2 files changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index a062cae..1756b73 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1889,7 +1889,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "c188e2e90c4a753d17ca8e9ecbd58aa943b5fce2"
+"reference": "b1822378fb781a510058c9b620258e0fafedada4"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1941,7 +1941,7 @@
 "donations",
 "payments"
 ],
-"time": "2017-08-03T18:29:58+00:00"
+"time": "2017-08-22T18:13:48+00:00"
 },
 {
 "name": "zordius/lightncandy",
diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
index 1bdfa4a..869612e 100644
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
@@ -97,6 +97,7 @@
'gateway' => 'globalcollect', 
// TODO: Connect donations get 'ingenico'
'gateway_txn_id' => '987654321',
'gross' => '3.00',
+   'installment' => 1,
'last_name' => 'Aardvark',
'order_id' => '987654321',
'payment_method' => 'cc',
@@ -118,6 +119,7 @@
'date' => 1500942220,
'gateway' => 'globalcollect',
'gateway_parent_id' => 
'11992288',
+   'gateway_refund_id' => 
'11992288',
'gross' => '100.00',
'gross_currency' => 'USD',
'type' => 'refund',
@@ -130,6 +132,7 @@
'date' => 1495023569,
'gateway' => 'globalcollect',
'gateway_parent_id' => 
'5552',
+   'gateway_refund_id' => 
'5552',
'gross' => '200.00',
'gross_currency' => 'USD',
'type' => 'chargeback',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8504fd5443548cd4c0da12221260c632324de01c
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable wgEchoPerUserBlacklist at all wikis

[Urbanecm (Code Review)]

Urbanecm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373133 )

Change subject: Enable wgEchoPerUserBlacklist at all wikis
..

Enable wgEchoPerUserBlacklist at all wikis

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 2462d46..f009a33 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17299,8 +17299,8 @@
 ],
 
 'wgEchoPerUserBlacklist' => [
-   'default' => false,
-   'metawiki' => true,
+   'default' => true,
+   'nonecho' => false,
 ],
 
 // Thanks should be enabled for wikis with Echo

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...vendor[master]: Update SmashPig for typo fix

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373132 )

Change subject: Update SmashPig for typo fix
..

Update SmashPig for typo fix

Change-Id: Ie843ed0a21fb8229650adf759eaeed984f1ffc4b
---
M composer/installed.json
M wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
M wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
3 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/composer/installed.json b/composer/installed.json
index 80d3591..77a0f4b 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1942,7 +1942,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git;,
-"reference": "f7b8b3b1fcbe1bb8ece2de5968f653891661f1b9"
+"reference": "b1822378fb781a510058c9b620258e0fafedada4"
 },
 "require": {
 "amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1960,7 +1960,7 @@
 "jakub-onderka/php-parallel-lint": "^0.9",
 "phpunit/phpunit": "^4.8"
 },
-"time": "2017-08-22T16:37:45+00:00",
+"time": "2017-08-22T18:13:48+00:00",
 "type": "library",
 "installation-source": "source",
 "autoload": {
diff --git 
a/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php 
b/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
index 5d03343..0ec05d2 100644
--- a/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
+++ b/wikimedia/smash-pig/PaymentProviders/Ingenico/Audit/IngenicoAudit.php
@@ -120,9 +120,9 @@
protected function parseRefund( DOMElement $recordNode, $type ) {
$record = $this->xmlToArray( $recordNode, $this->refundMap );
$record['type'] = $type;
-   // FIXME: Transaction ID is the same as the parent transaction 
ID.
+   // FIXME: Refund ID is the same as the parent transaction ID.
// That's not helpful...
-   $record['gateway_txn_id'] = $record['gateway_parent_id'];
+   $record['gateway_refund_id'] = $record['gateway_parent_id'];
if ( $record['installment'] < 0 ) {
// Refunds have negative EffortID. Weird.
// TODO: for refunds of recurring payments, determine 
whether the
diff --git 
a/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php 
b/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
index 428dff5..e63f1a3 100644
--- a/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
+++ b/wikimedia/smash-pig/PaymentProviders/Ingenico/Tests/phpunit/AuditTest.php
@@ -85,7 +85,7 @@
'date' => 1500942220,
'gross' => 100,
'gateway_parent_id' => '123456789',
-   'gateway_txn_id' => '123456789',
+   'gateway_refund_id' => '123456789',
'installment' => 1,
'gross_currency' => 'USD',
'type' => 'refund',
@@ -107,7 +107,7 @@
'date' => 1495023569,
'gross' => 200,
'gateway_parent_id' => '5167046621',
-   'gateway_txn_id' => '5167046621',
+   'gateway_refund_id' => '5167046621',
'installment' => 1,
'gross_currency' => 'USD',
'type' => 'chargeback',

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

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

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

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

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373131 )

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

Merge branch 'master' into deployment

9c67c29a2 Omnimail::omnigroupmember.get job: add slow download handling.
556ec49f5 CI: install CiviCRM with a fake sendmail
e66cf5f38 Update SmashPig library

Change-Id: Ie12fd395e24e6d6569aebee8d09d704e23935a8b
---
D sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
1 file changed, 0 insertions(+), 174 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/31/373131/1

diff --git a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php 
b/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
deleted file mode 100644
index 2516fcc..000
--- a/sites/all/modules/wmf_audit/tests/IngenicoAuditTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<<< HEAD   (4aa177 Merge branch 'master' into deployment)
-===
- __DIR__ . '/data/logs/',
-   'ingenico_audit_recon_completed_dir' => 
$this->getTempDir(),
-   'ingenico_audit_working_log_dir' => $this->getTempDir(),
-   );
-
-   foreach ( $dirs as $var => $dir ) {
-   if ( !is_dir( $dir ) ) {
-   mkdir( $dir );
-   }
-   variable_set( $var, $dir );
-   }
-
-   $old_working = glob( $dirs['ingenico_audit_working_log_dir'] . 
'*' );
-   foreach ( $old_working as $zap ) {
-   if ( is_file( $zap ) ) {
-   unlink( $zap );
-   }
-   }
-
-   variable_set( 'ingenico_audit_log_search_past_days', 7 );
-
-   // Fakedb doesn't fake the original txn for refunds, so add one 
here
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '11992288' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 8675309,
-   'currency' => 'USD',
-   'date' => 1455825706,
-   'email' => 'n...@flying.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '11992288',
-   'gross' => 100.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   $this->contact_id = $contribution['contact_id'];
-
-   // and another for the chargeback
-   $existing = wmf_civicrm_get_contributions_from_gateway_id( 
'globalcollect', '5552' );
-   if ( $existing ) {
-   // Previous test run may have crashed before cleaning up
-   $contribution = $existing[0];
-   } else {
-   $msg = array(
-   'contribution_tracking_id' => 5318008,
-   'currency' => 'USD',
-   'date' => 1443724034,
-   'email' => 'lovelys...@python.com',
-   'gateway' => 'globalcollect',
-   'gateway_txn_id' => '5552',
-   'gross' => 200.00,
-   'payment_method' => 'cc',
-   'payment_submethod' => 'visa',
-   'contact_id' => $this->contact_id,
-   );
-   $contribution = 
wmf_civicrm_contribution_message_import( $msg );
-   }
-   }
-
-   public function tearDown() {
-   $this->cleanUpContact( $this->contact_id );
-   }
-
-   public function auditTestProvider() {
-   return array(
-   array( __DIR__ . '/data/Ingenico/donation/', array(
-   'main' => array(
-   array(
-   'contribution_tracking_id' => 
'5551212',
-   'country' => 'US',
-   'currency' => 'USD',
-   'date' => 1501368968,
-   'email' => 
'dutch...@flying.net',
-   'first_name' => 'Arthur',
-  

[MediaWiki-commits] [Gerrit] operations/dns[master]: remove cnames for old labs puppetmasters

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373113 )

Change subject: remove cnames for old labs puppetmasters
..


remove cnames for old labs puppetmasters

We have dedicated systems for this now, labs-puppetmaster
and labtest-puppetmaster.

Bug: T171786
Change-Id: I38bc7d6a041d79471d764fafab59de6c50341f30
---
M templates/wikimedia.org
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 429e101..a8a29a4 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -496,8 +496,6 @@
 ldap-labs.eqiad 1H  IN CNAMEseaborgium
 ldap-labs.codfw 1H  IN CNAMEserpens
 
-labs-puppetmaster-eqiad300 IN CNAME  labcontrol1001
-labtest-puppetmaster-codfw 300 IN CNAME  labtestcontrol2001
 labs-puppetmaster  300 IN CNAME  labpuppetmaster1001
 labtest-puppetmaster   300 IN CNAME  labtestpuppetmaster2001
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38bc7d6a041d79471d764fafab59de6c50341f30
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] 3d2png/deploy[master]: Update submodule - point to current 3d2png master

[MarkTraceur (Code Review)]

MarkTraceur has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373129 )

Change subject: Update submodule - point to current 3d2png master
..


Update submodule - point to current 3d2png master

Change-Id: Ia3a0b33301076d2f548d65628fd8e6679ab880d3
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src b/src
index 537ef47..5922ac9 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 537ef47360fa5e06a586ebd9b5058afd31e1da45
+Subproject commit 5922ac9904f839ee8be35a08d8428c474824a782

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3a0b33301076d2f548d65628fd8e6679ab880d3
Gerrit-PatchSet: 1
Gerrit-Project: 3d2png/deploy
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 
Gerrit-Reviewer: MarkTraceur 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: setting labmon1002 to role spare

[RobH (Code Review)]

RobH has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373128 )

Change subject: setting labmon1002 to role spare
..


setting labmon1002 to role spare

system newly installed, setting to role spare until its pushed into
service

Bug: T165784
Change-Id: I12c34bfae65f6b5d19680fef37dc90803a851a39
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 6e09000..2bb8b99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1286,6 +1286,11 @@
 include ::base::firewall
 }
 
+# role spare until pushed into service via T165784
+node 'labmon1002.eqiad.wmnet' {
+role(spare::system)
+}
+
 node 'labnet1001.eqiad.wmnet' {
 role(wmcs::openstack::main::net,
   labs::openstack::nova::api,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...OAuth[master]: Add the app name in the success message of Special:OAuthMana...

[Framawiki (Code Review)]

Framawiki has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373130 )

Change subject: Add the app name in the success message of 
Special:OAuthManageMyGrants/revoke/xxx
..

Add the app name in the success message of 
Special:OAuthManageMyGrants/revoke/xxx

Bug: T171413
Change-Id: I5d7e68f0493f52231bddd7efdf7d9b0ed56e6f42
---
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 8 insertions(+), 5 deletions(-)


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

diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php 
b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
index d582a17..aa03503 100644
--- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
+++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
@@ -236,7 +236,10 @@
if ( $status instanceof \Status && $status->isOk() ) {
// Messages: mwoauthmanagemygrants-success-update,
// mwoauthmanagemygrants-success-renounce
-   $this->getOutput()->addWikiMsg( 
"mwoauthmanagemygrants-success-$action" );
+   $this->getOutput()->addWikiMsg( 
"mwoauthmanagemygrants-success-$action",
+   $cmr->get( 'name', function( $s ) use ( $cmr ) {
+   return '' . $s . ' [' . $cmr->get( 
'version' ) . ']';
+   } ));
}
}
 
diff --git a/i18n/en.json b/i18n/en.json
index d8ead7e..4dbced0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -180,8 +180,8 @@
"mwoauthmanagemygrants-renounce": "Deauthorize",
"mwoauthmanagemygrants-action": "Change status:",
"mwoauthmanagemygrants-confirm-submit": "Update access token status",
-   "mwoauthmanagemygrants-success-update": "Your preferences for this 
application have been updated.",
-   "mwoauthmanagemygrants-success-renounce": "The application's access to 
your account has been revoked.",
+   "mwoauthmanagemygrants-success-update": "Your preferences for $1 have 
been updated.",
+   "mwoauthmanagemygrants-success-renounce": "$1's access to your account 
has been revoked.",
"mwoauthmanagemygrants-basic-tooltip": "Why can't I update this grant? 
This grant gives your connected application basic permissions which it requires 
to function properly. If you don't want this connected application to have 
these rights, you should revoke the application's access.",
"mwoauthmanagemygrants-authonly-tooltip": "Why can't I update this 
grant? If you don't want this connected application to have this right, you 
should revoke the application's access.",
"logentry-mwoauthconsumer-propose": "$1 {{GENDER:$2|proposed}} an OAuth 
consumer (consumer key $4)",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c6a5d57..b829c2a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -190,8 +190,8 @@
"mwoauthmanagemygrants-renounce": "Used as label for the radio 
box.\n\nSee also:\n* {{msg-mw|Mwoauthmanagemygrants-action}}",
"mwoauthmanagemygrants-action": "Used as label for the radio box 
group.\n\nFollowed by the following radio boxes:\n* 
{{msg-mw|Mwoauthmanagemygrants-update}}\n* 
{{msg-mw|Mwoauthmanagemygrants-renounce}}\n{{Identical|Change status}}",
"mwoauthmanagemygrants-confirm-submit": "Used as label for the Submit 
button",
-   "mwoauthmanagemygrants-success-update": "Message shown when grants for 
an OAuth consumer are updated by a user",
-   "mwoauthmanagemygrants-success-renounce": "Message shown when grants 
for an OAuth consumer are totally revoked",
+   "mwoauthmanagemygrants-success-update": "Message shown when grants for 
an OAuth consumer are updated by a user\n\nParameters:\n* $1 - the application 
name",
+   "mwoauthmanagemygrants-success-renounce": "Message shown when grants 
for an OAuth consumer are totally revoked\n\nParameters:\n* $1 - the 
application name",
"mwoauthmanagemygrants-basic-tooltip": "Message for the tooltip shown 
next to the disabled checkbox for the \"basic\" grant on 
[[Special:OAuthManageMyGrants]], explaining why the checkbox cannot be 
modified.",
"mwoauthmanagemygrants-authonly-tooltip": "Message for the tooltip 
shown next to the disabled checkboxes for the \"authonly\" and 
\"authonlyprivate\" grants on [[Special:OAuthManageMyGrants]], explaining why 
the checkbox cannot be modified.\n\nCf. 
{{msg-mw|Mwoauthmanagemygrants-basic-tooltip}}",
"logentry-mwoauthconsumer-propose": "{{logentry}}",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d7e68f0493f52231bddd7efdf7d9b0ed56e6f42
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: setting labmon1002 to role spare

[RobH (Code Review)]

RobH has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373128 )

Change subject: setting labmon1002 to role spare
..

setting labmon1002 to role spare

system newly installed, setting to role spare until its pushed into
service

Bug: T165784
Change-Id: I12c34bfae65f6b5d19680fef37dc90803a851a39
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/373128/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 6e09000..2bb8b99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1286,6 +1286,11 @@
 include ::base::firewall
 }
 
+# role spare until pushed into service via T165784
+node 'labmon1002.eqiad.wmnet' {
+role(spare::system)
+}
+
 node 'labnet1001.eqiad.wmnet' {
 role(wmcs::openstack::main::net,
   labs::openstack::nova::api,

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

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

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

[MediaWiki-commits] [Gerrit] 3d2png/deploy[master]: Update submodule - point to current 3d2png master

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373129 )

Change subject: Update submodule - point to current 3d2png master
..

Update submodule - point to current 3d2png master

Change-Id: Ia3a0b33301076d2f548d65628fd8e6679ab880d3
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/3d2png/deploy 
refs/changes/29/373129/1

diff --git a/src b/src
index 537ef47..5922ac9 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 537ef47360fa5e06a586ebd9b5058afd31e1da45
+Subproject commit 5922ac9904f839ee8be35a08d8428c474824a782

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3a0b33301076d2f548d65628fd8e6679ab880d3
Gerrit-PatchSet: 1
Gerrit-Project: 3d2png/deploy
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[wmf/1.30.0-wmf.15]: Enable WebM playback via ogv.js

[Brion VIBBER (Code Review)]

Brion VIBBER has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373127 )

Change subject: Enable WebM playback via ogv.js
..

Enable WebM playback via ogv.js

WebM is now fairly stable in ogv.js, though current version spams console
a bit. Allow WebM to play back via the shim on Safari/IE/Edge.

This is prep for removing the Ogg Theora video transcodes from Wikimedia
in favor of WebM due to ongoing tooling issues.

Note that due to ordering of codecs, this will cause WebM versions to
play back preferably to the Ogg versions as soon as it goes out.

Bug: T172444
Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07
(cherry picked from commit a6f23cae887e638e3e08794f2520446d40e45d84)
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
3 files changed, 15 insertions(+), 3 deletions(-)


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

diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
index 44f3371..3626307 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
@@ -41,7 +41,9 @@
 * @return OGVPlayer
 */
_ogvJsInit: function() {
-   var options = {};
+   var options = {
+   enableWebM: true
+   };
if ( this._iOSAudioContext ) {
// Reuse the audio context we opened earlier
options.audioContext = this._iOSAudioContext;
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
index b0a2aff..e22fc85 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
@@ -94,6 +94,16 @@
 ], 'IEWebMPrompt' );
 
 var ogvJsPlayer = new mw.MediaPlayer( 'ogvJsPlayer', [
+   'video/webm',
+   'video/webm; codecs="vp8"',
+   'video/webm; codecs="vp8, vorbis"',
+   'video/webm; codecs="vp8, opus"',
+   'video/webm; codecs="vp9"',
+   'video/webm; codecs="vp9, vorbis"',
+   'video/webm; codecs="vp9, opus"',
+   'audio/webm',
+   'audio/webm; codecs="vorbis"',
+   'audio/webm; codecs="opus"',
'video/ogg',
'video/ogg; codecs="theora"',
'video/ogg; codecs="theora, vorbis"',
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
index 9d1e34f..bf68ae6 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
@@ -34,8 +34,8 @@
this.defaultPlayers['application/vnd.apple.mpegurl'] = 
['Native'];
 
this.defaultPlayers['video/ogg'] = ['Native', 'Vlc', 'OgvJs', 
'Generic', 'VLCApp'];
-   this.defaultPlayers['audio/webm'] = ['Native', 'Vlc', 'VLCApp', 
'IEWebMPrompt'];
-   this.defaultPlayers['video/webm'] = ['Native', 'Vlc', 'VLCApp', 
'IEWebMPrompt'];
+   this.defaultPlayers['audio/webm'] = ['Native', 'Vlc', 'OgvJs', 
'VLCApp', 'IEWebMPrompt'];
+   this.defaultPlayers['video/webm'] = ['Native', 'Vlc', 'OgvJs', 
'VLCApp', 'IEWebMPrompt'];
this.defaultPlayers['application/ogg'] = ['Native', 'Vlc', 
'OgvJs', 'Generic', 'VLCApp'];
this.defaultPlayers['audio/ogg'] = ['Native', 'Vlc', 'OgvJs', 
'VLCApp'];
this.defaultPlayers['audio/mpeg']= ['Native', 'Kplayer'];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Brion VIBBER 

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

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[wmf/1.30.0-wmf.14]: Enable WebM playback via ogv.js

[Brion VIBBER (Code Review)]

Brion VIBBER has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373126 )

Change subject: Enable WebM playback via ogv.js
..

Enable WebM playback via ogv.js

WebM is now fairly stable in ogv.js, though current version spams console
a bit. Allow WebM to play back via the shim on Safari/IE/Edge.

This is prep for removing the Ogg Theora video transcodes from Wikimedia
in favor of WebM due to ongoing tooling issues.

Note that due to ordering of codecs, this will cause WebM versions to
play back preferably to the Ogg versions as soon as it goes out.

Bug: T172444
Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07
(cherry picked from commit a6f23cae887e638e3e08794f2520446d40e45d84)
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
M MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
3 files changed, 15 insertions(+), 3 deletions(-)


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

diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
index 44f3371..3626307 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerOgvJs.js
@@ -41,7 +41,9 @@
 * @return OGVPlayer
 */
_ogvJsInit: function() {
-   var options = {};
+   var options = {
+   enableWebM: true
+   };
if ( this._iOSAudioContext ) {
// Reuse the audio context we opened earlier
options.audioContext = this._iOSAudioContext;
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
index b0a2aff..e22fc85 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js
@@ -94,6 +94,16 @@
 ], 'IEWebMPrompt' );
 
 var ogvJsPlayer = new mw.MediaPlayer( 'ogvJsPlayer', [
+   'video/webm',
+   'video/webm; codecs="vp8"',
+   'video/webm; codecs="vp8, vorbis"',
+   'video/webm; codecs="vp8, opus"',
+   'video/webm; codecs="vp9"',
+   'video/webm; codecs="vp9, vorbis"',
+   'video/webm; codecs="vp9, opus"',
+   'audio/webm',
+   'audio/webm; codecs="vorbis"',
+   'audio/webm; codecs="opus"',
'video/ogg',
'video/ogg; codecs="theora"',
'video/ogg; codecs="theora, vorbis"',
diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
index 9d1e34f..bf68ae6 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.MediaPlayers.js
@@ -34,8 +34,8 @@
this.defaultPlayers['application/vnd.apple.mpegurl'] = 
['Native'];
 
this.defaultPlayers['video/ogg'] = ['Native', 'Vlc', 'OgvJs', 
'Generic', 'VLCApp'];
-   this.defaultPlayers['audio/webm'] = ['Native', 'Vlc', 'VLCApp', 
'IEWebMPrompt'];
-   this.defaultPlayers['video/webm'] = ['Native', 'Vlc', 'VLCApp', 
'IEWebMPrompt'];
+   this.defaultPlayers['audio/webm'] = ['Native', 'Vlc', 'OgvJs', 
'VLCApp', 'IEWebMPrompt'];
+   this.defaultPlayers['video/webm'] = ['Native', 'Vlc', 'OgvJs', 
'VLCApp', 'IEWebMPrompt'];
this.defaultPlayers['application/ogg'] = ['Native', 'Vlc', 
'OgvJs', 'Generic', 'VLCApp'];
this.defaultPlayers['audio/ogg'] = ['Native', 'Vlc', 'OgvJs', 
'VLCApp'];
this.defaultPlayers['audio/mpeg']= ['Native', 'Kplayer'];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68f22d7cb0cee4fe3f5742a742d45189b617fe07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Brion VIBBER 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add explicit keystone_public_port to labs hiera

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373125 )

Change subject: add explicit keystone_public_port to labs hiera
..


add explicit keystone_public_port to labs hiera

Change-Id: I6507201db42edc100d53b17ae9473b4773ab7731
---
M hieradata/labs.yaml
M modules/shinken/templates/shinkengen.yaml.erb
2 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index b6ec558..d085d2e 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -86,8 +86,7 @@
 puppetmaster: "labs-puppetmaster.wikimedia.org"
 saltmaster: "labcontrol1001.wikimedia.org"
 mysql::server::use_apparmor: false  # The images we have for debian don't 
support it
-keystoneconfig:
-  public_port: '5000'
+keystone_public_port: '5000'
 
 # All labs instances have internet connectivity, so do not bother with proxies
 profile::base::use_apt_proxy: false
diff --git a/modules/shinken/templates/shinkengen.yaml.erb 
b/modules/shinken/templates/shinkengen.yaml.erb
index c3adee3..c26a1c2 100644
--- a/modules/shinken/templates/shinkengen.yaml.erb
+++ b/modules/shinken/templates/shinkengen.yaml.erb
@@ -2,5 +2,5 @@
 output_path: '/etc/shinken/generated'
 site: <%= scope.lookupvar("::site") %>
 keystone_host: <%= scope.function_hiera(['labs_keystone_host']) %>
-keystone_port: <%= scope.function_hiera(['keystoneconfig:public_port']) %>
+keystone_port: <%= scope.function_hiera(['keystone_public_port']) %>
 puppet_enc_host: <%= scope.function_hiera(['labs_puppet_master']) %>

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add explicit keystone_public_port to labs hiera

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373125 )

Change subject: add explicit keystone_public_port to labs hiera
..

add explicit keystone_public_port to labs hiera

Change-Id: I6507201db42edc100d53b17ae9473b4773ab7731
---
M hieradata/labs.yaml
M modules/shinken/templates/shinkengen.yaml.erb
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/373125/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index b6ec558..d085d2e 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -86,8 +86,7 @@
 puppetmaster: "labs-puppetmaster.wikimedia.org"
 saltmaster: "labcontrol1001.wikimedia.org"
 mysql::server::use_apparmor: false  # The images we have for debian don't 
support it
-keystoneconfig:
-  public_port: '5000'
+keystone_public_port: '5000'
 
 # All labs instances have internet connectivity, so do not bother with proxies
 profile::base::use_apt_proxy: false
diff --git a/modules/shinken/templates/shinkengen.yaml.erb 
b/modules/shinken/templates/shinkengen.yaml.erb
index c3adee3..c26a1c2 100644
--- a/modules/shinken/templates/shinkengen.yaml.erb
+++ b/modules/shinken/templates/shinkengen.yaml.erb
@@ -2,5 +2,5 @@
 output_path: '/etc/shinken/generated'
 site: <%= scope.lookupvar("::site") %>
 keystone_host: <%= scope.function_hiera(['labs_keystone_host']) %>
-keystone_port: <%= scope.function_hiera(['keystoneconfig:public_port']) %>
+keystone_port: <%= scope.function_hiera(['keystone_public_port']) %>
 puppet_enc_host: <%= scope.function_hiera(['labs_puppet_master']) %>

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add keystone_config:public_port to labs instance hiera

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373124 )

Change subject: add keystone_config:public_port to labs instance hiera
..


add keystone_config:public_port to labs instance hiera

I need this for shinkengen.

Change-Id: If837fa5631494cb9d3240584acda4cdef7b39653
---
M hieradata/labs.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index e5b9569..b6ec558 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -86,6 +86,8 @@
 puppetmaster: "labs-puppetmaster.wikimedia.org"
 saltmaster: "labcontrol1001.wikimedia.org"
 mysql::server::use_apparmor: false  # The images we have for debian don't 
support it
+keystoneconfig:
+  public_port: '5000'
 
 # All labs instances have internet connectivity, so do not bother with proxies
 profile::base::use_apt_proxy: false

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: add keystone_config:public_port to labs instance hiera

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373124 )

Change subject: add keystone_config:public_port to labs instance hiera
..

add keystone_config:public_port to labs instance hiera

I need this for shinkengen.

Change-Id: If837fa5631494cb9d3240584acda4cdef7b39653
---
M hieradata/labs.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/373124/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index e5b9569..b6ec558 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -86,6 +86,8 @@
 puppetmaster: "labs-puppetmaster.wikimedia.org"
 saltmaster: "labcontrol1001.wikimedia.org"
 mysql::server::use_apparmor: false  # The images we have for debian don't 
support it
+keystoneconfig:
+  public_port: '5000'
 
 # All labs instances have internet connectivity, so do not bother with proxies
 profile::base::use_apt_proxy: false

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: define labs_keystone_host on labs instances

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373123 )

Change subject: define labs_keystone_host on labs instances
..


define labs_keystone_host on labs instances

Change-Id: I4724895ce9b9dc26782b850802a06fadd0619246
---
M hieradata/labs.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index d30111a..e5b9569 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -82,6 +82,7 @@
   disable_agent_forwarding: false
   challenge_response_auth: false
 labs_puppet_master: "labs-puppetmaster.wikimedia.org"
+labs_keystone_host: "labcontrol1001.wikimedia.org"
 puppetmaster: "labs-puppetmaster.wikimedia.org"
 saltmaster: "labcontrol1001.wikimedia.org"
 mysql::server::use_apparmor: false  # The images we have for debian don't 
support it

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: define labs_keystone_host on labs instances

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373123 )

Change subject: define labs_keystone_host on labs instances
..

define labs_keystone_host on labs instances

Change-Id: I4724895ce9b9dc26782b850802a06fadd0619246
---
M hieradata/labs.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/373123/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index d30111a..e5b9569 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -82,6 +82,7 @@
   disable_agent_forwarding: false
   challenge_response_auth: false
 labs_puppet_master: "labs-puppetmaster.wikimedia.org"
+labs_keystone_host: "labcontrol1001.wikimedia.org"
 puppetmaster: "labs-puppetmaster.wikimedia.org"
 saltmaster: "labcontrol1001.wikimedia.org"
 mysql::server::use_apparmor: false  # The images we have for debian don't 
support it

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

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

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