[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Adding Equivset for AbuseFilter & AntiSpoof

[Dbarratt (Code Review)]

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

Change subject: Adding Equivset for AbuseFilter & AntiSpoof
..

Adding Equivset for AbuseFilter & AntiSpoof

The Equivset has been remove from AntiSpoof and a new library has
been created from it. Both AbuseFiler & AntiSpoof now require this
library.

Change-Id: I977d3498b2084a426e2ab4d85c000d1b9dcfe824
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_psr4.php
M composer/autoload_static.php
M composer/installed.json
A wikimedia/equivset/COPYING
A wikimedia/equivset/README
A wikimedia/equivset/bin/console
A wikimedia/equivset/data/equivset.in
A wikimedia/equivset/dist/equivset.json
A wikimedia/equivset/dist/equivset.ser
A wikimedia/equivset/dist/equivset.txt
A wikimedia/equivset/phpunit.xml
A wikimedia/equivset/src/Command/GenerateEquivset.php
A wikimedia/equivset/src/Equivset.php
A wikimedia/equivset/src/Exception/EquivsetException.php
17 files changed, 15,766 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/70/383970/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I977d3498b2084a426e2ab4d85c000d1b9dcfe824
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Dbarratt 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Move wfCountDown() into Maintenance class

[jenkins-bot (Code Review)]

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

Change subject: Move wfCountDown() into Maintenance class
..


Move wfCountDown() into Maintenance class

Doing this allows to restrict it to maintenance scripts and support
quiet mode.

Change-Id: Iad0858ce1fdd64f746d5f9d4a7d6ed96f21e94df
---
M RELEASE-NOTES-1.31
M includes/GlobalFunctions.php
M maintenance/Maintenance.php
M maintenance/resetUserTokens.php
M maintenance/update.php
5 files changed, 33 insertions(+), 3 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 57cbec4..efadf9a 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -44,6 +44,8 @@
 * MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.
 * The global function wfBCP47 was renamed to LanguageCode::bcp47.
 * The global function wfBCP47 is now deprecated.
+* The global function wfCountDown() is now deprecated in favor of
+  Maintenance::countDown().
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d53e98d..537a97f 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3047,6 +3047,8 @@
  * Count down from $seconds to zero on the terminal, with a one-second pause
  * between showing each number. For use in command-line scripts.
  *
+ * @deprecated since 1.31, use Maintenance::countDown()
+ *
  * @codeCoverageIgnore
  * @param int $seconds
  */
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index ecbbb85..9a29055 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1417,6 +1417,32 @@
}
 
/**
+* Count down from $seconds to zero on the terminal, with a one-second 
pause
+* between showing each number. If the maintenance script is in quiet 
mode,
+* this function does nothing.
+*
+* @since 1.31
+*
+* @codeCoverageIgnore
+* @param int $seconds
+*/
+   protected function countDown( $seconds ) {
+   if ( $this->isQuiet() ) {
+   return;
+   }
+   for ( $i = $seconds; $i >= 0; $i-- ) {
+   if ( $i != $seconds ) {
+   $this->output( str_repeat( "\x08", strlen( $i + 
1 ) ) );
+   }
+   $this->output( $i );
+   if ( $i ) {
+   sleep( 1 );
+   }
+   }
+   $this->output( "\n" );
+   }
+
+   /**
 * Wrapper for posix_isatty()
 * We default as considering stdin a tty (for nice readline methods)
 * but treating stout as not a tty to avoid color codes
diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index 481da98..1c8b4b9 100644
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -64,7 +64,7 @@
$this->output( "\n" );
$this->output( "Abort with control-c in the next five 
seconds "
. "(skip this countdown with --nowarn) ... " );
-   wfCountDown( 5 );
+   $this->countDown( 5 );
}
 
// We list user by user_id from one of the replica DBs
diff --git a/maintenance/update.php b/maintenance/update.php
index 5f705ba..5e2947b 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -128,7 +128,7 @@
$this->compatChecks();
} else {
$this->output( "Skipping compatibility checks, proceed 
at your own risk (Ctrl+C to abort)\n" );
-   wfCountDown( 5 );
+   $this->countDown( 5 );
}
 
// Check external dependencies are up to date
@@ -155,7 +155,7 @@
if ( !$this->hasOption( 'quick' ) ) {
$this->output( "Abort with control-c in the next five 
seconds "
. "(skip this countdown with --quick) ... " );
-   wfCountDown( 5 );
+   $this->countDown( 5 );
}
 
$time1 = microtime( true );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad0858ce1fdd64f746d5f9d4a7d6ed96f21e94df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove maintenance/checkSyntax.php

[MaxSem (Code Review)]

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

Change subject: Remove maintenance/checkSyntax.php
..

Remove maintenance/checkSyntax.php

Was useful years ago, but now we have much better tools.
Not used anywhere search can find.

Change-Id: Iaa094a686aeefd9a6071abc843ffc33c8daf2a5a
---
M autoload.php
D maintenance/checkSyntax.php
2 files changed, 0 insertions(+), 350 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/383969/1

diff --git a/autoload.php b/autoload.php
index 0a2ecf0..abedffd1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -255,7 +255,6 @@
'CheckLanguageCLI' => __DIR__ . 
'/maintenance/language/checkLanguage.inc',
'CheckLess' => __DIR__ . '/maintenance/checkLess.php',
'CheckStorage' => __DIR__ . '/maintenance/storage/checkStorage.php',
-   'CheckSyntax' => __DIR__ . '/maintenance/checkSyntax.php',
'CheckUsernames' => __DIR__ . '/maintenance/checkUsernames.php',
'ClassCollector' => __DIR__ . '/includes/utils/AutoloadGenerator.php',
'CleanupAncientTables' => __DIR__ . 
'/maintenance/cleanupAncientTables.php',
diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php
deleted file mode 100644
index 3910f29..000
--- a/maintenance/checkSyntax.php
+++ /dev/null
@@ -1,349 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Maintenance
- */
-
-require_once __DIR__ . '/Maintenance.php';
-
-/**
- * Maintenance script to check syntax of all PHP files in MediaWiki.
- *
- * @ingroup Maintenance
- */
-class CheckSyntax extends Maintenance {
-
-   // List of files we're going to check
-   private $mFiles = [], $mFailures = [], $mWarnings = [];
-   private $mIgnorePaths = [], $mNoStyleCheckPaths = [];
-
-   public function __construct() {
-   parent::__construct();
-   $this->addDescription( 'Check syntax for all PHP files in 
MediaWiki' );
-   $this->addOption( 'with-extensions', 'Also recurse the 
extensions folder' );
-   $this->addOption(
-   'path',
-   'Specific path (file or directory) to check, either 
with absolute path or '
-   . 'relative to the root of this MediaWiki 
installation',
-   false,
-   true
-   );
-   $this->addOption(
-   'list-file',
-   'Text file containing list of files or directories to 
check',
-   false,
-   true
-   );
-   $this->addOption(
-   'modified',
-   'Check only files that were modified (requires Git 
command-line client)'
-   );
-   $this->addOption( 'syntax-only', 'Check for syntax validity 
only, skip code style warnings' );
-   }
-
-   public function getDbType() {
-   return Maintenance::DB_NONE;
-   }
-
-   public function execute() {
-   $this->buildFileList();
-
-   $this->output( "Checking syntax (using php -l, this can take a 
long time)\n" );
-   foreach ( $this->mFiles as $f ) {
-   $this->checkFileWithCli( $f );
-   if ( !$this->hasOption( 'syntax-only' ) ) {
-   $this->checkForMistakes( $f );
-   }
-   }
-   $this->output( "\nDone! " . count( $this->mFiles ) . " files 
checked, " .
-   count( $this->mFailures ) . " failures and " . count( 
$this->mWarnings ) .
-   " warnings found\n" );
-   }
-
-   /**
-* Build the list of files we'll check for syntax errors
-*/
-   private function buildFileList() {
-   global $IP;
-
-   $this->mIgnorePaths = [
-   ];
-
-   $this->mNoStyleCheckPaths = [
-   // Third-party code we don't care about
-   "/activemq_stomp/",
-   "EmailPage/PHPMailer",
-   "FCKeditor/fckeditor/",
-   '\bphplot-',
-   "/svggraph/",
-   "\bjsmin.php$",
-   "PEAR/File_Ogg/",
-   "QPoll/Excel/",
-   "/geshi/",
-   "/smarty/",
-   ];
-
-   if ( $this->hasOption( 'path' ) ) {
-   $path = $this->getOption( 'path' );
-   if ( !$this->addPath( $path ) ) {
-   $this->error( "Error: can't find file or 
directory $path\n", true );
-   }
-
-   return; // process only this path
-   } elseif ( $this->hasOption( 

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Fixed placeholder text not showing properly

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383968 )

Change subject: Fixed placeholder text not showing properly
..

Fixed placeholder text not showing properly

Fix provided by Fisch at
https://phabricator.wikimedia.org/T173563#3678825

Change-Id: I473bae3adadaa8d16ccb3c2a4ec0823f0126f127
---
M modules/ext.advancedSearch.css
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch 
refs/changes/68/383968/1

diff --git a/modules/ext.advancedSearch.css b/modules/ext.advancedSearch.css
index 66e3a3f..cc90b5b 100644
--- a/modules/ext.advancedSearch.css
+++ b/modules/ext.advancedSearch.css
@@ -176,3 +176,7 @@
font-size: 110%;
color: #999;
 }
+
+.mw-advancedSearch-container input {
+   width:100%;
+}
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I473bae3adadaa8d16ccb3c2a4ec0823f0126f127
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Update comment

[MaxSem (Code Review)]

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

Change subject: Update comment
..

Update comment

Change-Id: If7cffbce4b64e4def6d6bbadbd71a6f0d1a8bbf6
---
M hive/mediawiki/history/create_mediawiki_revision_table.hql
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/67/383967/1

diff --git a/hive/mediawiki/history/create_mediawiki_revision_table.hql 
b/hive/mediawiki/history/create_mediawiki_revision_table.hql
index 0206c99..772f4c5 100644
--- a/hive/mediawiki/history/create_mediawiki_revision_table.hql
+++ b/hive/mediawiki/history/create_mediawiki_revision_table.hql
@@ -20,7 +20,7 @@
   `rev_deleted` boolean COMMENT 'This field is reserved for the 
RevisionDelete system. It\'s a bitfield in which the values are DELETED_TEXT = 
1\; DELETED_COMMENT = 2\; DELETED_USER = 4\; and DELETED_RESTRICTED = 8. So, 
for example, if nothing has been deleted from that revision, then the value is 
0\; if both the comment and user have been deleted, then the value is 6.',
   `rev_len` bigint  COMMENT 'This field contains the length of 
the article after the revision, in bytes. Used in history pages. Corresponds to 
rc_new_len.',
   `rev_parent_id`   bigint  COMMENT 'The rev_id of the previous 
revision to the page. Corresponds to rc_last_oldid.  For edits which are new 
page creations, rev_parent_id = 0.',
-  `rev_sha1`string  COMMENT 'This field is used to add the 
SHA-1 text content hash in base-36 (generated by wfBaseConvert().)',
+  `rev_sha1`string  COMMENT 'This field is used to add the 
SHA-1 text content hash in base-36 (generated by the base-convert library.)',
   `rev_content_model`   string  COMMENT 'Content model, see 
CONTENT_MODEL_XXX constants in Defines.php. These IDs will be exposed in the 
API and XML dumps. Extensions that define their own content model IDs should 
take care to avoid conflicts. Using the extension name as a prefix is 
recommended, for example \'myextension-somecontent\'. Possible values are, 
e.g., \'wikitext\', \'javascript\', \'css\', \'text\', and \'json\'.',
   `rev_content_format`  string  COMMENT 'Content format, see 
CONTENT_FORMAT_XXX constants in Defines.php. These should be MIME types, and 
will be exposed in the API and XML dumps. Extensions are free to use the below 
formats, or define their own. It is recommended to stick with the conventions 
for MIME types. Possible values are, e.g., \'text/x-wiki\', 
\'text/javascript\', \'text/css\', \'text/plain\', \'text/html\', 
\'application/vnd.php.serialized\', \'application/json\', and 
\'application/xml\'.'
 )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7cffbce4b64e4def6d6bbadbd71a6f0d1a8bbf6
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
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/core[master]: Hard deprecate wfBaseConvert()

[MaxSem (Code Review)]

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

Change subject: Hard deprecate wfBaseConvert()
..

Hard deprecate wfBaseConvert()

No callers anywhere.

Change-Id: If804d1153ca8e9e82eda3af4d992e395ab112158
---
M includes/GlobalFunctions.php
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d53e98d..279fc95 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2684,6 +2684,7 @@
 function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1,
$lowercase = true, $engine = 'auto'
 ) {
+   wfDeprecated( __FUNCTION__, '1.27' );
return Wikimedia\base_convert( $input, $sourceBase, $destBase, $pad, 
$lowercase, $engine );
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If804d1153ca8e9e82eda3af4d992e395ab112158
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...CodeMirror[master]: Remove call codeMirror.save()

[jenkins-bot (Code Review)]

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

Change subject: Remove call codeMirror.save()
..


Remove call codeMirror.save()

codeMirror.toTextArea() already calls codeMirror.save().

Change-Id: Ifeb8c482149540832d6389a9337baffbf9ec03fb
---
M resources/ext.CodeMirror.js
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index d5d4c3e..2cf1099 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -334,7 +334,6 @@
if ( codeMirror ) {
scrollTop = codeMirror.getScrollInfo().top;
setCodeEditorPreference( false );
-   codeMirror.save();
codeMirror.toTextArea();
codeMirror = null;
$.fn.textSelection = origTextSelection;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeb8c482149540832d6389a9337baffbf9ec03fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
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/core[master]: Make Shell::command() set the calling method name automatically

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383965 )

Change subject: Make Shell::command() set the calling method name automatically
..

Make Shell::command() set the calling method name automatically

Also fix some imprecise documentation.

Change-Id: Idaf902ad41c2ae6e6ea2b24451ae22721e0ccdc5
---
M includes/shell/Command.php
M includes/shell/Shell.php
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 9d87f05..3534590 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -154,7 +154,7 @@
}
 
/**
-* Sets calling function for profiler. By default, the caller for 
execute() will be used.
+* Sets name of calling function for use in the profiler.
 *
 * @param string $method
 * @return $this
diff --git a/includes/shell/Shell.php b/includes/shell/Shell.php
index a660a22..31b2185 100644
--- a/includes/shell/Shell.php
+++ b/includes/shell/Shell.php
@@ -47,9 +47,10 @@
 * @param string|string[] $command String or array of strings 
representing the command to
 * be executed, each value will be escaped.
 *   Example:   [ 'convert', '-font', 'font name' ] would produce 
"'convert' '-font' 'font name'"
+* @param string $method Name of calling method, for profiling.
 * @return Command
 */
-   public static function command( $command ) {
+   public static function command( $command, $method = __METHOD__ ) {
$args = func_get_args();
if ( count( $args ) === 1 && is_array( reset( $args ) ) ) {
// If only one argument has been passed, and that 
argument is an array,
@@ -59,8 +60,7 @@
$command = MediaWikiServices::getInstance()
->getShellCommandFactory()
->create();
-
-   return $command->params( $args );
+   return $command->profileMethod( $method )->params( $args );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove old workaround for HHVM

[MaxSem (Code Review)]

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

Change subject: Remove old workaround for HHVM
..

Remove old workaround for HHVM

The bug in question was fixed in HHVM 3.6.0, our minimum requirement is 3.6.5.

Change-Id: Id1d65cf438c7148064d747f09728ef4cb5f51b52
---
M maintenance/Maintenance.php
1 file changed, 1 insertion(+), 7 deletions(-)


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

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index ecbbb85..4ad6e6e 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1444,13 +1444,7 @@
}
 
if ( $isatty && function_exists( 'readline' ) ) {
-   $resp = readline( $prompt );
-   if ( $resp === null ) {
-   // Workaround for 
https://github.com/facebook/hhvm/issues/4776
-   return false;
-   } else {
-   return $resp;
-   }
+   return readline( $prompt );
} else {
if ( $isatty ) {
$st = self::readlineEmulation( $prompt );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1d65cf438c7148064d747f09728ef4cb5f51b52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: RCFilters: Use GroupWidget for grouping buttons and aggregat...

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Use GroupWidget for grouping buttons and aggregating 
events
..

RCFilters: Use GroupWidget for grouping buttons and aggregating events

Bug: T168849
Change-Id: I3d68121aa4b281751f6ea6cce2c68147855d6c68
---
M resources/Resources.php
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less
A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ViewSwitchWidget.js
6 files changed, 55 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/63/383963/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 4df8194..06012b8 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1786,6 +1786,7 @@
],
'mediawiki.rcfilters.filters.ui' => [
'scripts' => [
+   
'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CheckboxInputWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js',

'resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js',
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index 9dccc24..6a20f56 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -22,6 +22,7 @@
min-width: 16px;
min-height: 16px;
opacity: 0.5;
+   position: relative;
}
 
&-icon span {
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less
index a6ce4cd..1896103 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less
@@ -6,9 +6,5 @@
 
&-buttons {
margin-top: 0.5em;
-
-   .oo-ui-buttonWidget:not( :first-child ) {
-   margin-left: 0.5em;
-   }
}
 }
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js
new file mode 100644
index 000..167df09
--- /dev/null
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.GroupWidget.js
@@ -0,0 +1,41 @@
+( function ( mw ) {
+   /**
+* A group widget to allow for aggregation of events
+*
+* @extends OO.ui.Widget
+*
+* @constructor
+* @param {Object} [config] Configuration object
+* @param {Object} [events] Events to aggregate. The object represent 
the
+*  event name to aggregate and the event value to emit on aggregate 
for items.
+*/
+   mw.rcfilters.ui.GroupWidget = function MwRcfiltersUiViewSwitchWidget( 
config ) {
+   var aggregate = {};
+
+   config = config || {};
+
+   // Parent constructor
+   mw.rcfilters.ui.GroupWidget.parent.call( this, config );
+
+   // Mixin constructors
+   OO.ui.mixin.GroupElement.call( this, $.extend( {}, config, { 
$group: this.$element } ) );
+
+   if ( config.events ) {
+   // Aggregate events
+   $.each( config.events, function ( eventName, eventEmit 
) {
+   aggregate[ eventName ] = eventEmit;
+   } );
+
+   this.aggregate( aggregate );
+   }
+
+   if ( Array.isArray( config.items ) ) {
+   this.addItems( config.items );
+   }
+   };
+
+   /* Initialize */
+
+   OO.inheritClass( mw.rcfilters.ui.GroupWidget, OO.ui.Widget );
+   OO.mixinClass( mw.rcfilters.ui.GroupWidget, OO.ui.mixin.GroupWidget );
+}( mediaWiki ) );
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 7eda90a..8287ef9 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ 

[MediaWiki-commits] [Gerrit] marvin[master]: Fix: hide content for screen readers only

[Niedzielski (Code Review)]

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

Change subject: Fix: hide content for screen readers only
..

Fix: hide content for screen readers only

Hide formatting elements from the screen but not from screen readers
per: http://localhost:3000/wiki/MediaWiki:Common.css. A common example
is the fraction bar used to indicate an arithmetic division:
http://localhost:3000/wiki/1_+_1_+_1_+_1_+_⋯/793725799.

Change-Id: I4650ed0d7e8eb4a4c48af01e5e1fa7a75375e130
---
M src/common/components/content/styles/content.css
M src/common/components/content/styles/templates/plainlist.css
M src/common/data-clients/page-redirect.ts
3 files changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/62/383962/1

diff --git a/src/common/components/content/styles/content.css 
b/src/common/components/content/styles/content.css
index a6fab4c..439ae01 100644
--- a/src/common/components/content/styles/content.css
+++ b/src/common/components/content/styles/content.css
@@ -100,3 +100,17 @@
 .Content .metadata {
   overflow-x: auto;
 }
+
+/* Accessibility */
+
+/* Hide (formatting) elements from screen, but not from screenreaders.
+   http://localhost:3000/wiki/MediaWiki:Common.css/804730289
+   http://localhost:3000/wiki/1_+_1_+_1_+_1_+_⋯/793725799 */
+.Content .visualhide {
+  position: absolute;
+  left: -1px;
+  top: auto;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+}
diff --git a/src/common/components/content/styles/templates/plainlist.css 
b/src/common/components/content/styles/templates/plainlist.css
index 05005a6..e157163 100644
--- a/src/common/components/content/styles/templates/plainlist.css
+++ b/src/common/components/content/styles/templates/plainlist.css
@@ -1,4 +1,4 @@
-/* http://localhost:3000/wiki/Template:Plainlist
+/* http://localhost:3000/wiki/Template:Plainlist/628943872
http://localhost:3000/wiki/China/804850001 (infobox) */
 
 .Content .plainlist > ul {
diff --git a/src/common/data-clients/page-redirect.ts 
b/src/common/data-clients/page-redirect.ts
index 0644ff7..45b48ba 100644
--- a/src/common/data-clients/page-redirect.ts
+++ b/src/common/data-clients/page-redirect.ts
@@ -7,7 +7,7 @@
  * sending custom request headers like Api-User-Agent) will fail in most
  * current browsers due to a [spec bug].
  *
- * [redirect pages]: https://www.mediawiki.org/wiki/Help:Redirects
+ * [redirect pages]: http://localhost:3000/wiki/Help:Redirects
  * [spec bug]: https://github.com/whatwg/fetch/issues/204
  */
 export type PageRedirect = boolean;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4650ed0d7e8eb4a4c48af01e5e1fa7a75375e130
Gerrit-PatchSet: 1
Gerrit-Project: marvin
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/core[master]: ApiQueryLinks: Avoid MySQL order-by bug

[jenkins-bot (Code Review)]

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

Change subject: ApiQueryLinks: Avoid MySQL order-by bug
..


ApiQueryLinks: Avoid MySQL order-by bug

MySQL (and MariaDB) have a strange bug where it will often get confused
and insist on filesorting if a field that is constant in the WHERE
clause is also present in ORDER BY. We've worked around this in several
places in the API, and in fact it was done in this very module in r34720
and r37250.

But when r67450 added the pltitles and tltemplates parameters, it didn't
adjust the logic for avoiding the DB bug. This does that now.

Change-Id: I9f37f8812a94cdd088d3940da43d1046ebd455d6
---
M includes/api/ApiQueryLinks.php
1 file changed, 18 insertions(+), 6 deletions(-)

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



diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index 2f75e76..508bdf3 100644
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -87,25 +87,34 @@
 
$this->addTables( $this->table );
$this->addWhereFld( $this->prefix . '_from', array_keys( 
$this->getPageSet()->getGoodTitles() ) );
-   $this->addWhereFld( $this->prefix . '_namespace', 
$params['namespace'] );
 
+   $multiNS = true;
+   $multiTitle = true;
if ( $params[$this->titlesParam] ) {
+   // Filter the titles in PHP so our ORDER BY bug 
avoidance below works right.
+   $filterNS = $params['namespace'] ? array_flip( 
$params['namespace'] ) : false;
+
$lb = new LinkBatch;
foreach ( $params[$this->titlesParam] as $t ) {
$title = Title::newFromText( $t );
if ( !$title ) {
$this->addWarning( [ 
'apiwarn-invalidtitle', wfEscapeWikiText( $t ) ] );
-   } else {
+   } elseif ( !$filterNS || isset( 
$filterNS[$title->getNamespace()] ) ) {
$lb->addObj( $title );
}
}
$cond = $lb->constructSet( $this->prefix, 
$this->getDB() );
if ( $cond ) {
$this->addWhere( $cond );
+   $multiNS = count( $lb->data ) !== 1;
+   $multiTitle = count( call_user_func_array( 
'array_merge', $lb->data ) ) !== 1;
} else {
// No titles so no results
return;
}
+   } elseif ( $params['namespace'] ) {
+   $this->addWhereFld( $this->prefix . '_namespace', 
$params['namespace'] );
+   $multiNS = count( $params['namespace'] ) !== 1;
}
 
if ( !is_null( $params['continue'] ) ) {
@@ -134,12 +143,15 @@
if ( count( $this->getPageSet()->getGoodTitles() ) != 1 ) {
$order[] = $this->prefix . '_from' . $sort;
}
-   if ( count( $params['namespace'] ) != 1 ) {
+   if ( $multiNS ) {
$order[] = $this->prefix . '_namespace' . $sort;
}
-
-   $order[] = $this->prefix . '_title' . $sort;
-   $this->addOption( 'ORDER BY', $order );
+   if ( $multiTitle ) {
+   $order[] = $this->prefix . '_title' . $sort;
+   }
+   if ( $order ) {
+   $this->addOption( 'ORDER BY', $order );
+   }
$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
$res = $this->select( __METHOD__ );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f37f8812a94cdd088d3940da43d1046ebd455d6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
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] mediawiki/core[master]: Move wfCountDown() into Maintenance class

[MaxSem (Code Review)]

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

Change subject: Move wfCountDown() into Maintenance class
..

Move wfCountDown() into Maintenance class

Doing this allows to restrict it to maintenance scripts and support
quiet mode.

Change-Id: Iad0858ce1fdd64f746d5f9d4a7d6ed96f21e94df
---
M RELEASE-NOTES-1.31
M includes/GlobalFunctions.php
M maintenance/Maintenance.php
M maintenance/resetUserTokens.php
M maintenance/update.php
5 files changed, 33 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/383961/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 57cbec4..efadf9a 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -44,6 +44,8 @@
 * MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.
 * The global function wfBCP47 was renamed to LanguageCode::bcp47.
 * The global function wfBCP47 is now deprecated.
+* The global function wfCountDown() is now deprecated in favor of
+  Maintenance::countDown().
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d53e98d..537a97f 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3047,6 +3047,8 @@
  * Count down from $seconds to zero on the terminal, with a one-second pause
  * between showing each number. For use in command-line scripts.
  *
+ * @deprecated since 1.31, use Maintenance::countDown()
+ *
  * @codeCoverageIgnore
  * @param int $seconds
  */
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index ecbbb85..9a29055 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1417,6 +1417,32 @@
}
 
/**
+* Count down from $seconds to zero on the terminal, with a one-second 
pause
+* between showing each number. If the maintenance script is in quiet 
mode,
+* this function does nothing.
+*
+* @since 1.31
+*
+* @codeCoverageIgnore
+* @param int $seconds
+*/
+   protected function countDown( $seconds ) {
+   if ( $this->isQuiet() ) {
+   return;
+   }
+   for ( $i = $seconds; $i >= 0; $i-- ) {
+   if ( $i != $seconds ) {
+   $this->output( str_repeat( "\x08", strlen( $i + 
1 ) ) );
+   }
+   $this->output( $i );
+   if ( $i ) {
+   sleep( 1 );
+   }
+   }
+   $this->output( "\n" );
+   }
+
+   /**
 * Wrapper for posix_isatty()
 * We default as considering stdin a tty (for nice readline methods)
 * but treating stout as not a tty to avoid color codes
diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index 481da98..1c8b4b9 100644
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -64,7 +64,7 @@
$this->output( "\n" );
$this->output( "Abort with control-c in the next five 
seconds "
. "(skip this countdown with --nowarn) ... " );
-   wfCountDown( 5 );
+   $this->countDown( 5 );
}
 
// We list user by user_id from one of the replica DBs
diff --git a/maintenance/update.php b/maintenance/update.php
index 5f705ba..5e2947b 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -128,7 +128,7 @@
$this->compatChecks();
} else {
$this->output( "Skipping compatibility checks, proceed 
at your own risk (Ctrl+C to abort)\n" );
-   wfCountDown( 5 );
+   $this->countDown( 5 );
}
 
// Check external dependencies are up to date
@@ -155,7 +155,7 @@
if ( !$this->hasOption( 'quick' ) ) {
$this->output( "Abort with control-c in the next five 
seconds "
. "(skip this countdown with --quick) ... " );
-   wfCountDown( 5 );
+   $this->countDown( 5 );
}
 
$time1 = microtime( true );

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] operations/puppet[production]: authdns: remove ganglia support

[Dzahn (Code Review)]

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

Change subject: authdns: remove ganglia support
..


authdns: remove ganglia support

Bug: T177225
Change-Id: I52709b218ea8309c8114b4109787536427a1bb4f
---
D modules/authdns/files/ganglia/ganglia_gdnsd.py
D modules/authdns/files/ganglia/gdnsd.pyconf
D modules/authdns/manifests/ganglia.pp
M modules/role/manifests/authdns/server.pp
4 files changed, 0 insertions(+), 342 deletions(-)

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



diff --git a/modules/authdns/files/ganglia/ganglia_gdnsd.py 
b/modules/authdns/files/ganglia/ganglia_gdnsd.py
deleted file mode 100644
index 03f4809..000
--- a/modules/authdns/files/ganglia/ganglia_gdnsd.py
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2013 Faidon Liambotis
-# Copyright (c) 2013 Wikimedia Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-"""Gmond module for gdnsd statistics
-
-:copyright: (c) 2013 Faidon Liambotis and Wikimedia Foundation Inc.
-:author: Faidon Liambotis
-:license: GPLv2+
-"""
-
-import urllib2
-import json
-import time
-
-
-CONF = {
-'stats_url': 'http://127.0.0.1:3506/json',
-'prefix': 'gdnsd',
-'groups': 'gdnsd',
-}
-DESCRIPTIONS = {
-'stats_v6': 'DNS queries over IPv6',
-'stats_badvers': 'DNS BADVERS responses',
-'stats_formerr': 'DNS FORMERR responses',
-'stats_noerror': 'DNS NOERROR responses',
-'stats_notimp': 'DNS NOTIMP responses',
-'stats_nxdomain': 'DNS NXDOMAIN responses',
-'stats_refused': 'DNS REFUSED responses',
-'stats_dropped': 'DNS dropped packets',
-'stats_edns': 'DNS EDNS queries',
-'stats_edns_clientsub': 'DNS queries with EDNS Client Subnet',
-'udp_reqs': 'DNS UDP requests',
-'tcp_reqs': 'DNS TCP requests',
-'udp_edns_big': 'DNS UDP EDNS big',
-'udp_tc': 'DNS UDP TC-bit',
-'udp_edns_tc': 'DNS UDP EDNS TC-bit',
-'udp_sendfail': 'DNS UDP sendfail',
-'udp_recvfail': 'DNS UDP recvfail',
-'tcp_sendfail': 'DNS TCP sendfail',
-'tcp_recvfail': 'DNS TCP recvfail',
-}
-CACHE = {
-'time': 0,
-'data': {},
-}
-
-
-def build_desc(skel, prop):
-"""Build a description dict from a template.
-
-:param skel: template dict
-:param prop: substitution dict
-:returns: New dict
-"""
-new = skel.copy()
-for key, value in prop.iteritems():
-new[key] = value
-return new
-
-
-def fetch_metrics(url=CONF['stats_url']):
-"""Fetches & decodes metrics from gdnsd.
-
-:param url: URL for gdnsd's json output
-:returns: decoded dict
-"""
-metrics = {}
-try:
-response = urllib2.urlopen(url)
-data = response.read()
-response.close()
-metrics = json.loads(data)
-except Exception:  # pylint: disable-msg=W0703
-# Could be URLError, HTTPError, HTTPException or ValueError (from json)
-# doesn't matter why, as Ganglia won't propagate a message.
-# pass, i.e. just return {}.
-pass
-
-# remove the services section, as we're not interested in it
-metrics.pop('services', None)
-
-return metrics
-
-
-def fetch_metrics_cached(url=CONF['stats_url']):
-"""Fetches, decodes and caches metrics from gdnsd.
-Fetches at most once a second, otherwise serving from the cache.
-Tries to fetch twice, if the first attempt failed.
-Serves stale data up to 15s old if both attempts failed.
-
-:param url: URL for gdnsd's json output
-:returns: decoded dict
-"""
-# fetch at most once a second; especially useful considering that
-# the callback gets called for every single metric independently
-if time.time() - CACHE['time'] < 1 and CACHE['data']:
-return CACHE['data']
-
-# try three times, as its very error-prone
-# (yes, this is horrible)
-metrics = None
-for _ in range(3):
-metrics = fetch_metrics(url)
-if metrics:
-break
-
-if metrics:
-CACHE['time'] = time.time()
-CACHE['data'] = metrics
-else:
-# failed, return cached data up to 15s to avoid dives/spikes
-if time.time() - CACHE['time'] <= 15:
-metrics = CACHE['data']
-
-return metrics
-
-
-def metric_handler(name):
-"""Callback to return the current value for a metric.
-
-:param name: metric 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update email mute copy on preferences page

[jenkins-bot (Code Review)]

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

Change subject: Update email mute copy on preferences page
..


Update email mute copy on preferences page

Bug: T176365
Change-Id: Iabe26fe12ee212217ab6b05016638a683df94b05
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 6bf32b2..9826a56 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1061,8 +1061,8 @@
"timezoneregion-europe": "Europe",
"timezoneregion-indian": "Indian Ocean",
"timezoneregion-pacific": "Pacific Ocean",
-   "allowemail": "Enable email from other users",
-   "email-blacklist-label": "Prohibit these users from sending emails to 
me:",
+   "allowemail": "Allow other users to email me",
+   "email-blacklist-label": "Prohibit these users from emailing me:",
"prefs-searchoptions": "Search",
"prefs-namespaces": "Namespaces",
"default": "default",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iabe26fe12ee212217ab6b05016638a683df94b05
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Dmaza 
Gerrit-Reviewer: Dbarratt 
Gerrit-Reviewer: Kaldari 
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] wikimedia...autoreporter[master]: Bug fixes

[Chelsyx (Code Review)]

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

Change subject: Bug fixes
..


Bug fixes

Change-Id: Ifa99d8f6796a091124a0c902b8d2e370a9ec5b13
---
M report.Rmd
1 file changed, 21 insertions(+), 19 deletions(-)

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



diff --git a/report.Rmd b/report.Rmd
index ba84ad6..50c315b 100644
--- a/report.Rmd
+++ b/report.Rmd
@@ -94,6 +94,8 @@
   )
 })
 source("functions.R")
+# Take all R colors from graphical devices (with grey removed)
+large_color_palette = grDevices::colors()[grep('gr(a|e)y', 
grDevices::colors(), invert = T)]
 ```
 
 `r if (!is.null(params$test_description)) { params$test_description }`
@@ -514,7 +516,7 @@
 ```{r event_count_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * n_wiki)}
 event_count_function(by_wiki = TRUE) + 
   theme_facet() +
-  facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y")
+  facet_wrap(~ wiki, ncol = 1, scales = "free_y")
 ```
 
 ```{r event_after_click_all, echo=FALSE}
@@ -529,10 +531,10 @@
 event_after_click_function() + theme_min()
 ```
 
-```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * 
n_wiki)}
+```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * 
ceiling(n_wiki / 2))}
 event_after_click_function(by_wiki = TRUE) +
   theme_facet() +
-  facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y")
+  facet_wrap(~ wiki, ncol = 2, scales = "free_y")
 ```
 
  Searches
@@ -559,7 +561,7 @@
   knitr::kable()
 ```
 
-```{r daily_searches, echo=FALSE}
+```{r daily_searches, echo=FALSE, fig.height=(4 * n_wiki)}
 searches %>%
   group_by(group, wiki, date) %>%
   summarize(`All Searches` = n(), `Searches with Results` = sum(`got same-wiki 
results`), `Searches with Clicks` = sum(`same-wiki clickthrough`)) %>%
@@ -583,7 +585,7 @@
 group_by(!!! rlang::syms(c("group", "results", switch(by_wiki, "wiki", 
NULL %>%
 summarize(searches = length(unique(serp_id[!is.na(serp_id)]))) %>%
 bar_chart(x = "results", y = "searches", x_lab = "Number of same-wiki 
results returned", 
-  y_lab = "Number of searches", title = expression(paste("Number 
of searches with ", italic("n"), " same-wiki result returned, by test group", 
switch(by_wiki, "and wiki", NULL
+  y_lab = "Number of searches", title = paste("Number of searches 
with n same-wiki result returned, by test group", switch(by_wiki, "and wiki", 
NULL)))
 }
 n_results_summary_function() + theme_min()
 ```
@@ -609,7 +611,7 @@
 group_by(!!! rlang::syms(c("group", "offset", switch(by_wiki, "wiki", 
NULL %>%
 tally %>%
 bar_chart(x = "offset", y = "n", x_lab = "Offset", y_lab = "Number of 
SERPs", 
-  title = expression(paste("Number of SERPs with ", italic("n"), " 
offset results, by test group", switch(by_wiki, "and wiki", NULL))),
+  title = paste("Number of SERPs with n offset results, by test 
group", switch(by_wiki, "and wiki", NULL)),
   caption = "This can be regarded as a proxy for users visiting 
additional pages of their search results.") +
 scale_x_discrete(limits = c("No offset (page 1)", Pluralize(c(20, 40, 60, 
80), "result"), "100+ results"))
 }
@@ -643,14 +645,15 @@
 tally %>%
 mutate(prop = paste0(scales::percent_format()(n/sum(n)), " (", n, ")")) %>%
 select(-n) %>%
-tidyr::spread(group, prop)
+tidyr::spread(group, prop) %>%
+ungroup
 }
 get_bayes_factor <- function(data) {
   BF <- data %>%
 tally %>%
 tidyr::spread(group, n) %>%
 ungroup %>%
-select(params$test_group_names) %>%
+select(dplyr::one_of(params$test_group_names)) %>%
 as.matrix() %>%
 # see http://bayesfactorpcl.r-forge.r-project.org/#ctables for more info
 BayesFactor::contingencyTableBF(sampleType = "indepMulti", fixedMargin = 
"cols")
@@ -808,7 +811,7 @@
 iwclick_position_function() + theme_min()
 ```
 
-```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), 
echo=FALSE, fig.height=(5 * n_wiki)}
+```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), 
echo=FALSE, fig.height=(4 * n_wiki)}
 iwclick_position_function(by_wiki = TRUE) + 
   facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") +
   theme_facet()
@@ -1044,7 +1047,7 @@
   theme_facet()
 ```
 
-```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, results='asis', 
include=TRUE}
+```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, fig.width=11, 
fig.height=10, results='asis', include=TRUE}
 # TODO: duplicated code engagement_OR_all
 control_group <- grep("control", params$`test_group_names`, value = TRUE)
 test_group <- setdiff(params$`test_group_names`, control_group)
@@ -1063,17 +1066,16 @@
   labels = c("Pr[Control Engaging]", "Pr[Test Engaging]", "Pr[Test] - 
Pr[Control]", "Relative Risk", "Odds Ratio")
 )) %>%
 ggplot(aes(x = 1, y = estimate, ymin = 

[MediaWiki-commits] [Gerrit] wikimedia...autoreporter[master]: Bug fixes

[Chelsyx (Code Review)]

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

Change subject: Bug fixes
..

Bug fixes

Change-Id: Ifa99d8f6796a091124a0c902b8d2e370a9ec5b13
---
M report.Rmd
1 file changed, 21 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/autoreporter 
refs/changes/60/383960/1

diff --git a/report.Rmd b/report.Rmd
index ba84ad6..50c315b 100644
--- a/report.Rmd
+++ b/report.Rmd
@@ -94,6 +94,8 @@
   )
 })
 source("functions.R")
+# Take all R colors from graphical devices (with grey removed)
+large_color_palette = grDevices::colors()[grep('gr(a|e)y', 
grDevices::colors(), invert = T)]
 ```
 
 `r if (!is.null(params$test_description)) { params$test_description }`
@@ -514,7 +516,7 @@
 ```{r event_count_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * n_wiki)}
 event_count_function(by_wiki = TRUE) + 
   theme_facet() +
-  facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y")
+  facet_wrap(~ wiki, ncol = 1, scales = "free_y")
 ```
 
 ```{r event_after_click_all, echo=FALSE}
@@ -529,10 +531,10 @@
 event_after_click_function() + theme_min()
 ```
 
-```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * 
n_wiki)}
+```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * 
ceiling(n_wiki / 2))}
 event_after_click_function(by_wiki = TRUE) +
   theme_facet() +
-  facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y")
+  facet_wrap(~ wiki, ncol = 2, scales = "free_y")
 ```
 
  Searches
@@ -559,7 +561,7 @@
   knitr::kable()
 ```
 
-```{r daily_searches, echo=FALSE}
+```{r daily_searches, echo=FALSE, fig.height=(4 * n_wiki)}
 searches %>%
   group_by(group, wiki, date) %>%
   summarize(`All Searches` = n(), `Searches with Results` = sum(`got same-wiki 
results`), `Searches with Clicks` = sum(`same-wiki clickthrough`)) %>%
@@ -583,7 +585,7 @@
 group_by(!!! rlang::syms(c("group", "results", switch(by_wiki, "wiki", 
NULL %>%
 summarize(searches = length(unique(serp_id[!is.na(serp_id)]))) %>%
 bar_chart(x = "results", y = "searches", x_lab = "Number of same-wiki 
results returned", 
-  y_lab = "Number of searches", title = expression(paste("Number 
of searches with ", italic("n"), " same-wiki result returned, by test group", 
switch(by_wiki, "and wiki", NULL
+  y_lab = "Number of searches", title = paste("Number of searches 
with n same-wiki result returned, by test group", switch(by_wiki, "and wiki", 
NULL)))
 }
 n_results_summary_function() + theme_min()
 ```
@@ -609,7 +611,7 @@
 group_by(!!! rlang::syms(c("group", "offset", switch(by_wiki, "wiki", 
NULL %>%
 tally %>%
 bar_chart(x = "offset", y = "n", x_lab = "Offset", y_lab = "Number of 
SERPs", 
-  title = expression(paste("Number of SERPs with ", italic("n"), " 
offset results, by test group", switch(by_wiki, "and wiki", NULL))),
+  title = paste("Number of SERPs with n offset results, by test 
group", switch(by_wiki, "and wiki", NULL)),
   caption = "This can be regarded as a proxy for users visiting 
additional pages of their search results.") +
 scale_x_discrete(limits = c("No offset (page 1)", Pluralize(c(20, 40, 60, 
80), "result"), "100+ results"))
 }
@@ -643,14 +645,15 @@
 tally %>%
 mutate(prop = paste0(scales::percent_format()(n/sum(n)), " (", n, ")")) %>%
 select(-n) %>%
-tidyr::spread(group, prop)
+tidyr::spread(group, prop) %>%
+ungroup
 }
 get_bayes_factor <- function(data) {
   BF <- data %>%
 tally %>%
 tidyr::spread(group, n) %>%
 ungroup %>%
-select(params$test_group_names) %>%
+select(dplyr::one_of(params$test_group_names)) %>%
 as.matrix() %>%
 # see http://bayesfactorpcl.r-forge.r-project.org/#ctables for more info
 BayesFactor::contingencyTableBF(sampleType = "indepMulti", fixedMargin = 
"cols")
@@ -808,7 +811,7 @@
 iwclick_position_function() + theme_min()
 ```
 
-```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), 
echo=FALSE, fig.height=(5 * n_wiki)}
+```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), 
echo=FALSE, fig.height=(4 * n_wiki)}
 iwclick_position_function(by_wiki = TRUE) + 
   facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") +
   theme_facet()
@@ -1044,7 +1047,7 @@
   theme_facet()
 ```
 
-```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, results='asis', 
include=TRUE}
+```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, fig.width=11, 
fig.height=10, results='asis', include=TRUE}
 # TODO: duplicated code engagement_OR_all
 control_group <- grep("control", params$`test_group_names`, value = TRUE)
 test_group <- setdiff(params$`test_group_names`, control_group)
@@ -1063,17 +1066,16 @@
   labels = c("Pr[Control Engaging]", "Pr[Test Engaging]", "Pr[Test] - 
Pr[Control]", "Relative Risk", "Odds Ratio")
 )) %>%
 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: media: Ensure there ie enough data to extract software version

[Dereckson (Code Review)]

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

Change subject: media: Ensure there ie enough data to extract software version
..

media: Ensure there ie enough data to extract software version

The Software EXIF / other metadata field was expected to contain
the software name followed by the version number.

There are occurences in Wikimedia production logs of errors showing
that's not always the case.

Bug: T178130
Change-Id: I4187a41b5fd8d7b5574ab50523668d8feb11bccc
---
M includes/media/FormatMetadata.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/383959/1

diff --git a/includes/media/FormatMetadata.php 
b/includes/media/FormatMetadata.php
index 6661965..b5a8007 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -739,7 +739,7 @@
break;
 
case 'Software':
-   if ( is_array( $val ) ) {
+   if ( is_array( $val ) && count( 
$val )  > 1 ) {
// if its a software, 
version array.
$val = $this->msg( 
'exif-software-version-value', $val[0], $val[1] )->text();
} else {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update dumps archive_index.html for the files I just uploaded

[Tim Starling (Code Review)]

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

Change subject: Update dumps archive_index.html for the files I just uploaded
..

Update dumps archive_index.html for the files I just uploaded

Change-Id: I6e87761939d8769046ceee062b1628ab28cfe091
---
M modules/dumps/files/web/html/archive_index.html
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/383958/1

diff --git a/modules/dumps/files/web/html/archive_index.html 
b/modules/dumps/files/web/html/archive_index.html
index 71ae382..4b4bd83 100644
--- a/modules/dumps/files/web/html/archive_index.html
+++ b/modules/dumps/files/web/html/archive_index.html
@@ -23,6 +23,7 @@
 when they were created.  Happy perusing!

2001 (UseModWiki) tarballs of the directory
+   2001 (UseModWiki) dump converted to MediaWiki 
XML
2002 (UseModWiki) tarballs of the directory
2003 (phpwiki?) dumps of sql tables
2005 (MediaWiki 1.5?) XML files, warning: old 
schema!

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e87761939d8769046ceee062b1628ab28cfe091
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Revert "Limit thanks for new users at pl.wikipedia t...

[Dereckson (Code Review)]

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

Change subject: Revert "Revert "Limit thanks for new users at pl.wikipedia to 3 
per day""
..


Revert "Revert "Limit thanks for new users at pl.wikipedia to 3 per day""

The pl.wikipedia thanks feature is again abused, soon after the revert.

The wiki contributors interested by the question testimonied
social actions don't give satisfactory results, and would be
in favour of a permanent limit for new contributors.

As such, the sensible thing is probably to reenable the limit
for a longer term.

This reverts commit 67964e3b011ee6894ab62d108200fe5909bcbc66
and restores commit 4329654222bc2642f12cc36a2c60c22cbbd251b4.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index dc0a2b3..dd5dc89 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7822,6 +7822,12 @@
'extendedmover' => [ 16, 60 ], // T138703
],
],
+   '+plwiki' => [
+   // Limit to 3 per day for new users (T169268)
+   'thanks-notification' => [
+   'newbie' => [ 3, 86400 ],
+   ],
+   ],
 ],
 # @} end of wgRateLimits
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34fb2e83d6c0fac290bad9af8736f8977fc9a13b
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Ejegg (Code Review)]

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

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

Merge branch 'master' into deployment

9fa46538d Fix Omnimailing.load job to bypass creating recipients & to use 
internal replace, add test.

Change-Id: I924a1d028ebaaa33879bdb74b8e817b8247481d6
---
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailBaseTestClass.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientGetTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientLoadTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnirecipientProcessUnsubscribesTest.php
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/20170509_noCID
 - All - Jul 5 2017 06-27-45 AM.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AggregateGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/AuthenticateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/ExportListResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/GetMailingTemplateResponse2.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusCompleteResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/JobStatusWaitingResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/MailingGetResponse1.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/Raw
 Recipient Data Export Jul 03 2017 00-47-42 AM 1295.csv
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/Responses/RawRecipientDataExportResponse.txt
D 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/bootstrap.php
20 files changed, 0 insertions(+), 1,404 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/57/383957/1

diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
deleted file mode 100644
index 0509181..000
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnigroupmemberGetTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
-return \Civi\Test::e2e()
-  ->installMe(__DIR__)
-  ->apply();
-  }
-
-  public function tearDown() {
-parent::tearDown();
-  }
-
-  /**
-   * Example: Test that a version is returned.
-   */
-  public function testOmnigroupmemberGet() {
-$client = $this->setupSuccessfulDownloadClient();
-
-$result = civicrm_api3('Omnigroupmember', 'get', array('mail_provider' => 
'Silverpop', 'username' => 'Shrek', 'password' => 'Fiona', 'options' => 
array('limit' => 3), 'client' => $client, 'group_identifier' => 123));
-$this->assertEquals(3, $result['count']);
-$this->assertEquals('e...@example.com', $result['values'][0]['email']);
-$this->assertEquals('', $result['values'][0]['contact_id']);
-$this->assertEquals(TRUE, $result['values'][0]['is_opt_out']);
-$this->assertEquals('2016-10-18 20:01:00', 
$result['values'][0]['opt_in_date']);
-$this->assertEquals('2017-07-04 11:11:00', 
$result['values'][0]['opt_out_date']);
-$this->assertEquals('Added by WebForms', 
$result['values'][0]['opt_in_source']);
-$this->assertEquals('Opt out via email opt out.', 
$result['values'][0]['opt_out_source']);
-$this->assertEquals('clever place', $result['values'][2]['source']);
-$this->assertEquals('US', $result['values'][2]['country']);
-$this->assertEquals('en', $result['values'][2]['language']);
-$this->assertEquals('07/04/17', $result['values'][2]['created_date']);
-  }
-
-
-  /**
-   * @return \GuzzleHttp\Client
-   */
-  protected function setupSuccessfulDownloadClient() {
-$responses = array(
-  file_get_contents(__DIR__ . '/Responses/ExportListResponse.txt'),
-  file_get_contents(__DIR__ . '/Responses/JobStatusCompleteResponse.txt'),
-);
-copy(__DIR__ . '/Responses/20170509_noCID - All - 

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[jenkins-bot (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..


Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

9fa46538dbb848bdf9ebd9f48050ff4ca5e796db Fix Omnimailing.load job to bypass 
creating recipients & to use internal replace, add test.

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8da51794f7c4f1d67046beac039a4de0ea897bb8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Eileen 
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]: Update PsySh from 0.8.5 to 0.8.11

[Code Review]

Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383955 )

Change subject: Update PsySh from 0.8.5 to 0.8.11
..

Update PsySh from 0.8.5 to 0.8.11

0.8.11 adds bracketed paste support for readline,
meaning that it can differentiate between
interaction-triggering characters (such as newline
or tab) which have been entered manually, and ones
which have been pasted so their special effect should
be suppressed. Also a bunch of small bugfixes and features.

Release summaries: https://github.com/bobthecow/psysh/releases
All changes: 
https://github.com/bobthecow/psysh/compare/v0.8.5...v0.8.11?expand=1

There are no dependency changes; I've skimmed the code
changes and all seem harmless.

Change-Id: I33456904787fd86458249ddfbb00c6b55592da07
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/composer.json b/composer.json
index 634bace..2bd8d6c 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,7 @@
"nikic/php-parser": "2.1.0",
"nmred/kafka-php": "0.1.5",
"phpunit/phpunit": "4.8.35",
-   "psy/psysh": "0.8.5",
+   "psy/psysh": "0.8.11",
"wikimedia/avro": "1.7.7",
"wikimedia/testing-access-wrapper": "~1.0",
"wmde/hamcrest-html-matchers": "^0.1.0"

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [poc] RCFilters: Enable a batched update operation

[Mooeypoo (Code Review)]

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

Change subject: [poc] RCFilters: Enable a batched update operation
..

[poc] RCFilters: Enable a batched update operation

Mainly relevant for the filter multiselect and updating of the results
to prevent recomputation or repeated fetching unnecessarily.

Bug: T178042
Change-Id: I1f1c1fc5a5b722d99a0539f47631c71c5ce0e811
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
3 files changed, 62 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/383956/1

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 0d65466..2d53d03 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -828,11 +828,29 @@
 * This is equivalent to display all.
 */
mw.rcfilters.dm.FiltersViewModel.prototype.emptyAllFilters = function 
() {
+   var changed = [];
+
this.getItems().forEach( function ( filterItem ) {
if ( !filterItem.getGroupModel().isSticky() ) {
+   if ( filterItem.isSelected() ) {
+   changed.push( filterItem.getName() );
+   }
+
this.toggleFilterSelected( 
filterItem.getName(), false );
}
}.bind( this ) );
+
+   this.finishItemsUpdate( changed );
+   };
+
+   /**
+* Finish an item update operation for batching updates
+*
+* @param  {string[]} itemNames Names of the items that were updated
+* @fires filtersUpdated
+*/
+   mw.rcfilters.dm.FiltersViewModel.prototype.finishItemsUpdate = function 
( itemNames ) {
+   this.emit( 'filtersUpdated', itemNames );
};
 
/**
@@ -847,6 +865,8 @@
if ( item ) {
item.toggleSelected( isSelected );
}
+
+   this.finishItemsUpdate( [ name ] );
};
 
/**
@@ -858,6 +878,8 @@
Object.keys( filterDef ).forEach( function ( name ) {
this.toggleFilterSelected( name, filterDef[ name ] );
}.bind( this ) );
+
+   this.finishItemsUpdate( Object.keys( filterDef ) );
};
 
/**
@@ -1066,12 +1088,18 @@
// HACK make sure highlights are disabled globally 
while we toggle on the items,
// otherwise we'll call clearHighlight() and 
applyHighlight() many many times
this.highlightEnabled = false;
-   this.getItems().forEach( function ( filterItem ) {
+   this.getItemsSupportingHighlights().forEach( function ( 
filterItem ) {
filterItem.toggleHighlight( enable );
} );
 
this.highlightEnabled = enable;
this.emit( 'highlightChange', this.highlightEnabled );
+
+   this.finishItemsUpdate(
+   this.getItemsSupportingHighlights().map( 
function ( filterItem ) {
+   return filterItem.getName();
+   } )
+   );
}
};
 
@@ -1110,6 +1138,7 @@
 */
mw.rcfilters.dm.FiltersViewModel.prototype.setHighlightColor = function 
( filterName, color ) {
this.getItemByName( filterName ).setHighlightColor( color );
+   this.finishItemsUpdate( [ filterName ] );
};
 
/**
@@ -1119,15 +1148,23 @@
 */
mw.rcfilters.dm.FiltersViewModel.prototype.clearHighlightColor = 
function ( filterName ) {
this.getItemByName( filterName ).clearHighlightColor();
+   this.finishItemsUpdate( [ filterName ] );
};
 
/**
 * Clear highlight for all filter items
 */
mw.rcfilters.dm.FiltersViewModel.prototype.clearAllHighlightColors = 
function () {
-   this.getItems().forEach( function ( filterItem ) {
+   var changed = [];
+
+   this.getItemsSupportingHighlights().forEach( function ( 
filterItem ) {
+   if ( filterItem.getHighlightColor() ) {
+   changed.push( filterItem.getName() );
+   }
filterItem.clearHighlightColor();
  

[MediaWiki-commits] [Gerrit] mediawiki...CheckUser[master]: Changing $wgCheckUserCIDRLimit['IPv6'] from 32 to 19

[jenkins-bot (Code Review)]

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

Change subject: Changing $wgCheckUserCIDRLimit['IPv6'] from 32 to 19
..


Changing $wgCheckUserCIDRLimit['IPv6'] from 32 to 19

Reasoning is the same as Ia25e156fd8234519c4d74f1d41d93f94a313ce14

Bug: T177859
Change-Id: I0b85dace08cee46759deba6b4cc2fdde83fd2b4a
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 0803a14..48aefa6 100644
--- a/extension.json
+++ b/extension.json
@@ -19,7 +19,7 @@
"@doc": "see CheckUser.php",
"CheckUserCIDRLimit": {
"IPv4": 16,
-   "IPv6": 32
+   "IPv6": 19
},
"CheckUserMaxBlocks": 200,
"CUPublicKey": "",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b85dace08cee46759deba6b4cc2fdde83fd2b4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

[Eileen (Code Review)]

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

9fa46538dbb848bdf9ebd9f48050ff4ca5e796db Fix Omnimailing.load job to bypass 
creating recipients & to use internal replace, add test.

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/54/383954/1


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

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

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

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: improve page revision route typing

[Niedzielski (Code Review)]

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

Change subject: Chore: improve page revision route typing
..

Chore: improve page revision route typing

Require page revisions to be a number internally and externally through
the API.

Change-Id: I7f58eae45144f2f7a2dd35980e10d4b8d68b398c
---
M src/common/pages/home.tsx
M src/common/pages/wiki.tsx
M src/common/routers/api.ts
M src/common/routers/route.ts
4 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/53/383953/1

diff --git a/src/common/pages/home.tsx b/src/common/pages/home.tsx
index f47042b..ee63b2a 100644
--- a/src/common/pages/home.tsx
+++ b/src/common/pages/home.tsx
@@ -50,7 +50,7 @@
 },
 {
   title: "Ice_cream_cake",
-  revision: "24242119",
+  revision: 24242119,
   text: "An arbitrary revision"
 }
   ];
@@ -88,7 +88,7 @@
   text
 }: {
   title: string;
-  revision?: string;
+  revision?: number;
   text: string;
 }) => (
   
diff --git a/src/common/pages/wiki.tsx b/src/common/pages/wiki.tsx
index 3b008c0..167d4d6 100644
--- a/src/common/pages/wiki.tsx
+++ b/src/common/pages/wiki.tsx
@@ -16,7 +16,7 @@
*/
   title: PageTitleID | PageTitlePath;
 
-  revision?: string;
+  revision?: number;
 }
 
 export interface Props {
@@ -26,7 +26,7 @@
 export const getInitialProps = ({ title, revision }: Params): Promise =>
   requestPage({
 titlePath: title,
-revision: (revision && parseInt(revision, 10)) || undefined
+revision
   }).then(page => ({ page }));
 
 export const Component = ({ page }: Props): JSX.Element => (
diff --git a/src/common/routers/api.ts b/src/common/routers/api.ts
index de15682..7a02a95 100644
--- a/src/common/routers/api.ts
+++ b/src/common/routers/api.ts
@@ -26,7 +26,7 @@
 });
 
 export const wiki: Route = newRoute({
-  path: "/wiki/:title/:revision?",
+  path: "/wiki/:title/:revision(\\d+)?",
   importModule: () =>
 import(/* webpackChunkName: "pages/wiki" */ "../pages/wiki"),
   chunkName: "pages/wiki"
diff --git a/src/common/routers/route.ts b/src/common/routers/route.ts
index c556ae8..bb00217 100644
--- a/src/common/routers/route.ts
+++ b/src/common/routers/route.ts
@@ -7,7 +7,7 @@
  * Route.url().
  */
 export interface RouteParams {
-  [name: string]: string | undefined;
+  [name: string]: string | number | undefined;
 }
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f58eae45144f2f7a2dd35980e10d4b8d68b398c
Gerrit-PatchSet: 1
Gerrit-Project: marvin
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] operations/mediawiki-config[master]: Add logging for email blocks

[jenkins-bot (Code Review)]

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

Change subject: Add logging for email blocks
..


Add logging for email blocks

Bug: T175419
Change-Id: I0631001b3943fa81a1571d0f2ef062249326e84b
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2f73978..7340f94 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2036,7 +2036,12 @@
 # # Hack to block emails from some user who likes 'The Joker' --Andrew 
2009-05-28
 $wgHooks['EmailUser'][] = function ( &$to, &$from, &$subject, &$text ) {
$blockedAddresses = [ 'the4jo...@gmail.com', 
'randomdude5...@gmail.com', 'siyang...@yahoo.com', 'johnnyw...@gmail.com', 
'wikifreedomfigh...@googlemail.com' ];
-   return !in_array( $from->address, $blockedAddresses );
+   $emailIsBlacklisted = in_array( $from->address, $blockedAddresses );
+   if ( $emailIsBlacklisted ) {
+   wfDebugLog( 'AdHocDebug', "Blocking email from 
{$from->address}" ); // T175419
+   }
+
+   return !$emailIsBlacklisted;
 };
 
 // ContributionTracking for handling PayPal redirects

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0631001b3943fa81a1571d0f2ef062249326e84b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Dereckson 
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] mediawiki...AbuseFilter[master]: Add slow filters debug data to the logs.

[jenkins-bot (Code Review)]

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

Change subject: Add slow filters debug data to the logs.
..


Add slow filters debug data to the logs.

When $wgAbuseFilterRuntimeProfile is true, all filters taking
longer than $wgAbuseFilterRuntimeLimit will be logged for
later analysis

Bug: T174205
Change-Id: Id81833afa8421476a6cee47eb3393acdb3a38d65
---
M AbuseFilter.php
M extension.json
M includes/AbuseFilter.class.php
3 files changed, 51 insertions(+), 14 deletions(-)

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



diff --git a/AbuseFilter.php b/AbuseFilter.php
index 7f13eaf..58c410b 100644
--- a/AbuseFilter.php
+++ b/AbuseFilter.php
@@ -122,3 +122,8 @@
  * Whether to record runtime metrics for all filters combined.
  */
 $wgAbuseFilterRuntimeProfile = false;
+
+/**
+ * Runtime in milliseconds before a filter is considered slow.
+ */
+$wgAbuseFilterSlowFilterRuntimeLimit = 500;
diff --git a/extension.json b/extension.json
index a043b6c..dbda826 100644
--- a/extension.json
+++ b/extension.json
@@ -249,7 +249,8 @@
},
"AbuseFilterLogIPMaxAge": 7776000,
"AbuseFilterProfile": false,
-   "AbuseFilterRuntimeProfile": false
+   "AbuseFilterRuntimeProfile": false,
+   "AbuseFilterSlowFilterRuntimeLimit": 500
},
"load_composer_autoloader": true,
"manifest_version": 1
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 3ce5cdb..2d1face 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -450,10 +450,11 @@
 *
 * @param AbuseFilterVariableHolder $vars
 * @param string $group The filter's group (as defined in 
$wgAbuseFilterValidGroups)
+* @param Title|null $title
 *
 * @return bool[] Map of (integer filter ID => bool)
 */
-   public static function checkAllFilters( $vars, $group = 'default' ) {
+   public static function checkAllFilters( $vars, $group = 'default', 
Title $title = null ) {
global $wgAbuseFilterCentralDB, $wgAbuseFilterIsCentral;
 
// Fetch from the database.
@@ -472,7 +473,7 @@
);
 
foreach ( $res as $row ) {
-   $filter_matched[$row->af_id] = self::checkFilter( $row, 
$vars, true );
+   $filter_matched[$row->af_id] = self::checkFilter( $row, 
$vars, $title );
}
 
if ( $wgAbuseFilterCentralDB && !$wgAbuseFilterIsCentral ) {
@@ -510,7 +511,7 @@
 
foreach ( $res as $row ) {
$filter_matched['global-' . $row->af_id] =
-   self::checkFilter( $row, $vars, true, 
'global-' );
+   self::checkFilter( $row, $vars, $title, 
'global-' );
}
}
 
@@ -524,17 +525,17 @@
 * @static
 * @param stdClass $row
 * @param AbuseFilterVariableHolder $vars
-* @param bool $profile
+* @param Title|null $title
 * @param string $prefix
 * @return bool
 */
-   public static function checkFilter( $row, $vars, $profile = false, 
$prefix = '' ) {
-   global $wgAbuseFilterProfile;
+   public static function checkFilter( $row, $vars, Title $title = null, 
$prefix = '' ) {
+   global $wgAbuseFilterProfile, $wgAbuseFilterRuntimeProfile, 
$wgAbuseFilterSlowFilterRuntimeLimit;
 
$filterID = $prefix . $row->af_id;
 
$startConds = $startTime = null;
-   if ( $profile && $wgAbuseFilterProfile ) {
+   if ( $wgAbuseFilterProfile || $wgAbuseFilterRuntimeProfile ) {
$startConds = self::$condCount;
$startTime = microtime( true );
}
@@ -558,16 +559,46 @@
$result = false;
}
 
-   if ( $profile && $wgAbuseFilterProfile ) {
-   $endTime = microtime( true );
-   $endConds = self::$condCount;
+   $timeTaken = microtime( true ) - $startTime;
+   $condsUsed = self::$condCount - $startConds;
 
-   $timeTaken = $endTime - $startTime;
-   $condsUsed = $endConds - $startConds;
+   if ( $wgAbuseFilterProfile ) {
self::recordProfilingResult( $row->af_id, $timeTaken, 
$condsUsed );
}
 
+   $runtime = $timeTaken * 1000;
+   if ( $wgAbuseFilterRuntimeProfile && $runtime > 
$wgAbuseFilterSlowFilterRuntimeLimit ) {
+   self::recordSlowFilter( $filterID, $runtime, 
$condsUsed, $result, $title );
+   }
+

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch test wikis to HTML5 fragment mode in links

[jenkins-bot (Code Review)]

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

Change subject: Switch test wikis to HTML5 fragment mode in links
..


Switch test wikis to HTML5 fragment mode in links

To be merged on October 14 or later, 1 month from
Id18f8a8c2b402e4d3c22d6b5c15fc8abaacbf16a.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 89315ad..dc0a2b3 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19608,6 +19608,8 @@
 // T152540
 'wgFragmentMode' => [
'default' => [ 'legacy', 'html5' ],
+   'testwiki' => [ 'html5', 'legacy' ],
+   'test2wiki' => [ 'html5', 'legacy' ],
 ],
 
 'wmgUse3d' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81f92dac58983062b0c91bcd9c9bbf411948d8fb
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Reincorporate autoincremented numbering for links without di...

[Mholloway (Code Review)]

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

Change subject: Reincorporate autoincremented numbering for links without 
display text
..

Reincorporate autoincremented numbering for links without display text

We used to pull in mediawiki.skinning.content.parsoid for this but it
started breaking other stuff (T163738) and also stopped working for our
content service output, regressing T162116.  This pulls in a new snippet,
added to MobileApp extension, that works for us.

Bug: T162116
Change-Id: If1e34ed046c3fd5d9fd502cba6e5ed6ba578555b
Depends-On: I6083bbdcd3c4d36b466981f1ddaacd3536820d54
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 42 insertions(+), 16 deletions(-)


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

diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index a51fc86..c3df0b7 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -894,40 +894,40 @@
vertical-align: top;
display: inline-block;
}
-   
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-   
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-   
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-   
+
li.gallerybox div.thumb {
background-color: #fff;
border: 1px solid #ccc;
}
-   
+
div.gallerytext {
overflow: visible;
}
-   
+
ul.mw-gallery-packed-hover div.gallerytextwrapper {
overflow: visible;
height: auto;
}
-   
+
ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper,
ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper,
ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused 
div.gallerytextwrapper {
@@ -940,7 +940,7 @@
font-weight: normal;
margin: 0; /* correspond to style on div.thumb */
}
-   
+
ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper p,
ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper p,
ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused 
div.gallerytextwrapper p {
@@ -960,6 +960,19 @@
   display: none;
 }
 
+/*
+ * Auto-numbered external links
+ * Parsoid renders those as link without content, and lets CSS do the
+ * counting. This way the counting style can be customized, and counts update
+ * automatically when content is modified.
+ */
+.mw-body-content {
+   counter-reset: mw-numbered-ext-link;
+}
+.mw-body-content a[rel~='mw:ExtLink']:empty:after {
+   content: '[' counter( mw-numbered-ext-link ) ']';
+   counter-increment: mw-numbered-ext-link;
+}
 .content figure img,
 .content figure video {
   margin: 0.6em auto 0.6em auto;
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 88d031e..4ef7726 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -894,40 +894,40 @@
vertical-align: top;
display: inline-block;
}
-   
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-   
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-   
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-   
+
li.gallerybox div.thumb {
background-color: #fff;
border: 1px solid #ccc;
}
-   
+
div.gallerytext {
overflow: visible;
}
-   
+
ul.mw-gallery-packed-hover div.gallerytextwrapper {
overflow: visible;
height: auto;
}
-   
+
ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper,
ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper,
ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused 
div.gallerytextwrapper {
@@ -940,7 +940,7 @@
font-weight: normal;
margin: 0; /* correspond to style on div.thumb */
}
-   
+
ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper p,
ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper p,
ul.mw-gallery-packed-hover 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maintain-views: sort logging_whitelist

[Andrew Bogott (Code Review)]

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

Change subject: maintain-views: sort logging_whitelist
..


maintain-views: sort logging_whitelist

It will be easier to see what is and is not in logging_whitelist with
the list sorted alphabetically.

Change-Id: Ia467b0bd88aaecfa6b2cf25851a54381d8042548
---
M modules/role/templates/labs/db/views/maintain-views.yaml
1 file changed, 23 insertions(+), 23 deletions(-)

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



diff --git a/modules/role/templates/labs/db/views/maintain-views.yaml 
b/modules/role/templates/labs/db/views/maintain-views.yaml
index 7656725..515ead5 100644
--- a/modules/role/templates/labs/db/views/maintain-views.yaml
+++ b/modules/role/templates/labs/db/views/maintain-views.yaml
@@ -144,38 +144,38 @@
   - watchlist_count
 
 logging_whitelist:
+  - abusefilter
+  - block
+  - campus
+  - close
+  - course
+  - delete
+  - eparticle
+  - gather
+  - gblblock
   - gblrights
   - globalauth
-  - close
-  - lock
-  - gblblock
-  - managetags
-  - gather
-  - campus
+  - import
   - institution
   - instructor
-  - online
-  - merge
+  - lock
+  - managetags
   - massmessage
-  - course
-  - stable
-  - import
-  - abusefilter
-  - student
-  - eparticle
-  - rights
-  - pagetriage-deletion
-  - protect
+  - merge
+  - move
+  - newusers
+  - online
   - pagetriage-curation
-  - thanks
+  - pagetriage-deletion
+  - patrol
+  - protect
   - renameuser
   - review
-  - block
+  - rights
+  - stable
+  - student
+  - thanks
   - upload
-  - move
-  - delete
-  - patrol
-  - newusers
 
 customviews:
   abuse_filter:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia467b0bd88aaecfa6b2cf25851a54381d8042548
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
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] mediawiki...MobileApp[master]: Add autoincremented numbering for links without display text

[Mholloway (Code Review)]

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

Change subject: Add autoincremented numbering for links without display text
..

Add autoincremented numbering for links without display text

We used to pull in mediawiki.skinning.content.parsoid for this but it
started breaking other stuff (T163738) and also stopped working for our
content service output, regressing T162116.  This incorporates a snippet
that works for us.

Change-Id: I6083bbdcd3c4d36b466981f1ddaacd3536820d54
---
M styles/android/parsoid.less
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp 
refs/changes/51/383951/1

diff --git a/styles/android/parsoid.less b/styles/android/parsoid.less
index 54284e6..c5d55c0 100644
--- a/styles/android/parsoid.less
+++ b/styles/android/parsoid.less
@@ -1,3 +1,18 @@
+/*
+ * Auto-numbered external links
+ * Parsoid renders those as link without content, and lets CSS do the
+ * counting. This way the counting style can be customized, and counts update
+ * automatically when content is modified.
+ */
+.mw-body-content {
+   counter-reset: mw-numbered-ext-link;
+}
+
+.mw-body-content a[rel~='mw:ExtLink']:empty:after {
+   content: '[' counter( mw-numbered-ext-link ) ']';
+   counter-increment: mw-numbered-ext-link;
+}
+
 .content figure {
img,
video {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6083bbdcd3c4d36b466981f1ddaacd3536820d54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
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] operations/puppet[production]: maintain-views: sort logging_whitelist

[BryanDavis (Code Review)]

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

Change subject: maintain-views: sort logging_whitelist
..

maintain-views: sort logging_whitelist

It will be easier to see what is and is not in logging_whitelist with
the list sorted alphabetically.

Change-Id: Ia467b0bd88aaecfa6b2cf25851a54381d8042548
---
M modules/role/templates/labs/db/views/maintain-views.yaml
1 file changed, 23 insertions(+), 23 deletions(-)


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

diff --git a/modules/role/templates/labs/db/views/maintain-views.yaml 
b/modules/role/templates/labs/db/views/maintain-views.yaml
index 7656725..515ead5 100644
--- a/modules/role/templates/labs/db/views/maintain-views.yaml
+++ b/modules/role/templates/labs/db/views/maintain-views.yaml
@@ -144,38 +144,38 @@
   - watchlist_count
 
 logging_whitelist:
+  - abusefilter
+  - block
+  - campus
+  - close
+  - course
+  - delete
+  - eparticle
+  - gather
+  - gblblock
   - gblrights
   - globalauth
-  - close
-  - lock
-  - gblblock
-  - managetags
-  - gather
-  - campus
+  - import
   - institution
   - instructor
-  - online
-  - merge
+  - lock
+  - managetags
   - massmessage
-  - course
-  - stable
-  - import
-  - abusefilter
-  - student
-  - eparticle
-  - rights
-  - pagetriage-deletion
-  - protect
+  - merge
+  - move
+  - newusers
+  - online
   - pagetriage-curation
-  - thanks
+  - pagetriage-deletion
+  - patrol
+  - protect
   - renameuser
   - review
-  - block
+  - rights
+  - stable
+  - student
+  - thanks
   - upload
-  - move
-  - delete
-  - patrol
-  - newusers
 
 customviews:
   abuse_filter:

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Handle additional type of failed recurrance.

[XenoRyet (Code Review)]

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

Change subject: Handle additional type of failed recurrance.
..

Handle additional type of failed recurrance.

Sort transaction type 'recurring_payment_suspended_due_to_max_failed_payment' 
into it's proper slot.

Bug: T178086
Change-Id: I3b63ced8c957ff97c071846ad72873b5e2b56bbd
---
M PaymentProviders/PayPal/RecurringMessage.php
A 
PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment.json
A 
PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment_transformed.json
M PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
M config/paypal/main.yaml
5 files changed, 48 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig 
refs/changes/49/383949/1

diff --git a/PaymentProviders/PayPal/RecurringMessage.php 
b/PaymentProviders/PayPal/RecurringMessage.php
index e840fc2..8fe1644 100644
--- a/PaymentProviders/PayPal/RecurringMessage.php
+++ b/PaymentProviders/PayPal/RecurringMessage.php
@@ -55,6 +55,7 @@
case 'recurring_payment_failed':
case 'recurring_payment_skipped':
case 'recurring_payment_suspended':
+   case 
'recurring_payment_suspended_due_to_max_failed_payment':
$message['txn_type'] = 'subscr_failed';
break;
 
diff --git 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment.json
 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment.json
new file mode 100644
index 000..845fc4e
--- /dev/null
+++ 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment.json
@@ -0,0 +1,30 @@
+{
+  "payment_cycle": "Monthly",
+  "txn_type": "recurring_payment_suspended_due_to_max_failed_payment",
+  "last_name": "Public",
+  "next_payment_date": "N/A",
+  "residence_country": "US",
+  "initial_payment_amount": "0.00",
+  "rp_invoice_id": "49006681",
+  "currency_code": "USD",
+  "time_created": "06:14:38 Aug 02, 2017 PDT",
+  "verify_sign": "AjCMMDabnuh7zx7wI4NpWflSS.lHAqA5jlFVAAuXLAx61931ulA3ylnl",
+  "period_type": " Regular",
+  "payer_status": "verified",
+  "tax": "0.00",
+  "payer_email": "j...@public.com",
+  "first_name": "John",
+  "receiver_email": "nob...@wikimedia.org",
+  "payer_id": "WK4ADPUHGWN6U",
+  "product_type": "1",
+  "shipping": "0.00",
+  "amount_per_cycle": "5.00",
+  "profile_status": "Suspended",
+  "charset": "UTF-8",
+  "notify_version": "3.8",
+  "amount": "5.00",
+  "outstanding_balance": "15.00",
+  "recurring_payment_id": "I-WCJA1MBC3CWY",
+  "product_name": "Monthly donation to the Wikimedia Foundation",
+  "ipn_track_id": "4b8cbe1a39fec"
+}
\ No newline at end of file
diff --git 
a/PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment_transformed.json
 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment_transformed.json
new file mode 100644
index 000..3f5bcce
--- /dev/null
+++ 
b/PaymentProviders/PayPal/Tests/Data/recurring_payment_suspended_due_to_max_failed_payment_transformed.json
@@ -0,0 +1,15 @@
+{
+  "subscr_id": "I-WCJA1MBC3CWY",
+  "txn_type": "subscr_failed",
+  "contribution_tracking_id": "49006681",
+  "order_id": "49006681",
+  "email": "j...@public.com",
+  "first_name": "John",
+  "last_name": "Public",
+  "country": "US",
+  "gateway": "paypal_ec",
+  "recurring": "1",
+  "gross": "5.00",
+  "currency": "USD",
+  "date": "1501679678"
+}
diff --git 
a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php 
b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
index ea0cb1e..3cb6fc7 100644
--- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
+++ b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php
@@ -48,6 +48,7 @@
'refund_other.json' => 'refund',
'refund_unauthorized_spoof.json' => 'refund',
'refund_admin_fraud_reversal.json' => 'refund',
+   'recurring_payment_suspended_due_to_max_failed_payment.json' => 
'recurring',
// this should not actually get written to
// TODO 'new_case.json' => 'no-op',
];
diff --git a/config/paypal/main.yaml b/config/paypal/main.yaml
index c95ebe1..94b61ad 100644
--- a/config/paypal/main.yaml
+++ b/config/paypal/main.yaml
@@ -17,6 +17,7 @@
 
 # TODO: merge this with DonationInterface style var_map
 var_map:
+time_created: date
 payment_date: date # needs strtotime(payment_date)
 # FIXME Recurring messages use non-normalized field names, for example:
 txn_type: txn_type

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.rcfilters.Controller: Avoid ES6 method String#endsWith

[jenkins-bot (Code Review)]

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

Change subject: mw.rcfilters.Controller: Avoid ES6 method String#endsWith
..


mw.rcfilters.Controller: Avoid ES6 method String#endsWith

We still support ES5 browsers such as Internet Explorer 11 and Opera 12.

Bug: T178120
Change-Id: Ic85063dfbbcf26a99d343845c9fb801f1888d750
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 6da8119..4bc6183 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -386,7 +386,7 @@
this._deleteExcludedValuesFromFilterState( defaultFilters );
 
if ( Object.keys( defaultParams ).some( function ( paramName ) {
-   return paramName.endsWith( '_color' ) && defaultParams[ 
paramName ] !== null;
+   return paramName.match( /_color$/ ) && defaultParams[ 
paramName ] !== null;
} ) ) {
// There are highlights in the defaults, they're 
definitely
// not empty

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic85063dfbbcf26a99d343845c9fb801f1888d750
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Sbisson 
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...AntiSpoof[master]: Remove equivset from AntiSpoof and use new Equivset library.

[Dbarratt (Code Review)]

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

Change subject: Remove equivset from AntiSpoof and use new Equivset library.
..

Remove equivset from AntiSpoof and use new Equivset library.

Equivset is now an external library that should be used.

Bug: T177983
Change-Id: Ia8ed5edce08a8e0fe44ffba02072cc4fbd80dc61
---
M AntiSpoof_body.php
M composer.json
D equivset.php
D equivset.ser
D maintenance/Makefile
D maintenance/equivset.head
D maintenance/equivset.in
D maintenance/equivset.txt
D maintenance/generateEquivset.php
9 files changed, 15 insertions(+), 15,263 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AntiSpoof 
refs/changes/48/383948/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8ed5edce08a8e0fe44ffba02072cc4fbd80dc61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Dbarratt 

___
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.23.5

[jenkins-bot (Code Review)]

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

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


Update OOjs UI to v0.23.5

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

Also, replace uses of `OOUI\TextInputWidget( [ 'multiline' => true ] )`
with `OOUI\MultilineTextInputWidget()` to avoid deprecation warnings
(which cause unit tests to fail).

Depends-on: I990b14982ffb72fe981040d02c7023d13f721aaa
Change-Id: If8312c60e1547a6177f5491011badb6576f54b21
---
M composer.json
M includes/htmlform/fields/HTMLTextAreaField.php
M includes/widget/UsersMultiselectWidget.php
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-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/themes/apex/icons-interactions.json
A resources/lib/oojs-ui/themes/apex/images/icons/reload-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/reload-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/reload-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/reload-rtl.svg
M resources/lib/oojs-ui/themes/wikimediaui/icons-interactions.json
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/alert-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleSearch-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bell-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bigger-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-a-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-ain-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-dad-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-armn-to-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-be-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-zhe-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-g-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/browser-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-destructive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/case-sensitive-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clear-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clip-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clock-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/download-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/edit-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editUndo-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/external-link-ltr-progressive.png
M 

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

[VolkerE (Code Review)]

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

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


Update OOjs UI to v0.23.5

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

Change-Id: I990b14982ffb72fe981040d02c7023d13f721aaa
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/bin/testsuitegenerator.rb
M oojs/oojs-ui/demos/classes/IndexedDialog.js
M oojs/oojs-ui/demos/index.html
M oojs/oojs-ui/demos/pages/icons.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/demos/styles/demo.css
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Element.php
M oojs/oojs-ui/php/Theme.php
A oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php
A oojs/oojs-ui/php/widgets/SearchInputWidget.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
19 files changed, 193 insertions(+), 31 deletions(-)

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



diff --git a/composer.json b/composer.json
index bbd968a..f845dc5 100644
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,7 @@
"monolog/monolog": "1.22.1",
"mustangostang/spyc": "0.6.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.23.3",
+   "oojs/oojs-ui": "0.23.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 c2d2989..6262e59 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": "0c594f60d3795a4d41a93290ac37015c",
+"content-hash": "f93386e95c40850a5d8063d4b42fd186",
 "packages": [
 {
 "name": "composer/semver",
@@ -540,16 +540,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.23.3",
+"version": "v0.23.5",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "072606c2676ba903b8b2439a03d4dae3e5fa2e01"
+"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/072606c2676ba903b8b2439a03d4dae3e5fa2e01;,
-"reference": "072606c2676ba903b8b2439a03d4dae3e5fa2e01",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6;,
+"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6",
 "shasum": ""
 },
 "require": {
@@ -615,7 +615,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-10-04T01:07:16+00:00"
+"time": "2017-10-12T21:07:17+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index d98c4e3..16a67c7 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -751,10 +751,12 @@
 'OOUI\\LabelWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/LabelWidget.php',
 'OOUI\\Layout' => $vendorDir . '/oojs/oojs-ui/php/Layout.php',
 'OOUI\\MediaWikiTheme' => $vendorDir . 
'/oojs/oojs-ui/php/themes/MediaWikiTheme.php',
+'OOUI\\MultilineTextInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php',
 'OOUI\\PanelLayout' => $vendorDir . 
'/oojs/oojs-ui/php/layouts/PanelLayout.php',
 'OOUI\\ProgressBarWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/ProgressBarWidget.php',
 'OOUI\\RadioInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/RadioInputWidget.php',
 'OOUI\\RadioSelectInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php',
+'OOUI\\SearchInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/SearchInputWidget.php',
 'OOUI\\TabIndexedElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/TabIndexedElement.php',
 'OOUI\\Tag' => $vendorDir . '/oojs/oojs-ui/php/Tag.php',
 'OOUI\\TextInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/TextInputWidget.php',
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 0d3e8f2..7e2c63e 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -952,10 +952,12 @@
 'OOUI\\LabelWidget' => __DIR__ . 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mw.rcfilters.Controller: Avoid ES6 method String#endsWith

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383947 )

Change subject: mw.rcfilters.Controller: Avoid ES6 method String#endsWith
..

mw.rcfilters.Controller: Avoid ES6 method String#endsWith

We still support ES5 browsers such as Internet Explorer 11 and Opera 12.

Bug: T178120
Change-Id: Ic85063dfbbcf26a99d343845c9fb801f1888d750
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 6da8119..4bc6183 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -386,7 +386,7 @@
this._deleteExcludedValuesFromFilterState( defaultFilters );
 
if ( Object.keys( defaultParams ).some( function ( paramName ) {
-   return paramName.endsWith( '_color' ) && defaultParams[ 
paramName ] !== null;
+   return paramName.match( /_color$/ ) && defaultParams[ 
paramName ] !== null;
} ) ) {
// There are highlights in the defaults, they're 
definitely
// not empty

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic85063dfbbcf26a99d343845c9fb801f1888d750
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maintain-views: Add ip_changes view

[Andrew Bogott (Code Review)]

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

Change subject: maintain-views: Add ip_changes view
..


maintain-views: Add ip_changes view

Add a new view for all wikis that exposes rows where the IPs have not
been revision deleted (Revision::DELETED_USER).

Bug: T173891
Change-Id: Ia72432daf0c81a9cdf5f5978fe54181ba5dedfe0
---
M modules/role/templates/labs/db/views/maintain-views.yaml
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/templates/labs/db/views/maintain-views.yaml 
b/modules/role/templates/labs/db/views/maintain-views.yaml
index 8d8b8ab..7656725 100644
--- a/modules/role/templates/labs/db/views/maintain-views.yaml
+++ b/modules/role/templates/labs/db/views/maintain-views.yaml
@@ -246,6 +246,14 @@
   gu_hidden, gu_registration, NULL as gu_password_reset_key, NULL as 
gu_password_reset_expiration,
   NULL as gu_auth_token
 where: gu_hidden=''
+  ip_changes:
+source:
+  - ip_changes
+  - revision
+view: >
+  select ipc_rev_id, ipc_rev_timestamp, ipc_hex
+# 4 == Revision::DELETED_USER
+where: ipc_rev_id = rev_id AND (rev_deleted & 4) = 0
   ipblocks:
 source: ipblocks
 view: >

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia72432daf0c81a9cdf5f5978fe54181ba5dedfe0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Marostegui 
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] operations/puppet[production]: ganglia: decom class should use "ensure => purged"

[Dzahn (Code Review)]

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

Change subject: ganglia: decom class should use "ensure => purged"
..


ganglia: decom class should use "ensure => purged"

Per Moritz on T177225#3675626, this decom class should
use "ensure => purged" to make sure it also removes
config files and directory.

Bug: T177225
Change-Id: I98a037936f83b1aa151e43dfc32ee39c9179c913
---
M modules/ganglia/manifests/monitor/decommission.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ganglia/manifests/monitor/decommission.pp 
b/modules/ganglia/manifests/monitor/decommission.pp
index 702c37e..42c2e49 100644
--- a/modules/ganglia/manifests/monitor/decommission.pp
+++ b/modules/ganglia/manifests/monitor/decommission.pp
@@ -1,5 +1,5 @@
 class ganglia::monitor::decommission {
 package { 'ganglia-monitor':
-ensure => absent,
+ensure => purged,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Standardise on MinervaNeue's skin name (minerva)

[jenkins-bot (Code Review)]

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

Change subject: Standardise on MinervaNeue's skin name (minerva)
..


Standardise on MinervaNeue's skin name (minerva)

We will standardise on the key "minerva" and the styles
in MediaWiki:Minerva.css for desktop since this is what is
used for mobile. The name will however appear as MinervaNeue
to be consistent with the skin repo name (not the code).

Please merge I5fdb21243e0b599b07aa228107fd4b8c306c696c
shortly after merging this to remove the remaining logic
relating to this from MobileFrontend as otherwise two skins
will appear in user preferences.

Any existing users of MinervaNeue (key minervaneue on desktop)
will be thrown back into the Vector skin and will need to opt
into the MinervaNeue skin again. This is a minor disruption
given the low amount of users and instability of the skin.

Bug: T171644
Change-Id: Ieffb6334168047dcf05dcb60281865ab47056dc0
---
M i18n/en.json
M i18n/qqq.json
M skin.json
3 files changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 50c902e..d7f8a87 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,7 +2,6 @@
"@metadata": {
"authors": []
},
-   "skinname-minervaneue": "MinervaNeue",
"minerva-last-modified-date": "Last edited on $1, at $2",
"minerva-talk-add-topic": "Add discussion",
"mobile-frontend-console-recruit": "\\o/ Hey! This is open source 
software and we need volunteers to help us build this thing, make it better and 
fix any bugs that you might be seeing in this JavaScript console!\n\nYou can 
find our backlog @ https://phabricator.wikimedia.org/project/profile/67/;,
@@ -54,6 +53,6 @@
"mobile-frontend-user-page-member-since": "{{GENDER:$2|Joined}} $1",
"mobile-frontend-user-page-talk": "Talk",
"mobile-frontend-user-page-uploads": "Uploads",
-   "skinname-minerva": "Minerva",
+   "skinname-minerva": "MinervaNeue",
"minerva-skin-desc": "A responsive mobile first skin"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 78fb950..42b4faa 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,7 +11,7 @@
"Umherirrender"
]
},
-   "skinname-minervaneue": "The skin name for MinervaNeue.",
+   "skinname-minerva": "The skin name for MinervaNeue.",
"minerva-last-modified-date": "Text that displays the date the page was 
last modified. Parameters:\n* $1 - date\n* $2 - 
time\n{{Related|Mobile-frontend-last-modified}}",
"minerva-talk-add-topic": "Label for button which shows at bottom of 
talk pages in mobile view prompting addition of topic",
"mobile-frontend-console-recruit": "Message that is displayed in the 
JavaScript console aimed at developers in an attempt to recruit volunteers. The 
\\o/ emoticon is a man with his arms in the air with the purpose of drawing 
attention to the message. If this doesn't translate into the destination 
language feel free to omit it or use something more applicable.",
@@ -63,6 +63,5 @@
"mobile-frontend-user-page-member-since": "Message below the heading. 
$1 is the user registration date. $2 is the gender associated with the user 
account.",
"mobile-frontend-user-page-talk": "Text of the link to the user's talk 
page\n{{Identical|Talk}}",
"mobile-frontend-user-page-uploads": "Text of the link to the user's 
uploads page\n{{Identical|Upload}}",
-   "skinname-minerva": "{{optional}}",
"minerva-skin-desc": "{{desc|name=Minerva 
Neue|url=https://www.mediawiki.org/wiki/Skin:Minerva_Neue|what=skin}}"
 }
diff --git a/skin.json b/skin.json
index b8dba5a..7b66681 100644
--- a/skin.json
+++ b/skin.json
@@ -480,8 +480,7 @@
}
},
"ValidSkinNames": {
-   "minervaneue": "MinervaNeue",
-   "minerva": "Minerva"
+   "minerva": "MinervaNeue"
},
"author": [],
"config": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieffb6334168047dcf05dcb60281865ab47056dc0
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: cleanup ceilometer files and roles

[Rush (Code Review)]

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

Change subject: openstack: cleanup ceilometer files and roles
..

openstack: cleanup ceilometer files and roles

Not currently being used or managed

Bug: T171494
Change-Id: Iaf22f5ce60755a9c0759ca0c15ba757cfdc89fa5
---
M hieradata/common.yaml
M hieradata/regex.yaml
D modules/openstack/manifests/ceilometer/compute.pp
D modules/openstack/manifests/ceilometer/controller.pp
D modules/role/manifests/ceilometer/compute.pp
D modules/role/manifests/ceilometer/controller.pp
6 files changed, 0 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/383946/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 6ab8b06..1bfe69c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -379,7 +379,6 @@
   db_name: 'nova'
   api_db_name: 'novaapi'
   db_user: 'nova'
-  ceilometer_db_name: 'ceilometer'
   ldap_base_dn: 'dc=wikimedia,dc=org'
   ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
   ldap_proxyagent: 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1a5a3b3..8f22550 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -233,7 +233,6 @@
 api_host: *labsnovaapihost
 db_name: 'nova'
 db_user: 'nova'
-ceilometer_db_name: 'ceilometer'
 ldap_base_dn: 'dc=wikimedia,dc=org'
 ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
 ldap_proxyagent: 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
diff --git a/modules/openstack/manifests/ceilometer/compute.pp 
b/modules/openstack/manifests/ceilometer/compute.pp
deleted file mode 100644
index 20ecfdb..000
--- a/modules/openstack/manifests/ceilometer/compute.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-# Telemetry for OpenStack - the agent
-# https://wiki.openstack.org/wiki/Ceilometer
-class openstack::ceilometer::compute ($novaconfig, 
$openstack_version=$::openstack::version) {
-
-package { [ceilometer-agent-compute]:
-ensure  => present,
-}
-
-service {'ceilometer-agent-compute':
-ensure  => running,
-require => Package['ceilometer-agent-compute'];
-}
-
-file {
-'/etc/ceilometer/ceilometer.conf':
-content => 
template("openstack/${openstack_version}/ceilometer/ceilometer.conf.erb"),
-owner   => 'ceilometer',
-group   => 'ceilometer',
-notify  => Service['ceilometer-agent-compute'],
-require => Package['ceilometer-agent-compute'],
-mode=> '0440';
-}
-}
diff --git a/modules/openstack/manifests/ceilometer/controller.pp 
b/modules/openstack/manifests/ceilometer/controller.pp
deleted file mode 100644
index de68201..000
--- a/modules/openstack/manifests/ceilometer/controller.pp
+++ /dev/null
@@ -1,33 +0,0 @@
-# Telemetry for OpenStack - the controller
-# https://wiki.openstack.org/wiki/Ceilometer
-class openstack::ceilometer::controller ($novaconfig, 
$openstack_version=$::openstack::version) {
-
-package { [ceilometer-api, ceilometer-collector, ceilometer-agent-central, 
python-ceilometerclient]:
-ensure  => present,
-}
-
-service {'ceilometer-api':
-ensure  => running,
-require => Package['ceilometer-api'];
-}
-
-service {'ceilometer-collector':
-ensure  => running,
-require => Package['ceilometer-collector'];
-}
-
-service {'ceilometer-agent-central':
-ensure  => running,
-require => Package['ceilometer-agent-central'];
-}
-
-file {
-'/etc/ceilometer/ceilometer.conf':
-content => 
template("openstack/${openstack_version}/ceilometer/ceilometer.conf.erb"),
-owner   => 'ceilometer',
-group   => 'ceilometer',
-notify  => 
Service['ceilometer-api','ceilometer-collector','ceilometer-agent-central'],
-require => Package['ceilometer-api'],
-mode=> '0440';
-}
-}
diff --git a/modules/role/manifests/ceilometer/compute.pp 
b/modules/role/manifests/ceilometer/compute.pp
deleted file mode 100644
index f87a6b7..000
--- a/modules/role/manifests/ceilometer/compute.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class role::ceilometer::compute {
-include role::labs::openstack::nova::common
-$novaconfig = $role::labs::openstack::nova::common::novaconfig
-
-class { 'openstack::ceilometer::compute':
-openstack_version => $::openstack_version,
-novaconfig=> $novaconfig,
-}
-}
diff --git a/modules/role/manifests/ceilometer/controller.pp 
b/modules/role/manifests/ceilometer/controller.pp
deleted file mode 100644
index 199cbc4..000
--- a/modules/role/manifests/ceilometer/controller.pp
+++ /dev/null
@@ -1,10 +0,0 @@
-class role::ceilometer::controller {
-include role::labs::openstack::nova::common
-$novaconfig = 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ganglia: decom class should use "ensure => purged"

[Dzahn (Code Review)]

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

Change subject: ganglia: decom class should use "ensure => purged"
..

ganglia: decom class should use "ensure => purged"

Per Moritz on T177225#3675626, this decom class should
use "ensure => purged" to make sure it also removes
config files and directory.

Bug: T177225
Change-Id: I98a037936f83b1aa151e43dfc32ee39c9179c913
---
M modules/ganglia/manifests/monitor/decommission.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/383945/1

diff --git a/modules/ganglia/manifests/monitor/decommission.pp 
b/modules/ganglia/manifests/monitor/decommission.pp
index 702c37e..42c2e49 100644
--- a/modules/ganglia/manifests/monitor/decommission.pp
+++ b/modules/ganglia/manifests/monitor/decommission.pp
@@ -1,5 +1,5 @@
 class ganglia::monitor::decommission {
 package { 'ganglia-monitor':
-ensure => absent,
+ensure => purged,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Rename $wmf* to $wmg* in wmf-config

[Zoranzoki21 (Code Review)]

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

Change subject: Rename $wmf* to $wmg* in wmf-config
..

Rename $wmf* to $wmg* in wmf-config

Bug: T45956
Change-Id: Ia3a1cbdeae33a3c433be36537751145cafa4153f
---
M wmf-config/CirrusSearch-common.php
M wmf-config/CirrusSearch-labs.php
M wmf-config/CirrusSearch-production.php
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/LabsServices.php
M wmf-config/PoolCounterSettings.php
M wmf-config/ProductionServices.php
M wmf-config/abusefilter.php
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
M wmf-config/db-labs.php
M wmf-config/etcd.php
M wmf-config/filebackend.php
M wmf-config/flaggedrevs.php
M wmf-config/jobqueue-labs.php
M wmf-config/jobqueue.php
M wmf-config/logging.php
M wmf-config/mc-labs.php
M wmf-config/mobile.php
M wmf-config/redis.php
23 files changed, 256 insertions(+), 256 deletions(-)


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

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 83be43f..37ea964 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -26,7 +26,7 @@
 # Set up the the default cluster to send queries to,
 # and the list of clusters to write to.
 if ( $wmgCirrusSearchDefaultCluster === 'local' ) {
-   $wgCirrusSearchDefaultCluster = $wmfDatacenter;
+   $wgCirrusSearchDefaultCluster = $wmgDatacenter;
 } else {
$wgCirrusSearchDefaultCluster = $wmgCirrusSearchDefaultCluster;
 }
@@ -185,7 +185,7 @@
 // is pointed at a remote datacenter. Currently this makes the assumption that 
it will either
 // be eqiad or codfw which have ~40ms latency between them. Multiples are 
chosen using
 // (p75 + cross dc latency)/p75
-if ( $wgCirrusSearchDefaultCluster !== $wmfDatacenter ) {
+if ( $wgCirrusSearchDefaultCluster !== $wmgDatacenter ) {
// prefix has p75 of ~30ms
if ( isset( $wgPoolCounterConf[ 'CirrusSearch-Prefix' ] ) ) {
$wgPoolCounterConf['CirrusSearch-Prefix']['workers'] *= 2;
@@ -304,4 +304,4 @@
 # - CirrusSearch-labs.php
 # - CirrusSearch-production.php
 #
-require "{$wmfConfigDir}/CirrusSearch-{$wmfRealm}.php";
+require "{$wmgConfigDir}/CirrusSearch-{$wmgRealm}.php";
diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php
index 93143f2..ebd05c1 100644
--- a/wmf-config/CirrusSearch-labs.php
+++ b/wmf-config/CirrusSearch-labs.php
@@ -15,7 +15,7 @@
'pool' => 'cirrus-eqiad',
],
];
-   }, $wmfAllServices['eqiad']['search'] ),
+   }, $wmgAllServices['eqiad']['search'] ),
 ];
 
 if ( $wgDBname == 'enwiki' ) {
diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index e5ad326..054ad27 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -11,8 +11,8 @@
 $wgCirrusSearchMasterTimeout = '2m';
 
 $wgCirrusSearchClusters = [
-   'eqiad' => $wmfAllServices['eqiad']['search'],
-   'codfw' => $wmfAllServices['codfw']['search'],
+   'eqiad' => $wmgAllServices['eqiad']['search'],
+   'codfw' => $wmgAllServices['codfw']['search'],
 ];
 if ( defined( 'HHVM_VERSION' ) ) {
$wgCirrusSearchClusters['eqiad'] = array_map( function ( $host ) {
@@ -39,8 +39,8 @@
 
 if ( $wgDBname === 'labswiki' || $wgDBname === 'labtestwiki' ) {
$wgCirrusSearchClusters = [
-   'eqiad' => $wmfAllServices['eqiad']['search'],
-   'codfw' => $wmfAllServices['codfw']['search'],
+   'eqiad' => $wmgAllServices['eqiad']['search'],
+   'codfw' => $wmgAllServices['codfw']['search'],
];
 }
 
@@ -48,10 +48,10 @@
 
 $wgCirrusSearchBackup['backups'] = [
'type' => 'swift',
-   'swift_url' => $wmfSwiftEqiadConfig['cirrusAuthUrl'],
+   'swift_url' => $wmgSwiftEqiadConfig['cirrusAuthUrl'],
'swift_container' => 'global-data-elastic-backups',
-   'swift_username' => $wmfSwiftEqiadConfig['cirrusUser'],
-   'swift_password' => $wmfSwiftEqiadConfig['cirrusKey'],
+   'swift_username' => $wmgSwiftEqiadConfig['cirrusUser'],
+   'swift_password' => $wmgSwiftEqiadConfig['cirrusKey'],
'max_snapshot_bytes_per_sec' => '10mb',
'compress' => false,
'chunk_size' => '1g',
@@ -81,8 +81,8 @@
 
 // 5 second timeout for local cluster, 10 seconds for remote.
 $wgCirrusSearchClientSideConnectTimeout = [
-   'eqiad' => $wmfDatacenter === 'eqiad' ? 5 : 10,
-   'codfw' => $wmfDatacenter === 'codfw' ? 5 : 10,
+   'eqiad' => $wmgDatacenter === 'eqiad' ? 5 : 10,
+   'codfw' => $wmgDatacenter === 'codfw' ? 5 : 10,
 ];
 
 $wgCirrusSearchDropDelayedJobsAfter = [
diff --git 

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

[Jforrester (Code Review)]

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

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

Update VE core submodule to master (df62df432)

New changes:
539f1fd80 Update OOjs UI to v0.23.4
4dda3b936 Notification for DM node attached/detached
df62df432 Update OOjs UI to v0.23.5

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


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

diff --git a/lib/ve b/lib/ve
index 33e74b9..df62df4 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 33e74b92f44438e8a714494e1d46cbb05ce8da0d
+Subproject commit df62df432594de92db53d246ae4463e98d3e580b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1a159ecac246dd067b83bbe86f4b163bde83e8c
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] operations/puppet[production]: DO NOT MERGE: no-op patch for testing

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383942 )

Change subject: DO NOT MERGE: no-op patch for testing
..

DO NOT MERGE: no-op patch for testing

Change-Id: I3ac6ca4c089dde37af302952d9e4428acbd34fea
---
M manifests/site.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/383942/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 57c449f..5bb457c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3,6 +3,7 @@
 unless ($::environment == 'future') {
 import 'realm.pp' # These ones first
 }
+
 # Base nodes
 
 # Default variables. this way, they work with an ENC (as in labs) as well.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Handle and debug case where API returns no pages

[Jdlrobson (Code Review)]

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

Change subject: Handle and debug case where API returns no pages
..

Handle and debug case where API returns no pages

Bug: T177988
Change-Id: I395ba99a120a494ba6362527464dd09ce07fa084
---
M includes/DataProvider.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/includes/DataProvider.php b/includes/DataProvider.php
index 2d438b5..0e091f9 100644
--- a/includes/DataProvider.php
+++ b/includes/DataProvider.php
@@ -166,7 +166,13 @@
$data = $this->makeActionApiRequest( $params );
$continue = isset( $data['continue'] ) ? 
$data['continue'] : [];
$params = $continue + $params;
-   foreach ( $data['query']['pages'] as $page ) {
+   if ( isset( $data['query']['pages'] ) ) {
+   $pages = $data['query']['pages'];
+   } else {
+   $pages = [];
+   wfDebugLog( 'collection', 'No pages were found 
with query: ' . json_encode( $params ) );
+   }
+   foreach ( $pages as $page ) {
// Contributors will not be defined if pclimit 
is hit one of the other pages
if ( isset( $page['contributors'] ) ) {
foreach ( $page['contributors'] as $key 
=> $contrib ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Skin: Make skins aware of their registered skin name

[jenkins-bot (Code Review)]

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

Change subject: Skin: Make skins aware of their registered skin name
..


Skin: Make skins aware of their registered skin name

Remove the need for skin classes to have a hardcoded string as
skinname property value. This previously created the possibility
for the value to not match the skinname in the SkinFactory registry,
which creates confusing situations where message keys and load.php
urls are crafted with the internal skinname, but all other
handling (useskin, preferences, hooks, SkinFactory, ResourceLoader,
etc.) operate on the names in the registry.

We could enforce the matching by requiring a 1:1 relationship between
skinnames and Skin sub classes, but that is not backwards-compatible
with the 1:many map that wgValidSkinNames provides, and not compatible
SkinFactory either, which supports a factory function to return an
object. This makes a lot of sense and allows Skin-classees to be
re-used and composed with injection. If we do want to enforce 1:1,
we could validate it with a structure PHPUnit test, but instead this
change just uses the injected name from the constructor (passed by
ServiceWiring, previously unused).

The added unit test shows the new behaviour. Before this change,
getSkinName() on SkinFallback would always return 'fallback',
whereas now each instance of the class adheres to the registered
name (if it differs from the default).

Update the two direct uses of protected $skin->skinname to use
$skin->getSkinName() instead to enable sub-classes to optionally
implement an alternate source for the self-name (or to hardcode
it there as before).

Bug: T173546
Change-Id: I4383dcc3094da6e3c9ac12dc6c9311128db9db6e
---
M includes/skins/Skin.php
M tests/phpunit/includes/skins/SkinFactoryTest.php
2 files changed, 27 insertions(+), 1 deletion(-)

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



diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index e1d0034..f92a66f 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -34,7 +34,11 @@
  * @ingroup Skins
  */
 abstract class Skin extends ContextSource {
+   /**
+* @var string|null
+*/
protected $skinname = null;
+
protected $mRelevantTitle = null;
protected $mRelevantUser = null;
 
@@ -134,7 +138,17 @@
}
 
/**
-* @return string Skin name
+* @since 1.31
+* @param string|null $skinname
+*/
+   public function __construct( $skinname = null ) {
+   if ( is_string( $skinname ) ) {
+   $this->skinname = $skinname;
+   }
+   }
+
+   /**
+* @return string|null Skin name
 */
public function getSkinName() {
return $this->skinname;
diff --git a/tests/phpunit/includes/skins/SkinFactoryTest.php 
b/tests/phpunit/includes/skins/SkinFactoryTest.php
index d3663c8..a8b9fd1 100644
--- a/tests/phpunit/includes/skins/SkinFactoryTest.php
+++ b/tests/phpunit/includes/skins/SkinFactoryTest.php
@@ -48,6 +48,18 @@
$skin = $factory->makeSkin( 'testfallback' );
$this->assertInstanceOf( 'Skin', $skin );
$this->assertInstanceOf( 'SkinFallback', $skin );
+   $this->assertEquals( 'fallback', $skin->getSkinName() );
+   }
+
+   /**
+* @covers Skin::__constructor
+* @covers Skin::getSkinName
+*/
+   public function testGetSkinName() {
+   $skin = new SkinFallback();
+   $this->assertEquals( 'fallback', $skin->getSkinName(), 
'Default' );
+   $skin = new SkinFallback( 'testname' );
+   $this->assertEquals( 'testname', $skin->getSkinName(), 
'Constructor argument' );
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4383dcc3094da6e3c9ac12dc6c9311128db9db6e
Gerrit-PatchSet: 13
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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.23.5

[jenkins-bot (Code Review)]

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

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


Update OOjs UI to v0.23.5

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

Change-Id: I033f698ef84532469d6f5d61ec385f1102a04c1c
---
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
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-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-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-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-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 lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui.css
M lib/oojs-ui/oojs-ui-wikimediaui.js
M lib/oojs-ui/oojs-ui-wikimediaui.rtl.css
M 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Installer should make use of valid skin names

[Jdlrobson (Code Review)]

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

Change subject: Installer should make use of valid skin names
..

Installer should make use of valid skin names

Bug: T178118
Change-Id: I6596f0c95c79a19aa9360c5dcc095966406d3c5c
---
M includes/skins/SkinFallbackTemplate.php
1 file changed, 15 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/383940/1

diff --git a/includes/skins/SkinFallbackTemplate.php 
b/includes/skins/SkinFallbackTemplate.php
index ee8d841..8a5a7cc 100644
--- a/includes/skins/SkinFallbackTemplate.php
+++ b/includes/skins/SkinFallbackTemplate.php
@@ -31,7 +31,20 @@
|| is_file( 
"$styleDirectory/$skinDir/$skinDir.php" );
} );
 
-   return $possibleSkins;
+   // Load meta data for skins to locate ValidSkinNames (see 
T178118)
+   $validSkins = [];
+   foreach( $possibleSkins as $skinDirName ) {
+   $skinJsonPath = 
"$styleDirectory/$skinDirName/skin.json";
+   if ( file_exists( $skinJsonPath ) ) {
+   $data = file_get_contents( $skinJsonPath );
+   $json = json_decode( $data, true );
+   if ( isset( $json['ValidSkinNames'] ) ) {
+   $validSkins = array_merge( $validSkins, 
$json['ValidSkinNames'] );
+   }
+   }
+   }
+
+   return $validSkins;
}
 
/**
@@ -49,8 +62,7 @@
$skinsInstalledText = [];
$skinsInstalledSnippet = [];
 
-   foreach ( $installedSkins as $skin ) {
-   $normalizedKey = strtolower( $skin );
+   foreach ( $installedSkins as $normalizedKey => $skin ) {
$isEnabled = array_key_exists( $normalizedKey, 
$enabledSkins );
if ( $isEnabled ) {
$skinsInstalledText[] = $this->getMsg( 
'default-skin-not-found-row-enabled' )

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

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

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

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

[Jforrester (Code Review)]

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

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

Update OOjs UI to v0.23.5

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

Also, replace uses of `OOUI\TextInputWidget( [ 'multiline' => true ] )`
with `OOUI\MultilineTextInputWidget()` to avoid deprecation warnings
(which cause unit tests to fail).

Depends-on: I990b14982ffb72fe981040d02c7023d13f721aaa
Change-Id: If8312c60e1547a6177f5491011badb6576f54b21
---
M composer.json
M includes/htmlform/fields/HTMLTextAreaField.php
M includes/widget/UsersMultiselectWidget.php
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-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/themes/apex/icons-interactions.json
A resources/lib/oojs-ui/themes/apex/images/icons/reload-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/reload-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/reload-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/reload-rtl.svg
M resources/lib/oojs-ui/themes/wikimediaui/icons-interactions.json
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/alert-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/arched-arrow-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleCheck-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleRedirect-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/articleSearch-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/attachment-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bell-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bellOn-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bigger-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-a-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-ain-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-arab-dad-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-armn-to-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-be-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-cyrl-zhe-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/bold-g-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/book-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/browser-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-destructive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/cancel-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/case-sensitive-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clear-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clip-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/clock-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/download-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/edit-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-ltr-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editLock-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/editUndo-rtl-progressive.png
M 
resources/lib/oojs-ui/themes/wikimediaui/images/icons/external-link-ltr-progressive.png
M 

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

[Jforrester (Code Review)]

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

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

Update OOjs UI to v0.23.5

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

Change-Id: I990b14982ffb72fe981040d02c7023d13f721aaa
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_static.php
M composer/installed.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/bin/testsuitegenerator.rb
M oojs/oojs-ui/demos/classes/IndexedDialog.js
M oojs/oojs-ui/demos/index.html
M oojs/oojs-ui/demos/pages/icons.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/demos/styles/demo.css
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Element.php
M oojs/oojs-ui/php/Theme.php
A oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php
A oojs/oojs-ui/php/widgets/SearchInputWidget.php
M oojs/oojs-ui/php/widgets/TextInputWidget.php
19 files changed, 193 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/38/383938/1

diff --git a/composer.json b/composer.json
index bbd968a..f845dc5 100644
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,7 @@
"monolog/monolog": "1.22.1",
"mustangostang/spyc": "0.6.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.23.3",
+   "oojs/oojs-ui": "0.23.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 c2d2989..6262e59 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": "0c594f60d3795a4d41a93290ac37015c",
+"content-hash": "f93386e95c40850a5d8063d4b42fd186",
 "packages": [
 {
 "name": "composer/semver",
@@ -540,16 +540,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.23.3",
+"version": "v0.23.5",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "072606c2676ba903b8b2439a03d4dae3e5fa2e01"
+"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/072606c2676ba903b8b2439a03d4dae3e5fa2e01;,
-"reference": "072606c2676ba903b8b2439a03d4dae3e5fa2e01",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6;,
+"reference": "2f77f21e3867c48aa9d4dc78e332a05b89ff4ed6",
 "shasum": ""
 },
 "require": {
@@ -615,7 +615,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-10-04T01:07:16+00:00"
+"time": "2017-10-12T21:07:17+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index d98c4e3..16a67c7 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -751,10 +751,12 @@
 'OOUI\\LabelWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/LabelWidget.php',
 'OOUI\\Layout' => $vendorDir . '/oojs/oojs-ui/php/Layout.php',
 'OOUI\\MediaWikiTheme' => $vendorDir . 
'/oojs/oojs-ui/php/themes/MediaWikiTheme.php',
+'OOUI\\MultilineTextInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/MultilineTextInputWidget.php',
 'OOUI\\PanelLayout' => $vendorDir . 
'/oojs/oojs-ui/php/layouts/PanelLayout.php',
 'OOUI\\ProgressBarWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/ProgressBarWidget.php',
 'OOUI\\RadioInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/RadioInputWidget.php',
 'OOUI\\RadioSelectInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/RadioSelectInputWidget.php',
+'OOUI\\SearchInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/SearchInputWidget.php',
 'OOUI\\TabIndexedElement' => $vendorDir . 
'/oojs/oojs-ui/php/mixins/TabIndexedElement.php',
 'OOUI\\Tag' => $vendorDir . '/oojs/oojs-ui/php/Tag.php',
 'OOUI\\TextInputWidget' => $vendorDir . 
'/oojs/oojs-ui/php/widgets/TextInputWidget.php',
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 0d3e8f2..7e2c63e 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -952,10 +952,12 @@
 

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

[Jforrester (Code Review)]

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

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

Update OOjs UI to v0.23.5

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

Change-Id: I033f698ef84532469d6f5d61ec385f1102a04c1c
---
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.css
M lib/oojs-ui/oojs-ui-apex-icons-accessibility.rtl.css
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-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-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-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-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 lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui.css
M lib/oojs-ui/oojs-ui-wikimediaui.js
M lib/oojs-ui/oojs-ui-wikimediaui.rtl.css
M 

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Improve reporting of parse times by tracking initializations

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383936 )

Change subject: Improve reporting of parse times by tracking initializations
..

Improve reporting of parse times by tracking initializations

Change-Id: Ic674cdcdc0e0e15c4c9e89be79155e953ce78d91
---
M bin/parse.js
M lib/wt2html/parser.js
2 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/36/383936/1

diff --git a/bin/parse.js b/bin/parse.js
index ba32008..3c0d1ae 100755
--- a/bin/parse.js
+++ b/bin/parse.js
@@ -19,6 +19,8 @@
 var yargs = require('yargs');
 var yaml = require('js-yaml');
 
+var initTime;
+
 process.on('SIGUSR2', function() {
var heapdump = require('heapdump');
console.error('SIGUSR2 received! Writing snapshot.');
@@ -240,12 +242,16 @@
 
 var parse = exports.parse = function(input, argv, parsoidConfig, prefix, 
domain) {
var env;
+   var s1, s2;
+   s1 = Date.now();
return ParserEnv.getParserEnv(parsoidConfig, {
prefix: prefix,
domain: domain,
pageName: argv.page,
}).then(function(_env) {
env = _env;
+   env.startTime = s1;
+   env.bumpTimeUse("Init", initTime);
 
// fetch templates from enwiki by default.
if (argv.wgScriptPath) {
@@ -294,6 +300,9 @@
if (typeof input === 'string') {
return input;
}
+
+   s2 = Date.now();
+   env.bumpTimeUse("Setup Environment", s2 - s1);
 
if (argv.inputfile) {
// read input from the file, then process
@@ -348,6 +357,7 @@
}
return startsAtHTML(argv, env, str, pb);
} else {
+   env.bumpTimeUse("Pre-parse (source fetch)", Date.now() 
- s2);
return startsAtWikitext(argv, env, str);
}
});
@@ -355,6 +365,7 @@
 
 if (require.main === module) {
(function() {
+   var start = Date.now();
var defaultModeStr = "Default conversion mode : --wt2html";
 
var opts = yargs.usage(
@@ -448,6 +459,8 @@
}
}
 
+   initTime = Date.now() - start;
+
return parse(null, argv, pc, prefix, domain)
.then(function(res) {
var stdout = process.stdout;
diff --git a/lib/wt2html/parser.js b/lib/wt2html/parser.js
index dc77ed9..caf40ce 100644
--- a/lib/wt2html/parser.js
+++ b/lib/wt2html/parser.js
@@ -478,7 +478,9 @@
// maintained across all pipelines used by the document.
// (Ex: Cite state)
this.resetState({ toplevel: true });
-   this.env.startTime = Date.now();
+   if (!this.env.startTime) {
+   this.env.startTime = Date.now();
+   }
this.env.log('trace/time', 'Starting parse at ', this.env.startTime);
this.process(input);
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic674cdcdc0e0e15c4c9e89be79155e953ce78d91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: deferred: Improve DeferredUpdates test coverage

[jenkins-bot (Code Review)]

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

Change subject: deferred: Improve DeferredUpdates test coverage
..


deferred: Improve DeferredUpdates test coverage

From 1% of lines to 12% in deferred/.
From 6% of lines to 68% in DeferredUpdates.php.

* Adding relevant @covers tags to existing tests.
* Add coverage for MWCallableUpdate.
* Add coverage for MergeableUpdate.

Also:
* Make MergeableUpdate extend DeferrableUpdate.
  1. Because PHPUnit doesn't support implementing multiple interfaces
 in a mock, and would make the mock fail the typehint at run-time.
  2. It DeferredUpdates doesn't support having a MergeableUpdate that isn't
 itself a DeferrableUpdate given the only way to reach that code is past
 methods that are type-hinted with DeferrableUpdate.
  3. Making the interface extend DeferrableUpdate helps produce better and
 earlier errors. Instead of run-time error:
 > Argument 1 passed to addUpdate() must implement interface 
DeferrableUpdate
 > instance of MergeableUpdate given
 We get:
 > Fatal error: Class .. contains 1 abstract method and must therefore be
 > declared abstract or implement the remaining methods (doUpdate)

Change-Id: Ie384bf849a96bb37dc3e4a4154da2b02889e9fc8
---
M includes/deferred/MergeableUpdate.php
M tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
M tests/phpunit/includes/deferred/DeferredUpdatesTest.php
A tests/phpunit/includes/deferred/MWCallableUpdateTest.php
4 files changed, 113 insertions(+), 4 deletions(-)

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



diff --git a/includes/deferred/MergeableUpdate.php 
b/includes/deferred/MergeableUpdate.php
index 70760ce..8eeef13 100644
--- a/includes/deferred/MergeableUpdate.php
+++ b/includes/deferred/MergeableUpdate.php
@@ -6,7 +6,7 @@
  *
  * @since 1.27
  */
-interface MergeableUpdate {
+interface MergeableUpdate extends DeferrableUpdate {
/**
 * Merge this update with $update
 *
diff --git a/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php 
b/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
index 11b869a..f3c949d 100644
--- a/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
+++ b/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
@@ -3,6 +3,10 @@
 use Wikimedia\TestingAccessWrapper;
 
 class CdnCacheUpdateTest extends MediaWikiTestCase {
+
+   /**
+* @covers CdnCacheUpdate::merge
+*/
public function testPurgeMergeWeb() {
$this->setMwGlobals( 'wgCommandLineMode', false );
 
diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php 
b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
index 3b42356..999ad03 100644
--- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
+++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
@@ -3,10 +3,64 @@
 class DeferredUpdatesTest extends MediaWikiTestCase {
 
/**
+* @covers DeferredUpdates::addUpdate
+* @covers DeferredUpdates::push
+* @covers DeferredUpdates::doUpdates
+* @covers DeferredUpdates::execute
+* @covers DeferredUpdates::runUpdate
+*/
+   public function testAddAndRun() {
+   $update = $this->getMockBuilder( DeferrableUpdate::class )
+   ->setMethods( [ 'doUpdate' ] )->getMock();
+   $update->expects( $this->once() )->method( 'doUpdate' );
+
+   DeferredUpdates::addUpdate( $update );
+   DeferredUpdates::doUpdates();
+   }
+
+   /**
+* @covers DeferredUpdates::addUpdate
+* @covers DeferredUpdates::push
+*/
+   public function testAddMergeable() {
+   $this->setMwGlobals( 'wgCommandLineMode', false );
+
+   $update1 = $this->getMockBuilder( MergeableUpdate::class )
+   ->setMethods( [ 'merge', 'doUpdate' ] )->getMock();
+   $update1->expects( $this->once() )->method( 'merge' );
+   $update1->expects( $this->never() )->method( 'doUpdate' );
+
+   $update2 = $this->getMockBuilder( MergeableUpdate::class )
+   ->setMethods( [ 'merge', 'doUpdate' ] )->getMock();
+   $update2->expects( $this->never() )->method( 'merge' );
+   $update2->expects( $this->never() )->method( 'doUpdate' );
+
+   DeferredUpdates::addUpdate( $update1 );
+   DeferredUpdates::addUpdate( $update2 );
+   }
+
+   /**
+* @covers DeferredUpdates::addCallableUpdate
+* @covers MWCallableUpdate::getOrigin
+*/
+   public function testAddCallableUpdate() {
+   $this->setMwGlobals( 'wgCommandLineMode', true );
+
+   $ran = 0;
+   DeferredUpdates::addCallableUpdate( function () use ( &$ran ) {
+   $ran++;
+   

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

[jenkins-bot (Code Review)]

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

Change subject: Tag v0.23.5
..


Tag v0.23.5

Change-Id: I3c7d553beed79114805f1807b885bd40fb98
---
M History.md
M package.json
2 files changed, 8 insertions(+), 2 deletions(-)

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



diff --git a/History.md b/History.md
index 3053557..091a0ee 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,10 @@
 # OOjs UI Release History
+## v0.23.5 / 2017-10-12
+### Code
+* PHP MultilineTextInputWidget, SearchInputWidget: Remove duplicate `use` 
statements (Bartosz Dziewoński)
+* PHP Theme: Fix check for IconElement/IndicatorElement for inherited traits 
(Bartosz Dziewoński)
+
+
 ## v0.23.4 / 2017-10-11
 ### Styles
 * IndexLayout: Handle long lists of tabs (Bartosz Dziewoński)
@@ -487,7 +493,7 @@
 ### Code
 * GroupElement: Fix insertion bugs (Bartosz Dziewoński)
 * icons: Drop unused 'invert' variant from Apex 'icons-interactions' pack 
(Bartosz Dziewoński)
-* build: Add exec:composer and add it to _ci (Prateek Saxena)
+* build: Add exec:composer and add it to `_ci` (Prateek Saxena)
 
 
 ## v0.20.1 / 2017-03-28
diff --git a/package.json b/package.json
index f205ad9..de1e845 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.23.4",
+  "version": "0.23.5",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c7d553beed79114805f1807b885bd40fb98
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
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] operations/puppet[production]: maintain-views: Add ip_changes view

[BryanDavis (Code Review)]

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

Change subject: maintain-views: Add ip_changes view
..

maintain-views: Add ip_changes view

Add a new view for all wikis that exposes rows where the IPs have not
been revision deleted (Revision::DELETED_USER).

Bug: T173891
Change-Id: Ia72432daf0c81a9cdf5f5978fe54181ba5dedfe0
---
M modules/role/templates/labs/db/views/maintain-views.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/modules/role/templates/labs/db/views/maintain-views.yaml 
b/modules/role/templates/labs/db/views/maintain-views.yaml
index 8d8b8ab..7656725 100644
--- a/modules/role/templates/labs/db/views/maintain-views.yaml
+++ b/modules/role/templates/labs/db/views/maintain-views.yaml
@@ -246,6 +246,14 @@
   gu_hidden, gu_registration, NULL as gu_password_reset_key, NULL as 
gu_password_reset_expiration,
   NULL as gu_auth_token
 where: gu_hidden=''
+  ip_changes:
+source:
+  - ip_changes
+  - revision
+view: >
+  select ipc_rev_id, ipc_rev_timestamp, ipc_hex
+# 4 == Revision::DELETED_USER
+where: ipc_rev_id = rev_id AND (rev_deleted & 4) = 0
   ipblocks:
 source: ipblocks
 view: >

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Drop beta feature step testing in browser tests

[Jdlrobson (Code Review)]

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

Change subject: Drop beta feature step testing in browser tests
..

Drop beta feature step testing in browser tests

Page previews is enabled by default on the beta cluster and
in master.
In production config we enable it for all wikis but enwiki
and dewiki.

We should thus stop testing this to bring our testing in line with
reality.

This allows our browser tests to run against the beta cluster as
well as per commit as well as reduces the amount of code we need to
port to Node.js

Additional changes:
* Remove redundant support pages and properties

Bug: T177924
Change-Id: Ia85e7b60774232ced35641f2671462ca0ef64f18
---
M tests/browser/LocalSettings.php
M tests/browser/features/previews.feature
M tests/browser/features/support/pages/article_page.rb
D tests/browser/features/support/pages/special_preferences_page.rb
M tests/browser/features/support/step_definitions/common_steps.rb
5 files changed, 1 insertion(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/34/383934/1

diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index 9fc344e..f00b0f4 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -1,4 +1,3 @@
 https://gerrit.wikimedia.org/r/383934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia85e7b60774232ced35641f2671462ca0ef64f18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
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] apps...wikipedia[master]: Stop bundling mediawiki.skinning.content.parsoid

[Mholloway (Code Review)]

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

Change subject: Stop bundling mediawiki.skinning.content.parsoid
..

Stop bundling mediawiki.skinning.content.parsoid

It breaks image widening for MCS content and we only need it for
https://phabricator.wikimedia.org/T162116.

We'll need to re-fix that issue elsewhere, probably by copy-pasting the
relevant snippet to MobileApp.

Bug: T163738
Change-Id: I80162d32f8a607c8e28ae33b8e581244b0ddce09
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
M scripts/make-css-assets.bash
3 files changed, 2 insertions(+), 464 deletions(-)


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

diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index 6234065..a51fc86 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -1296,235 +1296,4 @@
   font-family: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial', 
'Liberation Sans', sans-serif;
   font-weight: bold;
   padding: 15px 0 0 !important;
-}/**
- * Style Parsoid HTML+RDFa output consistent with wikitext from PHP parser.
- */
-/*
- * Auto-numbered external links
- * Parsoid renders those as link without content, and lets CSS do the
- * counting. This way the counting style can be customized, and counts update
- * automatically when content is modified.
- */
-.mw-parser-output {
-  counter-reset: mw-numbered-ext-link;
-}
-.mw-parser-output a[rel~='mw:ExtLink']:empty:after {
-  content: '[' counter(mw-numbered-ext-link) ']';
-  counter-increment: mw-numbered-ext-link;
-}
-/**
- * References
- *
- * Parser and Extension:Cite output reference numbers for [1] for 
 tags.
- *
- * Markup:
- * Cake is good[2]
- * The cake is a lie[1]
- *
- * Styleguide 1.1.
- */
-span.reference {
-  font-size: 80%;
-  line-height: 1;
-  vertical-align: super;
-  unicode-bidi: -moz-isolate;
-  unicode-bidi: isolate;
-}
-sup,
-sub {
-  line-height: 1;
-}
-/**
- * Block media items
- */
-figure[typeof*='mw:Image'],
-figure[typeof*='mw:Video'],
-figure[typeof*='mw:Audio'] {
-  margin: 0;
-  /* Hide the caption for frameless and plain floated images */
-}
-figure[typeof*='mw:Image'] a,
-figure[typeof*='mw:Video'] a,
-figure[typeof*='mw:Audio'] a {
-  border: 0;
-}
-figure[typeof*='mw:Image'].mw-halign-right,
-figure[typeof*='mw:Video'].mw-halign-right,
-figure[typeof*='mw:Audio'].mw-halign-right {
-  /* @noflip */
-  margin: 0.5em 0 1.3em 1.4em;
-  /* @noflip */
-  clear: right;
-  /* @noflip */
-  float: right;
-}
-figure[typeof*='mw:Image'].mw-halign-left,
-figure[typeof*='mw:Video'].mw-halign-left,
-figure[typeof*='mw:Audio'].mw-halign-left {
-  /* @noflip */
-  margin: 0.5em 1.4em 1.3em 0;
-  /* @noflip */
-  clear: left;
-  /* @noflip */
-  float: left;
-}
-figure[typeof*='mw:Image'].mw-halign-none,
-figure[typeof*='mw:Video'].mw-halign-none,
-figure[typeof*='mw:Audio'].mw-halign-none {
-  margin: 0;
-  clear: none;
-  float: none;
-}
-figure[typeof*='mw:Image'].mw-halign-center,
-figure[typeof*='mw:Video'].mw-halign-center,
-figure[typeof*='mw:Audio'].mw-halign-center {
-  margin: 0 auto 0.5em auto;
-  display: table;
-  border-collapse: collapse;
-  clear: none;
-  float: none;
-}
-figure[typeof*='mw:Image'] > figcaption,
-figure[typeof*='mw:Video'] > figcaption,
-figure[typeof*='mw:Audio'] > figcaption {
-  display: none;
-}
-figure[typeof~='mw:Image/Thumb'],
-figure[typeof~='mw:Video/Thumb'],
-figure[typeof~='mw:Audio/Thumb'],
-figure[typeof~='mw:Image/Frame'],
-figure[typeof~='mw:Video/Frame'],
-figure[typeof~='mw:Audio/Frame'] {
-  display: table;
-  text-align: center;
-  border: 1px solid #c8ccd1;
-  border-collapse: separate;
-  border-spacing: 3px;
-  background-color: #f8f9fa;
-  width: 1px;
-  margin: 0.5em 0 1.3em 1.4em;
-  clear: right;
-  float: right;
-}
-figure[typeof~='mw:Image/Thumb'].mw-halign-center,
-figure[typeof~='mw:Video/Thumb'].mw-halign-center,
-figure[typeof~='mw:Audio/Thumb'].mw-halign-center,
-figure[typeof~='mw:Image/Frame'].mw-halign-center,
-figure[typeof~='mw:Video/Frame'].mw-halign-center,
-figure[typeof~='mw:Audio/Frame'].mw-halign-center {
-  border-collapse: separate;
-}
-figure[typeof~='mw:Image/Thumb'] > *:first-child > img,
-figure[typeof~='mw:Video/Thumb'] > *:first-child > img,
-figure[typeof~='mw:Audio/Thumb'] > *:first-child > img,
-figure[typeof~='mw:Image/Frame'] > *:first-child > img,
-figure[typeof~='mw:Video/Frame'] > *:first-child > img,
-figure[typeof~='mw:Audio/Frame'] > *:first-child > img,
-figure[typeof~='mw:Image/Thumb'] > *:first-child > video,
-figure[typeof~='mw:Video/Thumb'] > *:first-child > video,
-figure[typeof~='mw:Audio/Thumb'] > *:first-child > video,
-figure[typeof~='mw:Image/Frame'] > *:first-child > video,
-figure[typeof~='mw:Video/Frame'] > *:first-child > video,
-figure[typeof~='mw:Audio/Frame'] > *:first-child > video {
-  border: 1px 

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Code example dialog

[jenkins-bot (Code Review)]

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

Change subject: Code example dialog
..


Code example dialog

Shows a dialog with current SPARQL query and code snippets for popular
programming languages.

Change-Id: I0a7cb4c04382f7a8854940cd76f201f7dcafcfb6
---
A examples/code/Java.txt
A examples/code/JavaScript.txt
A examples/code/Matlab.txt
A examples/code/PHP.txt
A examples/code/Python.txt
A examples/code/R.txt
A examples/code/Ruby.txt
A examples/code/listeria.txt
M i18n/en.json
M i18n/qqq.json
M index.html
M style.css
M wikibase/init.js
A wikibase/queryService/api/CodeSamples.js
A wikibase/queryService/ui/dialog/CodeExample.js
15 files changed, 442 insertions(+), 3 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  Lucas Werkmeister (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/examples/code/Java.txt b/examples/code/Java.txt
new file mode 100644
index 000..be9cca1
--- /dev/null
+++ b/examples/code/Java.txt
@@ -0,0 +1,41 @@
+//https://github.com/BorderCloud/SPARQL-JAVA
+import com.bordercloud.sparql.Endpoint;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class Main {
+
+public static void main(String[] args) {
+try {
+Endpoint sp = new Endpoint("{ENDPOINT_URL}", false);
+
+String querySelect = {SPARQL_QUERY};
+
+HashMap rs = sp.query(querySelect);
+printResult(rs,30);
+
+}catch(EndpointException eex) {
+System.out.println(eex);
+eex.printStackTrace();
+}
+}
+
+public static void printResult(HashMap rs , int size) {
+
+  for (String variable : (ArrayList) rs.get("result").get("variables")) {
+System.out.print(String.format("%-"+size+"."+size+"s", variable ) + " 
| ");
+  }
+  System.out.print("\n");
+  for (HashMap value : (ArrayList>) rs.get("result").get("rows")) {
+//System.out.print(value);
+/* for (String key : value.keySet()) {
+ System.out.println(value.get(key));
+ }*/
+for (String variable : (ArrayList) rs.get("result").get("variables")) {
+  //System.out.println(value.get(variable));
+  System.out.print(String.format("%-"+size+"."+size+"s", 
value.get(variable)) + " | ");
+}
+System.out.print("\n");
+  }
+}
+}
diff --git a/examples/code/JavaScript.txt b/examples/code/JavaScript.txt
new file mode 100644
index 000..a3069e9
--- /dev/null
+++ b/examples/code/JavaScript.txt
@@ -0,0 +1,12 @@
+var endpointUrl = '{ENDPOINT_URL}',
+sparqlQuery = {SPARQL_QUERY},
+data = 'query=' + encodeURIComponent( sparqlQuery ),
+settings = {
+headers: { Accept: 'application/sparql-results+json' },
+data: data
+};
+
+$.ajax( endpointUrl, settings ).then( function ( data ) {
+$( 'body' ).append( ( $('').text( JSON.stringify( data) ) ) );
+console.log( data );
+} );
diff --git a/examples/code/Matlab.txt b/examples/code/Matlab.txt
new file mode 100644
index 000..4ecd07e
--- /dev/null
+++ b/examples/code/Matlab.txt
@@ -0,0 +1,24 @@
+%https://github.com/cbdavis/MatlabSPARQL/blob/master/sparql.m
+
+endpointUrl = '{ENDPOINT_URL}';
+sparqlQuery = {SPARQL_QUERY};
+
+url_head = strcat(endpointUrl,'?query=');
+url_query = urlencode(sparqlQuery);
+format = 'text/tab-separated-values';
+url_tail = strcat('=', format);
+
+url = strcat(url_head, url_query, url_tail);
+
+% get the data from the endpoint
+query_results = urlread(url);
+
+% write the data to a file so that tdfread can parse it
+fid = fopen('query_results.txt','w');
+if fid>=0
+fprintf(fid, '%s\n', query_results)
+fclose(fid)
+end
+
+% this reads the tsv file into a struct
+sparql_data = tdfread('query_results.txt')
diff --git a/examples/code/PHP.txt b/examples/code/PHP.txt
new file mode 100644
index 000..6f78f81
--- /dev/null
+++ b/examples/code/PHP.txt
@@ -0,0 +1,6 @@
+https://rdflib.github.io/sparqlwrapper/
+
+from SPARQLWrapper import SPARQLWrapper, JSON
+sparql = SPARQLWrapper("{ENDPOINT_URL}")
+sparql.setQuery({SPARQL_QUERY})
+sparql.setReturnFormat(JSON)
+results = sparql.query().convert()
+
+for result in results["results"]["bindings"]:
+print(result)
diff --git a/examples/code/R.txt b/examples/code/R.txt
new file mode 100644
index 000..0afa5d9
--- /dev/null
+++ b/examples/code/R.txt
@@ -0,0 +1,10 @@
+#http://www.r-bloggers.com/sparql-with-r-in-less-than-5-minutes/
+
+library(SPARQL) # SPARQL querying package
+library(ggplot2)
+
+endpoint <- "{ENDPOINT_URL}"
+query <- {SPARQL_QUERY}
+
+qd <- SPARQL(endpoint,query)
+df <- qd$results
diff --git a/examples/code/Ruby.txt b/examples/code/Ruby.txt
new file mode 100644
index 000..6a80423
--- /dev/null
+++ b/examples/code/Ruby.txt
@@ -0,0 +1,19 @@
+#gem install sparql
+#http://www.rubydoc.info/github/ruby-rdf/sparql/frames
+

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Replace flickr disclaimer background with WikimediaUI palett...

[jenkins-bot (Code Review)]

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

Change subject: Replace flickr disclaimer background with WikimediaUI palette 
color
..


Replace flickr disclaimer background with WikimediaUI palette color

Bug: T177709
Change-Id: I9469706bbf70be09b9cfc7f1ca77ce7b96fec755
---
M resources/uploadWizard.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/uploadWizard.css b/resources/uploadWizard.css
index 9e01f90..6c30f3c 100644
--- a/resources/uploadWizard.css
+++ b/resources/uploadWizard.css
@@ -230,10 +230,10 @@
 }
 
 #mwe-upwiz-flickr-disclaimer {
+   background-color: #eaf3ff;
font-size: 92%;
margin: 1em 0;
padding: 0.5em;
-   background-color: #dfeffa;
 }
 
 .filled + .filled {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9469706bbf70be09b9cfc7f1ca77ce7b96fec755
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add Wikilink code sample

[jenkins-bot (Code Review)]

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

Change subject: Add Wikilink code sample
..


Add Wikilink code sample

This produces a hyperlink to the query, in wikitext syntax.

Change-Id: Idc21506b5d250f5cc8ea13af8e818b9b8445b609
---
M wikibase/init.js
M wikibase/queryService/api/CodeSamples.js
2 files changed, 11 insertions(+), 2 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wikibase/init.js b/wikibase/init.js
index 0a66e6e..bc4bddc 100644
--- a/wikibase/init.js
+++ b/wikibase/init.js
@@ -36,7 +36,11 @@
var api = new wb.api.Wikibase( config.api.wikibase.uri, 
lang ),
sparqlApi = new wb.api.Sparql( 
config.api.sparql.uri, lang ),
querySamplesApi = new wb.api.QuerySamples( lang 
),
-   codeSamplesApi = new wb.api.CodeSamples( 
config.api.sparql.uri, config.location.root ),
+   codeSamplesApi = new wb.api.CodeSamples(
+   config.api.sparql.uri,
+   config.location.root,
+   config.location.index
+   ),
languageSelector = new 
wb.ui.i18n.LanguageSelector( $( '.uls-trigger' ), api, lang );
 
languageSelector.setChangeListener( function( lang ) {
diff --git a/wikibase/queryService/api/CodeSamples.js 
b/wikibase/queryService/api/CodeSamples.js
index 06e7e57..8fe915e 100644
--- a/wikibase/queryService/api/CodeSamples.js
+++ b/wikibase/queryService/api/CodeSamples.js
@@ -15,7 +15,7 @@
 * @author Jonas Kress
 * @constructor
 */
-   function SELF( endpoint, root ) {
+   function SELF( endpoint, root, index ) {
this._endpoint = endpoint;
this._languages = {
URL: {
@@ -33,6 +33,11 @@
},
mimetype: 'text/html'
},
+   Wikilink: {
+   code: function( query ) {
+   return '[' + index + '#' + 
encodeURIComponent( query ) + ' Query]';
+   }
+   },
PHP: {
escape: function( query ) {
var escapedQuery = query

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc21506b5d250f5cc8ea13af8e818b9b8445b609
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: category_redirect.py: Changed name of category for srwiki on...

[Zoranzoki21 (Code Review)]

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

Change subject: category_redirect.py: Changed name of category for srwiki on 
name on Serbian language
..

category_redirect.py: Changed name of category for srwiki on name on Serbian 
language

Change-Id: Ib711fde8eaba66f071d9db9bbf46bb779ac14202
---
M scripts/category_redirect.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/32/383932/1

diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index 6af1688..64cbbd1 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -90,7 +90,7 @@
 'sco': "Category:Wikipaedia soft redirectit categories",
 'simple': "Category:Category redirects",
 'sh': u"Kategorija:Preusmjerene kategorije Wikipedije",
-'sr': 'Категорија:Wikipedia soft redirected categories',
+'sr': 'Категорија:Википедијине меко преусмерене категорије',
 'vi': u"Thể loại:Thể loại đổi hướng",
 'zh': u"Category:已重定向的分类",
 'ro': 'Categorie:Categorii de redirecționare',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib711fde8eaba66f071d9db9bbf46bb779ac14202
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

___
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.23.5

[Jforrester (Code Review)]

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

Change subject: Tag v0.23.5
..

Tag v0.23.5

Change-Id: I3c7d553beed79114805f1807b885bd40fb98
---
M History.md
M package.json
2 files changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/31/383931/1

diff --git a/History.md b/History.md
index 3053557..091a0ee 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,10 @@
 # OOjs UI Release History
+## v0.23.5 / 2017-10-12
+### Code
+* PHP MultilineTextInputWidget, SearchInputWidget: Remove duplicate `use` 
statements (Bartosz Dziewoński)
+* PHP Theme: Fix check for IconElement/IndicatorElement for inherited traits 
(Bartosz Dziewoński)
+
+
 ## v0.23.4 / 2017-10-11
 ### Styles
 * IndexLayout: Handle long lists of tabs (Bartosz Dziewoński)
@@ -487,7 +493,7 @@
 ### Code
 * GroupElement: Fix insertion bugs (Bartosz Dziewoński)
 * icons: Drop unused 'invert' variant from Apex 'icons-interactions' pack 
(Bartosz Dziewoński)
-* build: Add exec:composer and add it to _ci (Prateek Saxena)
+* build: Add exec:composer and add it to `_ci` (Prateek Saxena)
 
 
 ## v0.20.1 / 2017-03-28
diff --git a/package.json b/package.json
index f205ad9..de1e845 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.23.4",
+  "version": "0.23.5",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c7d553beed79114805f1807b885bd40fb98
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] wikidata...gui[master]: Restore focus to editor after selecting example

[jenkins-bot (Code Review)]

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

Change subject: Restore focus to editor after selecting example
..


Restore focus to editor after selecting example

Bootstrap restores focus to the originally opening button for a modal
after closing it, which is a bad idea for the query examples dialog
because a very common action after selecting a query example is to run
it with Ctrl+Enter, which also reopens the examples dialog. Instead,
focus the editor, which is also useful for immediately editing the
example query.

Bootstrap’s focus-restoring logic is wrapped in several layers of event
handlers, and I can’t figure out any way to register an event handler of
our own after Bootstrap’s focus-restoring event handler, so we use a
setTimeout instead to get our code to run after Bootstrap’s focus
restorer. It’s not ideal – sometimes you can see a brief flash of focus
on the examples button before we move focus to the editor – but I can’t
figure out any better solution.

Bug: T178089
Change-Id: I24613f225ee56133deceec6a8f3048ee62139c7b
---
M wikibase/queryService/ui/App.js
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index b32c633..9c70658 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -317,6 +317,10 @@
}
 
self._editor.setValue( '#' + title + 
'\n' + query );
+
+   $( '#QueryExamples' ).one( 
'hidden.bs.modal', function() {
+   setTimeout( function() { 
self._editor.focus(); }, 0 );
+   } );
} );
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24613f225ee56133deceec6a8f3048ee62139c7b
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.

Change-Id: I300130c7b952a353ac28989d39d7f01366da2a37
---
M utils/TranslateSandbox.php
1 file changed, 15 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/19/383919/1

diff --git a/utils/TranslateSandbox.php b/utils/TranslateSandbox.php
index 7751d10..0f1a420 100644
--- a/utils/TranslateSandbox.php
+++ b/utils/TranslateSandbox.php
@@ -130,14 +130,25 @@
 */
public static function getUsers() {
$dbw = TranslateUtils::getSafeReadDB();
-   $tables = [ 'user', 'user_groups' ];
-   $fields = User::selectFields();
+   if ( is_callable( User::class, 'getQueryInfo' ) ) {
+   $userQuery = User::getQueryInfo();
+   } else {
+   $userQuery = [
+   'tables' => [ 'user' ],
+   'fields' => User::selectFields(),
+   'joins' => [],
+   ];
+   }
+   $tables = array_merge( $userQuery['tables'], [ 'user_groups' ] 
);
+   $fields = $userQuery['fields'];
$conds = [
'ug_group' => 'translate-sandboxed',
-   'ug_user = user_id',
];
+   $joins = [
+   'user_groups' => [ 'JOIN', 'ug_user = user_id' ],
+   ] + $userQuery['joins'];
 
-   $res = $dbw->select( $tables, $fields, $conds, __METHOD__ );
+   $res = $dbw->select( $tables, $fields, $conds, __METHOD__, [], 
$joins );
 
return UserArray::newFromResult( $res );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I300130c7b952a353ac28989d39d7f01366da2a37
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.

Change-Id: I42237e8e29497bbc56606f6ad01de3d525bf8b2a
---
M includes/Sanity/Checker.php
M maintenance/forceSearchIndex.php
2 files changed, 39 insertions(+), 10 deletions(-)


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

diff --git a/includes/Sanity/Checker.php b/includes/Sanity/Checker.php
index 8f8c364..cb907e2 100644
--- a/includes/Sanity/Checker.php
+++ b/includes/Sanity/Checker.php
@@ -303,11 +303,22 @@
}
$dbr = $this->getDB();
$where = 'page_id IN (' . $dbr->makeList( $pageIds ) . ')';
+   if ( is_callable( WikiPage::class, 'getQueryInfo' ) ) {
+   $pageQuery = WikiPage::getQueryInfo();
+   } else {
+   $pageQuery = [
+   'tables' => [ 'page' ],
+   'fields' => WikiPage::selectFields(),
+   'joins' => [],
+   ];
+   }
$res = $dbr->select(
-   [ 'page' ],
-   WikiPage::selectFields(),
+   $pageQuery['tables'],
+   $pageQuery['fields'],
$where,
-   __METHOD__
+   __METHOD__,
+   [],
+   $pageQuery['joins']
);
foreach ( $res as $row ) {
$page = WikiPage::newFromRow( $row );
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index 4e151ba..9d0f41e 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -427,7 +427,10 @@
 
protected function getIdsIterator() {
$dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
-   $it = new BatchRowIterator( $dbr, 'page', 'page_id', 
$this->mBatchSize );
+   $it = new BatchRowIterator(
+   $dbr, self::getPageQueryInfo()['tables'], 'page_id', 
$this->mBatchSize
+   );
+   $it->addJoinConditions( self::getPageQueryInfo()['joins'] );
$it->addConditions( [
'page_id in (' . $dbr->makeList( $this->pageIds, 
LIST_COMMA ) . ')',
] );
@@ -440,13 +443,13 @@
$dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
$it = new BatchRowIterator(
$dbr,
-   [ 'page', 'revision' ],
+   array_merge( self::getPageQueryInfo()['tables'], [ 
'revision' ] ),
[ 'rev_timestamp', 'page_id' ],
$this->mBatchSize
);
-   $it->addConditions( [
-   'rev_page = page_id',
-   'rev_id = page_latest',
+   $it->addJoinConditions( self::getPageQueryInfo()['joins'] );
+   $it->addJoinConditions( [
+   'revision' => [ 'JOIN', [ 'rev_page = page_id', 'rev_id 
= page_latest' ] ]
] );
 
$this->attachTimestampConditions( $dbr, $it, 'rev' );
@@ -457,7 +460,10 @@
 
protected function getUpdatesByIdIterator() {
$dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
-   $it = new BatchRowIterator( $dbr, 'page', 'page_id', 
$this->mBatchSize );
+   $it = new BatchRowIterator(
+   $dbr,  self::getPageQueryInfo()['tables'], 'page_id', 
$this->mBatchSize
+   );
+   $it->addJoinConditions( self::getPageQueryInfo()['joins'] );
$fromId = $this->getOption( 'fromId', 0 );
if ( $fromId > 0 ) {
$it->addConditions( [
@@ -490,9 +496,21 @@
}
}
 
+   private static function getPageQueryInfo() {
+   if ( is_callable( WikiPage::class, 'getQueryInfo' ) ) {
+   return WikiPage::getQueryInfo();
+   }
+
+   return [
+   'tables' => [ 'page' ],
+   'fields' => WikiPage::selectFields(),
+   'joins' => [],
+   ];
+   }
+
private function attachPageConditions( IDatabase $dbr, BatchRowIterator 
$it, $columnPrefix ) {
if ( $columnPrefix === 'page' ) {
-   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: shell: Deduplicate code in Command.php by combining else paths

[jenkins-bot (Code Review)]

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

Change subject: shell: Deduplicate code in Command.php by combining else paths
..


shell: Deduplicate code in Command.php by combining else paths

Also reduce indenting.

Change-Id: I33f83786c38bba0919372df0d5cdfa806d4361fc
---
M includes/shell/Command.php
1 file changed, 3 insertions(+), 4 deletions(-)

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



diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index fb2d787..d5a1bb3 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -245,10 +245,9 @@
   "MW_USE_LOG_PIPE=yes"
   );
$useLogPipe = true;
-   } elseif ( $this->useStderr ) {
-   $cmd .= ' 2>&1';
}
-   } elseif ( $this->useStderr ) {
+   }
+   if ( !$useLogPipe && $this->useStderr ) {
$cmd .= ' 2>&1';
}
wfDebug( __METHOD__ . ": $cmd\n" );
@@ -259,7 +258,7 @@
// input. See T129506.
if ( strlen( $cmd ) > SHELL_MAX_ARG_STRLEN ) {
throw new Exception( __METHOD__ .
-'(): total 
length of $cmd must not exceed SHELL_MAX_ARG_STRLEN' );
+   '(): total length of $cmd must not exceed 
SHELL_MAX_ARG_STRLEN' );
}
 
$desc = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I33f83786c38bba0919372df0d5cdfa806d4361fc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.

Change-Id: If75d2e76c2f166bc40a544dd502da43171ce1e7b
---
M includes/AbuseFilter.class.php
M includes/Views/AbuseFilterViewExamine.php
M includes/Views/AbuseFilterViewTestBatch.php
M includes/api/ApiAbuseFilterCheckMatch.php
4 files changed, 41 insertions(+), 23 deletions(-)


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

diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 552a351..eda3645 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -2082,6 +2082,23 @@
}
 
/**
+* Semi-copy of core RecentChange::getQueryInfo() for back-compat
+* @return array
+*/
+   public static function getRcQueryInfo() {
+   if ( is_callable( RecentChange::class, 'getQueryInfo' ) ) {
+   return RecentChange::getQueryInfo();
+   }
+
+   $commentQuery = CommentStore::newKey( 'rc_comment' )->getJoin();
+   return [
+   'tables' => [ 'recentchanges' ] + 
$commentQuery['tables'],
+   'fields' => RecentChange::selectFields() + 
$commentQuery['fields'],
+   'joins' => $commentQuery['joins'],
+   ];
+   }
+
+   /**
 * @param stdClass $row
 * @return AbuseFilterVariableHolder|null
 */
@@ -2151,10 +2168,7 @@
 
$vars->setVar( 'ACTION', 'delete' );
if ( class_exists( CommentStore::class ) ) {
-   $vars->setVar( 'SUMMARY', CommentStore::newKey( 
'rc_comment' )
-   // $row comes from RecentChange::selectFields()
-   ->getCommentLegacy( wfGetDB( DB_REPLICA ), $row 
)->text
-   );
+   $vars->setVar( 'SUMMARY', CommentStore::newKey( 
'rc_comment' )->getComment( $row )->text );
} else {
$vars->setVar( 'SUMMARY', $row->rc_comment );
}
@@ -2184,10 +2198,7 @@
 
$vars->setVar( 'ACTION', 'edit' );
if ( class_exists( CommentStore::class ) ) {
-   $vars->setVar( 'SUMMARY', CommentStore::newKey( 
'rc_comment' )
-   // $row comes from RecentChange::selectFields()
-   ->getCommentLegacy( wfGetDB( DB_REPLICA ), $row 
)->text
-   );
+   $vars->setVar( 'SUMMARY', CommentStore::newKey( 
'rc_comment' )->getComment( $row )->text );
} else {
$vars->setVar( 'SUMMARY', $row->rc_comment );
}
@@ -2231,10 +2242,7 @@
);
 
if ( class_exists( CommentStore::class ) ) {
-   $vars->setVar( 'SUMMARY', CommentStore::newKey( 
'rc_comment' )
-   // $row comes from RecentChange::selectFields()
-   ->getCommentLegacy( wfGetDB( DB_REPLICA ), $row 
)->text
-   );
+   $vars->setVar( 'SUMMARY', CommentStore::newKey( 
'rc_comment' )->getComment( $row )->text );
} else {
$vars->setVar( 'SUMMARY', $row->rc_comment );
}
diff --git a/includes/Views/AbuseFilterViewExamine.php 
b/includes/Views/AbuseFilterViewExamine.php
index 22be413..cf3189d 100644
--- a/includes/Views/AbuseFilterViewExamine.php
+++ b/includes/Views/AbuseFilterViewExamine.php
@@ -77,11 +77,14 @@
function showExaminerForRC( $rcid ) {
// Get data
$dbr = wfGetDB( DB_REPLICA );
+   $rcQuery = AbuseFilter::getRcQueryInfo();
$row = $dbr->selectRow(
-   'recentchanges',
-   RecentChange::selectFields(),
+   $rcQuery['tables'],
+   $rcQuery['fields'],
[ 'rc_id' => $rcid ],
-   __METHOD__
+   __METHOD__,
+   [],
+   $rcQuery['joins']
);
$out = $this->getOutput();
if ( !$row ) {
@@ -247,11 +250,13 @@
 
$conds[] = $this->mPage->buildTestConditions( $dbr );
 
+   $rcQuery = AbuseFilter::getRcQueryInfo();
$info = [
-   

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556, replaced with getQueryInfo() methods.

Change-Id: I401809d2638b11e6c77a318fc8fbbc41fa639083
Depends-On: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M includes/LocalRenameJob/LocalRenameUserJob.php
M includes/specials/SpecialUsersWhoWillBeRenamed.php
2 files changed, 13 insertions(+), 6 deletions(-)


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

diff --git a/includes/LocalRenameJob/LocalRenameUserJob.php 
b/includes/LocalRenameJob/LocalRenameUserJob.php
index c31b835..56c5a77 100644
--- a/includes/LocalRenameJob/LocalRenameUserJob.php
+++ b/includes/LocalRenameJob/LocalRenameUserJob.php
@@ -57,11 +57,14 @@
if ( isset( $this->params['force'] ) && $this->params['force'] 
) {
// If we're dealing with an invalid username, load the 
data ourselves to avoid
// any normalization at all done by User or Title.
+   $userQuery = User::getQueryInfo();
$row = wfGetDB( DB_MASTER )->selectRow(
-   'user',
-   User::selectFields(),
+   $userQuery['tables'],
+   $userQuery['fields'],
[ 'user_name' => $from ],
-   __METHOD__
+   __METHOD__,
+   [],
+   $userQuery['joins']
);
$oldUser = User::newFromRow( $row );
} else {
diff --git a/includes/specials/SpecialUsersWhoWillBeRenamed.php 
b/includes/specials/SpecialUsersWhoWillBeRenamed.php
index b269448..d50f9f8 100644
--- a/includes/specials/SpecialUsersWhoWillBeRenamed.php
+++ b/includes/specials/SpecialUsersWhoWillBeRenamed.php
@@ -67,13 +67,17 @@
}
 
$dbr = wfGetDB( DB_REPLICA );
+   $userQuery = User::getQueryInfo();
+   $blockQuery = Block::getQueryInfo();
+   $ipbUser = isset( $blockQuery['ipb_user'] ) ? 
$blockQuery['ipb_user'] : 'ipb_user';
$res = $dbr->select(
-   [ 'user', 'ipblocks' ],
-   User::selectFields(),
+   array_merge( $userQuery['tables'], 
$blockQuery['tables'] ),
+   $userQuery['fields'],
[ 'user_name' => array_unique( $names ), 'ipb_deleted 
IS NULL OR ipb_deleted = 0' ],
__METHOD__,
[], // $options
-   [ 'ipblocks' => [ 'LEFT JOIN', 'user_id = ipb_user' ] ]
+   [ 'ipblocks' => [ 'LEFT JOIN', "user_id = $ipbUser" ] ]
+   + $userQuery['joins'] + $blockQuery['joins']
);
$userArray = UserArray::newFromResult( $res );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I401809d2638b11e6c77a318fc8fbbc41fa639083
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556, replaced with getQueryInfo() methods.

Change-Id: I488afaa991e3d26b638a4f588f70db455959eadf
Depends-On: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M includes/Model/AbstractRevision.php
1 file changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/includes/Model/AbstractRevision.php 
b/includes/Model/AbstractRevision.php
index c08a81b..8a6f112 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -850,7 +850,15 @@
$options = [ 'USE INDEX' => 'rc_timestamp' ];
 
$dbr = wfGetDB( DB_REPLICA );
-   $rows = $dbr->select( 'recentchanges', 
RecentChange::selectFields(), $conditions, __METHOD__, $options );
+   $rcQuery = RecentChange::getQueryInfo();
+   $rows = $dbr->select(
+   $rcQuery['tables'],
+   $rcQuery['fields'],
+   $conditions,
+   __METHOD__,
+   $options,
+   $rcQuery['joins']
+   );
 
if ( $rows === false ) {
return null;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I488afaa991e3d26b638a4f588f70db455959eadf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add deprecation notices for selectFields() methods deprecate...

[Anomie (Code Review)]

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

Change subject: Add deprecation notices for selectFields() methods deprecated 
in Idcfd1556
..

Add deprecation notices for selectFields() methods deprecated in Idcfd1556

Now that WMF-deployed extensions have been updated to no longer call
them.

Change-Id: I04942ca1b95baa2126f2dcf4d0975536f4dd07c7
Depends-On: I300130c7b952a353ac28989d39d7f01366da2a37
Depends-On: Ia81bf6a655af800ce8ac19940d851e65746e1f77
Depends-On: I0d869aacaaad85cdd34361a611ac8348bdbb757d
Depends-On: I7b05a99e23da296a673eb0bd34f18344618c8be3
Depends-On: I42237e8e29497bbc56606f6ad01de3d525bf8b2a
Depends-On: If75d2e76c2f166bc40a544dd502da43171ce1e7b
Depends-On: I401809d2638b11e6c77a318fc8fbbc41fa639083
Depends-On: I5d62ad76fdb64a9c6efd228f27e9b5f512f17d5e
Depends-On: I488afaa991e3d26b638a4f588f70db455959eadf
Depends-On: Ibe82dadb0f2d1c5dbc38b96731c6e443c5469ff0
Depends-On: Id25b86dd415e2e3c6190a91faee2a3b815e50f61
---
M includes/Revision.php
M includes/changes/RecentChange.php
M includes/filerepo/file/LocalFile.php
M includes/filerepo/file/OldLocalFile.php
M includes/page/WikiPage.php
M includes/user/User.php
6 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/30/383930/1

diff --git a/includes/Revision.php b/includes/Revision.php
index d4e3fa6..bc60e8d 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -426,6 +426,7 @@
 * @return array
 */
public static function userJoinCond() {
+   wfDeprecated( __METHOD__, '1.31' );
return [ 'LEFT JOIN', [ 'rev_user != 0', 'user_id = rev_user' ] 
];
}
 
@@ -437,6 +438,7 @@
 * @return array
 */
public static function pageJoinCond() {
+   wfDeprecated( __METHOD__, '1.31' );
return [ 'INNER JOIN', [ 'page_id = rev_page' ] ];
}
 
@@ -448,6 +450,8 @@
 */
public static function selectFields() {
global $wgContentHandlerUseDB;
+
+   wfDeprecated( __METHOD__, '1.31' );
 
$fields = [
'rev_id',
@@ -481,6 +485,9 @@
 */
public static function selectArchiveFields() {
global $wgContentHandlerUseDB;
+
+   wfDeprecated( __METHOD__, '1.31' );
+
$fields = [
'ar_id',
'ar_page_id',
@@ -513,6 +520,7 @@
 * @return array
 */
public static function selectTextFields() {
+   wfDeprecated( __METHOD__, '1.31' );
return [
'old_text',
'old_flags'
@@ -525,6 +533,7 @@
 * @return array
 */
public static function selectPageFields() {
+   wfDeprecated( __METHOD__, '1.31' );
return [
'page_namespace',
'page_title',
@@ -541,6 +550,7 @@
 * @return array
 */
public static function selectUserFields() {
+   wfDeprecated( __METHOD__, '1.31' );
return [ 'user_name' ];
}
 
diff --git a/includes/changes/RecentChange.php 
b/includes/changes/RecentChange.php
index bb24120..a471865 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -210,6 +210,7 @@
 * @return array
 */
public static function selectFields() {
+   wfDeprecated( __METHOD__, '1.31' );
return [
'rc_id',
'rc_timestamp',
diff --git a/includes/filerepo/file/LocalFile.php 
b/includes/filerepo/file/LocalFile.php
index e0c002c..a4dcb96 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -200,6 +200,7 @@
 * @return array
 */
static function selectFields() {
+   wfDeprecated( __METHOD__, '1.31' );
return [
'img_name',
'img_size',
diff --git a/includes/filerepo/file/OldLocalFile.php 
b/includes/filerepo/file/OldLocalFile.php
index 404f384..431d7bd 100644
--- a/includes/filerepo/file/OldLocalFile.php
+++ b/includes/filerepo/file/OldLocalFile.php
@@ -110,6 +110,7 @@
 * @return array
 */
static function selectFields() {
+   wfDeprecated( __METHOD__, '1.31' );
return [
'oi_name',
'oi_archive_name',
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index e86ce36..7629657 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -292,6 +292,8 @@
public static function selectFields() {
global $wgContentHandlerUseDB, $wgPageLanguageUseDB;
 
+   

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix Omnimailing.load job to bypass creating recipients & to ...

[jenkins-bot (Code Review)]

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

Change subject: Fix Omnimailing.load job to bypass creating recipients & to use 
internal replace, add test.
..


Fix Omnimailing.load job to bypass creating recipients & to use internal 
replace, add test.

Yes, passing '_skip_evil_bao_auto_recipients_' really is the key to bypassing 
that function :-)

We don't really want all those mailing_job records either since Civi is not 
doing those mailings.

ALso replace not working as I thought & hence internalising the code to do that

Bug: T178020
Change-Id: Ia5a86ea84548fc10483b01bbfdc8931793ea7d1b
---
M 
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
A 
sites/default/civicrm/extensions/org.wikimedia.omnimail/tests/phpunit/OmnimailingLoadTest.php
2 files changed, 174 insertions(+), 57 deletions(-)

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



diff --git 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
index 44550ab..3a07646 100644
--- 
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
+++ 
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnimailing/Load.php
@@ -41,69 +41,73 @@
 $getParams['username'] = $params['username'];
 $getParams['password'] = $params['password'];
   }
+  if (isset($params['client'])) {
+$getParams['client'] = $params['client'];
+  }
   $mailings = civicrm_api3('Omnimailing', 'get', $getParams);
 
   foreach ($mailings['values']  as $mailing) {
-$campaign = civicrm_api3('Campaign', 'replace', array(
-  'name' => 'sp' . $mailing['external_identifier'],
-  'values' => array(
-array(
-  'title' => 'sp' . $mailing['external_identifier'],
-  'description' => $mailing['subject'],
-  'campaign_type_id' => 'Email',
-  'start_date' => date('Y-m-d H:i:s', $mailing['start_date']),
-  'status_id' => 'Completed',
-)
-  )
+$campaign = _civicrm_api3_omnimailing_load_api_replace(
+  'Campaign',
+  array('name' => 'sp' . $mailing['external_identifier']),
+  array(
+'title' => 'sp' . $mailing['external_identifier'],
+'description' => $mailing['subject'],
+'campaign_type_id' => 'Email',
+'start_date' => date('Y-m-d H:i:s', $mailing['start_date']),
+'status_id' => 'Completed',
 ));
+
 CRM_Core_PseudoConstant::flush();
-$result = civicrm_api3('Mailing', 'replace', array(
-  'hash' => 'sp' . $mailing['external_identifier'],
-  'debug' => 1,
-  'values' => array(
-array(
-  'body_html' => !empty($mailing['body_html']) ? $mailing['body_html'] 
: '',
-  'body_text' => !empty($mailing['body_text']) ? $mailing['body_text'] 
: '',
-  'name' => !empty($mailing['name']) ? $mailing['name'] : 'sp' . 
$mailing['external_identifier'],
-  'subject' => $mailing['subject'],
-  'created_date' => date('Y-m-d H:i:s', $mailing['scheduled_date']),
-  'hash' => 'sp' . $mailing['external_identifier'],
-  'scheduled_date' => date('Y-m-d H:i:s', $mailing['scheduled_date']),
-  'campaign_id' => $campaign['id'],
-  'is_completed' => 1,
-)
+
+$result =  _civicrm_api3_omnimailing_load_api_replace(
+  'Mailing',
+  array('hash' => 'sp' . $mailing['external_identifier']),
+  array(
+'body_html' => !empty($mailing['body_html']) ? $mailing['body_html'] : 
'',
+'body_text' => !empty($mailing['body_text']) ? $mailing['body_text'] : 
'',
+'name' => !empty($mailing['name']) ? $mailing['name'] : 'sp' . 
$mailing['external_identifier'],
+'subject' => $mailing['subject'],
+'created_date' => date('Y-m-d H:i:s', $mailing['scheduled_date']),
+'hash' => 'sp' . $mailing['external_identifier'],
+'scheduled_date' => date('Y-m-d H:i:s', $mailing['scheduled_date']),
+'campaign_id' => $campaign['id'],
   ),
-));
-$values[] = $result['values'][$result['id']];
-civicrm_api3('MailingStats', 'replace', array(
-  'mailing_id' => $result['id'],
-  'values' => array(
-array(
-  'debug' => 1,
-  'mailing_id' => $result['id'],
-  'mailing_name' => !empty($mailing['name']) ? $mailing['name'] : 'sp' 
. $mailing['external_identifier'],
-  'is_completed' => TRUE,
-  'created_date' => date('Y-m-d H:i:s', $mailing['scheduled_date']),
-  'start' => date('Y-m-d H:i:s', $mailing['start_date']),
-  //'finish' =>
-  'recipients' => $mailing['number_sent'],
-  'delivered' => $mailing['number_sent'] - $mailing['number_bounced'],
-  // 'send_rate'
-  'bounced' => 

[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.

Change-Id: Ia81bf6a655af800ce8ac19940d851e65746e1f77
---
M BaseBlacklist.php
1 file changed, 20 insertions(+), 9 deletions(-)


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

diff --git a/BaseBlacklist.php b/BaseBlacklist.php
index 1a25297..4063859 100644
--- a/BaseBlacklist.php
+++ b/BaseBlacklist.php
@@ -372,20 +372,31 @@
// Load all the relevant tables from the correct DB.
// This assumes that old_text is the actual text or
// that the external store system is at least unified.
+   if ( is_callable( Revision::class, 'getQueryInfo' ) ) {
+   $revQuery = Revision::getQueryInfo( [ 'page', 'text' ] 
);
+   } else {
+   $revQuery = [
+   'tables' => [ 'revision', 'page', 'text' ],
+   'fields' => array_merge(
+   Revision::selectFields(),
+   Revision::selectPageFields(),
+   Revision::selectTextFields()
+   ),
+   'joins' => [
+   'text' => [ 'JOIN', 
'old_id=rev_text_id' ]
+   ],
+   ];
+   }
$row = wfGetDB( DB_REPLICA, [], $wiki )->selectRow(
-   [ 'page', 'revision', 'text' ],
-   array_merge(
-   Revision::selectFields(),
-   Revision::selectPageFields(),
-   Revision::selectTextFields()
-   ),
+   $revQuery['tables'],
+   $revQuery['fields'],
[
'page_namespace' => $title->getNamespace(), // 
assume NS IDs match
'page_title' => $title->getDBkey(), // assume 
same case rules
-   'rev_id=page_latest',
-   'old_id=rev_text_id'
],
-   __METHOD__
+   __METHOD__,
+   [],
+   [ 'page' => [ 'JOIN', 'rev_id=page_latest' ] ] + 
$revQuery['joins']
);
 
return $row

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia81bf6a655af800ce8ac19940d851e65746e1f77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556, replaced with getQueryInfo() methods.

Change-Id: Id25b86dd415e2e3c6190a91faee2a3b815e50f61
Depends-On: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M backend/FlaggableWikiPage.php
M backend/FlaggedRevision.php
M frontend/FlaggedRevsUI.hooks.php
M frontend/RejectConfirmationFormUI.php
M maintenance/cachePendingRevs.php
5 files changed, 70 insertions(+), 47 deletions(-)


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

diff --git a/backend/FlaggableWikiPage.php b/backend/FlaggableWikiPage.php
index fcb1fc2..8409955 100644
--- a/backend/FlaggableWikiPage.php
+++ b/backend/FlaggableWikiPage.php
@@ -360,18 +360,21 @@
 * @return mixed Database result resource, or false on failure
 */
protected function pageData( $dbr, $conditions, $options = [] ) {
+   $pageQuery = WikiPage::getQueryInfo();
$row = $dbr->selectRow(
-   [ 'page', 'flaggedpages', 'flaggedpage_config' ],
+   array_merge( $pageQuery['tables'], [ 'flaggedpages', 
'flaggedpage_config' ] ),
array_merge(
-   WikiPage::selectFields(),
+   $pageQuery['fields'],
FRPageConfig::selectFields(),
-   [ 'fp_pending_since', 'fp_stable', 
'fp_reviewed' ] ),
+   [ 'fp_pending_since', 'fp_stable', 
'fp_reviewed' ]
+   ),
$conditions,
__METHOD__,
$options,
-   [
+   $pageQuery['joins'] + [
'flaggedpages'   => [ 'LEFT JOIN', 
'fp_page_id = page_id' ],
-   'flaggedpage_config' => [ 'LEFT JOIN', 
'fpc_page_id = page_id' ] ]
+   'flaggedpage_config' => [ 'LEFT JOIN', 
'fpc_page_id = page_id' ],
+   ]
);
return $row;
}
diff --git a/backend/FlaggedRevision.php b/backend/FlaggedRevision.php
index 3e8922a..b85b807 100644
--- a/backend/FlaggedRevision.php
+++ b/backend/FlaggedRevision.php
@@ -119,18 +119,18 @@
return null; // short-circuit query
}
# Skip deleted revisions
+   $frQuery = self::getQueryInfo();
$row = $db->selectRow(
-   [ 'flaggedrevs', 'revision' ],
-   self::selectFields(),
+   $frQuery['tables'],
+   $frQuery['fields'],
[
'fr_page_id' => $pageId,
'fr_rev_id'  => $revId,
-   'rev_id = fr_rev_id',
-   'rev_page = fr_page_id', // sanity
$db->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0'
],
__METHOD__,
-   $options
+   $options,
+   $frQuery['joins']
);
# Sorted from highest to lowest, so just take the first one if 
any
if ( $row ) {
@@ -169,18 +169,18 @@
return null; // short-circuit query
}
# Check tracking tables
+   $frQuery = self::getQueryInfo();
$row = $db->selectRow(
-   [ 'flaggedpages', 'flaggedrevs', 'revision' ],
-   self::selectFields(),
+   array_merge( [ 'flaggedpages' ], $frQuery['tables'] ),
+   $frQuery['fields'],
[
'fp_page_id' => $pageId,
'fr_rev_id = fp_stable',
-   'rev_id = fr_rev_id',
-   'rev_page = fr_page_id', // sanity
$db->bitAnd( 'rev_deleted', 
Revision::DELETED_TEXT ) . ' = 0', // sanity
],
__METHOD__,
-   $options
+   $options,
+   $frQuery['joins']
);
if ( $row ) {
$frev = new self( $row );
@@ -212,18 +212,17 @@
return null; // short-circuit query
}
# 

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556, replaced with getQueryInfo() methods.

Change-Id: Ibe82dadb0f2d1c5dbc38b96731c6e443c5469ff0
Depends-On: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M renameInvalidUsernames.php
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/renameInvalidUsernames.php b/renameInvalidUsernames.php
index 9af4d09..c44 100644
--- a/renameInvalidUsernames.php
+++ b/renameInvalidUsernames.php
@@ -54,7 +54,11 @@
 
protected function rename( $userId, $wiki ) {
$dbw = wfGetDB( DB_MASTER, [], $wiki );
-   $row = $dbw->selectRow( 'user', User::selectFields(), [ 
'user_id' => $userId ], __METHOD__ );
+   $userQuery = User::getQueryInfo();
+   $row = $dbw->selectRow(
+   $userQuery['tables'], $userQuery['fields'], [ 'user_id' 
=> $userId ],
+   __METHOD__, [], $userQuery['joins']
+   );
 
$oldUser = User::newFromRow( $row );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe82dadb0f2d1c5dbc38b96731c6e443c5469ff0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556, replaced with getQueryInfo() methods.

Change-Id: I5d62ad76fdb64a9c6efd228f27e9b5f512f17d5e
Depends-On: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M includes/cache/RevisionLocalCache.php
M maintenance/backfillUnreadWikis.php
2 files changed, 10 insertions(+), 13 deletions(-)


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

diff --git a/includes/cache/RevisionLocalCache.php 
b/includes/cache/RevisionLocalCache.php
index b879de6..0c968e3 100644
--- a/includes/cache/RevisionLocalCache.php
+++ b/includes/cache/RevisionLocalCache.php
@@ -29,21 +29,14 @@
if ( $this->lookups ) {
// @Todo Add newFromIds() to Revision
$dbr = wfGetDB( DB_REPLICA );
-   $fields = array_merge(
-   Revision::selectFields(),
-   Revision::selectPageFields(),
-   Revision::selectUserFields()
-   );
+   $revQuery = Revision::getQueryInfo( [ 'page', 'user' ] 
);
$res = $dbr->select(
-   [ 'revision', 'page', 'user' ],
-   $fields,
+   $revQuery['tables'],
+   $revQuery['fields'],
[ 'rev_id' => $this->lookups ],
__METHOD__,
[],
-   [
-   'page' => Revision::pageJoinCond(),
-   'user' => Revision::userJoinCond()
-   ]
+   $revQuery['joins']
);
if ( $res ) {
foreach ( $res as $row ) {
diff --git a/maintenance/backfillUnreadWikis.php 
b/maintenance/backfillUnreadWikis.php
index 3323647..d2c4b52 100644
--- a/maintenance/backfillUnreadWikis.php
+++ b/maintenance/backfillUnreadWikis.php
@@ -25,8 +25,12 @@
$iterator = new BatchRowIterator( 
$dbFactory->getSharedDb( DB_REPLICA ), 'echo_unread_wikis', 'euw_user', 
$this->mBatchSize );
$iterator->addConditions( [ 'euw_wiki' => wfWikiID() ] 
);
} else {
-   $iterator = new BatchRowIterator( wfGetDB( DB_REPLICA 
), 'user', 'user_id', $this->mBatchSize );
-   $iterator->setFetchColumns( User::selectFields() );
+   $userQuery = User::getQueryInfo();
+   $iterator = new BatchRowIterator(
+   wfGetDB( DB_REPLICA ), $userQuery['tables'], 
'user_id', $this->mBatchSize
+   );
+   $iterator->setFetchColumns( $userQuery['fields'] );
+   $iterator->addJoinConditions( $userQuery['joins'] );
}
 
$processed = 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d62ad76fdb64a9c6efd228f27e9b5f512f17d5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.

Change-Id: I0d869aacaaad85cdd34361a611ac8348bdbb757d
---
M includes/specials/SpecialMobileHistory.php
1 file changed, 12 insertions(+), 3 deletions(-)


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

diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index d8760dd..20fff25 100644
--- a/includes/specials/SpecialMobileHistory.php
+++ b/includes/specials/SpecialMobileHistory.php
@@ -156,10 +156,19 @@
 
$options['LIMIT'] = self::LIMIT + 1;
 
-   $tables = [ self::DB_REVISIONS_TABLE ];
-   $fields = Revision::selectFields();
+   if ( is_callable( Revision::class, 'getQueryInfo' ) ) {
+   $revQuery = Revision::getQueryInfo();
+   } else {
+   $revQuery = [
+   'tables' => [ self::DB_REVISIONS_TABLE ],
+   'fields' => Revision::selectFields(),
+   'joins' => [],
+   ];
+   }
 
-   $res = $dbr->select( $tables, $fields, $conds, __METHOD__, 
$options );
+   $res = $dbr->select(
+   $revQuery['tables'], $revQuery['fields'], $conds, 
__METHOD__, $options, $revQuery['joins']
+   );
 
return $res;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d869aacaaad85cdd34361a611ac8348bdbb757d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Update for deprecation of selectFields() methods

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Update for deprecation of selectFields() methods
..

Update for deprecation of selectFields() methods

Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.

Change-Id: I7b05a99e23da296a673eb0bd34f18344618c8be3
---
M includes/api/ApiQueryGeoSearch.php
1 file changed, 10 insertions(+), 2 deletions(-)


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

diff --git a/includes/api/ApiQueryGeoSearch.php 
b/includes/api/ApiQueryGeoSearch.php
index 227c6b3..7e00520 100644
--- a/includes/api/ApiQueryGeoSearch.php
+++ b/includes/api/ApiQueryGeoSearch.php
@@ -109,12 +109,20 @@
$this->dieDebug( __METHOD__, 'Logic error' );
}
 
-   $this->addTables( 'page' );
// retrieve some fields only if page set needs them
if ( is_null( $resultPageSet ) ) {
+   $this->addTables( 'page' );
$this->addFields( [ 'page_id', 'page_namespace', 
'page_title' ] );
} else {
-   $this->addFields( WikiPage::selectFields() );
+   if ( is_callable( WikiPage::class, 'getQueryInfo' ) ) {
+   $pageQuery = WikiPage::getQueryInfo();
+   $this->addTables( $pageQuery['tables'] );
+   $this->addFields( $pageQuery['fields'] );
+   $this->addJoinConds( $pageQuery['joins'] );
+   } else {
+   $this->addTables( 'page' );
+   $this->addFields( WikiPage::selectFields() );
+   }
}
$this->addWhereFld( 'page_namespace', $params['namespace'] );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b05a99e23da296a673eb0bd34f18344618c8be3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace selectFields() methods with getQueryInfo()

[Anomie (Code Review)]

Hello Daniel Kinzler, Tim Starling, Legoktm,

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

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

to review the following change.


Change subject: Replace selectFields() methods with getQueryInfo()
..

Replace selectFields() methods with getQueryInfo()

Several classes have a "selectFields()" static method to tell callers
which fields to select from the database. With the recent comment table
change and the upcoming actor table change, this pattern has become too
simplistic as a SELECT will need to join several tables to be able to
retrieve all the needed fields.

Thus, we deprecate the selectFields() methods in favor of getQueryInfo()
methods that return tables and join conditions in addition to the
fields.

Change-Id: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M RELEASE-NOTES-1.31
M docs/hooks.txt
M includes/Block.php
M includes/FeedUtils.php
M includes/Revision.php
M includes/RevisionList.php
M includes/Title.php
M includes/actions/HistoryAction.php
M includes/api/ApiComparePages.php
M includes/api/ApiQueryAllDeletedRevisions.php
M includes/api/ApiQueryAllImages.php
M includes/api/ApiQueryAllRevisions.php
M includes/api/ApiQueryDeletedRevisions.php
M includes/api/ApiQueryFilearchive.php
M includes/api/ApiQueryRevisions.php
M includes/api/ApiQueryUsers.php
M includes/changes/RecentChange.php
M includes/changetags/ChangeTagsRevisionList.php
M includes/diff/DifferenceEngine.php
M includes/filerepo/LocalRepo.php
M includes/filerepo/file/ArchivedFile.php
M includes/filerepo/file/LocalFile.php
M includes/filerepo/file/OldLocalFile.php
M includes/jobqueue/jobs/CategoryMembershipChangeJob.php
M includes/jobqueue/jobs/RecentChangesUpdateJob.php
M includes/libs/objectcache/WANObjectCache.php
M includes/logging/LogEntry.php
M includes/page/Article.php
M includes/page/PageArchive.php
M includes/page/WikiPage.php
M includes/revisiondelete/RevDelArchiveList.php
M includes/revisiondelete/RevDelArchivedFileList.php
M includes/revisiondelete/RevDelFileList.php
M includes/revisiondelete/RevDelRevisionList.php
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialRecentchangeslinked.php
M includes/specials/SpecialWatchlist.php
M includes/specials/pagers/ContribsPager.php
M includes/specials/pagers/MergeHistoryPager.php
M includes/user/PasswordReset.php
M includes/user/User.php
M includes/user/UserArray.php
M maintenance/checkImages.php
M maintenance/cleanupBlocks.php
M maintenance/eraseArchivedFile.php
M maintenance/populateRevisionLength.php
M maintenance/populateRevisionSha1.php
M maintenance/rebuildImages.php
M maintenance/rebuildtextindex.php
M maintenance/refreshFileHeaders.php
M maintenance/refreshImageMetadata.php
M maintenance/storage/testCompression.php
M tests/phpunit/includes/RevisionStorageTest.php
M tests/phpunit/includes/page/ArticleTest.php
55 files changed, 923 insertions(+), 422 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/18/383918/1

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 57cbec4..aad5d03 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -44,6 +44,26 @@
 * MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.
 * The global function wfBCP47 was renamed to LanguageCode::bcp47.
 * The global function wfBCP47 is now deprecated.
+* Several methods for returning lists of fields to select from the database
+  have been deprecated in favor of similar methods that also return the tables
+  to select from and the join conditions for those tables.
+  * Block::selectFields() → Block::getQueryInfo()
+  * RecentChange::selectFields() → RecentChange::getQueryInfo()
+  * ArchivedFile::selectFields() → ArchivedFile::getQueryInfo()
+  * LocalFile::selectFields() → LocalFile::getQueryInfo()
+  * LocalFile::getCacheFields() with a prefix no longer works
+  * LocalFile::getLazyCacheFields() with a prefix no longer works
+  * OldLocalFile::selectFields() → OldLocalFile::getQueryInfo()
+  * RecentChange::selectFields() → RecentChange::getQueryInfo()
+  * Revision::userJoinCond() → Revision::getQueryInfo( [ 'user' ] )
+  * Revision::selectUserFields() → Revision::getQueryInfo( [ 'user' ] )
+  * Revision::pageJoinCond() → Revision::getQueryInfo( [ 'page' ] )
+  * Revision::selectPageFields() → Revision::getQueryInfo( [ 'page' ] )
+  * Revision::selectTextFields() → Revision::getQueryInfo( [ 'text' ] )
+  * Revision::selectFields() → Revision::getQueryInfo()
+  * Revision::selectArchiveFields() → Revision::getArchiveQueryInfo()
+  * User::selectFields() → User::getQueryInfo()
+  * WikiPage::selectFields() → WikiPage::getQueryInfo()
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/docs/hooks.txt b/docs/hooks.txt
index a19e9fc..effc6d9 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -689,6 

[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Remove wgWikiEditorIconVersion

[jenkins-bot (Code Review)]

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

Change subject: Remove wgWikiEditorIconVersion
..


Remove wgWikiEditorIconVersion

The usage of the variable was removed in
https://phabricator.wikimedia.org/rEWED9862d7d87128ebca7ec8fe47e6c4abf043f53239

Change-Id: I505d1c711546fa1d41aca20facaf9a35d6b7caf7
---
M lqt.js
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/lqt.js b/lqt.js
index 15b5c66..a12e320 100644
--- a/lqt.js
+++ b/lqt.js
@@ -9,8 +9,6 @@
 
 ( function ( mw, $ ) {
 
-   window.wgWikiEditorIconVersion = 0;
-
$.getCSS = function ( url, media ) {
$( '' ).attr( {
href: url,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I505d1c711546fa1d41aca20facaf9a35d6b7caf7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...LiquidThreads[master]: Remove wgWikiEditorIconVersion

[Fomafix (Code Review)]

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

Change subject: Remove wgWikiEditorIconVersion
..

Remove wgWikiEditorIconVersion

The usage of the variable was removed in
https://phabricator.wikimedia.org/rEWED9862d7d87128ebca7ec8fe47e6c4abf043f53239

Change-Id: I505d1c711546fa1d41aca20facaf9a35d6b7caf7
---
M lqt.js
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/lqt.js b/lqt.js
index 15b5c66..a12e320 100644
--- a/lqt.js
+++ b/lqt.js
@@ -9,8 +9,6 @@
 
 ( function ( mw, $ ) {
 
-   window.wgWikiEditorIconVersion = 0;
-
$.getCSS = function ( url, media ) {
$( '' ).attr( {
href: url,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I505d1c711546fa1d41aca20facaf9a35d6b7caf7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add profiles/roles for stats/ML on Wikimedia Cloud

[Bearloga (Code Review)]

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

Change subject: Add profiles/roles for stats/ML on Wikimedia Cloud
..

Add profiles/roles for stats/ML on Wikimedia Cloud

Makes the following roles available:
 - discovery::forecaster
 uses the discovery_computing::forecasting profile
 - discovery::bayes
 uses the discovery_computing::bayesian_statistics profile
 - discovery::learner
 uses the discovery_computing::machine_learning profile
 - discovery::allstar_cruncher
 uses all 3 profiles mentioned above to create a
 multi-purpose statistical computing machine

Also fixes the timeout to install tidyverse and adds a way to
install R packages from Bioconductor.

Bug: T178096
Change-Id: If5b67444d78773683da5892a2ecdf741cee606de
---
A modules/profile/manifests/discovery_computing/base.pp
A modules/profile/manifests/discovery_computing/bayesian_statistics.pp
A modules/profile/manifests/discovery_computing/forecasting.pp
A modules/profile/manifests/discovery_computing/machine_learning.pp
M modules/r_lang/README.md
A modules/r_lang/files/biocLite.R
A modules/r_lang/manifests/bioc.pp
M modules/r_lang/manifests/init.pp
A modules/role/manifests/discovery/README.md
A modules/role/manifests/discovery/allstar_cruncher.pp
A modules/role/manifests/discovery/bayes.pp
A modules/role/manifests/discovery/forecaster.pp
A modules/role/manifests/discovery/learner.pp
M modules/shiny_server/manifests/init.pp
14 files changed, 521 insertions(+), 1 deletion(-)


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

diff --git a/modules/profile/manifests/discovery_computing/base.pp 
b/modules/profile/manifests/discovery_computing/base.pp
new file mode 100644
index 000..6d6187c
--- /dev/null
+++ b/modules/profile/manifests/discovery_computing/base.pp
@@ -0,0 +1,61 @@
+# Provision for statistical computing and number crunching
+#
+# Install and configure R and install Discovery-specific essential R/Python
+# packages for doing computationally-heavy statistics and machine learning.
+#
+# Due to the outdated version of R on the currently available Ubuntu version
+# (Trusty), it is recommended to only apply this profile (and any profiles or
+# roles that include it) to instances running on Debian (Jessie or newer).
+#
+# filtertags: labs-project-discovery-stats
+class profile::discovery_computing::base {
+# `include ::r` would not install devtools, which would mean that we could
+# not install R packages from Git/GitHub
+class { 'r_lang':
+devtools => true,
+}
+
+require_package()
+$essentials = [
+'virtualenv',  # Python virtual environment creator
+'build-essential', # for building stuff
+'liblapack-dev',   # Library of linear algebra routines
+'libgsl0-dev', # GNU Scientific Library
+'python3-dev', # header files and a static library for Python
+'python3-scipy'# scientific tools for Python
+]
+require_package($essentials)
+
+$cran_packages = [
+# Essentials
+'BH', # Boost C++ Header Files
+'Rcpp',   # R and C++ Integration
+# Data Manipulation
+'data.table', # fast data frames
+'glue',   # better than paste() for combining strings
+# Miscellaneous
+'optparse'# needed for /etc/update-pkg.R
+]
+r_lang::cran { $cran_packages }
+$rcpp_integrations = [
+'RcppArmadillo', # 'Rcpp' Integration for the 'Armadillo' Templated 
Linear Algebra Library
+'RcppEigen', # 'Rcpp' Integration for the 'Eigen' Templated Linear 
Algebra Library
+'RcppGSL',   # 'Rcpp' Integration for 'GNU GSL' Vectors and 
Matrices
+'RcppNumerical', # 'Rcpp' Integration for Numerical Computing Libraries
+]
+r_lang::cran { $rcpp_integrations:
+require => [
+Package['libgsl0-dev'],
+R_lang::Cran['Rcpp']
+],
+}
+
+# tidyverse includes packages such as dplyr, tidyr, magrittr, readr,
+# ggplot2, broom, purrr, rvest, forcats, lubridate, and jsonlite
+# It's a lot of packages so we *really* need to extend the timeout.
+r_lang::cran { 'tidyverse':
+require => R_lang::Cran['Rcpp'],
+timeout => 12000,
+}
+
+}
diff --git 
a/modules/profile/manifests/discovery_computing/bayesian_statistics.pp 
b/modules/profile/manifests/discovery_computing/bayesian_statistics.pp
new file mode 100644
index 000..b37758d
--- /dev/null
+++ b/modules/profile/manifests/discovery_computing/bayesian_statistics.pp
@@ -0,0 +1,39 @@
+# Provision for Bayesian statistics
+#
+# Install and configure R and install Discovery-specific essential R/Python
+# packages for Markov chain Monte Carlo (MCMC) sampling when performing
+# Bayesian inference.
+#
+# Due to the outdated version of R on the currently available Ubuntu 

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: Replace flickr disclaimer background with WikimediaUI palett...

[VolkerE (Code Review)]

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

Change subject: Replace flickr disclaimer background with WikimediaUI palette 
color
..

Replace flickr disclaimer background with WikimediaUI palette color

Bug: T177709
Change-Id: I9469706bbf70be09b9cfc7f1ca77ce7b96fec755
---
M resources/uploadWizard.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/15/383915/1

diff --git a/resources/uploadWizard.css b/resources/uploadWizard.css
index 9e01f90..6c30f3c 100644
--- a/resources/uploadWizard.css
+++ b/resources/uploadWizard.css
@@ -230,10 +230,10 @@
 }
 
 #mwe-upwiz-flickr-disclaimer {
+   background-color: #eaf3ff;
font-size: 92%;
margin: 1em 0;
padding: 0.5em;
-   background-color: #dfeffa;
 }
 
 .filled + .filled {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9469706bbf70be09b9cfc7f1ca77ce7b96fec755
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
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] integration/zuul[debian/jessie-wikimedia]: Update paramiko to 2.2

[Paladox (Code Review)]

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

Change subject: Update paramiko to 2.2
..

Update paramiko to 2.2

This is so it will be able to take advantage of the new upcomming gerrit
update.

I've tested on gerrit-test.

Bug: T171165
Change-Id: Id0a972e4e19847edc3d5e01b6a57a4295d86453a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/14/383914/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0a972e4e19847edc3d5e01b6a57a4295d86453a
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/zuul[upstream]: Update paramiko to 2.2

[Paladox (Code Review)]

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

Change subject: Update paramiko to 2.2
..

Update paramiko to 2.2

Tested on gerrit-test.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/zuul 
refs/changes/13/383913/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c4270d03817305fb77e5497031adf463a393997
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: upstream
Gerrit-Owner: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: PHP MultilineTextInputWidget, SearchInputWidget: Remove dupl...

[jenkins-bot (Code Review)]

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

Change subject: PHP MultilineTextInputWidget, SearchInputWidget: Remove 
duplicate `use` statements
..


PHP MultilineTextInputWidget, SearchInputWidget: Remove duplicate `use` 
statements

The IconElement and IndicatorElement traits are already included in
TextInputWidget, which is the parent of both of these classes. It is
not necessary to duplicate that, and it causes warnings on PHP 5.5.

Bug: T178100
Change-Id: I6e9b6b966e7e7ec0c05b80011a1236585f8c46d8
---
M php/widgets/MultilineTextInputWidget.php
M php/widgets/SearchInputWidget.php
2 files changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/php/widgets/MultilineTextInputWidget.php 
b/php/widgets/MultilineTextInputWidget.php
index 9dd3716..73d3975 100644
--- a/php/widgets/MultilineTextInputWidget.php
+++ b/php/widgets/MultilineTextInputWidget.php
@@ -6,8 +6,6 @@
  * Input widget with a text field.
  */
 class MultilineTextInputWidget extends TextInputWidget {
-   use IconElement;
-   use IndicatorElement;
 
/**
 * Allow multiple lines of text.
diff --git a/php/widgets/SearchInputWidget.php 
b/php/widgets/SearchInputWidget.php
index 6349479..0c87b0f 100644
--- a/php/widgets/SearchInputWidget.php
+++ b/php/widgets/SearchInputWidget.php
@@ -6,8 +6,6 @@
  * Input widget with a text field.
  */
 class SearchInputWidget extends TextInputWidget {
-   use IconElement;
-   use IndicatorElement;
 
public function __construct( array $config = [] ) {
// Config initialization

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e9b6b966e7e7ec0c05b80011a1236585f8c46d8
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
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]: deferred: Introduce OuterScopeUpdate

[Krinkle (Code Review)]

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

Change subject: deferred: Introduce OuterScopeUpdate
..

deferred: Introduce OuterScopeUpdate

This allows scheduling of updates that need to start their own
transaction. Specifically for cases where the ability to commit
early is not enough (which is already possible via LBFactory
getEmptyTransactionTicket and commitAndWaitForReplication).

Change-Id: I0910587b61c8ddf825f91e92c2f93582cc7ebd80
---
M autoload.php
M includes/deferred/DeferredUpdates.php
A includes/deferred/OuterScopeUpdate.php
M tests/phpunit/includes/deferred/DeferredUpdatesTest.php
A tests/phpunit/includes/deferred/OuterScopeUpdateTest.php
5 files changed, 96 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/383912/1

diff --git a/autoload.php b/autoload.php
index 0a2ecf0..6640ffa 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1051,6 +1051,7 @@
'OrderedStreamingForkController' => __DIR__ . 
'/includes/OrderedStreamingForkController.php',
'OrphanStats' => __DIR__ . '/maintenance/storage/orphanStats.php',
'Orphans' => __DIR__ . '/maintenance/orphans.php',
+   'OuterScopeUpdate' => __DIR__ . 
'/includes/deferred/OuterScopeUpdate.php',
'OutputPage' => __DIR__ . '/includes/OutputPage.php',
'PHPVersionCheck' => __DIR__ . '/includes/PHPVersionCheck.php',
'PNGHandler' => __DIR__ . '/includes/media/PNG.php',
diff --git a/includes/deferred/DeferredUpdates.php 
b/includes/deferred/DeferredUpdates.php
index e8e250b..a3ca4f8 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -250,6 +250,8 @@
// Run only the job enqueue logic to complete 
the update later
$spec = $update->getAsJobSpecification();
JobQueueGroup::singleton( $spec['wiki'] 
)->push( $spec['job'] );
+   } elseif ( $update instanceof OuterScopeUpdate ) {
+   $update->doUpdate();
} else {
// Run the bulk of the update now
$fnameTrxOwner = get_class( $update ) . 
'::doUpdate';
diff --git a/includes/deferred/OuterScopeUpdate.php 
b/includes/deferred/OuterScopeUpdate.php
new file mode 100644
index 000..a9a27ed
--- /dev/null
+++ b/includes/deferred/OuterScopeUpdate.php
@@ -0,0 +1,31 @@
+callback = $callback;
+   $this->fname = $fname;
+   }
+
+   public function doUpdate() {
+   call_user_func( $this->callback );
+   }
+
+   public function getOrigin() {
+   return $this->fname;
+   }
+}
diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php 
b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
index 999ad03..8f14e9f 100644
--- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
+++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
@@ -1,5 +1,7 @@
 assertTrue( $x, "Outer POSTSEND update ran" );
$this->assertTrue( $y, "Nested PRESEND update ran" );
}
+
+   /**
+* @covers DeferredUpdates::runUpdate
+*/
+   public function testRunUpdateTransactionScope() {
+   $this->setMwGlobals( 'wgCommandLineMode', false );
+
+   $lbFactory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+   $this->assertFalse( $lbFactory->hasTransactionRound(), 'Initial 
state' );
+
+   $ran = 0;
+   DeferredUpdates::addCallableUpdate( function () use ( &$ran, 
$lbFactory ) {
+   $ran++;
+   $this->assertTrue( $lbFactory->hasTransactionRound(), 
'Has transaction' );
+   } );
+   DeferredUpdates::doUpdates();
+
+   $this->assertSame( 1, $ran, 'Update ran' );
+   $this->assertFalse( $lbFactory->hasTransactionRound(), 'Final 
state' );
+
+   }
+
+   /**
+* @covers DeferredUpdates::runUpdate
+* @covers OuterScopeUpdate::getOrigin
+*/
+   public function testRunOuterScopeUpdate() {
+   $this->setMwGlobals( 'wgCommandLineMode', false );
+
+   $lbFactory = 
MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+   $this->assertFalse( $lbFactory->hasTransactionRound(), 'Initial 
state' );
+
+   $ran = 0;
+   DeferredUpdates::addUpdate( new OuterScopeUpdate(
+   function () use ( &$ran, $lbFactory ) {
+   $ran++;
+   $this->assertFalse( 
$lbFactory->hasTransactionRound(), 'No transaction' );
+   } )
+   );
+   DeferredUpdates::doUpdates();
+
+   $this->assertSame( 1, 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: deferred: Improve DeferredUpdates test coverage

[Krinkle (Code Review)]

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

Change subject: deferred: Improve DeferredUpdates test coverage
..

deferred: Improve DeferredUpdates test coverage

From 1% of lines to 12% in deferred/.
From 6% of lines to 68% in DeferredUpdates.php.

* Adding relevant @covers tags to existing tests.
* Add coverage for MWCallableUpdate.
* Add coverage for MergeableUpdate.

Also:
* Make MergeableUpdate extend DeferrableUpdate.
  1. Because PHPUnit doesn't support implementing multiple interfaces
 in a mock, and would make the mock fail the typehint at run-time.
  2. It DeferredUpdates doesn't support having a MergeableUpdate that isn't
 itself a DeferrableUpdate given the only way to reach that code is past
 methods that are type-hinted with DeferrableUpdate.
  3. Making the interface extend DeferrableUpdate helps produce better and
 earlier errors. Instead of run-time error:
 > Argument 1 passed to addUpdate() must implement interface 
DeferrableUpdate
 > instance of MergeableUpdate given
 We get:
 > Fatal error: Class .. contains 1 abstract method and must therefore be
 > declared abstract or implement the remaining methods (doUpdate)

Change-Id: Ie384bf849a96bb37dc3e4a4154da2b02889e9fc8
---
M includes/deferred/MergeableUpdate.php
M tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
M tests/phpunit/includes/deferred/DeferredUpdatesTest.php
A tests/phpunit/includes/deferred/MWCallableUpdateTest.php
4 files changed, 113 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/383911/1

diff --git a/includes/deferred/MergeableUpdate.php 
b/includes/deferred/MergeableUpdate.php
index 70760ce..8eeef13 100644
--- a/includes/deferred/MergeableUpdate.php
+++ b/includes/deferred/MergeableUpdate.php
@@ -6,7 +6,7 @@
  *
  * @since 1.27
  */
-interface MergeableUpdate {
+interface MergeableUpdate extends DeferrableUpdate {
/**
 * Merge this update with $update
 *
diff --git a/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php 
b/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
index 11b869a..f3c949d 100644
--- a/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
+++ b/tests/phpunit/includes/deferred/CdnCacheUpdateTest.php
@@ -3,6 +3,10 @@
 use Wikimedia\TestingAccessWrapper;
 
 class CdnCacheUpdateTest extends MediaWikiTestCase {
+
+   /**
+* @covers CdnCacheUpdate::merge
+*/
public function testPurgeMergeWeb() {
$this->setMwGlobals( 'wgCommandLineMode', false );
 
diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php 
b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
index 3b42356..999ad03 100644
--- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
+++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
@@ -3,10 +3,64 @@
 class DeferredUpdatesTest extends MediaWikiTestCase {
 
/**
+* @covers DeferredUpdates::addUpdate
+* @covers DeferredUpdates::push
+* @covers DeferredUpdates::doUpdates
+* @covers DeferredUpdates::execute
+* @covers DeferredUpdates::runUpdate
+*/
+   public function testAddAndRun() {
+   $update = $this->getMockBuilder( DeferrableUpdate::class )
+   ->setMethods( [ 'doUpdate' ] )->getMock();
+   $update->expects( $this->once() )->method( 'doUpdate' );
+
+   DeferredUpdates::addUpdate( $update );
+   DeferredUpdates::doUpdates();
+   }
+
+   /**
+* @covers DeferredUpdates::addUpdate
+* @covers DeferredUpdates::push
+*/
+   public function testAddMergeable() {
+   $this->setMwGlobals( 'wgCommandLineMode', false );
+
+   $update1 = $this->getMockBuilder( MergeableUpdate::class )
+   ->setMethods( [ 'merge', 'doUpdate' ] )->getMock();
+   $update1->expects( $this->once() )->method( 'merge' );
+   $update1->expects( $this->never() )->method( 'doUpdate' );
+
+   $update2 = $this->getMockBuilder( MergeableUpdate::class )
+   ->setMethods( [ 'merge', 'doUpdate' ] )->getMock();
+   $update2->expects( $this->never() )->method( 'merge' );
+   $update2->expects( $this->never() )->method( 'doUpdate' );
+
+   DeferredUpdates::addUpdate( $update1 );
+   DeferredUpdates::addUpdate( $update2 );
+   }
+
+   /**
+* @covers DeferredUpdates::addCallableUpdate
+* @covers MWCallableUpdate::getOrigin
+*/
+   public function testAddCallableUpdate() {
+   $this->setMwGlobals( 'wgCommandLineMode', true );
+
+   $ran = 0;
+   DeferredUpdates::addCallableUpdate( function () use ( &$ran ) {
+   $ran++;
+ 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: PHP Theme: Fix check for IconElement/IndicatorElement for in...

[jenkins-bot (Code Review)]

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

Change subject: PHP Theme: Fix check for IconElement/IndicatorElement for 
inherited traits
..


PHP Theme: Fix check for IconElement/IndicatorElement for inherited traits

`class_uses( $foo )` only returns a list of traits used specifically
by class Foo, and will not include traits used in Foo's ancestors.
We would have to walk the list returned by `class_parents( $foo )`,
call `class_uses()` on each one and merge them.

This complication is unnecessary though, as we can instead easily
check whether the method we want to call for each case exists.
This way is also closer how the JS Theme does this.

Bug: T178100
Change-Id: If081a50770ad07ba32ee1a81aa6a668878656177
---
M php/Theme.php
1 file changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/php/Theme.php b/php/Theme.php
index 8e8c823..4e45450 100644
--- a/php/Theme.php
+++ b/php/Theme.php
@@ -57,14 +57,13 @@
 */
public function updateElementClasses( Element $element ) {
$classes = $this->getElementClasses( $element );
-   $traits = class_uses( $element );
 
-   if ( in_array( IconElement::class, $traits ) ) {
+   if ( method_exists( $element, 'getIconElement' ) ) {
$element->getIconElement()
->removeClasses( $classes['off'] )
->addClasses( $classes['on'] );
}
-   if ( in_array( IndicatorElement::class, $traits ) ) {
+   if ( method_exists( $element, 'getIndicatorElement' ) ) {
$element->getIndicatorElement()
->removeClasses( $classes['off'] )
->addClasses( $classes['on'] );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If081a50770ad07ba32ee1a81aa6a668878656177
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Added language support for srwiki

[Zoranzoki21 (Code Review)]

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

Change subject: Added language support for srwiki
..

Added language support for srwiki

Change-Id: I817e752cae5fbc04878bffc44c314b67b90556da
---
M scripts/checkimages.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/10/383910/1

diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index b749c24..81165a1 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -121,6 +121,7 @@
 'it': u'{{subst:unverdata}}',
 'ja': u'{{subst:Nld}}',
 'ko': u'{{subst:nld}}',
+'sr': '{{subst:датотека без лиценце}}',
 'ta': u'{{subst:nld}}',
 'ur': u'{{subst:حقوق نسخہ تصویر نامعلوم}}',
 'zh': u'{{subst:No license/auto}}',
@@ -167,6 +168,7 @@
   '',
 'ja': u'{{subst:Welcome/intro}}\n{{subst:welcome|--}}\n',
 'ko': u'{{환영}}--\n',
+'sr': '{{Добродошлица}} %s',
 'ta': u'{{welcome}}\n\n',
 'ur': u'{{خوش آمدید}}\n\n',
 'zh': u'{{subst:welcome|sign=}}',
@@ -380,6 +382,7 @@
u'Template:Permissionotrs'],
 'ja': [u'Template:Information'],
 'ko': [u'Template:그림 정보'],
+'sr': [u'Template:Информација'],
 'ta': [u'Template:Information'],
 'ur': [u'Template:معلومات'],
 'zh': [u'Template:Information'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I817e752cae5fbc04878bffc44c314b67b90556da
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: pdns recursor module/profile/role

[Rush (Code Review)]

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

Change subject: openstack: pdns recursor module/profile/role
..

openstack: pdns recursor module/profile/role

* This deprecates the needed per host values
  for labservices1002
* use 'secondary' for primary/secondary active/active
  pairs and 'standby' for primary/standby active/standby
  pairs
* couple recursor monitoring with recursor profile

Bug: T171494
Change-Id: I1055766185d5381a666bbd97976e80eb7a681837
---
M hieradata/codfw/profile/openstack/labtest/pdns.yaml
A hieradata/common/profile/openstack/base/pdns/labsdb.yaml
M hieradata/eqiad/profile/openstack/main/pdns.yaml
D hieradata/hosts/labservices1002.yaml
R hieradata/role/eqiad/wmcs/openstack/main/net_standby.yaml
R hieradata/role/eqiad/wmcs/openstack/main/services_primary.yaml
C hieradata/role/eqiad/wmcs/openstack/main/services_secondary.yaml
M modules/profile/manifests/openstack/base/pdns/auth/monitor/pdns_control.pp
M modules/profile/manifests/openstack/base/pdns/auth/service.pp
A modules/profile/manifests/openstack/base/pdns/recursor/monitor/rec_control.pp
A modules/profile/manifests/openstack/base/pdns/recursor/service.pp
A modules/profile/manifests/openstack/labtest/pdns/recursor/service.pp
M modules/role/manifests/wmcs/openstack/labtest/services.pp
R modules/role/manifests/wmcs/openstack/main/net_standby.pp
R modules/role/manifests/wmcs/openstack/main/services_primary.pp
C modules/role/manifests/wmcs/openstack/main/services_secondary.pp
16 files changed, 1,061 insertions(+), 27 deletions(-)


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

diff --git a/hieradata/codfw/profile/openstack/labtest/pdns.yaml 
b/hieradata/codfw/profile/openstack/labtest/pdns.yaml
index 91206e6..1de72f5 100644
--- a/hieradata/codfw/profile/openstack/labtest/pdns.yaml
+++ b/hieradata/codfw/profile/openstack/labtest/pdns.yaml
@@ -1,3 +1,5 @@
+profile::openstack::labtest::pdns::tld: 'labtest'
+profile::openstack::labtest::pdns::private_reverse: '196.10.in-addr.arpa'
 profile::openstack::labtest::pdns::host: 'labtest-ns0.wikimedia.org'
 profile::openstack::labtest::pdns::host_secondary: 'labtest-ns0.wikimedia.org'
 profile::openstack::labtest::pdns::recursor: 'labtest-recursor0.wikimedia.org'
diff --git a/hieradata/common/profile/openstack/base/pdns/labsdb.yaml 
b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
new file mode 100644
index 000..c7377da
--- /dev/null
+++ b/hieradata/common/profile/openstack/base/pdns/labsdb.yaml
@@ -0,0 +1,897 @@
+# There are two old school replica servers (c1, c3 -- c2 is dead now).  The 
mapping of
+# "shards" (s1, etc.) and databases (enwiki, etc.) to these is
+# arbitrary in so much as all replicas have all the same data
+#  and can be adjusted to depool a server or redistribute load.
+
+profile::openstack::base::pdns::labsdb::c1:
+  - bgwiki
+  - bgwiktionary
+  - c1
+  - commonswiki
+  - cswiki
+  - enwiki
+  - enwikiquote
+  - enwiktionary
+  - eowiki
+  - fiwiki
+  - idwiki
+  - itwiki
+  - nlwiki
+  - nowiki
+  - plwiki
+  - ptwiki
+  - s1
+  - s2
+  - s4
+  - svwiki
+  - thwiki
+  - trwiki
+  - zhwiki
+
+profile::openstack::base::pdns::labsdb::c2:
+  - c2
+
+profile::openstack::base::pdns::labsdb::c3:
+  - aawiki
+  - aawikibooks
+  - aawiktionary
+  - abwiki
+  - abwiktionary
+  - acewiki
+  - advisorywiki
+  - adywiki
+  - afwiki
+  - afwikibooks
+  - afwikiquote
+  - afwiktionary
+  - akwiki
+  - akwikibooks
+  - akwiktionary
+  - alswiki
+  - alswikibooks
+  - alswikiquote
+  - alswiktionary
+  - amwiki
+  - amwikiquote
+  - amwiktionary
+  - angwiki
+  - angwikibooks
+  - angwikiquote
+  - angwikisource
+  - angwiktionary
+  - anwiki
+  - anwiktionary
+  - arcwiki
+  - arwiki
+  - arwikibooks
+  - arwikimedia
+  - arwikinews
+  - arwikiquote
+  - arwikisource
+  - arwikiversity
+  - arwiktionary
+  - arzwiki
+  - astwiki
+  - astwikibooks
+  - astwikiquote
+  - astwiktionary
+  - aswiki
+  - aswikibooks
+  - aswikisource
+  - aswiktionary
+  - atjwiki
+  - avwiki
+  - avwiktionary
+  - aywiki
+  - aywikibooks
+  - aywiktionary
+  - azbwiki
+  - azwiki
+  - azwikibooks
+  - azwikiquote
+  - azwikisource
+  - azwiktionary
+  - barwiki
+  - bat_smgwiki
+  - bawiki
+  - bawikibooks
+  - bclwiki
+  - bdwikimedia
+  - be_x_oldwiki
+  - betawikiversity
+  - bewiki
+  - bewikibooks
+  - bewikimedia
+  - bewikiquote
+  - bewikisource
+  - bewiktionary
+  - bgwikibooks
+  - bgwikinews
+  - bgwikiquote
+  - bgwikisource
+  - bhwiki
+  - bhwiktionary
+  - biwiki
+  - biwikibooks
+  - biwiktionary
+  - bjnwiki
+  - bmwiki
+  - bmwikibooks
+  - bmwikiquote
+  - bmwiktionary
+  - bnwiki
+  - bnwikibooks
+  - bnwikisource
+  - bnwiktionary
+  - bowiki
+  - bowikibooks
+  - bowiktionary
+  - bpywiki
+  - brwiki
+  - brwikimedia
+  - brwikiquote
+  - brwikisource
+  - brwiktionary
+  - bswiki
+  - bswikibooks
+  - bswikinews
+  - 

[MediaWiki-commits] [Gerrit] oojs/ui[master]: PHP Theme: Fix check for IconElement/IndicatorElement for in...

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383908 )

Change subject: PHP Theme: Fix check for IconElement/IndicatorElement for 
inherited traits
..

PHP Theme: Fix check for IconElement/IndicatorElement for inherited traits

`class_uses( $foo )` only returns a list of traits used specifically
by class Foo, and will not include traits used in Foo's ancestors.
We would have to walk the list returned by `class_parents( $foo )`,
call `class_uses()` on each one and merge them.

This complication is unnecessary though, as we can instead easily
check whether the method we want to call for each case exists.
This way is also closer how the JS Theme does this.

Bug: T178100
Change-Id: If081a50770ad07ba32ee1a81aa6a668878656177
---
M php/Theme.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/08/383908/1

diff --git a/php/Theme.php b/php/Theme.php
index 8e8c823..4e45450 100644
--- a/php/Theme.php
+++ b/php/Theme.php
@@ -57,14 +57,13 @@
 */
public function updateElementClasses( Element $element ) {
$classes = $this->getElementClasses( $element );
-   $traits = class_uses( $element );
 
-   if ( in_array( IconElement::class, $traits ) ) {
+   if ( method_exists( $element, 'getIconElement' ) ) {
$element->getIconElement()
->removeClasses( $classes['off'] )
->addClasses( $classes['on'] );
}
-   if ( in_array( IndicatorElement::class, $traits ) ) {
+   if ( method_exists( $element, 'getIndicatorElement' ) ) {
$element->getIndicatorElement()
->removeClasses( $classes['off'] )
->addClasses( $classes['on'] );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Do not include @nomin instruction in dist build

[jenkins-bot (Code Review)]

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

Change subject: Do not include @nomin instruction in dist build
..


Do not include @nomin instruction in dist build

When bundled by ResourceLoader this can interfere with debugging
of other concatenated files.

The nomin instruction introduced in 7bd29bb0582f
was meant to avoid RL minifying an already
uglified bundle, but that shouldn't matter here.

Bug: T177344
Change-Id: I90829668544e7c4ff7ddfdbb90d91b88a27a69f4
---
M resources/dist/index.js
M resources/dist/index.js.json
M webpack.config.js
3 files changed, 2 insertions(+), 12 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I90829668544e7c4ff7ddfdbb90d91b88a27a69f4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Krinkle 
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...wikidiff2[debian]: Update changelog for 1.5.1

[Legoktm (Code Review)]

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

Change subject: Update changelog for 1.5.1
..

Update changelog for 1.5.1

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/wikidiff2 
refs/changes/07/383907/1

diff --git a/debian/changelog b/debian/changelog
index da4b56a..b1b2ec8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php-wikidiff2 (1.5.1) jessie-wikimedia; urgency=medium
+
+  [ Johannes Kroll ]
+  * Allow for styling of RTL languages
+
+ -- Kunal Mehta   Thu, 12 Oct 2017 12:51:49 -0700
+
 php-wikidiff2 (1.5.0) jessie-wikimedia; urgency=medium
 
   [ Max Semenik ]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5622efe35b4639f580e7118f704baaf98e9bfdfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/wikidiff2
Gerrit-Branch: debian
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...wikidiff2[debian]: Merge tag '1.5.1' into debian

[Legoktm (Code Review)]

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

Change subject: Merge tag '1.5.1' into debian
..

Merge tag '1.5.1' into debian

1.5.1

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/wikidiff2 
refs/changes/06/383906/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aaf16033b0fd7ece55070717de88bac817602a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/wikidiff2
Gerrit-Branch: debian
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...wikidiff2[master]: Bump version to 1.5.1

[jenkins-bot (Code Review)]

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

Change subject: Bump version to 1.5.1
..


Bump version to 1.5.1

Change-Id: If0550871b6a8293ae39b0f006e4a65e5ca9933dd
---
M Wikidiff2.h
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Wikidiff2.h b/Wikidiff2.h
index 4bef72b..909e084 100644
--- a/Wikidiff2.h
+++ b/Wikidiff2.h
@@ -16,7 +16,7 @@
 #include 
 #include 
 
-#define WIKIDIFF2_VERSION_STRING   "1.5.0"
+#define WIKIDIFF2_VERSION_STRING   "1.5.1"
 
 class Wikidiff2 {
public:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0550871b6a8293ae39b0f006e4a65e5ca9933dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/wikidiff2
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tobias Gritschacher 
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: labs-ip-alias-dump as a cron rather than exec

[Rush (Code Review)]

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

Change subject: openstack: labs-ip-alias-dump as a cron rather than exec
..


openstack: labs-ip-alias-dump as a cron rather than exec

This takes a full minute to run even as a noop and sometimes
inline with a puppet run will take much longer for actual
updates.  It is also not running any time we are doing
legit maintenance.  I want to avoid running expected and
regular operations via exec as a cron substitute.

Change-Id: I2d5aebe378b54674c7dd0bb7701e82f2d83f9153
---
M modules/dnsrecursor/manifests/labsaliaser.pp
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/modules/dnsrecursor/manifests/labsaliaser.pp 
b/modules/dnsrecursor/manifests/labsaliaser.pp
index 1e9c9c7..82a05c7 100644
--- a/modules/dnsrecursor/manifests/labsaliaser.pp
+++ b/modules/dnsrecursor/manifests/labsaliaser.pp
@@ -34,14 +34,15 @@
 source => 'puppet:///modules/dnsrecursor/labs-ip-alias-dump.py',
 }
 
-exec { '/usr/local/bin/labs-ip-alias-dump.py':
+cron { 'labs-ip-alias-dump':
+ensure  => 'present',
 user=> 'root',
-group   => 'root',
+command => '/usr/local/bin/labs-ip-alias-dump.py --check-changes-only 
|| /usr/local/bin/labs-ip-alias-dump.py',
+minute  => 30,
 notify  => Service['pdns-recursor'],
 require => File[
 '/usr/local/bin/labs-ip-alias-dump.py',
 '/etc/labs-dns-alias.yaml'
 ],
-unless  => '/usr/local/bin/labs-ip-alias-dump.py --check-changes-only',
 }
 }

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

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

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