[MediaWiki-commits] [Gerrit] mediawiki...NSFileRepo[REL1_27]: Removed type hint

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369596 )

Change subject: Removed type hint
..

Removed type hint

The explicit type hint broke "Extension:PageForms" functionality

NEEDS CHERRY-PICK TO REL1_27

Change-Id: I6bc6640768cb1220740bcac6fb21652dc63a8d27
---
M src/Hooks/UploadFormBeforeProcessing.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NSFileRepo 
refs/changes/96/369596/1

diff --git a/src/Hooks/UploadFormBeforeProcessing.php 
b/src/Hooks/UploadFormBeforeProcessing.php
index 6f91816..1a3c408 100644
--- a/src/Hooks/UploadFormBeforeProcessing.php
+++ b/src/Hooks/UploadFormBeforeProcessing.php
@@ -41,9 +41,9 @@
 * See static method "handle"
 * @param \IContextSource $context
 * @param \Config $config
-* @param \SpecialUpload $uploadForm
+* @param \SpecialUpload $uploadForm 'Extension:PageForms' fires this 
hook with \PFUploadWindow as parameter
 */
-   public function __construct( \IContextSource $context, \Config $config, 
\SpecialUpload $uploadForm ) {
+   public function __construct( \IContextSource $context, \Config $config, 
/* \SpecialUpload */ $uploadForm ) {
$this->context = $context;
$this->config = $config;
$this->uploadForm = $uploadForm;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bc6640768cb1220740bcac6fb21652dc63a8d27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 

___
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 newlines to all dblists missing them

[jenkins-bot (Code Review)]

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

Change subject: Add newlines to all dblists missing them
..


Add newlines to all dblists missing them

Change-Id: I34bc342acf5399617f61eb7316d9593a37acdec4
---
M dblists/closed-labs.dblist
M dblists/gettingstarted-with-category-suggestions.dblist
M dblists/large.dblist
M dblists/medium.dblist
M dblists/nonbetafeatures.dblist
M dblists/nonflow.dblist
M dblists/nowikidatadescriptiontaglines-computed.dblist
M dblists/wikivoyage.dblist
8 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/dblists/closed-labs.dblist b/dblists/closed-labs.dblist
index d5520df..40440de 100644
--- a/dblists/closed-labs.dblist
+++ b/dblists/closed-labs.dblist
@@ -1 +1 @@
-eswiki
\ No newline at end of file
+eswiki
diff --git a/dblists/gettingstarted-with-category-suggestions.dblist 
b/dblists/gettingstarted-with-category-suggestions.dblist
index 09bb991..8874c5a 100644
--- a/dblists/gettingstarted-with-category-suggestions.dblist
+++ b/dblists/gettingstarted-with-category-suggestions.dblist
@@ -6,4 +6,4 @@
 zhwiki
 fawiki
 ruwiki
-ptwiki
\ No newline at end of file
+ptwiki
diff --git a/dblists/large.dblist b/dblists/large.dblist
index 9cd512c..705ded8 100644
--- a/dblists/large.dblist
+++ b/dblists/large.dblist
@@ -38,4 +38,4 @@
 warwiki
 wikidatawiki
 zhwiki
-zhwiktionary
\ No newline at end of file
+zhwiktionary
diff --git a/dblists/medium.dblist b/dblists/medium.dblist
index fc79517..5ee9237 100644
--- a/dblists/medium.dblist
+++ b/dblists/medium.dblist
@@ -365,4 +365,4 @@
 zhwikinews
 zhwikiquote
 zhwikisource
-zhwikivoyage
\ No newline at end of file
+zhwikivoyage
diff --git a/dblists/nonbetafeatures.dblist b/dblists/nonbetafeatures.dblist
index eaba68b..c9d8cf2 100644
--- a/dblists/nonbetafeatures.dblist
+++ b/dblists/nonbetafeatures.dblist
@@ -1,2 +1,2 @@
 loginwiki
-votewiki
\ No newline at end of file
+votewiki
diff --git a/dblists/nonflow.dblist b/dblists/nonflow.dblist
index e1069d1..30081ea 100644
--- a/dblists/nonflow.dblist
+++ b/dblists/nonflow.dblist
@@ -8,4 +8,4 @@
 labtestwiki
 loginwiki
 metawiki
-votewiki
\ No newline at end of file
+votewiki
diff --git a/dblists/nowikidatadescriptiontaglines-computed.dblist 
b/dblists/nowikidatadescriptiontaglines-computed.dblist
index fdeac05..cc17b43 100644
--- a/dblists/nowikidatadescriptiontaglines-computed.dblist
+++ b/dblists/nowikidatadescriptiontaglines-computed.dblist
@@ -1 +1 @@
-%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
\ No newline at end of file
+%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
diff --git a/dblists/wikivoyage.dblist b/dblists/wikivoyage.dblist
index 53efbaa..813d8f3 100644
--- a/dblists/wikivoyage.dblist
+++ b/dblists/wikivoyage.dblist
@@ -15,4 +15,4 @@
 svwikivoyage
 ukwikivoyage
 viwikivoyage
-zhwikivoyage
\ No newline at end of file
+zhwikivoyage

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add newlines to all dblists missing them

[Chad (Code Review)]

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

Change subject: Add newlines to all dblists missing them
..

Add newlines to all dblists missing them

Change-Id: I34bc342acf5399617f61eb7316d9593a37acdec4
---
M dblists/closed-labs.dblist
M dblists/gettingstarted-with-category-suggestions.dblist
M dblists/large.dblist
M dblists/medium.dblist
M dblists/nonbetafeatures.dblist
M dblists/nonflow.dblist
M dblists/nowikidatadescriptiontaglines-computed.dblist
M dblists/wikivoyage.dblist
8 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/dblists/closed-labs.dblist b/dblists/closed-labs.dblist
index d5520df..40440de 100644
--- a/dblists/closed-labs.dblist
+++ b/dblists/closed-labs.dblist
@@ -1 +1 @@
-eswiki
\ No newline at end of file
+eswiki
diff --git a/dblists/gettingstarted-with-category-suggestions.dblist 
b/dblists/gettingstarted-with-category-suggestions.dblist
index 09bb991..8874c5a 100644
--- a/dblists/gettingstarted-with-category-suggestions.dblist
+++ b/dblists/gettingstarted-with-category-suggestions.dblist
@@ -6,4 +6,4 @@
 zhwiki
 fawiki
 ruwiki
-ptwiki
\ No newline at end of file
+ptwiki
diff --git a/dblists/large.dblist b/dblists/large.dblist
index 9cd512c..705ded8 100644
--- a/dblists/large.dblist
+++ b/dblists/large.dblist
@@ -38,4 +38,4 @@
 warwiki
 wikidatawiki
 zhwiki
-zhwiktionary
\ No newline at end of file
+zhwiktionary
diff --git a/dblists/medium.dblist b/dblists/medium.dblist
index fc79517..5ee9237 100644
--- a/dblists/medium.dblist
+++ b/dblists/medium.dblist
@@ -365,4 +365,4 @@
 zhwikinews
 zhwikiquote
 zhwikisource
-zhwikivoyage
\ No newline at end of file
+zhwikivoyage
diff --git a/dblists/nonbetafeatures.dblist b/dblists/nonbetafeatures.dblist
index eaba68b..c9d8cf2 100644
--- a/dblists/nonbetafeatures.dblist
+++ b/dblists/nonbetafeatures.dblist
@@ -1,2 +1,2 @@
 loginwiki
-votewiki
\ No newline at end of file
+votewiki
diff --git a/dblists/nonflow.dblist b/dblists/nonflow.dblist
index e1069d1..30081ea 100644
--- a/dblists/nonflow.dblist
+++ b/dblists/nonflow.dblist
@@ -8,4 +8,4 @@
 labtestwiki
 loginwiki
 metawiki
-votewiki
\ No newline at end of file
+votewiki
diff --git a/dblists/nowikidatadescriptiontaglines-computed.dblist 
b/dblists/nowikidatadescriptiontaglines-computed.dblist
index fdeac05..cc17b43 100644
--- a/dblists/nowikidatadescriptiontaglines-computed.dblist
+++ b/dblists/nowikidatadescriptiontaglines-computed.dblist
@@ -1 +1 @@
-%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
\ No newline at end of file
+%% wikinews.dblist + wikiversity.dblist + wikisource.dblist + wikibooks.dblist 
+ wiktionary.dblist + special.dblist - s4.dblist
diff --git a/dblists/wikivoyage.dblist b/dblists/wikivoyage.dblist
index 53efbaa..813d8f3 100644
--- a/dblists/wikivoyage.dblist
+++ b/dblists/wikivoyage.dblist
@@ -15,4 +15,4 @@
 svwikivoyage
 ukwikivoyage
 viwikivoyage
-zhwikivoyage
\ No newline at end of file
+zhwikivoyage

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34bc342acf5399617f61eb7316d9593a37acdec4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: CirrusSearch configuration for LTR AB test

[EBernhardson (Code Review)]

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

Change subject: CirrusSearch configuration for LTR AB test
..

CirrusSearch configuration for LTR AB test

Adds two new rescore profiles for the AB test and sets up
triggers to enable them

Bug: T171212
Change-Id: I730a8a59f8dc2636ceabbe28f02b78cc39306b61
---
M wmf-config/CirrusSearch-production.php
M wmf-config/InitialiseSettings.php
2 files changed, 67 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index ef888a7..211f67d 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -102,3 +102,28 @@
 $wgCirrusSearchIndexDeletes = $wmgCirrusSearchIndexDeletes;
 // Enable searching archive
 $wgCirrusSearchEnableArchive = $wmgCirrusSearchEnableArchive;
+
+// LTR Rescore profile
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-20rs'] = 
$wgCirrusSearchRescoreProfiles['wsum_inclinks_pv'];
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-20rs']['unsupported_syntax'] = 
[ 'full_text_querystring', 'query_string', 'filter_only' ];
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-20rs']['fallback_profile'] = 
'wsum_inclinks_pv';
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-20rs']['rescore'][] = [
+   'window' => 20,
+   'query_weight' => 0.0,
+   'rescore_query_weight' => 1.0,
+   'score_mode' => 'total',
+   'type' => 'ltr',
+   'model' => 'enwiki-500t-v1',
+];
+
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-1024rs'] = 
$wgCirrusSearchRescoreProfiles['wsum_inclinks_pv'];
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-1024rs']['unsupported_syntax'] 
= [ 'full_text_querystring', 'query_string', 'filter_only' ];
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-1024rs']['fallback_profile'] = 
'wsum_inclinks_pv';
+$wgCirrusSearchRescoreProfiles['enwiki-500t-v1-1024rs']['rescore'][] = [
+   'window' => 20,
+   'query_weight' => 0.0,
+   'rescore_query_weight' => 1.0,
+   'score_mode' => 'total',
+   'type' => 'ltr',
+   'model' => 'enwiki-500t-v1',
+];
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 9db84ff..5c67cde 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18359,6 +18359,48 @@
 
 'wmgCirrusSearchUserTesting' => [
'default' => [],
+   'enwiki' => [
+   'ltr' => [
+   'buckets' => [
+   // control
+   'control' => [
+   'trigger' => 'control',
+   ],
+   // ltr with small rescore window
+   'ltr-20' => [
+   'trigger' => 'ltr-20',
+   'globals' => [
+   'wgCirrusSearchRescoreProfile' 
=> 'enwiki-500t-v1-20rs',
+   ]
+   ],
+   // interleaved ltr with small rescore window
+   'ltr-i-20' => [
+   'trigger' => 'ltr-i-20',
+   'globals' => [
+   
'wgCirrusSearchInterleaveConfig' => [
+   
'CirrusSearchRescoreProfile' => 'enwiki-500t-v1-20rs',
+   ],
+   ],
+   ],
+   // ltr with large(er) rescore window
+   'ltr-1024' => [
+   'trigger' => 'ltr-1024',
+   'globals' => [
+   'wgCirrusSearchRescoreProfile' 
=> 'enwiki-500t-v1-1024rs',
+   ],
+   ],
+   // interleaved ltr with large(er) rescore window
+   'ltr-i-20' => [
+   'trigger' => 'ltr-i-1024',
+   'globals' => [
+   
'wgCirrusSearchInterleaveConfig' => [
+   
'CirrusSearchRescoreProfile' => 'enwiki-500t-v1-1024rs',
+   ],
+   ],
+   ],
+   ],
+   ],
+   ],
 ],
 
 'wmgCirrusSearchLanguageDetectors' => [

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add drush via composer.

[Eileen (Code Review)]

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

Change subject: Add drush via composer.
..

Add drush via composer.

I discussed upgrading drush with Casey & he felt we were
better to switch to drush via composer - this commit adds it in

Change-Id: I6c821ff467ff891fb0c6e3d94046e237079123a6
---
M composer.json
M composer.lock
2 files changed, 987 insertions(+), 290 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/93/369593/1

diff --git a/composer.json b/composer.json
index 17283df..7633929 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,8 @@
 "phpseclib/phpseclib":  "~2.0",
 "predis/predis": "1.*",
 "twig/twig": "1.*",
-"wikimedia/composer-merge-plugin": "^1.4"
+"wikimedia/composer-merge-plugin": "^1.4",
+"drush/drush": "^8.1"
 },
 "repositories": [
   {
diff --git a/composer.lock b/composer.lock
index b6be6ff..d15ed38 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": "31353eb88ccf3548983207723255bb5f",
+"content-hash": "b27331ac0c4835d866123ea5c6b2f833",
 "packages": [
 {
 "name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -252,6 +252,105 @@
 "time": "2014-05-19T10:25:02+00:00"
 },
 {
+"name": "consolidation/annotated-command",
+"version": "1.4.1",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/annotated-command.git;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/annotated-command/zipball/c2dc2464e1edf0498bf97a99f34cac5805d00946;,
+"reference": "c2dc2464e1edf0498bf97a99f34cac5805d00946",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+"psr/log": "~1.0",
+"symfony/console": "~2.5|~3.0",
+"symfony/event-dispatcher": "~2.5|~3.0",
+"symfony/finder": "~2.5|~3.0"
+},
+"require-dev": {
+"consolidation/output-formatters": "~1",
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\AnnotatedCommand\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+"license": [
+"MIT"
+],
+"authors": [
+{
+"name": "Greg Anderson",
+"email": "greg.1.ander...@greenknowe.org"
+}
+],
+"description": "Initialize Symfony Console commands from annotated 
command class methods.",
+"time": "2016-09-13T21:37:50+00:00"
+},
+{
+"name": "consolidation/output-formatters",
+"version": "1.1.0",
+"source": {
+"type": "git",
+"url": 
"https://github.com/consolidation/output-formatters.git;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261"
+},
+"dist": {
+"type": "zip",
+"url": 
"https://api.github.com/repos/consolidation/output-formatters/zipball/aadb1ed2deb72bc1351bb6f3b3ddd328222e9261;,
+"reference": "aadb1ed2deb72bc1351bb6f3b3ddd328222e9261",
+"shasum": ""
+},
+"require": {
+"php": ">=5.4.0",
+"symfony/console": "~2.5|~3.0"
+},
+"require-dev": {
+"phpunit/phpunit": "4.*",
+"satooshi/php-coveralls": "^1.0",
+"squizlabs/php_codesniffer": "2.*"
+},
+"type": "library",
+"extra": {
+"branch-alias": {
+"dev-master": "1.x-dev"
+}
+},
+"autoload": {
+"psr-4": {
+"Consolidation\\OutputFormatters\\": "src"
+}
+},
+"notification-url": "https://packagist.org/downloads/;,
+

[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Add a template's contents as the landing page

[Samwilson (Code Review)]

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

Change subject: Add a template's contents as the landing page
..

Add a template's contents as the landing page

Bug: T172085
Change-Id: If61e089470925be1ea33f1500459f43732546b73
---
M i18n/en.json
M includes/SpecialCreatePage.php
M phpcs.xml
3 files changed, 5 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow 
refs/changes/92/369592/1

diff --git a/i18n/en.json b/i18n/en.json
index 19e030c..6b73c28 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,3 +1,5 @@
 {
-   "acw-desc": "Customizes new page creation experience for new users"
+   "acw-desc": "Customizes new page creation experience for new users",
+   "createpage": "Create page",
+   "acw-landing-page-template": "CreatePage landing page"
 }
diff --git a/includes/SpecialCreatePage.php b/includes/SpecialCreatePage.php
index 9dbdabb..84e2b68 100644
--- a/includes/SpecialCreatePage.php
+++ b/includes/SpecialCreatePage.php
@@ -2,7 +2,6 @@
 
 namespace ArticleCreationWorkflow;
 
-use Exception;
 use UnlistedSpecialPage;
 
 /**
@@ -18,7 +17,7 @@
 */
public function execute( $subPage ) {
parent::execute( $subPage );
-
-   throw new Exception( 'Not implemented' );
+   $templateName = wfMessage( 'acw-landing-page-template' );
+   $this->getOutput()->addWikiText( '{{' . $templateName . 
'|page=' . $subPage . '}}' );
}
 }
diff --git a/phpcs.xml b/phpcs.xml
index 60dda4e..dc070b6 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,11 +2,8 @@
 
.

-   



-   

-   vendor
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If61e089470925be1ea33f1500459f43732546b73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Samwilson 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add class="mw-headline-fallback" for fallback anchor

[Fomafix (Code Review)]

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

Change subject: Add class="mw-headline-fallback" for fallback anchor
..

Add class="mw-headline-fallback" for fallback anchor

This allows to add CSS styles when a fallback anchor is targeted:

.mw-headline-fallback:target {
...
}

Change-Id: I09dac830eb02aee0512e748595da5552cefb4801
---
M includes/Linker.php
M tests/parser/parserTests.txt
2 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/369591/1

diff --git a/includes/Linker.php b/includes/Linker.php
index 2ca851c..f5a3b69 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1625,7 +1625,7 @@
. "";
if ( $fallbackAnchor !== false && $fallbackAnchor !== $anchor ) 
{
$fallbackAnchor = htmlspecialchars( $fallbackAnchor );
-   $ret = "$ret";
+   $ret = "$ret";
}
return $ret;
}
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index ab79b59..b18ed89 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -28424,10 +28424,10 @@
 
 Foo bar[edit]
 foo Bar[edit]
-Тест[edit]
-Тест[edit]
-тест[edit]
-Hey  # " %: '[edit]
+Тест[edit]
+Тест[edit]
+тест[edit]
+Hey  # " %: '[edit]
 #Foo bar #foo Bar #Тест #тест #Hey  # " %: '
 %F0%9F%92%A9 
 #啤酒 #啤酒
@@ -28471,10 +28471,10 @@
 
 Foo bar[edit]
 foo Bar[edit]
-Тест[edit]
-Тест[edit]
-тест[edit]
-Hey  # " %: 
'[edit]
+Тест[edit]
+Тест[edit]
+тест[edit]
+Hey  # " %: 
'[edit]
 #Foo bar #foo Bar #Тест #тест #Hey  # " %: '
 .F0.9F.92.A9 
 #啤酒 #啤酒

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I09dac830eb02aee0512e748595da5552cefb4801
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki/core[master]: Human-readable section ID support

[jenkins-bot (Code Review)]

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

Change subject: Human-readable section ID support
..


Human-readable section ID support

It adds the ability to replace the current section ID escaping
schema (.C0.DE) with a HTML5-compliant escaping schema that is
displayed as Unicode in many modern browsers.

See the linked bug for discussion of various options that were
considered before the implementation. A few remarks:
* Because Sanitizer::escapeId() is used in a bunch of places without
  escaping, I'm deprecating it without altering its behavior.
* The bug described in comments for Parser::guessLegacySectionNameFromWikiText()
  is still there in some Edge versions that display mojibake.

Bug: T152540
Change-Id: Id304010a0342efbb7ef2d56c5b8b244f2e4fb2c5
---
M RELEASE-NOTES-1.30
M autoload.php
M includes/DefaultSettings.php
M includes/EditPage.php
M includes/Linker.php
M includes/Sanitizer.php
M includes/Setup.php
M includes/Title.php
M includes/actions/InfoAction.php
M includes/api/ApiMain.php
M includes/htmlform/HTMLForm.php
M includes/htmlform/HTMLFormField.php
M includes/htmlform/OOUIHTMLForm.php
M includes/htmlform/fields/HTMLFormFieldCloner.php
M includes/htmlform/fields/HTMLRadioField.php
M includes/page/ImagePage.php
M includes/parser/Parser.php
A includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php
M includes/skins/BaseTemplate.php
M includes/skins/Skin.php
M includes/specials/SpecialListgrants.php
M includes/specials/SpecialListgrouprights.php
M includes/specials/SpecialVersion.php
M includes/specials/pagers/AllMessagesTablePager.php
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.preview.js
M resources/src/mediawiki/mediawiki.util.js
M tests/parser/ParserTestRunner.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/SanitizerTest.php
M tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
31 files changed, 811 insertions(+), 130 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index c5ab81a..452cb35 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -26,6 +26,13 @@
   array. This allows dependency injection to be used for ResourceLoader 
modules.
 * $wgExceptionHooks has been removed.
 * (T45547) $wgUsePigLatinVariant added (off by default).
+* (T152540) MediaWiki now supports a section ID escaping style that allows to 
display
+  non-Latin characters verbatim on many modern browsers. This is controlled by 
the
+  new configuration setting, $wgFragmentMode.
+* $wgExperimentalHtmlIds is now deprecated and will be removed in a future 
version,
+  use $wgFragmentMode to migrate off it to a modern alternative.
+* $wgExternalInterwikiFragmentMode was introduced to control how fragments in
+  sinterwikis going outside of current wiki farm are encoded.
 
 === New features in 1.30 ===
 * (T37247) Output from Parser::parse() will now be wrapped in a div with
@@ -143,6 +150,14 @@
   MediaWikiServices instead. Access to the underlying BagOStuff is possible
   through the new ParserCache::getCacheStorage() method.
 * .mw-ui-constructive CSS class (deprecated in 1.27) was removed.
+* Sanitizer::escapeId() was deprecated, use escapeIdForAttribute(),
+  escapeIdForLink() or escapeIdForExternalInterwiki() instead.
+* Title::escapeFragmentForURL() was deprecated, use one of the aforementioned
+  Sanitizer functions or, if possible, Title::getFragmentForURL().
+* Second parameter to Sanitizer::escapeIdReferenceList() ($options) now does
+  nothing and is deprecated.
+* mw.util.escapeId() was deprecated, use escapeIdForAttribute() or
+  escapeIdForLink().
 
 == Compatibility ==
 MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/autoload.php b/autoload.php
index 2bf1d4c..d44a305 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1231,6 +1231,7 @@
'ResourceLoaderJqueryMsgModule' => __DIR__ . 
'/includes/resourceloader/ResourceLoaderJqueryMsgModule.php',
'ResourceLoaderLanguageDataModule' => __DIR__ . 
'/includes/resourceloader/ResourceLoaderLanguageDataModule.php',
'ResourceLoaderLanguageNamesModule' => __DIR__ . 
'/includes/resourceloader/ResourceLoaderLanguageNamesModule.php',
+   'ResourceLoaderMediaWikiUtilModule' => __DIR__ . 
'/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php',
'ResourceLoaderModule' => __DIR__ . 
'/includes/resourceloader/ResourceLoaderModule.php',
'ResourceLoaderOOUIFileModule' => __DIR__ . 
'/includes/resourceloader/ResourceLoaderOOUIFileModule.php',
'ResourceLoaderOOUIImageModule' => __DIR__ . 
'/includes/resourceloader/ResourceLoaderOOUIImageModule.php',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b6d75ce..8e38121 100644
--- a/includes/DefaultSettings.php
+++ 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix Special:Undelete search - use variable and not request p...

[Smalyshev (Code Review)]

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

Change subject: Fix Special:Undelete search - use variable and not request param
..

Fix Special:Undelete search - use variable and not request param

Using request param fixes default to false.

Change-Id: I61f3f5d18783e2256612d91ca35437a6e65e0c15
---
M includes/specials/SpecialUndelete.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/89/369589/1

diff --git a/includes/specials/SpecialUndelete.php 
b/includes/specials/SpecialUndelete.php
index 28914f4..740207d 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -277,7 +277,7 @@
$fieldset,
new OOUI\HtmlSnippet(
Html::hidden( 'title', 
$this->getPageTitle()->getPrefixedDBkey() ) .
-   Html::hidden( 'fuzzy', 
$this->getRequest()->getVal( 'fuzzy' ) )
+   Html::hidden( 'fuzzy', $fuzzySearch )
)
);
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Namespace this extension

[MaxSem (Code Review)]

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

Change subject: Namespace this extension
..

Namespace this extension

Change-Id: I2f3e8dd47a50c6163ad33d94421819f4d572ca06
---
D GlobalPreferences.php
M extension.json
R includes/GlobalPreferences.php
R includes/Hooks.php
R includes/SpecialGlobalPreferences.php
5 files changed, 37 insertions(+), 39 deletions(-)


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

diff --git a/GlobalPreferences.php b/GlobalPreferences.php
deleted file mode 100644
index b1a1a0e..000
--- a/GlobalPreferences.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- * @file
- * @ingroup Extensions
- *
- * Partially based off of work by Werdna
- * https://www.mediawiki.org/wiki/Special:Code/MediaWiki/49790
- */
-
-if ( function_exists( 'wfLoadExtension' ) ) {
-   wfLoadExtension( 'GlobalPreferences' );
-   // Keep i18n globals so mergeMessageFileList.php doesn't break
-   $wgMessagesDirs['GlobalPreferences'] = __DIR__ . '/i18n';
-   $wgExtensionMessagesFiles['GlobalPreferencesAlias'] = __DIR__ . 
'/GlobalPreferences.alias.php';
-   wfWarn(
-   'Deprecated PHP entry point used for GlobalPreferences 
extension. '
-   . 'Please use wfLoadExtension instead, '
-   . 'see https://www.mediawiki.org/wiki/Extension_registration 
for more details.'
-   );
-   return true;
-} else {
-   die( 'This version of the GlobalPreferences extension requires 
MediaWiki 1.25+' );
-}
diff --git a/extension.json b/extension.json
index 2bc56f7..8245339 100644
--- a/extension.json
+++ b/extension.json
@@ -12,7 +12,7 @@
"GlobalPreferencesDB": null
},
"SpecialPages": {
-   "GlobalPreferences": "SpecialGlobalPreferences"
+   "GlobalPreferences": 
"GlobalPreferences\\SpecialGlobalPreferences"
},
"MessagesDirs": {
"GlobalPreferences": [
@@ -23,26 +23,26 @@
"GlobalPreferencesAlias": "GlobalPreferences.alias.php"
},
"AutoloadClasses": {
-   "GlobalPreferences": "GlobalPreferences.body.php",
-   "GlobalPreferencesHooks": "GlobalPreferences.hooks.php",
-   "SpecialGlobalPreferences": "SpecialGlobalPreferences.php"
+   "GlobalPreferences\\GlobalPreferences": 
"includes/GlobalPreferences.php",
+   "GlobalPreferences\\Hooks": "includes/Hooks.php",
+   "GlobalPreferences\\SpecialGlobalPreferences": 
"includes/SpecialGlobalPreferences.php"
},
"Hooks": {
"UserLoadOptions": [
-   "GlobalPreferencesHooks::onUserLoadOptions"
+   "GlobalPreferences\\Hooks::onUserLoadOptions"
],
"UserSaveOptions": [
-   "GlobalPreferencesHooks::onUserSaveOptions"
+   "GlobalPreferences\\Hooks::onUserSaveOptions"
],
"PreferencesFormPreSave": [
-   "GlobalPreferencesHooks::onPreferencesFormPreSave"
+   "GlobalPreferences\\Hooks::onPreferencesFormPreSave"
],
"LoadExtensionSchemaUpdates": [
-   "GlobalPreferencesHooks::onLoadExtensionSchemaUpdates"
+   "GlobalPreferences\\Hooks::onLoadExtensionSchemaUpdates"
]
},
"ExtensionFunctions": [
-   "GlobalPreferencesHooks::onExtensionFunctions"
+   "GlobalPreferences\\Hooks::onExtensionFunctions"
],
"ResourceFileModulePaths": {
"localBasePath": "resources",
diff --git a/GlobalPreferences.body.php b/includes/GlobalPreferences.php
similarity index 94%
rename from GlobalPreferences.body.php
rename to includes/GlobalPreferences.php
index d681ac5..fd5c6b8 100644
--- a/GlobalPreferences.body.php
+++ b/includes/GlobalPreferences.php
@@ -10,6 +10,15 @@
  * Partially based off of work by Werdna
  * https://www.mediawiki.org/wiki/Special:Code/MediaWiki/49790
  */
+
+namespace GlobalPreferences;
+
+use CentralIdLookup;
+use IContextSource;
+use RequestContext;
+use User;
+use Wikimedia\Rdbms\Database;
+
 class GlobalPreferences {
 
/**
@@ -82,6 +91,7 @@
/**
 * Convenience function to check if we're on the local
 * prefs page
+*
 * @param IContextSource $context The context to use; if not set main 
request context is used.
 * @return bool
 */
diff --git a/GlobalPreferences.hooks.php b/includes/Hooks.php
similarity index 96%
rename from GlobalPreferences.hooks.php
rename to includes/Hooks.php
index fecc178..1f57698 100644
--- a/GlobalPreferences.hooks.php
+++ b/includes/Hooks.php
@@ -1,6 

[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: jshint use es6

[jenkins-bot (Code Review)]

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

Change subject: jshint use es6
..


jshint use es6

Change-Id: I367575217e45fc03ab230504393d0d4c8ac33797
---
M .jshintrc
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/.jshintrc b/.jshintrc
index 7b9fd7e..9d3785f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -7,5 +7,6 @@
 "noarg": true,
 "nonew": true,
 "undef": true,
-"node": true
+"node": true,
+"esversion": 6
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I367575217e45fc03ab230504393d0d4c8ac33797
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Golopotw 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Physikerwelt 
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...CodeMirror[master]: Switch icons to 'highlighter' symbol

[Samwilson (Code Review)]

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

Change subject: Switch icons to 'highlighter' symbol
..

Switch icons to 'highlighter' symbol

This adds the new 'highlighter' symbol to the five CodeMirror SVG
icons, and regenerates their PNG counterparts (using Inkscape).

The only changes to the SVG files apart from the paths (and their
positions) are whitespace formatting. I'm not sure all those
gradients need to be there, but I guess someone did that for a
reason. :-)

Bug: T164441
Change-Id: Ibdb8ecf53eb03fb1d1805e788a3e497e4941263a
---
M resources/images/cm-icon.png
M resources/images/cm-icon.svg
M resources/images/cm-off.png
M resources/images/cm-off.svg
M resources/images/cm-on.png
M resources/images/cm-on.svg
M resources/images/old-cm-off.png
M resources/images/old-cm-off.svg
M resources/images/old-cm-on.png
M resources/images/old-cm-on.svg
10 files changed, 141 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror 
refs/changes/87/369587/1

diff --git a/resources/images/cm-icon.png b/resources/images/cm-icon.png
index 3fb98e8..1776503 100644
--- a/resources/images/cm-icon.png
+++ b/resources/images/cm-icon.png
Binary files differ
diff --git a/resources/images/cm-icon.svg b/resources/images/cm-icon.svg
index b8f5eb4..abe4593 100644
--- a/resources/images/cm-icon.svg
+++ b/resources/images/cm-icon.svg
@@ -1 +1,9 @@
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; 
width="24" height="24" viewBox="0 0 24 24">
\ No newline at end of file
+
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; width="24" height="24"
+ viewBox="0 0 24 24">
+
+
+
+
diff --git a/resources/images/cm-off.png b/resources/images/cm-off.png
index 560e02e..ab4ad0e 100644
--- a/resources/images/cm-off.png
+++ b/resources/images/cm-off.png
Binary files differ
diff --git a/resources/images/cm-off.svg b/resources/images/cm-off.svg
index 171bc93..684dea7 100644
--- a/resources/images/cm-off.svg
+++ b/resources/images/cm-off.svg
@@ -1 +1,8 @@
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; 
version="1" width="22" height="22">
\ No newline at end of file
+
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; version="1" width="22" height="22">
+
+
+
+
\ No newline at end of file
diff --git a/resources/images/cm-on.png b/resources/images/cm-on.png
index b63ce26..9dd3332 100644
--- a/resources/images/cm-on.png
+++ b/resources/images/cm-on.png
Binary files differ
diff --git a/resources/images/cm-on.svg b/resources/images/cm-on.svg
index ac3b4c7..0769a5a 100644
--- a/resources/images/cm-on.svg
+++ b/resources/images/cm-on.svg
@@ -1 +1,18 @@
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; 
height="22" width="22" version="1">
\ No newline at end of file
+
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; height="22" width="22" version="1">
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/images/old-cm-off.png b/resources/images/old-cm-off.png
index 29d4f78..8e59e5b 100644
--- a/resources/images/old-cm-off.png
+++ b/resources/images/old-cm-off.png
Binary files differ
diff --git a/resources/images/old-cm-off.svg b/resources/images/old-cm-off.svg
index 696f716..76b39e4 100644
--- a/resources/images/old-cm-off.svg
+++ b/resources/images/old-cm-off.svg
@@ -1 +1,46 @@
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; 
height="22" width="23">
\ No newline at end of file
+
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; height="22" width="23">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/images/old-cm-on.png b/resources/images/old-cm-on.png
index 97325a0..f7d1058 100644
--- a/resources/images/old-cm-on.png
+++ b/resources/images/old-cm-on.png
Binary files differ
diff --git a/resources/images/old-cm-on.svg b/resources/images/old-cm-on.svg
index 672eb93..8f174c5 100644
--- a/resources/images/old-cm-on.svg
+++ b/resources/images/old-cm-on.svg
@@ -1 +1,60 @@
-http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; 
height="22" width="23">
\ No newline at end of file
+
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; height="22" width="23">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+   

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Remove externalstore role; instead use only for wikimediaflow

[Mattflaschen (Code Review)]

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

Change subject: Remove externalstore role; instead use only for wikimediaflow
..

Remove externalstore role; instead use only for wikimediaflow

Before there was an externalstore role, which both defined the ES
setup and used it for all core pages.  Then, wikimediaflow depended
on that role.

This caused problems with some multi-wiki setups (T161190).

-

Instead, there is now an externalstore module that is not directly
accessible.  wikimediaflow now imports this.

If you are using wikimediaflow, you shouldn't notice any difference.

If you previously used the externalstore role directly (and don't use
wikimediaflow), your core pages will stop working.  You can work around
this by adding:

require ::externalstore

under the "class role" line of the puppet/modules/role/manifests/ of
any role you have enabled.

If you still see the error, do action=purge.

(Or, destroy your VM.)

Bug: T136969
Bug: T161190
Change-Id: Ifaaad90028dcc50c9555c2e8a12140106a186c2f
---
M puppet/hieradata/common.yaml
R puppet/modules/externalstore/manifests/init.pp
R puppet/modules/externalstore/templates/conf.php.erb
M puppet/modules/role/manifests/wikimediaflow.pp
4 files changed, 28 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/86/369586/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 69289d3..cbbe5e4 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -72,6 +72,12 @@
 
 crm::tools::dir: "%{hiera('mwv::services_dir')}/fundraising-tools"
 
+externalstore::grant_db_host: "%{hiera('mysql::grant_host_name')}"
+externalstore::db_host: "%{hiera('mediawiki::multiwiki::db_host')}"
+externalstore::db_user: "%{hiera('mediawiki::multiwiki::db_user')}"
+externalstore::db_pass: "%{hiera('mediawiki::multiwiki::db_pass')}"
+externalstore::db_name: 'external'
+
 hhvm::common_settings:
   date:
 timezone: UTC
@@ -332,12 +338,6 @@
 role::echo::echo_dir: "%{hiera('mediawiki::dir')}/extensions/Echo"
 
 role::elk::vhost_name: "logstash%{hiera('mwv::tld')}"
-
-role::externalstore::grant_db_host: "%{hiera('mysql::grant_host_name')}"
-role::externalstore::db_host: "%{hiera('mediawiki::multiwiki::db_host')}"
-role::externalstore::db_user: "%{hiera('mediawiki::multiwiki::db_user')}"
-role::externalstore::db_pass: "%{hiera('mediawiki::multiwiki::db_pass')}"
-role::externalstore::db_name: 'external'
 
 payments::branch: fundraising/REL1_27
 payments::dir: /vagrant/mediawiki-fr
diff --git a/puppet/modules/role/manifests/externalstore.pp 
b/puppet/modules/externalstore/manifests/init.pp
similarity index 64%
rename from puppet/modules/role/manifests/externalstore.pp
rename to puppet/modules/externalstore/manifests/init.pp
index c37168f..16560ed 100644
--- a/puppet/modules/role/manifests/externalstore.pp
+++ b/puppet/modules/externalstore/manifests/init.pp
@@ -1,11 +1,15 @@
-# == Class: role::externalstore
+# == Class: externalstore
 # ExternalStore is a system that allows MediaWiki (and optionally
 # extensions) to store content in a separate database, rather than
-# the text table
+# the text table.
 #
-# If you disable this role, you will not be able to access content
-# that was saved when it was active.
-class role::externalstore (
+# If you (indirectly, via a role that was using it) disable this
+# module, you will not be able to access content that was saved when
+# it was active.
+#
+# This only defines the separate database; it doesn't use it for
+# anything.  Roles and other modules can import it.
+class externalstore (
 $grant_db_host,
 $db_host,
 $db_name,
@@ -15,7 +19,7 @@
 include ::mediawiki
 
 mysql::db { 'external store db':
-dbname => 'external',
+dbname => $db_name,
 }
 
 mysql::sql { "GRANT ALL PRIVILEGES ON ${db_name}.* TO 
${db_user}@${grant_db_host}":
@@ -30,6 +34,9 @@
 }
 
 mediawiki::settings { 'external store settings':
-values => template('role/externalstore/conf.php.erb'),
+values => template('externalstore/conf.php.erb'),
 }
+
+# External Store defined above, to reference in other modules
+$main_store = "array( 'DB://${db_name}' )"
 }
diff --git a/puppet/modules/role/templates/externalstore/conf.php.erb 
b/puppet/modules/externalstore/templates/conf.php.erb
similarity index 64%
rename from puppet/modules/role/templates/externalstore/conf.php.erb
rename to puppet/modules/externalstore/templates/conf.php.erb
index 7fa8a2c..7a730f6 100644
--- a/puppet/modules/role/templates/externalstore/conf.php.erb
+++ b/puppet/modules/externalstore/templates/conf.php.erb
@@ -1,3 +1,8 @@
+// This is good enough for Flow, but causes
+// issues with cross-wiki scenarios like
+// T161190.  So it shouldn't be used for
+// core pages (wgDefaultExternalStore) until
+// that's 

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Add earlier hook to avoid JS redirect

[MarkAHershberger (Code Review)]

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

Change subject: Add earlier hook to avoid JS redirect
..

Add earlier hook to avoid JS redirect

Note that we have to pass in $title by ref because we will replace the object.

Change-Id: I3eff5988c95738ef6de5fd8404ad3becba09b0c8
---
M PluggableAuthHooks.php
1 file changed, 42 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth 
refs/changes/85/369585/1

diff --git a/PluggableAuthHooks.php b/PluggableAuthHooks.php
index a82d024..724faec 100644
--- a/PluggableAuthHooks.php
+++ b/PluggableAuthHooks.php
@@ -176,4 +176,46 @@
unset( $personal_urls['logout'] );
}
}
+
+   /**
+* Implements PersonalUrls hook.
+* See https://www.mediawiki.org/wiki/Manual:Hooks/BeforeInitialize
+* Redirects ASAP to login
+* @param Title &$title being used for request
+* @param Article $article associated Article
+* @param OutputPage $out object
+* @param User $user current user
+* @param WebRequest $request why we're here
+* @param MediaWiki $mw object
+*
+* Note that $title has to be passed by ref so we can replace it.
+*/
+   public static function doBeforeInitialize(
+   Title &$title, Article $article, OutputPage $out, User $user,
+   WebRequest $request, MediaWiki $mw
+   ) {
+   if ( !$GLOBALS['wgPluggableAuth_EnableAutoLogin'] ) {
+   return;
+   }
+   if ( !$out->getUser()->isAnon() ) {
+   return;
+   }
+   if ( !User::isEveryoneAllowed( 'read' ) && $title->userCan( 
'read' ) ) {
+   return;
+   }
+   $loginSpecialPages = 
ExtensionRegistry::getInstance()->getAttribute(
+   'PluggableAuthLoginSpecialPages' );
+   foreach ( $loginSpecialPages as $page ) {
+   if ( $title->isSpecial( $page ) ) {
+   return;
+   }
+   }
+
+   $oldTitle = $title;
+   $title = Title::newFromText( "UserLogin", NS_SPECIAL );
+   $out->redirect( $title->getFullURL( [
+   'returnto' => $oldTitle,
+   'returntoquery' => $request->getRawQueryString()
+   ] ) );
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eff5988c95738ef6de5fd8404ad3becba09b0c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

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

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Conform to coding conventions

[MarkAHershberger (Code Review)]

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

Change subject: Conform to coding conventions
..

Conform to coding conventions

* Address CodeSniffer issues.
* Add .dir-locals.el for emacs users.
* Introduce personal pref for long lines in argument lists
* Hooks don't need to return true any more.  Doing so makes
  CodeSniffer go bonkers w/o a comment.
* When passing in objects pass by ref isn't needed.

Change-Id: Iad94d077418078bb9d714606ff328b338a30b5cf
---
A .dir-locals.el
M PluggableAuthHooks.php
2 files changed, 125 insertions(+), 36 deletions(-)


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

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 000..2280495
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,88 @@
+((nil . ((mode . flycheck)
+(mode . company)
+(mode . edep)
+(mode . subword)
+(tab-width . 4)
+(c-basic-offset . 4)
+(indent-tabs-mode . t)
+(eval . (progn (when (fboundp 'delete-trailing-whitespace)
+ (delete-trailing-whitespace))
+ (tabify (point-min) 
(point-max
+(c-hanging-braces-alist
+ (defun-open after)
+ (block-open after)
+ (defun-close))
+(c-offsets-alist . (
+(access-label . -)
+(annotation-top-cont . 
0)
+(annotation-var-cont . 
+)
+(arglist-close . 
php-lineup-arglist-close)
+(arglist-cont-nonempty 
first
+   
php-lineup-cascaded-calls
+   
c-lineup-arglist)
+(arglist-intro . 
php-lineup-arglist-intro)
+(block-close . 0)
+(block-open . 0)
+(brace-entry-open . 0)
+(brace-list-close . 0)
+(brace-list-entry . 0)
+(brace-list-intro . +)
+(brace-list-open . 0)
+(c . 
c-lineup-C-comments)
+(case-label . 0)
+(catch-clause . 0)
+(class-close . 0)
+(comment-intro . 0)
+(composition-close . 0)
+(composition-open . 0)
+(cpp-define-intro 
c-lineup-cpp-define +)
+(cpp-macro . [0])
+(cpp-macro-cont . +)
+(defun-block-intro . +)
+(defun-close . 0)
+(defun-open . 0)
+(do-while-closure . 0)
+(else-clause . 0)
+(extern-lang-close . 0)
+(extern-lang-open . 0)
+(friend . 0)
+(func-decl-cont . +)
+(inclass . +)
+(incomposition . +)
+(inexpr-class . +)
+(inexpr-statement . +)
+(inextern-lang . +)
+(inher-cont . 
c-lineup-multi-inher)
+(inher-intro . +)
+  

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add 'enhanced' view (Group by pages)

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Add 'enhanced' view (Group by pages)
..


RCFilters: Add 'enhanced' view (Group by pages)

Bug: T168513
Change-Id: If099f8809342f68662f91824a2b023bf90833760
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
A 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesLimitPopupWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitButtonWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
9 files changed, 134 insertions(+), 16 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8c295b2..396569d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1351,6 +1351,8 @@
"recentchanges-submit": "Show",
"rcfilters-legend-heading": "List of abbreviations:",
"rcfilters-other-review-tools": "Other review tools:",
+   "rcfilters-group-results-by-page": "Group results by page",
+   "rcfilters-grouping-title": "Grouping",
"rcfilters-activefilters": "Active filters",
"rcfilters-advancedfilters": "Advanced filters",
"rcfilters-limit-title": "Changes to show",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 89f6f41..ba0a8da 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1541,6 +1541,8 @@
"recentchanges-submit": "Label for submit button in 
[[Special:RecentChanges]]\n{{Identical|Show}}",
"rcfilters-legend-heading": "Used as a heading for legend box on 
[[Special:RecentChanges]] and [[Special:Watchlist]] when RCFilters are 
enabled.",
"rcfilters-other-review-tools": "Used as a heading for the community 
collection of other links on [[Special:RecentChanges]] when RCFilters are 
enabled.",
+   "rcfilters-group-results-by-page": "A label for the checkbox describing 
whether the results in [[Special:RecentChanges]] are grouped by page when 
RCFilters are enabled.",
+   "rcfilters-grouping-title": "Title for the section showing display 
options for grouping results in [[Special:RecentChanges]] when RCFilters are 
enabled.",
"rcfilters-activefilters": "Title for the filters selection showing the 
active filters.",
"rcfilters-advancedfilters": "Title for the buttons allowing the user 
to switch to the various advanced filters views.",
"rcfilters-limit-title": "Title for the options to change the number of 
results shown.",
diff --git a/resources/Resources.php b/resources/Resources.php
index 82f285e..deeb73f 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1815,6 +1815,7 @@

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ValuePickerWidget.less',
+   
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesLimitPopupWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.DatePopupWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less',

'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less',
@@ -1835,6 +1836,8 @@
'messages' => [
'rcfilters-activefilters',
'rcfilters-advancedfilters',
+   'rcfilters-group-results-by-page',
+   'rcfilters-grouping-title',
'rcfilters-limit-title',
'rcfilters-limit-shownum',
'rcfilters-days-title',
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 5cca5d8..e7871b2 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -142,7 +142,7 @@
// Store the default parameter state
// For this group type, parameter values are 
direct
// We need to convert from a boolean to a 
string ('1' and '0')
-   model.defaultParams[ filter.name ] = String( 
Number( !!filter.default ) );
+  

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[REL1_29]: Fix incorrect find/replace for getUser causing fatal

[jenkins-bot (Code Review)]

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

Change subject: Fix incorrect find/replace for getUser causing fatal
..


Fix incorrect find/replace for getUser causing fatal

Follows-up 9f477ae5a81592bed1f548cef1525a1c0b992e1b

Bug: T164096
Change-Id: I7546a5f7227fb0a2535388f745cb3059a04060d8
(cherry picked from commit aa44500d8661e837d83b216bb19d26f9eaad7e10)
---
M business/RevisionReviewForm.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/business/RevisionReviewForm.php b/business/RevisionReviewForm.php
index 84aab90..39655fa 100644
--- a/business/RevisionReviewForm.php
+++ b/business/RevisionReviewForm.php
@@ -384,7 +384,7 @@
&& $newRev->getUser( Revision::RAW ) )
{
if ( $newRev->getUser( Revision::RAW ) != 
$this->user->getId() ) { // no self-reverts
-   FRUserCounters::incCount( getUser( 
Revision::RAW ), 'revertedEdits' );
+   FRUserCounters::incCount( 
$newRev->getUser( Revision::RAW ), 'revertedEdits' );
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7546a5f7227fb0a2535388f745cb3059a04060d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Normalize arbitrary values before adding them

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Normalize arbitrary values before adding them
..


RCFilters: Normalize arbitrary values before adding them

Bug: T172026
Change-Id: Iba0e20b6d4266e22b3e894742dd182291f741eb1
---
M includes/specials/SpecialRecentchanges.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
4 files changed, 94 insertions(+), 14 deletions(-)

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



diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index 157c3ed..46f7927 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -193,6 +193,14 @@
'wgRCFiltersChangeTags',
$this->buildChangeTagList()
);
+   $out->addJsConfigVars(
+   'StructuredChangeFiltersDisplayConfig',
+   [
+   'maxLimit' => 
(int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
+   'arrayLimit' => 
$this->getConfig()->get( 'RCLinkLimits' ),
+   'arrayDays' => $this->getConfig()->get( 
'RCLinkDays' ),
+   ]
+   );
}
}
 
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
index 5cca5d8..536680e 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
@@ -17,6 +17,9 @@
 * @cfg {boolean} [hidden] This group is hidden from the regular menu 
views
 * @cfg {boolean} [allowArbitrary] Allows for an arbitrary value to be 
added to the
 *  group from the URL, even if it wasn't initially set up.
+* @cfg {number} [range] An object defining minimum and maximum values 
for numeric
+*  groups. { min: x, max: y }
+* @cfg {number} [minValue] Minimum value for numeric groups
 * @cfg {string} [separator='|'] Value separator for 'string_options' 
groups
 * @cfg {boolean} [active] Group is active
 * @cfg {boolean} [fullCoverage] This filters in this group 
collectively cover all results
@@ -44,6 +47,7 @@
this.title = config.title || name;
this.hidden = !!config.hidden;
this.allowArbitrary = !!config.allowArbitrary;
+   this.numericRange = config.range;
this.separator = config.separator || '|';
this.labelPrefixKey = config.labelPrefixKey;
 
@@ -289,6 +293,26 @@
};
 
/**
+* Get group maximum value for numeric groups
+*
+* @return {number|null} Group max value
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.getMaxValue = function () {
+   return this.numericRange && this.numericRange.max !== undefined 
?
+   this.numericRange.max : null;
+   };
+
+   /**
+* Get group minimum value for numeric groups
+*
+* @return {number|null} Group max value
+*/
+   mw.rcfilters.dm.FilterGroup.prototype.getMinValue = function () {
+   return this.numericRange && this.numericRange.min !== undefined 
?
+   this.numericRange.min : null;
+   };
+
+   /**
 * Get group name
 *
 * @return {string} Group name
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index fbd44fd..79b3d6f 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -33,6 +33,7 @@
 */
mw.rcfilters.Controller.prototype.initialize = function ( 
filterStructure, namespaceStructure, tagList ) {
var parsedSavedQueries, limitDefault,
+   displayConfig = mw.config.get( 
'StructuredChangeFiltersDisplayConfig' ),
controller = this,
views = {},
items = [],
@@ -103,6 +104,10 @@
hidden: true,
allowArbitrary: true,
validate: $.isNumeric,
+   range: {
+   min: 1,
+

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[REL1_29]: Fix incorrect find/replace for getUser causing fatal

[Reedy (Code Review)]

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

Change subject: Fix incorrect find/replace for getUser causing fatal
..

Fix incorrect find/replace for getUser causing fatal

Follows-up 9f477ae5a81592bed1f548cef1525a1c0b992e1b

Bug: T164096
Change-Id: I7546a5f7227fb0a2535388f745cb3059a04060d8
(cherry picked from commit aa44500d8661e837d83b216bb19d26f9eaad7e10)
---
M business/RevisionReviewForm.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/business/RevisionReviewForm.php b/business/RevisionReviewForm.php
index 84aab90..39655fa 100644
--- a/business/RevisionReviewForm.php
+++ b/business/RevisionReviewForm.php
@@ -384,7 +384,7 @@
&& $newRev->getUser( Revision::RAW ) )
{
if ( $newRev->getUser( Revision::RAW ) != 
$this->user->getId() ) { // no self-reverts
-   FRUserCounters::incCount( getUser( 
Revision::RAW ), 'revertedEdits' );
+   FRUserCounters::incCount( 
$newRev->getUser( Revision::RAW ), 'revertedEdits' );
}
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7546a5f7227fb0a2535388f745cb3059a04060d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: REL1_29
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Add print logo

[jenkins-bot (Code Review)]

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

Change subject: Add print logo
..


Add print logo

Logo cannot be displayed as a background image because it won't be
visible in print unless the user prints backgrounds too.

A sample configuration looks like this:

$wgVectorPrintLogo = [
'url' => 
'https://en.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg',
'width' => 174,
'height' => 27
];

The solution presented in the patch has a downside of not being able
to scale images down if their dimensions are bigger than the
dimensions specified in the config variable. For example, if we want
to go with an SVG image, then IE8 won't be able to render it.
Alternatively, if we want to go with a PNG image, its dimensions need
to match the exact dimensoins in the config variable, otherwise the
image will show up larger or smaller depending on its dimensions.

A more complicated approach of scaling images using `transform: scale`
hasn't been used because we wanted to keep the configuration simple
while supporting the majority of our users. With the current change,
we can reuse the existing configuration options from Minerva, for
exmaple. It would look something like this:

$wgVectorPrintLogo = [
'url' => $wgMFCustomLogos['copyright'],
'width' => $wgMFCustomLogos['copyright-width'],
'height' => $wgMFCustomLogos['copyright-height']
];

Bug: T169826
Change-Id: If8f9f8d95fd3c955ece37d6c8ab6995596189667
---
A README.md
A ResourceLoaderLessModule.php
M print.less
M skin.json
4 files changed, 102 insertions(+), 2 deletions(-)

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



diff --git a/README.md b/README.md
new file mode 100644
index 000..4b3f40b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+Vector Skin
+
+
+Configuration options
+-
+
+### $wgVectorPrintLogo
+
+Logo used in print styles. Keys are `url`, `width`, and `height` (in
+pixels). Note that this solution only works correctly if the image
+pointed to by `url` is an SVG that does not specify width and height
+attributes, or its width and height match the corresponding variables
+below. Alternatively, a PNG or other type of image can be used, but
+its dimensions also need to match the corresponding variable below.
+That in turn may result in blurry images, though.
+
+Example configuration:
+
+   $wgVectorPrintLogo = [
+   'url' => 
'https://en.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg',
+   'width' => 174,
+   'height' => 27
+   ];
+
+* Type: `Array`
+* Default: `false`
diff --git a/ResourceLoaderLessModule.php b/ResourceLoaderLessModule.php
new file mode 100644
index 000..ca980fd
--- /dev/null
+++ b/ResourceLoaderLessModule.php
@@ -0,0 +1,55 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace Vector;
+
+use ConfigFactory;
+use CSSMin;
+use MediaWiki\MediaWikiServices;
+use ResourceLoaderContext;
+use ResourceLoaderFileModule;
+
+/**
+ * ResourceLoader module for print styles.
+ */
+class ResourceLoaderLessModule extends ResourceLoaderFileModule {
+   /**
+* Get language-specific LESS variables for this module.
+*
+* @param ResourceLoaderContext $context
+* @return array
+*/
+   protected function getLessVars( ResourceLoaderContext $context ) {
+   $lessVars = parent::getLessVars( $context );
+   $config = 
MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'vector' );
+   $printLogo = $config->get( 'VectorPrintLogo' );
+   if ( $printLogo ) {
+   $lessVars[ 'printLogo' ] = true;
+   $lessVars[ 'printLogoUrl' ] = CSSMin::buildUrlValue( 
$printLogo['url'] );
+   $lessVars[ 'printLogoWidth' ] = intval( 
$printLogo['width'] );
+   $lessVars[ 'printLogoHeight' ] = intval( 
$printLogo['height'] );
+   } else {
+   $lessVars[ 'printLogo' ] = false;
+   }
+   return $lessVars;
+   }
+}
diff --git a/print.less b/print.less
index 1587085..8c230f2 100644
--- a/print.less
+++ b/print.less
@@ -39,6 +39,22 @@
line-height: 28pt;
margin-bottom: 20px;
padding-bottom: 5px;
+
+   // We could also use a CSS background to display the 
logo.
+   // The problem is that the logo won't be printed unless 
the user prints the background too.
+   // Note. This specification does not fully define the 
interaction of :before and :after with
+   // replaced elements (such as IMG in HTML). This will 
be defined in more detail in a future
+ 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename the "live preview" preference to be clearer what it p...

[Jforrester (Code Review)]

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

Change subject: Rename the "live preview" preference to be clearer what it 
provides
..

Rename the "live preview" preference to be clearer what it provides

Bug: T171176
Change-Id: I2a9f94fa36245593163197707ae13bcb86aa62b8
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/369582/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 039d617..68f4468 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -30,7 +30,7 @@
"tog-shownumberswatching": "Show the number of watching users",
"tog-oldsig": "Your existing signature:",
"tog-fancysig": "Treat signature as wikitext (without an automatic 
link)",
-   "tog-uselivepreview": "Use live preview",
+   "tog-uselivepreview": "Show previews without reloading the page",
"tog-forceeditsummary": "Prompt me when entering a blank edit summary",
"tog-watchlisthideown": "Hide my edits from the watchlist",
"tog-watchlisthidebots": "Hide bot edits from the watchlist",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add 'advanced filters' label to the view selection

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Add 'advanced filters' label to the view selection
..


RCFilters: Add 'advanced filters' label to the view selection

Bug: T171894
Change-Id: I595d7d4a66eaedb76c9a4e4690be4ec4ef696a2d
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
5 files changed, 13 insertions(+), 0 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index d9bbf9a..039d617 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1451,6 +1451,7 @@
"rcfilters-tag-prefix-tags": "#$1",
"rcfilters-exclude-button-off": "Exclude selected",
"rcfilters-exclude-button-on": "Excluding selected",
+   "rcfilters-view-advanced-filters-label": "Advanced filters",
"rcfilters-view-tags": "Tagged edits",
"rcfilters-view-namespaces-tooltip": "Filter results by namespace",
"rcfilters-view-tags-tooltip": "Filter results using edit tags",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 89f6f41..6afc626 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1641,6 +1641,7 @@
"rcfilters-tag-prefix-tags": "Prefix for the edit tags in 
[[Special:RecentChanges]]. Edit tags use a hash (#) as prefix. Please keep this 
format.\n\nParameters:\n* $1 - Tag display name.",
"rcfilters-exclude-button-off": "Title for the button that excludes 
selected namespaces, when it is not yet active.",
"rcfilters-exclude-button-on": "Title for the button that excludes 
selected namespaces, when it is not yet active.",
+   "rcfilters-view-advanced-filters-label": "Label for the view switch 
that changes between advanced filters in [[Special:RecentChanges]]",
"rcfilters-view-tags": "Title for the tags view in 
[[Special:RecentChanges]]\n{{Identical|Tag}}",
"rcfilters-view-namespaces-tooltip": "Tooltip for the button that loads 
the namespace view in [[Special:RecentChanges]]",
"rcfilters-view-tags-tooltip": "Tooltip for the button that loads the 
tags view in [[Special:RecentChanges]]",
diff --git a/resources/Resources.php b/resources/Resources.php
index 82f285e..5c29e83 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1878,6 +1878,7 @@
'rcfilters-tag-prefix-tags',
'rcfilters-exclude-button-off',
'rcfilters-exclude-button-on',
+   'rcfilters-view-advanced-filters-label',
'rcfilters-view-tags',
'rcfilters-view-namespaces-tooltip',
'rcfilters-view-tags-tooltip',
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index a5cf744..076636c 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -70,6 +70,9 @@
margin-left: 0;
}
 
+   
.oo-ui-labelElement.oo-ui-optionWidget.oo-ui-buttonElement:first-child {
+   margin-left: 0;
+   }
}
}
}
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 934c7c4..08beacd 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -141,6 +141,13 @@
items: [
new OO.ui.ButtonOptionWidget( {
framed: false,
+   data: '',
+   disabled: true,
+   classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget-label' ],
+   label: mw.msg( 
'rcfilters-view-advanced-filters-label' )
+   } ),
+   new OO.ui.ButtonOptionWidget( {
+   framed: false,
data: 'namespaces',

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: MT: Sanitize HTML output from machine translation services

[jenkins-bot (Code Review)]

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

Change subject: MT: Sanitize HTML output from machine translation services
..


MT: Sanitize HTML output from machine translation services

Uses DOMPurify.

DOMPurify need a DOM implementation. jsdom is used and defined as
dependency.

Some MT tests updated since attribute orders changed in sanitized
output.

Bug: T169295
Change-Id: I25c533e1ad7fe1b70937edf0fdbcae4b03b570fa
---
M lib/mt/MTClient.js
M package.json
M test/mt/Apertium.test.js
3 files changed, 29 insertions(+), 4 deletions(-)

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



diff --git a/lib/mt/MTClient.js b/lib/mt/MTClient.js
index 7afa926..3918f37 100644
--- a/lib/mt/MTClient.js
+++ b/lib/mt/MTClient.js
@@ -2,7 +2,9 @@
 
 var LinearDoc = require( __dirname + '/../lineardoc' ),
BBPromise = require( 'bluebird' ),
-   SubSequenceMatcher = require( 
'./annotationmapper/SubsequenceMatcher.js' );
+   SubSequenceMatcher = require( 
'./annotationmapper/SubsequenceMatcher.js' ),
+   createDOMPurify = require( 'dompurify' ),
+   jsdom = require( 'jsdom' );
 
 /**
  * MTClient - Generic machine translation client.
@@ -85,7 +87,28 @@
 
return BBPromise.all( chain ).then( function ( results ) {
targetDoc.items = results;
-   return targetDoc.getHtml();
+   // Return sanitized HTML output
+   return self.sanitize( targetDoc.getHtml() );
+   } );
+};
+
+/**
+ * Sanitize given HTML using DOMPurify
+ * @param {string} html Dirty HTML
+ * @return {string} sanitized HTML output
+ */
+MTClient.prototype.sanitize = function ( html ) {
+   if ( !this.DOMPurify ) {
+   // Lazy initialize DOMPurify
+   this.DOMPurify = createDOMPurify( ( new jsdom.JSDOM( '' ) 
).window );
+   }
+
+   if ( !this.DOMPurify.isSupported ) {
+   throw new Error( 'DOMPurify not suppported in the DOM 
environment provided by JSDOM' );
+   }
+
+   return this.DOMPurify.sanitize( html, {
+   ADD_URI_SAFE_ATTR: [ 'rel' ] // Without this rel="mw:WikiLink" 
attributes will be removed.
} );
 };
 
diff --git a/package.json b/package.json
index deb7a8f..3710b9d 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,9 @@
 "preq": "^0.5.2",
 "service-runner": "^2.2.5",
 "swagger-router": "^0.4.6",
-"swagger-ui": "git+https://github.com/wikimedia/swagger-ui#master;
+"swagger-ui": "git+https://github.com/wikimedia/swagger-ui#master;,
+"dompurify": "^0.9.0",
+"jsdom": "^10.1.0"
   },
   "devDependencies": {
 "async": "^1.4.2",
diff --git a/test/mt/Apertium.test.js b/test/mt/Apertium.test.js
index 4989651..34aecf3 100644
--- a/test/mt/Apertium.test.js
+++ b/test/mt/Apertium.test.js
@@ -84,7 +84,7 @@
{
title: 'Find longest match among multiple matches',
source: 'The 
New York Times, which has an executive editor over the news pages 
and an editorial page editor over opinion pages.',
-   target: 'The 
New York Times, el cual tiene un editor ejecutivo sobre las páginas 
noticiosas y un editor de página del editorial encima páginas de 
opinión.',
+   target: 'The New York 
Times, el cual tiene un editor ejecutivo sobre las páginas 
noticiosas y un editor de página del editorial encima páginas de 
opinión.',
textTranslations: {
'The New York Times, which has an executive editor over 
the news pages and an editorial page editor over opinion pages.': 'The New York 
Times, el cual tiene un editor ejecutivo sobre las páginas noticiosas y un 
editor de página del editorial encima páginas de opinión.',
'The New York Times': 'The New York Times',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25c533e1ad7fe1b70937edf0fdbcae4b03b570fa
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't reload results for redundant requests

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Don't reload results for redundant requests
..


RCFilters: Don't reload results for redundant requests

Ignore reloading if the requests are:
- Change of inverted namespaces if there are no namespace items
  selected.
- Reloading of new saved query if that same query is already loaded

Bug: T172138
Change-Id: Id43bef8a08aab3412a6c5cb538d048935a178114
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 22 insertions(+), 3 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 9d2c331..fbd44fd 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -399,7 +399,17 @@
 */
mw.rcfilters.Controller.prototype.toggleInvertedNamespaces = function 
() {
this.filtersModel.toggleInvertedNamespaces();
-   this.updateChangesList();
+
+   if (
+   this.filtersModel.getFiltersByView( 'namespaces' )
+   .filter( function ( filterItem ) {
+   return filterItem.isSelected();
+   } )
+   .length
+   ) {
+   // Only re-fetch results if there are namespace items 
that are actually selected
+   this.updateChangesList();
+   }
};
 
/**
@@ -601,9 +611,18 @@
 */
mw.rcfilters.Controller.prototype.applySavedQuery = function ( queryID 
) {
var data, highlights,
-   queryItem = this.savedQueriesModel.getItemByID( queryID 
);
+   queryItem = this.savedQueriesModel.getItemByID( queryID 
),
+   currentMatchingQuery = 
this.findQueryMatchingCurrentState();
 
-   if ( queryItem ) {
+   if (
+   queryItem &&
+   (
+   // If there's already a query, don't reload it
+   // if it's the same as the one that already 
exists
+   !currentMatchingQuery ||
+   currentMatchingQuery.getID() !== 
queryItem.getID()
+   )
+   ) {
data = queryItem.getData();
highlights = data.highlights;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id43bef8a08aab3412a6c5cb538d048935a178114
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Scroll widget to top when switching view

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Scroll widget to top when switching view
..


RCFilters: Scroll widget to top when switching view

Bug: T170651
Change-Id: I19865b0af73e88c2893ba688476aa505d7730947
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 934c7c4..530429e 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -29,6 +29,7 @@
this.queriesModel = savedQueriesModel;
this.$overlay = config.$overlay || this.$element;
this.matchingQuery = null;
+   this.currentView = this.model.getCurrentView();
 
// Parent
mw.rcfilters.ui.FilterTagMultiselectWidget.parent.call( this, 
$.extend( true, {
@@ -360,6 +361,11 @@
 
// Update input
this.input.setValue( inputValue );
+
+   if ( this.currentView !== view ) {
+   this.scrollToTop( this.$element );
+   this.currentView = view;
+   }
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19865b0af73e88c2893ba688476aa505d7730947
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: TTO 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Trim results to allow searching for spaces after ...

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Trim results to allow searching for spaces after 
trigger
..


RCFilters: Trim results to allow searching for spaces after trigger

Recognize a search string even if there are spaces after the trigger,
for example, '#   sometag' as 'sometag' in the 'tags' view.

Bug: T168225
Change-Id: Ic31b73396d9afe8cd62398b4cf5116f8aee25e67
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
1 file changed, 3 insertions(+), 0 deletions(-)

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



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 a6a22ef..52c5bb0 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -848,6 +848,9 @@
if ( view !== 'default' ) {
query = query.substr( 1 );
}
+   // Trim again to also intercept cases where the spaces were 
after the trigger
+   // eg: '#   str'
+   query = query.trim();
 
// Check if the search if actually empty; this can be a problem 
when
// we use prefixes to denote different views

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic31b73396d9afe8cd62398b4cf5116f8aee25e67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Add {{GENDER:}} for flow-dialog-cancelconfirm-{title, message}

[Catrope (Code Review)]

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

Change subject: Add {{GENDER:}} for flow-dialog-cancelconfirm-{title,message}
..

Add {{GENDER:}} for flow-dialog-cancelconfirm-{title,message}

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


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

diff --git a/i18n/en.json b/i18n/en.json
index 89730fc..7f7c562 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -554,8 +554,8 @@
"flow-notification-enabled-on-talkpage-email-batch-body": "Flow, the 
new wiki discussion system, has been enabled on {{GENDER:$1|your}} user talk 
page on {{SITENAME}}. You can get more information, provide feedback or disable 
the new system any time from the Beta features section in {{GENDER:$1|your}} 
preferences.",
"flow-beta-feature-add-archive-template-edit-summary": "Adding archive 
template",
"flow-beta-feature-remove-archive-template-edit-summary": "Removing 
archive template",
-   "flow-dialog-cancelconfirm-title": "Are you sure?",
-   "flow-dialog-cancelconfirm-message": "Are you sure you want to cancel 
without saving first?",
+   "flow-dialog-cancelconfirm-title": "Are {{GENDER:|you}} sure?",
+   "flow-dialog-cancelconfirm-message": "Are {{GENDER:|you}} sure you want 
to cancel without saving first?",
"flow-dialog-cancelconfirm-keep": "Continue editing",
"flow-dialog-cancelconfirm-discard": "Discard changes",
"flow-optin-archive-wikitext": "Move wikitext page to make room for a 
discussion board.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f3c35ec0a000767ed85536ff345ea4253527242
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: share some mobile-sections tests

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: share some mobile-sections tests
..


Hygiene: share some mobile-sections tests

DRY

Change-Id: Ia64f53fb2322f73be636174d23bc18aadb608edd
---
M test/features/mobile-sections/pagecontent-v2.js
M test/features/mobile-sections/pagecontent.js
A test/features/mobile-sections/shared.js
3 files changed, 108 insertions(+), 196 deletions(-)

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



diff --git a/test/features/mobile-sections/pagecontent-v2.js 
b/test/features/mobile-sections/pagecontent-v2.js
index a445d35..8d6e480 100644
--- a/test/features/mobile-sections/pagecontent-v2.js
+++ b/test/features/mobile-sections/pagecontent-v2.js
@@ -1,9 +1,9 @@
 'use strict';
 
 const assert = require('../../utils/assert.js');
-const headers = require('../../utils/headers.js');
-const preq   = require('preq');
+const preq = require('preq');
 const server = require('../../utils/server.js');
+const shared = require('./shared.js');
 
 describe('mobile-sections-v2', function() {
 
@@ -15,102 +15,7 @@
 return `${server.config.uri}${domain}/v1/page/formatted/${title}`;
 };
 
-it('should respond to GET request with expected headers, incl. CORS and 
CSP headers', () => {
-const uri = localUri('Foobar');
-return headers.checkHeaders(uri);
-});
-
-it('Supports revision number in request URL', () => {
-const title = '%2Fr%2FThe_Donald';
-const rev = 764101607;
-const uri = localUri(`${title}/${rev}`);
-return preq.get({ uri })
-.then((res) => {
-assert.equal(res.body.lead.revision, rev,
-'the requested revision should be returned');
-});
-});
-
-it('Supports revision number and tid string in request URL', () => {
-const title = '%2Fr%2FThe_Donald';
-const rev = 764101607;
-const tid = 'b24de3d0-ecde-11e6-a863-ed5fc1010eed';
-const uri = localUri(`${title}/${rev}/${tid}`);
-return preq.get({ uri })
-.then((res) => {
-assert.equal(res.body.lead.revision, rev,
-'We return the page with requested revision and tid');
-});
-});
-
-it('Mixmatch valid title and valid revision id gives 404', () => {
-const title = '%2Fr%2FThe_Donald';
-const rev = 752758357; // belongs to Roald Dahl
-const uri = localUri(`${title}/${rev}`);
-return preq.get({ uri })
-.catch((res) => {
-assert.equal(res.status, 404);
-});
-});
-
-it('Bad revision id gives bad request', () => {
-const title = '%2Fr%2FThe_Donald'; // belongs to Roald Dahl
-const rev = 'Reddit';
-const uri = localUri(`${title}/${rev}`);
-return preq.get({ uri })
-.catch((res) => {
-assert.equal(res.status, 400, 'Should be integer');
-});
-});
-
-it('Check content of fixed revision', () => {
-const title = 'Leonard_Cohen';
-const rev = 747517267; // revision before his death.
-const uri = localUri(`${title}/${rev}`);
-return preq.get({ uri })
-.then((res) => {
-let hasDeathSection = false;
-res.body.remaining.sections.forEach((section) => {
-if (section.line === 'Death') {
-hasDeathSection = true;
-}
-});
-assert.ok(!hasDeathSection,
-'Leonard Cohen did not use to be dead. RIP dear man...');
-});
-});
-
-it('Check content of fresh revision', () => {
-const title = 'Leonard_Cohen';
-const uri = localUri(title);
-return preq.get({ uri })
-.then((res) => {
-let hasDeathSection = false;
-res.body.remaining.sections.forEach((section) => {
-if (section.line === 'Death') {
-hasDeathSection = true;
-}
-});
-assert.ok(hasDeathSection,
-'... but he is now which makes me sad.');
-});
-});
-
-it('Missing title should respond with 404', () => {
-const uri = localUri('weoiuyrxcmxn', 'test.wikipedia.org');
-return preq.get({ uri })
-.then(() => {
-assert.fail("expected an exception to be thrown");
-}).catch((res) => {
-// Most checks are commented out here because the error messages 
are inconsistent.
-
-// const body = res.body;
-assert.deepEqual(res.status, 404);
-// assert.deepEqual(body.type, 'missingtitle');
-// assert.deepEqual(body.title, 'Not found.');
-// assert.deepEqual(body.detail, 'Page or revision not found.');
-});
-});
+

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: refactor mobile-sections tests

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: refactor mobile-sections tests
..


Hygiene: refactor mobile-sections tests

so most of the test cases can be shared later.
Moved unrelated tests (for formatted-lead and reference endpoints) to
different files.
Take advantage of localUri function to build URIs for testing.

Change-Id: If9fc0665778fa82e0f57df77a5175a1a2f468082
---
A test/features/mobile-sections-lead/pagecontent-v2.js
M test/features/mobile-sections/pagecontent-v2.js
M test/features/mobile-sections/pagecontent.js
A test/features/references/pagecontent.js
4 files changed, 291 insertions(+), 176 deletions(-)

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



diff --git a/test/features/mobile-sections-lead/pagecontent-v2.js 
b/test/features/mobile-sections-lead/pagecontent-v2.js
new file mode 100644
index 000..ac4a339
--- /dev/null
+++ b/test/features/mobile-sections-lead/pagecontent-v2.js
@@ -0,0 +1,48 @@
+'use strict';
+
+const preq   = require('preq');
+const assert = require('../../utils/assert.js');
+const headers = require('../../utils/headers.js');
+const server = require('../../utils/server.js');
+
+describe('formatted-lead', function() {
+
+this.timeout(2); // eslint-disable-line no-invalid-this
+
+before(() => { return server.start(); });
+
+const localUri = (title, domain = 'en.wikipedia.org') => {
+return `${server.config.uri}${domain}/v1/page/formatted-lead/${title}`;
+};
+
+it('should respond to GET request with expected headers, incl. CORS and 
CSP headers', () => {
+const uri = localUri('Foobar');
+return headers.checkHeaders(uri);
+});
+
+it('File pages have a file property', () => {
+const title = 
'File:Charlie_and_the_Chocolate_Factory_original_cover.jpg';
+const uri = localUri(title);
+return preq.get({ uri })
+.then((res) => {
+assert.deepEqual(res.status, 200);
+assert.ok(res.body.userinfo === undefined, 'userinfo property 
should be undefined');
+assert.ok(res.body.imageinfo !== undefined, 'imageinfo property 
should defined');
+assert.ok(res.body.imageinfo.thumburl !== undefined,
+'thumbnail url property is defined');
+});
+});
+
+it('User pages have a userinfo property', () => {
+const uri = localUri('User:Jdlrobson');
+return preq.get({ uri })
+.then((res) => {
+assert.deepEqual(res.status, 200);
+assert.ok(res.body.imageinfo === undefined, 'imageinfo property 
should undefined');
+assert.ok(res.body.userinfo !== undefined, 'userinfo property 
should defined');
+assert.ok(res.body.userinfo.registration !== undefined,
+'userinfo property should have date of registration');
+assert.ok(res.body.userinfo.name === 'Jdlrobson', 'userinfo 
property should have name');
+});
+});
+});
diff --git a/test/features/mobile-sections/pagecontent-v2.js 
b/test/features/mobile-sections/pagecontent-v2.js
index e434c13..a445d35 100644
--- a/test/features/mobile-sections/pagecontent-v2.js
+++ b/test/features/mobile-sections/pagecontent-v2.js
@@ -5,41 +5,127 @@
 const preq   = require('preq');
 const server = require('../../utils/server.js');
 
-const enWikiHost = 'en.wikipedia.org/v1';
-
 describe('mobile-sections-v2', function() {
 
 this.timeout(2); // eslint-disable-line no-invalid-this
 
 before(() => { return server.start(); });
 
+const localUri = (title, domain = 'en.wikipedia.org') => {
+return `${server.config.uri}${domain}/v1/page/formatted/${title}`;
+};
+
 it('should respond to GET request with expected headers, incl. CORS and 
CSP headers', () => {
-const uri = `${server.config.uri}${enWikiHost}/page/formatted/Foobar`;
+const uri = localUri('Foobar');
 return headers.checkHeaders(uri);
 });
 
 it('Supports revision number in request URL', () => {
 const title = '%2Fr%2FThe_Donald';
 const rev = 764101607;
-const uri = 
`${server.config.uri}${enWikiHost}/page/formatted/${title}/${rev}`;
+const uri = localUri(`${title}/${rev}`);
 return preq.get({ uri })
-   .then((res) => {
-   assert.equal(res.body.lead.revision, rev,
-   'We return the page with requested revision');
-   });
+.then((res) => {
+assert.equal(res.body.lead.revision, rev,
+'the requested revision should be returned');
+});
 });
 
 it('Supports revision number and tid string in request URL', () => {
 const title = '%2Fr%2FThe_Donald';
 const rev = 764101607;
 const tid = 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: MCS no longer uses mobile view API under the hood

[Jdlrobson (Code Review)]

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

Change subject: MCS no longer uses mobile view API under the hood
..

MCS no longer uses mobile view API under the hood

After this change we will only use it for the mainpage
Yay!

Changes:
* Remove getMobileViewMetadata
* Remove call to getMobileViewMetadata
* Decrease indent - all code stays same

Bug: T103362
Change-Id: Iebf446c29dfe9cb944f0bf8cc335513ded0abc72
---
M lib/mwapi.js
1 file changed, 78 insertions(+), 106 deletions(-)


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

diff --git a/lib/mwapi.js b/lib/mwapi.js
index 400e060..d739e65 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -125,30 +125,6 @@
 };
 
 /**
- * Builds the request to get page metadata from MW API action=mobileview.
- * The plan is to deprecate this method and usage of the mobileview api 
(T103362).
- * Please use getMetaData and queries that do not hit the mobileview api.
- * @param {!Object} app the application object
- * @param {!Object} req the request object
- * @return {!Promise} a promise resolving as an JSON object containing the 
response
- */
-function getMobileViewMetadata(app, req) {
-const props = [];
-
-const query = apiParams({
-action: 'mobileview',
-page: req.params.title,
-prop: props.join('|'),
-thumbwidth: mwapi.LEAD_IMAGE_XL
-});
-return api.mwApiGet(app, req.params.domain, query)
-.then((response) => {
-mwapi.checkForMobileviewInResponse(req.logger, response);
-return response;
-});
-}
-
-/**
  * Given protection status for an article simplify it to allow easy reference
  * @param {!Array} mwApiProtectionObj e.g.
  *  [ { type: 'edit', level: 'autoconfirmed', expiry: 'infinity' }
@@ -180,90 +156,86 @@
 const props = ['coordinates','pageprops', 'pageimages', 'pageterms', 
'revisions',
 'info', 'langlinks'];
 
-return getMobileViewMetadata(app, req)
-  .then((mvResponse) => {
-  const query = apiParams({
-  action: 'query',
-  lllimit: 'max',
-  meta: 'siteinfo',
-  pilicense: 'any',
-  pithumbsize: 320,
-  pageprops: ['wikibase_item',
-  'disambiguation', 'displaytitle', 
'normalizedtitle'].join('|'),
-  wbptterms: 'description',
-  inprop: ['protection'].join('|'),
-  rvprop: ['ids', 'timestamp', 'user', 'contentmodel'].join('|'),
-  titles: req.params.title,
+const query = apiParams({
+action: 'query',
+lllimit: 'max',
+meta: 'siteinfo',
+pilicense: 'any',
+pithumbsize: 320,
+pageprops: ['wikibase_item',
+'disambiguation', 'displaytitle', 'normalizedtitle'].join('|'),
+wbptterms: 'description',
+inprop: ['protection'].join('|'),
+rvprop: ['ids', 'timestamp', 'user', 'contentmodel'].join('|'),
+titles: req.params.title,
+redirects: 1,
+prop: props.join('|')
+});
+
+return api.mwApiGet(app, req.params.domain, query)
+  .then((apiResponse) => {
+  const mv = mvResponse.body.mobileview;
+  const body = apiResponse.body;
+  const page = body.query && body.query.pages
+  && body.query.pages[0];
+  const coords = page && page.coordinates && page.coordinates[0];
+  const revision = page && page.revisions && page.revisions[0];
+  const pageprops = page && page.pageprops;
+  const siteinfo = body.query && body.query.general;
+  let mainpage, geo;
+
+  // Extract coordinates from the API response
+  if (coords) {
+  geo = {
+  latitude: coords.lat,
+  longitude: coords.lon
+  };
+  }
+  const normalized = body.query
+  && body.query.normalized && body.query.normalized[0]
+  && body.query.normalized[0].to;
+  const displayTitle = pageprops && pageprops.displaytitle;
+  const redirect = body.query.redirects && body.query.redirects.to;
+  const title = redirect || page.title;
+  const thumbUrl = page.thumbnail && page.thumbnail.source;
+  const image = page.pageimage ? {
+  file: page.pageimage.replace(/ /g, '_'),
+  urls: {
+  320: thumbUrl,
+  640: thumbUrl.replace('320', '640'),
+  800: thumbUrl.replace('320', '800'),
+  1024: thumbUrl.replace('320', '1024')
+  }
+  } : undefined;
+  const protection = simplifyProtectionObject(page.protection);
+  const modifier = revision.anon !== undefined ? { anon: true } : {};
+  modifier.user = revision.user;
+  // Always set to unknown until support in 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "mw.widgets.visibleByteLimit: Temporarily disable whi...

[jenkins-bot (Code Review)]

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

Change subject: Revert "mw.widgets.visibleByteLimit: Temporarily disable whilst 
OOjs UI label bug is fixed"
..


Revert "mw.widgets.visibleByteLimit: Temporarily disable whilst OOjs UI label 
bug is fixed"

This reverts commit b6f39380938223a25ee280a96c25ce0d05a4c207.

Not to be merged before the new version of OOjs UI.

Bug: T169982
Change-Id: Ia194f5835a5d62ad46b498938a4764f0c0964589
---
M 
resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git 
a/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js
 
b/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js
index 51b9815..5678a80 100644
--- 
a/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js
+++ 
b/resources/src/mediawiki.widgets.visibleByteLimit/mediawiki.widgets.visibleByteLimit.js
@@ -9,15 +9,12 @@
 mediaWiki.widgets.visibleByteLimit = function ( textInputWidget, limit ) {
limit = limit || +textInputWidget.$input.attr( 'maxlength' );
 
-   // Temporarily disabled whilst upstream bug is fixed; T169982
-   /*
function updateCount() {
textInputWidget.setLabel( ( limit - $.byteLength( 
textInputWidget.getValue() ) ).toString() );
}
textInputWidget.on( 'change', updateCount );
// Initialise value
updateCount();
-   */
 
// Actually enforce limit
textInputWidget.$input.byteLimit( limit );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia194f5835a5d62ad46b498938a4764f0c0964589
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: OOjs UI: Bring forward upstream fix for jQuery access key issue

[jenkins-bot (Code Review)]

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

Change subject: OOjs UI: Bring forward upstream fix for jQuery access key issue
..


OOjs UI: Bring forward upstream fix for jQuery access key issue

* a8d27103cc1b7621cedd8065a2a4777e43551fd6
  Follow-up 022f532: don't crash if TitledElement initializes
  before AccessKeyedElement

Bug: T172236
Change-Id: Ib188d2bdb359c7bb2db755240c50943d5d1713d7
---
M resources/lib/oojs-ui/oojs-ui-apex.js
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.js
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.js
7 files changed, 18 insertions(+), 7 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib188d2bdb359c7bb2db755240c50943d5d1713d7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
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/TransparencyReport-private[master]: Fix multiple instance issue

[Siddparmar (Code Review)]

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

Change subject: Fix multiple instance issue
..


Fix multiple instance issue

Change-Id: I92436659cb06fd98fbb8ff0ce1bfa5581bca9d1a
---
M build/data/targeted_takedown.csv
M source/data/targeted_takedown.csv
2 files changed, 14 insertions(+), 14 deletions(-)

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



diff --git a/build/data/targeted_takedown.csv b/build/data/targeted_takedown.csv
index 48be04d..6ea70fe 100644
--- a/build/data/targeted_takedown.csv
+++ b/build/data/targeted_takedown.csv
@@ -46,7 +46,7 @@
 Japanese Wikipedia,ja.wikipedia.org,1,0,juldec14
 Korean Wikinews,ko.wikinews.org,1,0,juldec14
 Slovenian Wikipedia,sl.wikipedia.org,1,0,juldec14
-Multiple,,5,0,juldec14
+Multiple Projects,,5,0,juldec14
 Not a WMF site,,4,0,juldec14
 No Project Named,,8,0,juldec14
 English Wikipedia,en.wikipedia.org,105,0,janjun15
@@ -57,7 +57,7 @@
 Not a WMF site,,10,0,janjun15
 Japanese Wikipedia,jp.wikipedia.org,5,0,janjun15
 Italian Wikipedia,it.wikipedia.org,4,0,janjun15
-Multiple,,4,0,janjun15
+Multiple Projects,,4,0,janjun15
 Russian Wikisource,ru.wikisource.org,4,0,janjun15
 Spanish Wikipedia,es.wikipedia.org,3,0,janjun15
 Czech Wikipedia,cs.wikipedia.org,3,0,janjun15
@@ -83,8 +83,8 @@
 No Project Named,,21,0,juldec15
 German Wikipedia,de.wikipedia.org,16,0,juldec15
 French Wikipedia,fr.wikipedia.org,12,0,juldec15
-Multiple,,9,0,juldec15
-Not a WMF Site,,9,0,juldec15
+Multiple Projects,,9,0,juldec15
+Not a WMF site,,9,0,juldec15
 Korean Wikipedia,ko.wikipedia.org,5,0,juldec15
 Spanish Wikipedia,es.wikipedia.org,4,0,juldec15
 Japanese Wikipedia,ja.wikipedia.org,4,0,juldec15
@@ -110,7 +110,7 @@
 German Wikipedia,de.wikipedia.org,17,0,janjun16
 French Wikipedia,fr.wikipedia.org,16,0,janjun16
 Wikimedia Commons,commons.wikimedia.org,16,0,janjun16
-Not a WMF Site,,15,0,janjun16
+Not a WMF site,,15,0,janjun16
 Spanish Wikipedia,es.wikipedia.org,8,0,janjun16
 Italian Wikipedia,it.wikipedia.org,5,0,janjun16
 Multiple Projects,,5,0,janjun16
@@ -142,7 +142,7 @@
 Wikimedia Commons,commons.wikimedia.org,21,0,juldec16
 German Wikipedia,de.wikipedia.org,17,0,juldec16
 French Wikipedia,fr.wikipedia.org,12,0,juldec16
-Not a WMF Site,,7,0,juldec16
+Not a WMF site,,7,0,juldec16
 Multiple Projects,,6,0,juldec16
 Unknown,,6,0,juldec16
 Italian Wikipedia,it.wikipedia.org,5,0,juldec16
@@ -171,7 +171,7 @@
 German Wikipedia,de.wikipedia.org,20,0,janjun17
 Not a WMF site,,16,0,janjun17
 Russian Wikipedia,ru.wikipedia.org,15,0,janjun17
-Multiple projects,,14,0,janjun17
+Multiple Projects,,14,0,janjun17
 Spanish Wikipedia,es.wikipedia.org,10,0,janjun17
 Portuguese Wikipedia,,6,0,janjun17
 Dutch Wikipedia,pt.wikipedia.org,5,0,janjun17
diff --git a/source/data/targeted_takedown.csv 
b/source/data/targeted_takedown.csv
index 48be04d..6ea70fe 100644
--- a/source/data/targeted_takedown.csv
+++ b/source/data/targeted_takedown.csv
@@ -46,7 +46,7 @@
 Japanese Wikipedia,ja.wikipedia.org,1,0,juldec14
 Korean Wikinews,ko.wikinews.org,1,0,juldec14
 Slovenian Wikipedia,sl.wikipedia.org,1,0,juldec14
-Multiple,,5,0,juldec14
+Multiple Projects,,5,0,juldec14
 Not a WMF site,,4,0,juldec14
 No Project Named,,8,0,juldec14
 English Wikipedia,en.wikipedia.org,105,0,janjun15
@@ -57,7 +57,7 @@
 Not a WMF site,,10,0,janjun15
 Japanese Wikipedia,jp.wikipedia.org,5,0,janjun15
 Italian Wikipedia,it.wikipedia.org,4,0,janjun15
-Multiple,,4,0,janjun15
+Multiple Projects,,4,0,janjun15
 Russian Wikisource,ru.wikisource.org,4,0,janjun15
 Spanish Wikipedia,es.wikipedia.org,3,0,janjun15
 Czech Wikipedia,cs.wikipedia.org,3,0,janjun15
@@ -83,8 +83,8 @@
 No Project Named,,21,0,juldec15
 German Wikipedia,de.wikipedia.org,16,0,juldec15
 French Wikipedia,fr.wikipedia.org,12,0,juldec15
-Multiple,,9,0,juldec15
-Not a WMF Site,,9,0,juldec15
+Multiple Projects,,9,0,juldec15
+Not a WMF site,,9,0,juldec15
 Korean Wikipedia,ko.wikipedia.org,5,0,juldec15
 Spanish Wikipedia,es.wikipedia.org,4,0,juldec15
 Japanese Wikipedia,ja.wikipedia.org,4,0,juldec15
@@ -110,7 +110,7 @@
 German Wikipedia,de.wikipedia.org,17,0,janjun16
 French Wikipedia,fr.wikipedia.org,16,0,janjun16
 Wikimedia Commons,commons.wikimedia.org,16,0,janjun16
-Not a WMF Site,,15,0,janjun16
+Not a WMF site,,15,0,janjun16
 Spanish Wikipedia,es.wikipedia.org,8,0,janjun16
 Italian Wikipedia,it.wikipedia.org,5,0,janjun16
 Multiple Projects,,5,0,janjun16
@@ -142,7 +142,7 @@
 Wikimedia Commons,commons.wikimedia.org,21,0,juldec16
 German Wikipedia,de.wikipedia.org,17,0,juldec16
 French Wikipedia,fr.wikipedia.org,12,0,juldec16
-Not a WMF Site,,7,0,juldec16
+Not a WMF site,,7,0,juldec16
 Multiple Projects,,6,0,juldec16
 Unknown,,6,0,juldec16
 Italian Wikipedia,it.wikipedia.org,5,0,juldec16
@@ -171,7 +171,7 @@
 German Wikipedia,de.wikipedia.org,20,0,janjun17
 Not a WMF site,,16,0,janjun17
 Russian Wikipedia,ru.wikipedia.org,15,0,janjun17
-Multiple 

[MediaWiki-commits] [Gerrit] wikimedia/TransparencyReport-private[master]: Fix multiple instance issue

[Siddparmar (Code Review)]

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

Change subject: Fix multiple instance issue
..

Fix multiple instance issue

Change-Id: I92436659cb06fd98fbb8ff0ce1bfa5581bca9d1a
---
M build/data/targeted_takedown.csv
M source/data/targeted_takedown.csv
2 files changed, 14 insertions(+), 14 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private 
refs/changes/79/369579/1

diff --git a/build/data/targeted_takedown.csv b/build/data/targeted_takedown.csv
index 48be04d..6ea70fe 100644
--- a/build/data/targeted_takedown.csv
+++ b/build/data/targeted_takedown.csv
@@ -46,7 +46,7 @@
 Japanese Wikipedia,ja.wikipedia.org,1,0,juldec14
 Korean Wikinews,ko.wikinews.org,1,0,juldec14
 Slovenian Wikipedia,sl.wikipedia.org,1,0,juldec14
-Multiple,,5,0,juldec14
+Multiple Projects,,5,0,juldec14
 Not a WMF site,,4,0,juldec14
 No Project Named,,8,0,juldec14
 English Wikipedia,en.wikipedia.org,105,0,janjun15
@@ -57,7 +57,7 @@
 Not a WMF site,,10,0,janjun15
 Japanese Wikipedia,jp.wikipedia.org,5,0,janjun15
 Italian Wikipedia,it.wikipedia.org,4,0,janjun15
-Multiple,,4,0,janjun15
+Multiple Projects,,4,0,janjun15
 Russian Wikisource,ru.wikisource.org,4,0,janjun15
 Spanish Wikipedia,es.wikipedia.org,3,0,janjun15
 Czech Wikipedia,cs.wikipedia.org,3,0,janjun15
@@ -83,8 +83,8 @@
 No Project Named,,21,0,juldec15
 German Wikipedia,de.wikipedia.org,16,0,juldec15
 French Wikipedia,fr.wikipedia.org,12,0,juldec15
-Multiple,,9,0,juldec15
-Not a WMF Site,,9,0,juldec15
+Multiple Projects,,9,0,juldec15
+Not a WMF site,,9,0,juldec15
 Korean Wikipedia,ko.wikipedia.org,5,0,juldec15
 Spanish Wikipedia,es.wikipedia.org,4,0,juldec15
 Japanese Wikipedia,ja.wikipedia.org,4,0,juldec15
@@ -110,7 +110,7 @@
 German Wikipedia,de.wikipedia.org,17,0,janjun16
 French Wikipedia,fr.wikipedia.org,16,0,janjun16
 Wikimedia Commons,commons.wikimedia.org,16,0,janjun16
-Not a WMF Site,,15,0,janjun16
+Not a WMF site,,15,0,janjun16
 Spanish Wikipedia,es.wikipedia.org,8,0,janjun16
 Italian Wikipedia,it.wikipedia.org,5,0,janjun16
 Multiple Projects,,5,0,janjun16
@@ -142,7 +142,7 @@
 Wikimedia Commons,commons.wikimedia.org,21,0,juldec16
 German Wikipedia,de.wikipedia.org,17,0,juldec16
 French Wikipedia,fr.wikipedia.org,12,0,juldec16
-Not a WMF Site,,7,0,juldec16
+Not a WMF site,,7,0,juldec16
 Multiple Projects,,6,0,juldec16
 Unknown,,6,0,juldec16
 Italian Wikipedia,it.wikipedia.org,5,0,juldec16
@@ -171,7 +171,7 @@
 German Wikipedia,de.wikipedia.org,20,0,janjun17
 Not a WMF site,,16,0,janjun17
 Russian Wikipedia,ru.wikipedia.org,15,0,janjun17
-Multiple projects,,14,0,janjun17
+Multiple Projects,,14,0,janjun17
 Spanish Wikipedia,es.wikipedia.org,10,0,janjun17
 Portuguese Wikipedia,,6,0,janjun17
 Dutch Wikipedia,pt.wikipedia.org,5,0,janjun17
diff --git a/source/data/targeted_takedown.csv 
b/source/data/targeted_takedown.csv
index 48be04d..6ea70fe 100644
--- a/source/data/targeted_takedown.csv
+++ b/source/data/targeted_takedown.csv
@@ -46,7 +46,7 @@
 Japanese Wikipedia,ja.wikipedia.org,1,0,juldec14
 Korean Wikinews,ko.wikinews.org,1,0,juldec14
 Slovenian Wikipedia,sl.wikipedia.org,1,0,juldec14
-Multiple,,5,0,juldec14
+Multiple Projects,,5,0,juldec14
 Not a WMF site,,4,0,juldec14
 No Project Named,,8,0,juldec14
 English Wikipedia,en.wikipedia.org,105,0,janjun15
@@ -57,7 +57,7 @@
 Not a WMF site,,10,0,janjun15
 Japanese Wikipedia,jp.wikipedia.org,5,0,janjun15
 Italian Wikipedia,it.wikipedia.org,4,0,janjun15
-Multiple,,4,0,janjun15
+Multiple Projects,,4,0,janjun15
 Russian Wikisource,ru.wikisource.org,4,0,janjun15
 Spanish Wikipedia,es.wikipedia.org,3,0,janjun15
 Czech Wikipedia,cs.wikipedia.org,3,0,janjun15
@@ -83,8 +83,8 @@
 No Project Named,,21,0,juldec15
 German Wikipedia,de.wikipedia.org,16,0,juldec15
 French Wikipedia,fr.wikipedia.org,12,0,juldec15
-Multiple,,9,0,juldec15
-Not a WMF Site,,9,0,juldec15
+Multiple Projects,,9,0,juldec15
+Not a WMF site,,9,0,juldec15
 Korean Wikipedia,ko.wikipedia.org,5,0,juldec15
 Spanish Wikipedia,es.wikipedia.org,4,0,juldec15
 Japanese Wikipedia,ja.wikipedia.org,4,0,juldec15
@@ -110,7 +110,7 @@
 German Wikipedia,de.wikipedia.org,17,0,janjun16
 French Wikipedia,fr.wikipedia.org,16,0,janjun16
 Wikimedia Commons,commons.wikimedia.org,16,0,janjun16
-Not a WMF Site,,15,0,janjun16
+Not a WMF site,,15,0,janjun16
 Spanish Wikipedia,es.wikipedia.org,8,0,janjun16
 Italian Wikipedia,it.wikipedia.org,5,0,janjun16
 Multiple Projects,,5,0,janjun16
@@ -142,7 +142,7 @@
 Wikimedia Commons,commons.wikimedia.org,21,0,juldec16
 German Wikipedia,de.wikipedia.org,17,0,juldec16
 French Wikipedia,fr.wikipedia.org,12,0,juldec16
-Not a WMF Site,,7,0,juldec16
+Not a WMF site,,7,0,juldec16
 Multiple Projects,,6,0,juldec16
 Unknown,,6,0,juldec16
 Italian Wikipedia,it.wikipedia.org,5,0,juldec16
@@ -171,7 +171,7 @@
 German Wikipedia,de.wikipedia.org,20,0,janjun17
 Not a WMF site,,16,0,janjun17
 Russian 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: OOjs UI: Bring forward upstream fix for jQuery access key issue

[Jforrester (Code Review)]

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

Change subject: OOjs UI: Bring forward upstream fix for jQuery access key issue
..

OOjs UI: Bring forward upstream fix for jQuery access key issue

Change-Id: Ib188d2bdb359c7bb2db755240c50943d5d1713d7
---
M resources/lib/oojs-ui/oojs-ui-apex.js
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.js
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.js
7 files changed, 18 insertions(+), 7 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib188d2bdb359c7bb2db755240c50943d5d1713d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/mediawiki-config[master]: Make babel use Database and SUL wikis use metawiki

[jenkins-bot (Code Review)]

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

Change subject: Make babel use Database and SUL wikis use metawiki
..


Make babel use Database and SUL wikis use metawiki

Bug: T145366
Change-Id: I92720cfc3883a89348e3d4ed8bc8deb5880a157e
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fc86899..0fcbf52 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2431,6 +2431,12 @@
$wgBabelMainCategory = $wmgBabelMainCategory;
$wgBabelDefaultLevel = $wmgBabelDefaultLevel;
$wgBabelUseUserLanguage = $wmgBabelUseUserLanguage;
+
+   $wgBabelUseDatabase = true;
+   if ( $wmgUseCentralAuth ) {
+   $wgBabelCentralDb = 'metawiki';
+   $wgBabelCentralApi = 'https://meta.wikimedia.org/w/api.php';
+   }
 }
 
 if ( $wmgUseBounceHandler ) {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Add syslog-udp for logstash testing on 11515"

[EBernhardson (Code Review)]

Hello Giuseppe Lavagetto, jenkins-bot, Ayounsi,

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

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

to review the following change.


Change subject: Revert "Add syslog-udp for logstash testing on 11515"
..

Revert "Add syslog-udp for logstash testing on 11515"

Tested, doesn't help. Tracked the problem down to a firewall
not accepting messages from the expected subnets.

This reverts commit ae76d2781f2460b868fc9ba90851a075ed02e6d0.

Change-Id: I6822b0ebd7907123cc74f454b2b158120e40f311
---
M modules/role/manifests/logstash/collector.pp
1 file changed, 0 insertions(+), 14 deletions(-)


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

diff --git a/modules/role/manifests/logstash/collector.pp 
b/modules/role/manifests/logstash/collector.pp
index 93e463a..38d561f 100644
--- a/modules/role/manifests/logstash/collector.pp
+++ b/modules/role/manifests/logstash/collector.pp
@@ -37,23 +37,9 @@
 port => 10514,
 }
 
-# T166126 Testing a different syslog method
-logstash::input::udp { 'syslog-udp':
-port  => 10515,
-type  => 'syslog',
-codec => 'plain',
-}
-
 ferm::service { 'logstash_syslog_udp':
 proto   => 'udp',
 port=> '10514',
-notrack => true,
-srange  => '$DOMAIN_NETWORKS',
-}
-
-ferm::service { 'logstash_syslog_udp-2':
-proto   => 'udp',
-port=> '10515',
 notrack => true,
 srange  => '$DOMAIN_NETWORKS',
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6822b0ebd7907123cc74f454b2b158120e40f311
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: extension.json usage for Scribunto

[jenkins-bot (Code Review)]

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

Change subject: extension.json usage for Scribunto
..


extension.json usage for Scribunto

Bug: T139800
Change-Id: I40040a6d9eb94c074f3299208513edc6d75c74c4
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0e3cfd8..fc86899 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2859,7 +2859,7 @@
 }
 
 if ( $wmgUseScribunto ) {
-   include "$IP/extensions/Scribunto/Scribunto.php";
+   wfLoadExtension( 'Scribunto' );
$wgScribuntoUseGeSHi = true;
$wgScribuntoUseCodeEditor = true;
$wgScribuntoGatherFunctionStats = true;  // ori, 29-Oct-2015
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index b707838..5c4d8d9 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -115,7 +115,7 @@
 $IP/extensions/RSS/extension.json
 $IP/extensions/SandboxLink/extension.json
 $IP/extensions/Score/extension.json
-$IP/extensions/Scribunto/Scribunto.php
+$IP/extensions/Scribunto/extension.json
 $IP/extensions/SearchExtraNS/extension.json
 $IP/extensions/SecurePoll/extension.json
 $IP/extensions/ShortUrl/extension.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40040a6d9eb94c074f3299208513edc6d75c74c4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: OOUIHTMLForm does not support the 'cols' parameter for texta...

[jenkins-bot (Code Review)]

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

Change subject: OOUIHTMLForm does not support the 'cols' parameter for textareas
..


OOUIHTMLForm does not support the 'cols' parameter for textareas

Bug: T172199
Change-Id: I9cf5f51aca9bd9068752c6ddbf3d24bc900ee14d
---
M wmf-config/CommonSettings.php
M wmf-config/MetaContactPages.php
2 files changed, 0 insertions(+), 10 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index dd5dafc..0e3cfd8 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -998,7 +998,6 @@
'SenderName' => 'Contact Form on ' . $wgSitename,
'RequireDetails' => false,
'IncludeIP' => false,
-   'DisplayFormat' => 'table',
'RLModules' => [],
'RLStyleModules' => [],
'AdditionalFields' => [
@@ -1006,7 +1005,6 @@
'label-message' => 'emailmessage',
'type' => 'textarea',
'rows' => 20,
-   'cols' => 80,
'required' => true,
],
],
@@ -1021,13 +1019,11 @@
'SenderEmail' => $wmgNotificationSender,
'RequireDetails' => true,
'IncludeIP' => true,
-   'DisplayFormat' => 'vform',
'AdditionalFields' => [
'Text' => [
'label-message' => 'emailmessage',
'type' => 'textarea',
'rows' => 20,
-   'cols' => 80,
'required' => true
],
'Disclaimer' => [
diff --git a/wmf-config/MetaContactPages.php b/wmf-config/MetaContactPages.php
index c92ed90..45af40b 100644
--- a/wmf-config/MetaContactPages.php
+++ b/wmf-config/MetaContactPages.php
@@ -20,7 +20,6 @@
'SenderEmail' => null,
'RequireDetails' => true,
'IncludeIP' => false,
-   'DisplayFormat' => 'vform',
'RLStyleModules' => [
'ext.wikimediamessages.contactpage.affcomusergroup',
],
@@ -153,7 +152,6 @@
'label-message' => 
'contactpage-license-request-description',
'type' => 'textarea',
'rows' => 10,
-   'cols' => 80,
'required' => true,
],
 
@@ -179,28 +177,24 @@
'label-message' => 
'contactpage-license-abuse-description',
'type' => 'textarea',
'rows' => 5,
-   'cols' => 80,
'required' => true,
],
'Location' => [
'label-message' => 'contactpage-license-abuse-location',
'type' => 'textarea',
'rows' => 5,
-   'cols' => 80,
'required' => true,
],
'TheirContact' => [
'label-message' => 
'contactpage-license-abuse-theircontact',
'type' => 'textarea',
'rows' => 5,
-   'cols' => 80,
'required' => true,
],
'YourContact' => [
'label-message' => 
'contactpage-license-abuse-yourcontact',
'type' => 'textarea',
'rows' => 5,
-   'cols' => 80,
'required' => true,
],
'TradeMark' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cf5f51aca9bd9068752c6ddbf3d24bc900ee14d
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up 022f532: don't crash if TitledElement initializes ...

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 022f532: don't crash if TitledElement initializes 
before AccessKeyedElement
..


Follow-up 022f532: don't crash if TitledElement initializes before 
AccessKeyedElement

If a widget mixed in both TitledElement and AccessKeyedElement,
and called the TitledElement constructor first, then that would
call updateTitle() which calls formatTitleWithAccessKey(),
which then tries to access this.$accessKeyed before it's initialized.
This led to a JS error, but only if $.fn.updateTooltipAccessKeys
was set.

To prevent this from happening, short-circuit formatTitleWithAccessKey()
if this.$accessKeyed is not yet set, and call updateTitle() in the
AccessKeyedElement constructor to make sure it runs again.

Change-Id: I6c212c97da350554c9f364b4e967b0c6dea31d43
---
M src/mixins/AccessKeyedElement.js
1 file changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/src/mixins/AccessKeyedElement.js b/src/mixins/AccessKeyedElement.js
index dc5a00c..5ee7c0b 100644
--- a/src/mixins/AccessKeyedElement.js
+++ b/src/mixins/AccessKeyedElement.js
@@ -35,6 +35,12 @@
// Initialization
this.setAccessKey( config.accessKey || null );
this.setAccessKeyedElement( config.$accessKeyed || this.$element );
+
+   // If this is also a TitledElement and it initialized before we did, we 
may have
+   // to update the title with the access key
+   if ( this.updateTitle ) {
+   this.updateTitle();
+   }
 };
 
 /* Setup */
@@ -119,6 +125,11 @@
  */
 OO.ui.mixin.AccessKeyedElement.prototype.formatTitleWithAccessKey = function ( 
title ) {
var accessKey;
+
+   if ( !this.$accessKeyed ) {
+   // Not initialized yet; the constructor will call updateTitle() 
which will rerun this function
+   return title;
+   }
// Use jquery.accessKeyLabel if available to show modifiers, otherwise 
just display the single key
if ( $.fn.updateTooltipAccessKeys && 
$.fn.updateTooltipAccessKeys.getAccessKeyLabel ) {
accessKey = $.fn.updateTooltipAccessKeys.getAccessKeyLabel( 
this.$accessKeyed[ 0 ] );

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Assign autopatrol to all holders of autoreview on arwiki

[jenkins-bot (Code Review)]

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

Change subject: Assign autopatrol to all holders of autoreview on arwiki
..


Assign autopatrol to all holders of autoreview on arwiki

Bug: T167071
Change-Id: Ia0b284f096dcf3f9cd1d10cc9fec76e68ef70d6b
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f24899c..9db84ff 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7897,6 +7897,7 @@
'reupload' => true,
'reupload-own' => true,
'reupload-shared' => true,
+   'autopatrol' => true, // T167071
],
'rollbacker' => [ 'rollback' => true ],
 
@@ -7924,6 +7925,10 @@
'reupload' => true,
'reupload-own' => true,
'reupload-shared' => true,
+   'autopatrol' => true, // T167071
+   ],
+   'autoreview' => [
+   'autopatrol' => true, // T167071
],
],
'+arwikisource' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0b284f096dcf3f9cd1d10cc9fec76e68ef70d6b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: throttling filter to protect access to sparql endpoint

[jenkins-bot (Code Review)]

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

Change subject: throttling filter to protect access to sparql endpoint
..


throttling filter to protect access to sparql endpoint

This provides a way to throttle client which consume too much resources.

See the description in the ThrittlingFilter class for details.

Bug: T170860
Change-Id: If3c0c28c47f953fdb7f3b6186da8a9535cc18bdf
---
M blazegraph/pom.xml
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/Bucketing.java
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/ClientIPFilter.java
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/Throttler.java
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/ThrottlingFilter.java
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/ThrottlingState.java
A 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/UserAgentIpAddressBucketing.java
A 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/throttling/ClientIPFilterTest.java
A 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/throttling/ThrottlerTest.java
A 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/throttling/ThrottlingStateTest.java
A 
blazegraph/src/test/java/org/wikidata/query/rdf/blazegraph/throttling/UserAgentIpAddressBucketingTest.java
M pom.xml
M war/src/main/webapp/WEB-INF/web.xml
13 files changed, 1,162 insertions(+), 1 deletion(-)

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



diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 86187ef..5318026 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -74,6 +74,10 @@
   jetty-http
 
 
+  org.isomorphism
+  token-bucket
+
+
   org.linkeddatafragments
   ldfserver
   classes
@@ -127,6 +131,21 @@
   test
 
 
+  org.slf4j
+  jcl-over-slf4j
+  test
+
+
+  org.slf4j
+  slf4j-simple
+  test
+
+
+  org.springframework
+  spring-test
+  test
+
+
   org.wikidata.query.rdf
   testTools
   test
diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/Bucketing.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/Bucketing.java
new file mode 100644
index 000..ace9eeb
--- /dev/null
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/Bucketing.java
@@ -0,0 +1,22 @@
+package org.wikidata.query.rdf.blazegraph.throttling;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Segmentation of requests.
+ *
+ * Resource consumption is done by client. This interface defines how we
+ * segment clients in different buckets.
+ *
+ * @param  the type of the bucket identifier
+ */
+public interface Bucketing {
+/**
+ * Compute a identifier for the bucket in which this request needs to be
+ * stored.
+ *
+ * @param request the request for which to compute the bucket
+ * @return an object identifying the bucket
+ */
+T bucket(HttpServletRequest request);
+}
diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/ClientIPFilter.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/ClientIPFilter.java
new file mode 100644
index 000..ce2e67e
--- /dev/null
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/throttling/ClientIPFilter.java
@@ -0,0 +1,80 @@
+package org.wikidata.query.rdf.blazegraph.throttling;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * Wrap {@link HttpServletRequest} so that it honors the "X-Real-IP" header.
+ */
+public class ClientIPFilter implements Filter {
+
+/** Header name for X-Client-IP. */
+private static final String X_CLIENT_IP = "X-Client-IP";
+
+/** {@inheritDoc} */
+@Override
+public void init(FilterConfig filterConfig) throws ServletException {
+// Do nothing
+}
+
+/**
+ * Wrap {@link HttpServletRequest} so that it honors the "X-Real-IP" 
header.
+ *
+ * @param request {@inheritDoc}
+ * @param response {@inheritDoc}
+ * @param chain {@inheritDoc}
+ * @throws IOException {@inheritDoc}
+ * @throws ServletException {@inheritDoc}
+ */
+@Override
+public void doFilter(ServletRequest request, ServletResponse response, 
FilterChain chain)
+throws IOException, ServletException {
+if (request instanceof 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Rename Wikinews namespace to Wikinieuws on nl.wikinews

[jenkins-bot (Code Review)]

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

Change subject: Rename Wikinews namespace to Wikinieuws on nl.wikinews
..


Rename Wikinews namespace to Wikinieuws on nl.wikinews

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 83f626c..f24899c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2766,6 +2766,7 @@
'newwiki' => 'विकिपिडिया',
'newiktionary' => 'विक्सनरी', // T129768
'nlwiktionary' => 'WikiWoordenboek',
+   'nlwikinews' => 'Wikinieuws', // T172211
'nostalgiawiki' => 'Wikipedia',
'nowikibooks' => 'Wikibøker',
'nowikinews' => 'Wikinytt',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3fc6a8a0f056584c9351410f9e812b6d6983abb0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: add "issue globalsign.com" to CAA recs

[BBlack (Code Review)]

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

Change subject: add "issue globalsign.com" to CAA recs
..

add "issue globalsign.com" to CAA recs

SSLMate still doesn't list them in the official generator, but
their generator can be downloaded and tweaked to add it (as I've
done here).

The CA-level cutoff date for support is coming up in ~5 weeks, so
GS has to be rolling this out soon.

I have yet to see anything customer-facing from GlobalSign about
their CAA support.  I suspect they perhaps think it's a non-issue
and assume customers who don't know about it will simply not use
CAA (which is a valid choice, and equivalent to allowing all
registrars), but haven't thought about the need to explicitly
communicate the use of the tag "globalsign.com" and get in the
SSLMate generator, etc?

Globalsign does mention using "globalsign.com" as a CAA field in
their recent blog post:

https://www.globalsign.com/en/blog/what-is-the-ca-browser-forum/

... but only as an example of how to configure CAA, not as
documentation on their practices.  So, going with that for now on
the assumption they wouldn't give self-invalid examples.

Bug: T155806
Change-Id: I1fdb793128017f64ea403d3c2cfeade0ded829ea
---
M templates/mediawiki.org
M templates/w.wiki
M templates/wikibooks.org
M templates/wikidata.org
M templates/wikimedia.org
M templates/wikimediafoundation.org
M templates/wikinews.org
M templates/wikipedia.org
M templates/wikiquote.org
M templates/wikisource.org
M templates/wikiversity.org
M templates/wikivoyage.org
M templates/wiktionary.org
M templates/wmfusercontent.org
14 files changed, 28 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/75/369575/1

diff --git a/templates/mediawiki.org b/templates/mediawiki.org
index 43c811a..c6794f6 100644
--- a/templates/mediawiki.org
+++ b/templates/mediawiki.org
@@ -26,8 +26,9 @@
 600 IN TXT  
"google-site-verification=SB70h2VwbTUOmrd3YTPxnT4gjjX5u_g8MAxkIaCW03c"
 
 ; CAA records
-; issue digicert.com, iodef "mailto:dns-ad...@wikimedia.org;
+; issue globalsign.com, issue digicert.com, iodef 
"mailto:dns-ad...@wikimedia.org;
 ; cf. https://sslmate.com/labs/caa/
+@   600 IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
 @   600 IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
 @   600 IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
 
diff --git a/templates/w.wiki b/templates/w.wiki
index b67f44b..bb3a687 100644
--- a/templates/w.wiki
+++ b/templates/w.wiki
@@ -28,7 +28,8 @@
 _dmarc  600 IN TXT "v=DMARC1; p=none; sp=none; 
rua=mailto:dmarc-...@wikimedia.org; ruf=mailto:dmarc-...@wikimedia.org;;
 
 ; CAA records
-; issue digicert.com, iodef "mailto:dns-ad...@wikimedia.org;
+; issue globalsign.com, issue digicert.com, iodef 
"mailto:dns-ad...@wikimedia.org;
 ; cf. https://sslmate.com/labs/caa/
+@   600 IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
 @   600 IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
 @   600 IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
diff --git a/templates/wikibooks.org b/templates/wikibooks.org
index fbf8bd8..45bcdd2 100644
--- a/templates/wikibooks.org
+++ b/templates/wikibooks.org
@@ -27,8 +27,9 @@
 600 IN TXT  
"google-site-verification=djm1t6aP_Yt6WNSj834eVqD83qomWtLP0_1NveYTBfU"
 
 ; CAA records
-; issue digicert.com, iodef "mailto:dns-ad...@wikimedia.org;
+; issue globalsign.com, issue digicert.com, iodef 
"mailto:dns-ad...@wikimedia.org;
 ; cf. https://sslmate.com/labs/caa/
+@   600 IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
 @   600 IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
 @   600 IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
 
diff --git a/templates/wikidata.org b/templates/wikidata.org
index d7e1aac..54a3b8c 100644
--- a/templates/wikidata.org
+++ b/templates/wikidata.org
@@ -26,8 +26,9 @@
 600 IN TXT  
"google-site-verification=8Twc3OrOQ9oBq5C81ZCsPa3fRRJT1xdt5yDBvdnDtUQ"
 
 ; CAA records
-; issue digicert.com, iodef "mailto:dns-ad...@wikimedia.org;
+; issue globalsign.com, issue digicert.com, iodef 
"mailto:dns-ad...@wikimedia.org;
 ; cf. https://sslmate.com/labs/caa/
+@   600 IN TYPE257 \# 21 00056973737565676C6F62616C7369676E2E636F6D
 @   600 IN TYPE257 \# 19 0005697373756564696769636572742E636F6D
 @   600 IN TYPE257 \# 37 
0005696F6465666D61696C746F3A646E732D61646D696E4077696B696D656469612E6F7267
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 35ee489..113e2ad 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -56,8 +56,9 @@
 donate  5M  IN TXT  "v=spf1 

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.12]: Follow-up 31be7d0: send tags list if experimental mode is di...

[Jforrester (Code Review)]

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

Change subject: Follow-up 31be7d0: send tags list if experimental mode is 
disabled
..

Follow-up 31be7d0: send tags list if experimental mode is disabled

Change-Id: Ia9f44ed47d79f02c5d14ce756133e64c7ae926f9
(cherry picked from commit 7f8cbb602f04095c7a06820311f5b0479d876ffb)
---
M includes/specials/SpecialRecentchanges.php
1 file changed, 4 insertions(+), 6 deletions(-)


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

diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index 1f8e3c5..157c3ed 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -189,12 +189,10 @@
'wgStructuredChangeFiltersEnableLiveUpdate',
$this->getConfig()->get( 
'StructuredChangeFiltersEnableLiveUpdate' )
);
-   if ( $experimentalStructuredChangeFilters ) {
-   $out->addJsConfigVars(
-   'wgRCFiltersChangeTags',
-   $this->buildChangeTagList()
-   );
-   }
+   $out->addJsConfigVars(
+   'wgRCFiltersChangeTags',
+   $this->buildChangeTagList()
+   );
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9f44ed47d79f02c5d14ce756133e64c7ae926f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.12]: RCFilters: Unsticky the 'limit' preference temporarily

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Unsticky the 'limit' preference temporarily
..


RCFilters: Unsticky the 'limit' preference temporarily

Bug: T172156
Bug: T171514
Change-Id: I0bed6de70655a4a8a90ceb2f900ffbe98e643d33
(cherry picked from commit 5e13bdf9d8b25f9b108b45c7134ae6dd11bd3b9b)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 23 insertions(+), 6 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 4051eda..9d2c331 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -105,7 +105,11 @@
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
'default': String( limitDefault ),
-   isSticky: true,
+   // Temporarily making this not sticky 
until we resolve the problem
+   // with the misleading preference. Note 
that if this is to be permanent
+   // we should remove all sticky behavior 
methods completely
+   // See T172156
+   // isSticky: true,
filters: [ 50, 100, 250, 500 ].map( 
function ( num ) {
return 
controller._createFilterDataFromNumber( num, num );
} )
@@ -124,7 +128,8 @@
Number( i );
},
'default': mw.user.options.get( 
'rcdays', '30' ),
-   isSticky: true,
+   // Temporarily making this not sticky 
while limit is not sticky, see above
+   // isSticky: true,
filters: [
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5,
@@ -810,9 +815,13 @@
/**
 * Update the limit default value
 *
-* @param {number} newValue New value
+* param {number} newValue New value
 */
-   mw.rcfilters.Controller.prototype.updateLimitDefault = function ( 
newValue ) {
+   mw.rcfilters.Controller.prototype.updateLimitDefault = function ( /* 
newValue */ ) {
+   // HACK: Temporarily remove this from being sticky
+   // See T172156
+
+   /*
if ( !$.isNumeric( newValue ) ) {
return;
}
@@ -825,14 +834,20 @@
// Update the preference for this session
mw.user.options.set( 'rcfilters-rclimit', newValue );
}
+   */
+   return;
};
 
/**
 * Update the days default value
 *
-* @param {number} newValue New value
+* param {number} newValue New value
 */
-   mw.rcfilters.Controller.prototype.updateDaysDefault = function ( 
newValue ) {
+   mw.rcfilters.Controller.prototype.updateDaysDefault = function ( /* 
newValue */ ) {
+   // HACK: Temporarily remove this from being sticky
+   // See T172156
+
+   /*
if ( !$.isNumeric( newValue ) ) {
return;
}
@@ -845,6 +860,8 @@
// Update the preference for this session
mw.user.options.set( 'rcdays', newValue );
}
+   */
+   return;
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bed6de70655a4a8a90ceb2f900ffbe98e643d33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Adding new wiki to whitelist

[Nuria (Code Review)]

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

Change subject: Adding new wiki to whitelist
..

Adding new wiki to whitelist

Change-Id: I82f6396fb8cf932e07d9cd7565114b0ced0abfa1
---
M static_data/pageview/whitelist/whitelist.tsv
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/73/369573/1

diff --git a/static_data/pageview/whitelist/whitelist.tsv 
b/static_data/pageview/whitelist/whitelist.tsv
index 6758778..d772e6e 100644
--- a/static_data/pageview/whitelist/whitelist.tsv
+++ b/static_data/pageview/whitelist/whitelist.tsv
@@ -622,6 +622,7 @@
 projectrs.wikimedia2016-11-01 00:00:00
 projectrue.wikipedia   2015-10-12 00:00:00
 projectru.wikibooks2015-10-12 00:00:00
+project ru.wikidata 2017-08-01 00:00:00
 projectru.wikinews 2015-10-12 00:00:00
 projectru.wikimedia2016-10-20 00:00:00
 projectru.wikipedia2015-10-12 00:00:00

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82f6396fb8cf932e07d9cd7565114b0ced0abfa1
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Nuria 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 31be7d0: send tags list if experimental mode is di...

[jenkins-bot (Code Review)]

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

Change subject: Follow-up 31be7d0: send tags list if experimental mode is 
disabled
..


Follow-up 31be7d0: send tags list if experimental mode is disabled

Change-Id: Ia9f44ed47d79f02c5d14ce756133e64c7ae926f9
---
M includes/specials/SpecialRecentchanges.php
1 file changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index 1f8e3c5..157c3ed 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -189,12 +189,10 @@
'wgStructuredChangeFiltersEnableLiveUpdate',
$this->getConfig()->get( 
'StructuredChangeFiltersEnableLiveUpdate' )
);
-   if ( $experimentalStructuredChangeFilters ) {
-   $out->addJsConfigVars(
-   'wgRCFiltersChangeTags',
-   $this->buildChangeTagList()
-   );
-   }
+   $out->addJsConfigVars(
+   'wgRCFiltersChangeTags',
+   $this->buildChangeTagList()
+   );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9f44ed47d79f02c5d14ce756133e64c7ae926f9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up 022f532: don't crash if TitledElement initializes ...

[Catrope (Code Review)]

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

Change subject: Follow-up 022f532: don't crash if TitledElement initializes 
before AccessKeyedElement
..

Follow-up 022f532: don't crash if TitledElement initializes before 
AccessKeyedElement

If a widget mixed in both TitledElement and AccessKeyedElement,
and called the TitledElement constructor first, then that would
call updateTitle() which calls formatTitleWithAccessKey(),
which then tries to access this.$accessKeyed before it's initialized.
This led to a JS error, but only if $.fn.updateTooltipAccessKeys
was set.

To prevent this from happening, short-circuit formatTitleWithAccessKey()
if this.$accessKeyed is not yet set, and call updateTitle() in the
AccessKeyedElement constructor to make sure it runs again.

Change-Id: I6c212c97da350554c9f364b4e967b0c6dea31d43
---
M src/mixins/AccessKeyedElement.js
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/72/369572/1

diff --git a/src/mixins/AccessKeyedElement.js b/src/mixins/AccessKeyedElement.js
index dc5a00c..5ee7c0b 100644
--- a/src/mixins/AccessKeyedElement.js
+++ b/src/mixins/AccessKeyedElement.js
@@ -35,6 +35,12 @@
// Initialization
this.setAccessKey( config.accessKey || null );
this.setAccessKeyedElement( config.$accessKeyed || this.$element );
+
+   // If this is also a TitledElement and it initialized before we did, we 
may have
+   // to update the title with the access key
+   if ( this.updateTitle ) {
+   this.updateTitle();
+   }
 };
 
 /* Setup */
@@ -119,6 +125,11 @@
  */
 OO.ui.mixin.AccessKeyedElement.prototype.formatTitleWithAccessKey = function ( 
title ) {
var accessKey;
+
+   if ( !this.$accessKeyed ) {
+   // Not initialized yet; the constructor will call updateTitle() 
which will rerun this function
+   return title;
+   }
// Use jquery.accessKeyLabel if available to show modifiers, otherwise 
just display the single key
if ( $.fn.updateTooltipAccessKeys && 
$.fn.updateTooltipAccessKeys.getAccessKeyLabel ) {
accessKey = $.fn.updateTooltipAccessKeys.getAccessKeyLabel( 
this.$accessKeyed[ 0 ] );

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Optimalize all PNGs in this repo

[jenkins-bot (Code Review)]

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

Change subject: Optimalize all PNGs in this repo
..


Optimalize all PNGs in this repo

Bug: T170569
Change-Id: If46ecc5f83c5988ae878ebf69347b43513f9a4f4
---
M docroot/noc/css/images/audio-icon.png
M docroot/noc/css/images/bullet-icon.png
M docroot/noc/css/images/document-icon.png
M docroot/noc/css/images/external-link-ltr-icon.png
M docroot/noc/css/images/file-icon.png
M docroot/noc/css/images/global/calendar.png
M docroot/noc/css/images/global/left.png
M docroot/noc/css/images/global/right.png
M docroot/noc/css/images/lock-icon.png
M docroot/noc/css/images/mail-icon.png
M docroot/noc/css/images/news-icon.png
M docroot/noc/css/images/portal-break.png
M docroot/noc/css/images/preferences-break.png
M docroot/noc/css/images/preferences-fade.png
M docroot/noc/css/images/search-fade.png
M docroot/noc/css/images/talk-icon.png
M docroot/noc/css/images/user-icon.png
M docroot/noc/css/images/video-icon.png
M static/apple-touch/wikidata.png
M static/apple-touch/wikipedia.png
M static/apple-touch/wiktionary/en.png
M static/images/project-logos/eswikisource-2x.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Incubator-logo.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Meta-logo.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Wikibooks-logo.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Wikidata-logo.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Wikinews-logo.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Wikipedia-logo.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Wikiquote.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Wikisource-logo.svg.png
M 
static/images/project-logos/notifications/30px-Notification-icon-Wiktionary-logo.svg.png
M static/images/project-logos/notifications/30px-Wikimedia_labs_logo.svg.png
32 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/docroot/noc/css/images/audio-icon.png 
b/docroot/noc/css/images/audio-icon.png
index 0f59a2b..185a279 100644
--- a/docroot/noc/css/images/audio-icon.png
+++ b/docroot/noc/css/images/audio-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/bullet-icon.png 
b/docroot/noc/css/images/bullet-icon.png
index e304b26..cb925a7 100644
--- a/docroot/noc/css/images/bullet-icon.png
+++ b/docroot/noc/css/images/bullet-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/document-icon.png 
b/docroot/noc/css/images/document-icon.png
index 91dc16f..65aaca8 100644
--- a/docroot/noc/css/images/document-icon.png
+++ b/docroot/noc/css/images/document-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/external-link-ltr-icon.png 
b/docroot/noc/css/images/external-link-ltr-icon.png
index 4b710b0..4d6a75a 100644
--- a/docroot/noc/css/images/external-link-ltr-icon.png
+++ b/docroot/noc/css/images/external-link-ltr-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/file-icon.png 
b/docroot/noc/css/images/file-icon.png
index 1261f00..53e40df 100644
--- a/docroot/noc/css/images/file-icon.png
+++ b/docroot/noc/css/images/file-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/global/calendar.png 
b/docroot/noc/css/images/global/calendar.png
index 0eb9ca7..d1ff0dc 100644
--- a/docroot/noc/css/images/global/calendar.png
+++ b/docroot/noc/css/images/global/calendar.png
Binary files differ
diff --git a/docroot/noc/css/images/global/left.png 
b/docroot/noc/css/images/global/left.png
index f8cb2b2..085eb4d 100644
--- a/docroot/noc/css/images/global/left.png
+++ b/docroot/noc/css/images/global/left.png
Binary files differ
diff --git a/docroot/noc/css/images/global/right.png 
b/docroot/noc/css/images/global/right.png
index d02b707..9b7cc45 100644
--- a/docroot/noc/css/images/global/right.png
+++ b/docroot/noc/css/images/global/right.png
Binary files differ
diff --git a/docroot/noc/css/images/lock-icon.png 
b/docroot/noc/css/images/lock-icon.png
index 9e63807..ac222d7 100644
--- a/docroot/noc/css/images/lock-icon.png
+++ b/docroot/noc/css/images/lock-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/mail-icon.png 
b/docroot/noc/css/images/mail-icon.png
index 50de078..b6ad279 100644
--- a/docroot/noc/css/images/mail-icon.png
+++ b/docroot/noc/css/images/mail-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/news-icon.png 
b/docroot/noc/css/images/news-icon.png
index 8ab4995..58a421b 100644
--- a/docroot/noc/css/images/news-icon.png
+++ b/docroot/noc/css/images/news-icon.png
Binary files differ
diff --git a/docroot/noc/css/images/portal-break.png 
b/docroot/noc/css/images/portal-break.png
index e81b559..f0c421a 100644
--- 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Don't reload results for redundant requests

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Don't reload results for redundant requests
..

RCFilters: Don't reload results for redundant requests

Ignore reloading if the requests are:
- Change of inverted namespaces if there are no namespace items
  selected.
- Reloading of new saved query if that same query is already loaded

Bug: T172138
Change-Id: Id43bef8a08aab3412a6c5cb538d048935a178114
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 22 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/71/369571/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 4051eda..2220957 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -394,7 +394,17 @@
 */
mw.rcfilters.Controller.prototype.toggleInvertedNamespaces = function 
() {
this.filtersModel.toggleInvertedNamespaces();
-   this.updateChangesList();
+
+   if (
+   this.filtersModel.getFiltersByView( 'namespaces' )
+   .filter( function ( filterItem ) {
+   return filterItem.isSelected();
+   } )
+   .length
+   ) {
+   // Only re-fetch results if there are namespace items 
that are actually selected
+   this.updateChangesList();
+   }
};
 
/**
@@ -596,9 +606,18 @@
 */
mw.rcfilters.Controller.prototype.applySavedQuery = function ( queryID 
) {
var data, highlights,
-   queryItem = this.savedQueriesModel.getItemByID( queryID 
);
+   queryItem = this.savedQueriesModel.getItemByID( queryID 
),
+   currentMatchingQuery = 
this.findQueryMatchingCurrentState();
 
-   if ( queryItem ) {
+   if (
+   queryItem &&
+   (
+   // If therre's already a query, don't reload it
+   // if it's the same as the one that already 
exists
+   !currentMatchingQuery ||
+   currentMatchingQuery.getID() !== 
queryItem.getID()
+   )
+   ) {
data = queryItem.getData();
highlights = data.highlights;
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make wikiquote.png equivalent to enwikiquote.png

[jenkins-bot (Code Review)]

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

Change subject: Make wikiquote.png equivalent to enwikiquote.png
..


Make wikiquote.png equivalent to enwikiquote.png

Bug: T171887
Change-Id: I167ecc1f450d9ae6f17027417786ae12c1aeeb91
---
M static/images/project-logos/wikiquote.png
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/static/images/project-logos/wikiquote.png 
b/static/images/project-logos/wikiquote.png
index 4184de0..51d929f 100644
--- a/static/images/project-logos/wikiquote.png
+++ b/static/images/project-logos/wikiquote.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I167ecc1f450d9ae6f17027417786ae12c1aeeb91
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: Reception123 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.12]: RCFilters: Unsticky the 'limit' preference temporarily

[Catrope (Code Review)]

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

Change subject: RCFilters: Unsticky the 'limit' preference temporarily
..

RCFilters: Unsticky the 'limit' preference temporarily

Bug: T172156
Bug: T171514
Change-Id: I0bed6de70655a4a8a90ceb2f900ffbe98e643d33
(cherry picked from commit 5e13bdf9d8b25f9b108b45c7134ae6dd11bd3b9b)
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 23 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/70/369570/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 4051eda..9d2c331 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -105,7 +105,11 @@
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
'default': String( limitDefault ),
-   isSticky: true,
+   // Temporarily making this not sticky 
until we resolve the problem
+   // with the misleading preference. Note 
that if this is to be permanent
+   // we should remove all sticky behavior 
methods completely
+   // See T172156
+   // isSticky: true,
filters: [ 50, 100, 250, 500 ].map( 
function ( num ) {
return 
controller._createFilterDataFromNumber( num, num );
} )
@@ -124,7 +128,8 @@
Number( i );
},
'default': mw.user.options.get( 
'rcdays', '30' ),
-   isSticky: true,
+   // Temporarily making this not sticky 
while limit is not sticky, see above
+   // isSticky: true,
filters: [
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5,
@@ -810,9 +815,13 @@
/**
 * Update the limit default value
 *
-* @param {number} newValue New value
+* param {number} newValue New value
 */
-   mw.rcfilters.Controller.prototype.updateLimitDefault = function ( 
newValue ) {
+   mw.rcfilters.Controller.prototype.updateLimitDefault = function ( /* 
newValue */ ) {
+   // HACK: Temporarily remove this from being sticky
+   // See T172156
+
+   /*
if ( !$.isNumeric( newValue ) ) {
return;
}
@@ -825,14 +834,20 @@
// Update the preference for this session
mw.user.options.set( 'rcfilters-rclimit', newValue );
}
+   */
+   return;
};
 
/**
 * Update the days default value
 *
-* @param {number} newValue New value
+* param {number} newValue New value
 */
-   mw.rcfilters.Controller.prototype.updateDaysDefault = function ( 
newValue ) {
+   mw.rcfilters.Controller.prototype.updateDaysDefault = function ( /* 
newValue */ ) {
+   // HACK: Temporarily remove this from being sticky
+   // See T172156
+
+   /*
if ( !$.isNumeric( newValue ) ) {
return;
}
@@ -845,6 +860,8 @@
// Update the preference for this session
mw.user.options.set( 'rcdays', newValue );
}
+   */
+   return;
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bed6de70655a4a8a90ceb2f900ffbe98e643d33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.12
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable page previews on a variety of pages

[jenkins-bot (Code Review)]

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

Change subject: Disable page previews on a variety of pages
..


Disable page previews on a variety of pages

Bug: T170893
Change-Id: Ia353086e2cfb9b2e955f4b5645a89abc59b8b107
---
M wmf-config/InitialiseSettings.php
1 file changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c525116..83f626c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13468,6 +13468,29 @@
'huwiki' => true,
 ],
 
+'wgPopupsPageBlacklist' => [
+   'default' => [
+   'Special:CreateAccount',
+   'Special:GlobalRenameRequest',
+   'Special:UserLogin',
+   'Special:MergeAccount',
+   'Special:ChangeCredentials',
+   'Special:OAuthListConsumers',
+   'Special:GlobalUserRights',
+   'Special:Notifications',
+   'Special:UserRights',
+   'Special:Upload',
+   'Special:VipsTest',
+   'Special:ApiFeatureUsage',
+   'Special:ExpandTemplates',
+   'Special:GadgetUsage',
+   'Special:GraphSandbox',
+   'Special:TemplateSandbox',
+   'Special:MostLinkedFiles',
+   'Special:Book',
+   'Special:CiteThisPage',
+   ],
+],
 'wgPopupsAnonsEnabledSamplingRate' => [
'default' => 0,
'sewikimedia' => 1, // T68374

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add new mobile watermark for Urdu Wikipedia.

[jenkins-bot (Code Review)]

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

Change subject: Add new mobile watermark for Urdu Wikipedia.
..


Add new mobile watermark for Urdu Wikipedia.

Bug: T171769
Change-Id: I79f578843798c64cc190de1e4906f1cd648935d8
---
A static/images/mobile/copyright/wikipedia-wordmark-ur.svg
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/static/images/mobile/copyright/wikipedia-wordmark-ur.svg 
b/static/images/mobile/copyright/wikipedia-wordmark-ur.svg
new file mode 100644
index 000..f9e60d4
--- /dev/null
+++ b/static/images/mobile/copyright/wikipedia-wordmark-ur.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 141a3c8..c525116 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15441,6 +15441,11 @@
'copyright-width' => 122,
'copyright-height' => 22,
],
+   'urwiki' => [
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-ur.svg',
+   'copyright-width' => 66,
+   'copyright-height' => 26,
+   ],
'wikivoyage' => [
'copyright' => 
'/static/images/mobile/copyright/wikivoyage-wordmark-en.svg',
'copyright-width' => 96,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79f578843798c64cc190de1e4906f1cd648935d8
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reception123 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Debt 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Nirzar 
Gerrit-Reviewer: Reception123 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: محمد شعیب 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update wordmark for Wikipedia Atikamekw

[jenkins-bot (Code Review)]

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

Change subject: Update wordmark for Wikipedia Atikamekw
..


Update wordmark for Wikipedia Atikamekw

Bug: T168203
Change-Id: Icb8b5c7bda3df0b6dc1c67f0050d0039cc5a6433
---
A static/images/mobile/copyright/wikipedia-wordmark-atj.svg
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/static/images/mobile/copyright/wikipedia-wordmark-atj.svg 
b/static/images/mobile/copyright/wikipedia-wordmark-atj.svg
new file mode 100644
index 000..33c174c
--- /dev/null
+++ b/static/images/mobile/copyright/wikipedia-wordmark-atj.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 574936d..141a3c8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15381,6 +15381,11 @@
'copyright-width' => 79,
'copyright-height' => 22,
],
+   'atjwiki' => [
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-atj.svg',
+   'copyright-width' => 133,
+   'copyright-height' => 18,
+   ],
'bnwiki' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-bn.svg',
'copyright-width' => 92,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Unsticky the 'limit' preference temporarily

[jenkins-bot (Code Review)]

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

Change subject: RCFilters: Unsticky the 'limit' preference temporarily
..


RCFilters: Unsticky the 'limit' preference temporarily

Bug: T172156
Bug: T171514
Change-Id: I0bed6de70655a4a8a90ceb2f900ffbe98e643d33
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 23 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: 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 4051eda..9d2c331 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -105,7 +105,11 @@
validate: $.isNumeric,
sortFunc: function ( a, b ) { return 
Number( a.name ) - Number( b.name ); },
'default': String( limitDefault ),
-   isSticky: true,
+   // Temporarily making this not sticky 
until we resolve the problem
+   // with the misleading preference. Note 
that if this is to be permanent
+   // we should remove all sticky behavior 
methods completely
+   // See T172156
+   // isSticky: true,
filters: [ 50, 100, 250, 500 ].map( 
function ( num ) {
return 
controller._createFilterDataFromNumber( num, num );
} )
@@ -124,7 +128,8 @@
Number( i );
},
'default': mw.user.options.get( 
'rcdays', '30' ),
-   isSticky: true,
+   // Temporarily making this not sticky 
while limit is not sticky, see above
+   // isSticky: true,
filters: [
// Hours (1, 2, 6, 12)
0.04166, 0.0833, 0.25, 0.5,
@@ -810,9 +815,13 @@
/**
 * Update the limit default value
 *
-* @param {number} newValue New value
+* param {number} newValue New value
 */
-   mw.rcfilters.Controller.prototype.updateLimitDefault = function ( 
newValue ) {
+   mw.rcfilters.Controller.prototype.updateLimitDefault = function ( /* 
newValue */ ) {
+   // HACK: Temporarily remove this from being sticky
+   // See T172156
+
+   /*
if ( !$.isNumeric( newValue ) ) {
return;
}
@@ -825,14 +834,20 @@
// Update the preference for this session
mw.user.options.set( 'rcfilters-rclimit', newValue );
}
+   */
+   return;
};
 
/**
 * Update the days default value
 *
-* @param {number} newValue New value
+* param {number} newValue New value
 */
-   mw.rcfilters.Controller.prototype.updateDaysDefault = function ( 
newValue ) {
+   mw.rcfilters.Controller.prototype.updateDaysDefault = function ( /* 
newValue */ ) {
+   // HACK: Temporarily remove this from being sticky
+   // See T172156
+
+   /*
if ( !$.isNumeric( newValue ) ) {
return;
}
@@ -845,6 +860,8 @@
// Update the preference for this session
mw.user.options.set( 'rcdays', newValue );
}
+   */
+   return;
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bed6de70655a4a8a90ceb2f900ffbe98e643d33
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Add the Recommendation API service's URI

[Mobrovac (Code Review)]

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

Change subject: Config: Add the Recommendation API service's URI
..

Config: Add the Recommendation API service's URI

Bug: T170877
Depends-On: If3941b4326e51dcd8740d1fa3eef29d16728da2c
Change-Id: I2dc1224633504c2d0e7adc93c6e672803af87cee
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/68/369568/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 9012345..8e54af7 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -89,6 +89,8 @@
   host: <%= mobileapps_uri %>
 citoid:
   host: <%= citoid_uri %>
+recommendation:
+  host: <%= recommendation_uri %>
 events:
   uri: <%= eventlogging_service_uri %>
   topic: resource_change

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dc1224633504c2d0e7adc93c6e672803af87cee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Update coding standards

[MaxSem (Code Review)]

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

Change subject: Update coding standards
..


Update coding standards

This doesn't introduce any code changes, just some documentation
and code formatting, in order to pass phpcs.

Change-Id: I6772823a8b47b38c6741d8a58b9a94571bdaafed
---
M .gitignore
M GlobalPreferences.body.php
M GlobalPreferences.hooks.php
M GlobalPreferences.php
M SpecialGlobalPreferences.php
A composer.json
A phpcs.xml
7 files changed, 114 insertions(+), 50 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 3c3629e..8ec4b92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-node_modules
+node_modules/
+vendor/
+composer.lock
diff --git a/GlobalPreferences.body.php b/GlobalPreferences.body.php
index aa7fc53..d681ac5 100644
--- a/GlobalPreferences.body.php
+++ b/GlobalPreferences.body.php
@@ -19,7 +19,7 @@
public static function getPrefsDB( $type = DB_SLAVE ) {
global $wgGlobalPreferencesDB;
if ( $wgGlobalPreferencesDB ) {
-   return wfGetDB( $type, array(), $wgGlobalPreferencesDB 
);
+   return wfGetDB( $type, [], $wgGlobalPreferencesDB );
} else {
return wfGetDB( $type );
}
@@ -27,7 +27,7 @@
 
/**
 * Checks if the user is globalized
-* @param User $user
+* @param User $user The user
 * @return bool
 */
public static function isUserGlobalized( User $user ) {
@@ -42,7 +42,7 @@
/**
 * Gets the user's ID that we're using in the table
 * Returns 0 if the user is not global
-* @param User $user
+* @param User $user The user for whom to get the ID.
 * @return int
 */
public static function getUserID( User $user ) {
@@ -53,37 +53,36 @@
/**
 * Deletes all of a user's global prefs
 * Assumes that the user is globalized
-* @param User $user
+* @param User $user The user.
 */
public static function resetGlobalUserSettings( User $user ) {
if ( !isset( $user->mGlobalPrefs ) ) {
-   $user->getOption( '' ); // Trigger loading
+   // Triggers User::loadOptions.
+   $user->getOption( '' );
}
if ( count( $user->mGlobalPrefs ) ) {
self::getPrefsDB( DB_MASTER )->delete(
'global_preferences',
-   array( 'gp_user' => self::getUserID( $user ) ),
+   [ 'gp_user' => self::getUserID( $user ) ],
__METHOD__
);
}
}
 
/**
-* Convenience function to check if we're on the global
-* prefs page
-* @param IContextSource $context
+* Convenience function to check if we're on the global prefs page.
+* @param IContextSource $context The context to use; if not set main 
request context is used.
 * @return bool
 */
public static function onGlobalPrefsPage( $context = null ) {
$context = $context ?: RequestContext::getMain();
-   return $context->getTitle()
-   && $context->getTitle()->isSpecial( 'GlobalPreferences' );
+   return $context->getTitle() && $context->getTitle()->isSpecial( 
'GlobalPreferences' );
}
 
/**
 * Convenience function to check if we're on the local
 * prefs page
-* @param IContextSource $context
+* @param IContextSource $context The context to use; if not set main 
request context is used.
 * @return bool
 */
public static function onLocalPrefsPage( $context = null ) {
diff --git a/GlobalPreferences.hooks.php b/GlobalPreferences.hooks.php
index 23b4fea..fecc178 100644
--- a/GlobalPreferences.hooks.php
+++ b/GlobalPreferences.hooks.php
@@ -7,23 +7,27 @@
 * Special:GlobalPrefs
 * @var array
 */
-   static $badPrefs = array(
-   'realname', // Stored in user table, doesn't work yet
-   'userid', // @todo Show CA user id / shared user table id?
-   'usergroups', // @todo Show CA global groups instead?
-   'editcount', // @todo Should global edit count instead?
+   protected static $badPrefs = [
+   // Stored in user table, doesn't work yet
+   'realname',
+   // @todo Show CA user id / shared user table id?
+   'userid',
+   // @todo Show CA global groups instead?
+   'usergroups',
+   // @todo Should global edit count instead?
+   'editcount',

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add syslog-udp for logstash testing on 11515

[Ayounsi (Code Review)]

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

Change subject: Add syslog-udp for logstash testing on 11515
..


Add syslog-udp for logstash testing on 11515

Lets see if using udp directly, rather than syslog,
makes any difference for this bug.

Bug: T166126
Change-Id: I896266f2aac3ef5e41dc47e22edaf886fc7c5a89
---
M modules/role/manifests/logstash/collector.pp
1 file changed, 14 insertions(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/logstash/collector.pp 
b/modules/role/manifests/logstash/collector.pp
index 38d561f..93e463a 100644
--- a/modules/role/manifests/logstash/collector.pp
+++ b/modules/role/manifests/logstash/collector.pp
@@ -37,6 +37,13 @@
 port => 10514,
 }
 
+# T166126 Testing a different syslog method
+logstash::input::udp { 'syslog-udp':
+port  => 10515,
+type  => 'syslog',
+codec => 'plain',
+}
+
 ferm::service { 'logstash_syslog_udp':
 proto   => 'udp',
 port=> '10514',
@@ -44,6 +51,13 @@
 srange  => '$DOMAIN_NETWORKS',
 }
 
+ferm::service { 'logstash_syslog_udp-2':
+proto   => 'udp',
+port=> '10515',
+notrack => true,
+srange  => '$DOMAIN_NETWORKS',
+}
+
 ferm::service { 'logstash_syslog_tcp':
 proto   => 'tcp',
 port=> '10514',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I896266f2aac3ef5e41dc47e22edaf886fc7c5a89
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

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


Update VE core submodule to master (18ae4004f)

New changes:
887ebb1a4 Clarify comments that certain 'html' parameters must be whole 
documents
cc50757ee LinearTabKeyDownHandler: Abort if modifiers are used
23f70f760 jsduck: Explcitly name library files so we don't pull in CSS files
18ae4004f Update OOjs UI to v0.22.4

Bug: T171600
Bug: T172168
Change-Id: I2510174db0f650113702674e37e768aa558f02cc
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/lib/ve b/lib/ve
index 4d6745b..18ae400 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 4d6745b2f8ea2dc89dfb7e22855983e0469cf859
+Subproject commit 18ae4004fc776e102f90d2e7c078f8bcd98a410a

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2510174db0f650113702674e37e768aa558f02cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Deskana 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Write to term_full_entity_id column in wb_terms table in pro...

[Ladsgroup (Code Review)]

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

Change subject: Write to term_full_entity_id column in wb_terms table in prod 
too
..

Write to term_full_entity_id column in wb_terms table in prod too

Bug: T167229
Change-Id: I96a9db0a5b6eb766becb35cbc5bf3eacab7eccd6
---
M wmf-config/Wikibase-production.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index 5e1214d..b36b56c 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -24,7 +24,6 @@
'P153',
'P185',
];
-   $wgWBRepoSettings['writeFullEntityIdColumn'] = true;
$wgWBRepoSettings['readFullEntityIdColumn'] = true;
 
$wgWBRepoSettings['statementSections']['property'] = [
@@ -112,6 +111,7 @@
 
$wgWBQualityConstraintsEnableConstraintsImportFromStatements = true;
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
+   $wgWBRepoSettings['writeFullEntityIdColumn'] = true;
 }
 
 if ( $wmgUseWikibaseClient ) {

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Merge branch 'master' into deploy

f997b74 Final export should have blanks instead of NULL

Change-Id: If6967d8f29f9165692491664258cf7b39b805415
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 233 deletions(-)

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



diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index ddb39fc..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,233 +0,0 @@
-<<< HEAD   (58bcbf Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation_date from 
silverpop_export_view")
-actual = cursor.fetchone()
-expected = ('NO', Decimal('0.00'),
-Decimal('0.00'), '',
-'', Decimal('0.00'),
-0, '', Decimal('0.00'),
-Decimal('0.00'), '')
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_timezone():
-'''
-Test that we export timezone records where they exist
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 

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

[Ejegg (Code Review)]

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

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

Merge branch 'master' into deploy

f997b74 Final export should have blanks instead of NULL

Change-Id: If6967d8f29f9165692491664258cf7b39b805415
---
D silverpop_export/tests/test_update.py
1 file changed, 0 insertions(+), 233 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/66/369566/1

diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
deleted file mode 100644
index ddb39fc..000
--- a/silverpop_export/tests/test_update.py
+++ /dev/null
@@ -1,233 +0,0 @@
-<<< HEAD   (58bcbf Merge branch 'master' into deploy)
-===
-import datetime
-from decimal import Decimal
-import mock
-import MySQLdb
-import os
-import warnings
-
-import database.db
-import silverpop_export.update
-
-conn = None
-db_name = None
-
-
-def setup():
-global conn
-global db_name
-# FIXME: parameterize test configuration better
-db_host = "127.0.0.1"
-db_pass = None
-if 'EXECUTOR_NUMBER' in os.environ:
-# We're running under Jenkins.  Assume things.
-db_name = "test"
-db_user = "root"
-else:
-db_name = "test"
-db_user = "test"
-
-db_params = {"user": db_user, "host": db_host}
-if db_pass:
-db_params['passwd'] = db_pass
-
-conn = database.db.Connection(**db_params)
-conn.execute("set default_storage_engine=memory")
-conn.execute("drop database if exists " + db_name)
-conn.execute("create database " + db_name)
-conn.db_conn.select_db(db_name)
-
-
-def test_test_setup():
-'''
-Set up the civcrm and export databases and run the update with no data.
-'''
-run_update_with_fixtures(fixture_queries=[])
-
-
-def test_duplicate():
-'''
-Test that we export one record for a duplicate contact.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0),
-(2, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1),
-(2);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select count(*) from silverpop_export")
-assert cursor.fetchone() == (1,)
-
-
-def test_no_donations():
-'''
-Test that we set the donation-related fields correctly when a contact has
-no donations.
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select has_recurred_donation, highest_usd_amount, " +
-   "highest_native_amount, highest_native_currency, " +
-   "highest_donation_date, lifetime_usd_total, " +
-   "donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation_date from 
silverpop_export_view")
-actual = cursor.fetchone()
-expected = ('NO', Decimal('0.00'),
-Decimal('0.00'), '',
-'', Decimal('0.00'),
-0, '', Decimal('0.00'),
-Decimal('0.00'), '')
-assert actual == expected
-
-
-def test_refund_history():
-'''
-Test that we don't include refunded donations in a donor's history
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 'person1@localhost', 1, 0);
-""", """
-insert into civicrm_contact (id) values
-(1);
-""", """
-insert into civicrm_contribution (id, contact_id, receive_date, 
total_amount, trxn_id, contribution_status_id) values
-(1, 1, '2015-01-03', 15.25, 'xyz123', 1),
-(2, 1, '2016-05-05', 25.25, 'abc456', 9);
-""", """
-insert into wmf_contribution_extra (entity_id, original_amount, 
original_currency) values
-(1, 20.15, 'CAD'),
-(2, 35.15, 'CAD');
-"""])
-
-cursor = conn.db_conn.cursor()
-cursor.execute("select highest_usd_amount, lifetime_usd_total, 
donation_count, latest_currency, latest_native_amount, latest_usd_amount, 
latest_donation  from silverpop_export")
-expected = (Decimal('15.25'), Decimal('15.25'), 1, 'CAD', 
Decimal('20.15'), Decimal('15.25'), datetime.datetime(2015, 1, 3))
-assert cursor.fetchone() == expected
-
-
-def test_timezone():
-'''
-Test that we export timezone records where they exist
-'''
-
-run_update_with_fixtures(fixture_queries=["""
-insert into civicrm_email (contact_id, email, is_primary, on_hold) values
-(1, 

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Use lead section when editing page without section marks

[Bmansurov (Code Review)]

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

Change subject: Use lead section when editing page without section marks
..

Use lead section when editing page without section marks

The config variable `MFNamespacesWithoutCollapsibleSections` controls
namespaces where section collapsing is disabled. In those namespaces
page is not divided into sections marked with `.mf-section-X` classes.
If that's the case the edit button edits the first section, which is
the whole page.

Bug: T157995
Change-Id: I3ec353575529c1fb11a33fc35c9886cf232e327f
---
M resources/skins.minerva.editor/init.js
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/65/369565/1

diff --git a/resources/skins.minerva.editor/init.js 
b/resources/skins.minerva.editor/init.js
index 1def74e..e13f10c 100644
--- a/resources/skins.minerva.editor/init.js
+++ b/resources/skins.minerva.editor/init.js
@@ -250,8 +250,11 @@
$( '.nojs-edit' ).removeClass( 'nojs-edit' );
$( '#ca-edit a' ).remove();
// FIXME: unfortunately the main page is special cased.
-   if ( mw.config.get( 'wgIsMainPage' ) || isNewPage || ( 
leadSection && leadSection.text() ) ) {
+   if ( mw.config.get( 'wgIsMainPage' ) || isNewPage ||
+( leadSection && leadSection.text() ) || 
page.getSections().length === 0 ) {
// if lead section is not empty, open editor 
with lead section
+   // In some namespaces (controlled by 
MFNamespacesWithoutCollapsibleSections)
+   // sections are not marked. Use the lead 
section for such cases.
addEditButton( 0, '#ca-edit' );
} else {
// if lead section is empty or does not exist, 
open editor with first section

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

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

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

[MediaWiki-commits] [Gerrit] operations...gerrit[master]: Adding targets since we don't have a dsh list

[Chad (Code Review)]

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

Change subject: Adding targets since we don't have a dsh list
..


Adding targets since we don't have a dsh list

(This should be automated later)

Also while we're here, ignore the log directory

Change-Id: I7e50ebae99f0adf7f7dc6b182ffdd6f63295932f
---
A scap/.gitignore
M scap/scap.cfg
A scap/targets
3 files changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Paladox: Looks good to me, but someone else must approve
  Chad: Verified; Looks good to me, approved



diff --git a/scap/.gitignore b/scap/.gitignore
new file mode 100644
index 000..80dd262
--- /dev/null
+++ b/scap/.gitignore
@@ -0,0 +1 @@
+log/
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 23e926c..72d5c8b 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -1,5 +1,5 @@
 [global]
 git_repo: gerrit/gerrit
 ssh_user: gerrit2
-dsh_targets: /etc/dsh/group/gerrit
+dsh_targets: /srv/deployment/gerrit/gerrit/scap/targets
 git_fat: True
diff --git a/scap/targets b/scap/targets
new file mode 100644
index 000..00381bb
--- /dev/null
+++ b/scap/targets
@@ -0,0 +1,2 @@
+cobalt.wikimedia.org
+gerrit2001.wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e50ebae99f0adf7f7dc6b182ffdd6f63295932f
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/gerrit
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...trending-edits[master]: Define npm peer dependency explicitly

[jenkins-bot (Code Review)]

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

Change subject: Define npm peer dependency explicitly
..


Define npm peer dependency explicitly

npm 3 requires dependencies to be explicitly defined.

Bug: T172094
Change-Id: Ic640ccf0f577e47036d473892522ea758014fab4
---
M package.json
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  BearND: Looks good to me, but someone else must approve
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jdlrobson: Verified; Looks good to me, approved



diff --git a/package.json b/package.json
index 6a5b000..a46160a 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
   "devDependencies": {
 "extend": "^3.0.0",
 "istanbul": "^0.4.4",
+"jscs": "^3.0.3",
 "mocha": "^2.5.3",
 "mocha-jscs": "^5.0.1",
 "mocha-jshint": "^2.3.1",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic640ccf0f577e47036d473892522ea758014fab4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...SmashPig[master]: Get rid of return-a-reference option

[jenkins-bot (Code Review)]

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

Change subject: Get rid of return-a-reference option
..


Get rid of return-a-reference option

We aren't using it any more, and we shouldn't start.

Bug: T171560
Change-Id: I28e310da3f86f8540a61b81ae466ff4c848bdca7
---
M Core/Configuration.php
M Core/DataStores/QueueWrapper.php
M Core/Listeners/ListenerBase.php
3 files changed, 15 insertions(+), 30 deletions(-)

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



diff --git a/Core/Configuration.php b/Core/Configuration.php
index 3923c7a..bf59f2a 100644
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -104,15 +104,12 @@
 * Obtain a value from the configuration. If the key does not exist 
this will throw an
 * exception.
 *
-* @param string $nodeParameter node to obtain. If this 
contains '/' it is assumed that the
+* @param string $path Parameter node to obtain. If this contains '/' 
it is assumed that the
 *value is contained under additional keys.
-* @param bool $returnRef If true will return a reference to the 
configuration node. This will
-*mean that any modifications to the node 
will be stored in RAM for the
-*duration of the session.
 * @return mixed
 * @throws ConfigurationKeyException
 */
-   public function ( $node, $returnRef = false ) {
+   public function val( $path ) {
/*
 * Magic "/" returns the entire configuration tree.
 *
@@ -122,34 +119,22 @@
 * Note: Never log this tree insecurely, it will contain 
processor
 * credentials and other sensitive information.
 */
-   if ( $node === '/' ) {
-   if ( $returnRef ) {
-   // TODO: Don't offer a return-by-reference.
-   $options = &$this->options;
-   } else {
-   $options = $this->options;
-   }
-   return $options;
+   if ( $path === '/' ) {
+   return $this->options;
}
 
-   $keys = explode( '/', $node );
+   $segments = explode( '/', $path );
 
-   $croot = & $this->options;
-   foreach ( $keys as $key ) {
-   if ( array_key_exists( $key, $croot ) ) {
-   $croot = & $croot[ $key ];
+   $currentNode = $this->options;
+   foreach ( $segments as $segment ) {
+   if ( array_key_exists( $segment, $currentNode ) ) {
+   $currentNode = $currentNode[$segment];
} else {
-   throw new ConfigurationKeyException( 
"Configuration key '{$node}' does not exist.", $node );
+   throw new ConfigurationKeyException( 
"Configuration key '{$path}' does not exist.", $path );
}
}
 
-   if ( $returnRef ) {
-   return $croot;
-   } else {
-   // Dereference the variable
-   $obj = $croot;
-   return $obj;
-   }
+   return $currentNode;
}
 
/**
@@ -208,7 +193,7 @@
 */
public function nodeExists( $node ) {
try {
-   $this->val( $node, true );
+   $this->val( $node );
return true;
} catch ( ConfigurationKeyException $ex ) {
return false;
diff --git a/Core/DataStores/QueueWrapper.php b/Core/DataStores/QueueWrapper.php
index ac504f6..537038d 100644
--- a/Core/DataStores/QueueWrapper.php
+++ b/Core/DataStores/QueueWrapper.php
@@ -30,7 +30,7 @@
 $key = "data-store/$queueName";
 
 // Examine the config node for a queue name
-$node = $config->val( $key, true );
+$node = $config->val( $key );
 if (
 empty( $node['constructor-parameters'] ) ||
 empty( $node['constructor-parameters'][0]['queue'] )
@@ -52,4 +52,4 @@
 return $config->object( $key );
 }
 
-}
\ No newline at end of file
+}
diff --git a/Core/Listeners/ListenerBase.php b/Core/Listeners/ListenerBase.php
index 2c32225..9d35737 100644
--- a/Core/Listeners/ListenerBase.php
+++ b/Core/Listeners/ListenerBase.php
@@ -49,7 +49,7 @@
 */
protected function validateRemoteIp() {
// Obtain whitelist
-   $whitelist = $this->c->val( 'security/ip-whitelist', true );
+   $whitelist = 

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Restore unsubscribe tag replacement

[jenkins-bot (Code Review)]

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

Change subject: Restore unsubscribe tag replacement
..


Restore unsubscribe tag replacement

Bug: T170302
Change-Id: If4eab0a9ab95980445b606a5f7b47a7980ea0596
---
M sites/all/modules/thank_you/generators/ThankYou.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/sites/all/modules/thank_you/generators/ThankYou.php 
b/sites/all/modules/thank_you/generators/ThankYou.php
index fa6fc89..9eb26cd 100644
--- a/sites/all/modules/thank_you/generators/ThankYou.php
+++ b/sites/all/modules/thank_you/generators/ThankYou.php
@@ -28,6 +28,7 @@
'/\[endifRecurringProblem\]<\/p>/' => "\n{% endif 
%}",
'/()?\[ifRecurring\]\s*/' => "{% if recurring 
%}\n\\1",
'/\s*\[endifRecurring\]\s*(<\/p>)?/' => "\\1\n{% endif 
%}",
+   '/\[#?unsubscribe ((?:(?!\]).)*)\]/' => '$1',
// All of the thank you letter's if...endif blocks 
should be outside p tags, not inside
'/\s*({%\s*if [^}]+})\s*/i' => "\\1\n",
'/\s*{%\s*endif\s*%}\s*<\/p>/i' => "\n{% endif %}",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Redo "enable mapframe for euwiki, ptwiki and uawikimedia"

[jenkins-bot (Code Review)]

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

Change subject: Redo "enable mapframe for euwiki, ptwiki and uawikimedia"
..


Redo "enable mapframe for euwiki, ptwiki and uawikimedia"

Bug: T167619
Bug: T168915
Bug: T164574
Bug: T171805

This reverts commit 1990549e4935255f5cd0bffed99569002d2bb8e2.

Change-Id: I18c1a63c0559b16652600d0d0e78b0f0ffdfa001
---
M wmf-config/InitialiseSettings.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 32af7bc..574936d 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19048,14 +19048,19 @@
'default' => false,
'mediawikiwiki' => true,
'cawiki' => true,
+   'cswiki' => true, // T171588
+   'euwiki' => true, // T167619
'fiwiki' => true, // T151591
'frwiki' => true,
'hewiki' => true,
'mkwiki' => true,
'nowiki' => true, // T154021
+   'ptwiki' => true, // T168915
'ruwiki' => true,
+   'svwiki' => true, // T161032
'testwiki' => true,
'test2wiki' => true,
+   'uawikimedia' => true, // T164574
 ],
 
 'wgKartographerEnableMapFrame' => [
@@ -19063,11 +19068,13 @@
'wikipedia' => false,
'cawiki' => true,
'cswiki' => true, // T171588
+   'euwiki' => true, // T167619
'fiwiki' => true, // T151591
'frwiki' => true,
'hewiki' => true,
'mkwiki' => true,
'nowiki' => true, // T154021
+   'ptwiki' => true, // T168915
'ruwiki' => true,
'svwiki' => true, // T161032
'testwiki' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18c1a63c0559b16652600d0d0e78b0f0ffdfa001
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Debt 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...tools[master]: Final export should have blanks instead of NULL

[jenkins-bot (Code Review)]

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

Change subject: Final export should have blanks instead of NULL
..


Final export should have blanks instead of NULL

Adds some defaults and constraints on the stats columns instead of
updating them at the end.

Also switches blank export test to look at view.

Bug: T91692
Change-Id: Idc8103e0d6b269dbc49db39422cdab63a9be19d8
---
M silverpop_export/tests/test_update.py
M silverpop_export/update_table.sql
2 files changed, 19 insertions(+), 29 deletions(-)

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



diff --git a/silverpop_export/tests/test_update.py 
b/silverpop_export/tests/test_update.py
index a15841c..53dae36 100644
--- a/silverpop_export/tests/test_update.py
+++ b/silverpop_export/tests/test_update.py
@@ -83,14 +83,13 @@
"highest_native_amount, highest_native_currency, " +
"highest_donation_date, lifetime_usd_total, " +
"donation_count, latest_currency, latest_native_amount, " +
-   "latest_usd_amount, latest_donation from silverpop_export")
+   "latest_usd_amount, latest_donation_date from 
silverpop_export_view")
 actual = cursor.fetchone()
-print(actual)
-expected = (0, Decimal('0.00'),
-Decimal('0.00'), None,
-None, Decimal('0.00'),
-0, None, Decimal('0.00'),
-Decimal('0.00'), None)
+expected = ('NO', Decimal('0.00'),
+Decimal('0.00'), '',
+'', Decimal('0.00'),
+0, '', Decimal('0.00'),
+Decimal('0.00'), '')
 assert actual == expected
 
 
diff --git a/silverpop_export/update_table.sql 
b/silverpop_export/update_table.sql
index 7fb768a..ab6932f 100755
--- a/silverpop_export/update_table.sql
+++ b/silverpop_export/update_table.sql
@@ -26,19 +26,19 @@
   opted_out tinyint(1),
 
   -- Lifetime contribution statistics
-  has_recurred_donation tinyint(1),
-  highest_usd_amount decimal(20,2),
-  highest_native_amount decimal(20,2),
-  highest_native_currency varchar(3),
-  lifetime_usd_total decimal(20,2),
-  donation_count int,
+  has_recurred_donation tinyint(1) not null default 0,
+  highest_usd_amount decimal(20,2) not null default 0,
+  highest_native_amount decimal(20,2) not null default 0,
+  highest_native_currency varchar(3) not null default '',
+  lifetime_usd_total decimal(20,2) not null default 0,
+  donation_count int not null default 0,
 
   -- Latest contribution statistics
-  latest_currency varchar(3),
-  latest_native_amount decimal(20,2),
-  latest_usd_amount decimal(20,2),
-  latest_donation datetime,
-  highest_donation_date datetime,
+  latest_currency varchar(3) not null default '',
+  latest_native_amount decimal(20,2) not null default 0,
+  latest_usd_amount decimal(20,2) not null default 0,
+  latest_donation datetime null,
+  highest_donation_date datetime null,
 
   -- Address information
   city varchar(128),
@@ -290,15 +290,6 @@
 
 -- Normalize the data prior to final export
 UPDATE silverpop_export_staging SET preferred_language='en' WHERE 
preferred_language IS NULL;
-UPDATE silverpop_export_staging SET
-highest_usd_amount = 0,
-lifetime_usd_total = 0,
-donation_count = 0,
-latest_native_amount = 0,
-latest_usd_amount = 0,
-highest_native_amount = 0,
-has_recurred_donation = 0
-  WHERE donation_count IS NULL AND opted_out = 0;
 UPDATE silverpop_export_staging SET country='US' where country IS NULL AND 
opted_out = 0;
 
 --
@@ -412,9 +403,9 @@
 highest_usd_amount,
 highest_native_amount,
 highest_native_currency,
-DATE_FORMAT(highest_donation_date, '%m/%d/%Y') highest_donation_date,
+IFNULL(DATE_FORMAT(highest_donation_date, '%m/%d/%Y'), '') 
highest_donation_date,
 lifetime_usd_total,
-DATE_FORMAT(latest_donation, '%m/%d/%Y') latest_donation_date,
+IFNULL(DATE_FORMAT(latest_donation, '%m/%d/%Y'), '') latest_donation_date,
 latest_usd_amount,
 latest_currency,
 latest_native_amount,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc8103e0d6b269dbc49db39422cdab63a9be19d8
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid duplicate accesskey hints on OOUI widgets

[jenkins-bot (Code Review)]

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

Change subject: Avoid duplicate accesskey hints on OOUI widgets
..


Avoid duplicate accesskey hints on OOUI widgets

Values returned by `Linker::tooltipAndAccesskeyAttribs()` and
`Linker::titleAttrib( ..., 'withaccess' )` include an accesskey
hint in the title text. This is unnecessary when used for OOjs UI
widgets, since after the changes from T168408 they display an
accesskey hint automatically.

Also fixed some other accesskey bugs in HTMLForm which probably
no one ever ran into.

Bug: T168408
Change-Id: I63285b5bce3341875a6d82eba059623bf105ca62
---
M includes/EditPage.php
M includes/htmlform/HTMLFormField.php
M includes/htmlform/OOUIHTMLForm.php
M includes/htmlform/fields/HTMLCheckField.php
M includes/htmlform/fields/HTMLMultiSelectField.php
M includes/htmlform/fields/HTMLTextAreaField.php
M includes/htmlform/fields/HTMLTextField.php
7 files changed, 45 insertions(+), 16 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 229a36a..fc77006 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3076,7 +3076,7 @@
'tabindex' => 1,
'size' => 60,
'spellcheck' => 'true',
-   ] + Linker::tooltipAndAccesskeyAttribs( 'summary' );
+   ];
}
 
/**
@@ -3097,6 +3097,7 @@
$inputAttrs = null, $spanLabelAttrs = null
) {
$inputAttrs = $this->getSummaryInputAttributes( $inputAttrs );
+   $inputAttrs += Linker::tooltipAndAccesskeyAttribs( 'summary' );
 
$spanLabelAttrs = ( is_array( $spanLabelAttrs ) ? 
$spanLabelAttrs : [] ) + [
'class' => $this->missingSummary ? 'mw-summarymissed' : 
'mw-summary',
@@ -3132,6 +3133,10 @@
$inputAttrs = OOUI\Element::configFromHtmlAttributes(
$this->getSummaryInputAttributes( $inputAttrs )
);
+   $inputAttrs += [
+   'title' => Linker::titleAttrib( 'summary' ),
+   'accessKey' => Linker::accesskey( 'summary' ),
+   ];
 
// For compatibility with old scripts and extensions, we want 
the legacy 'id' on the ``
$inputAttrs['inputId'] = $inputAttrs['id'];
@@ -4277,7 +4282,7 @@
$accesskey = null;
if ( isset( $options['tooltip'] ) ) {
$accesskey = $this->context->msg( 
"accesskey-{$options['tooltip']}" )->text();
-   $title = Linker::titleAttrib( 
$options['tooltip'], 'withaccess' );
+   $title = Linker::titleAttrib( 
$options['tooltip'] );
}
if ( isset( $options['title-message'] ) ) {
$title = $this->context->msg( 
$options['title-message'] )->text();
@@ -4355,8 +4360,7 @@
$attribs = [
'name' => 'wpSave',
'tabindex' => ++$tabindex,
-   ] + Linker::tooltipAndAccesskeyAttribs( 'save' );
-
+   ];
if ( $this->oouiEnabled ) {
$saveConfig = OOUI\Element::configFromHtmlAttributes( 
$attribs );
$buttons['save'] = new OOUI\ButtonInputWidget( [
@@ -4368,11 +4372,13 @@
'label' => $buttonLabel,
'infusable' => true,
'type' => 'submit',
+   'title' => Linker::titleAttrib( 'save' ),
+   'accessKey' => Linker::accesskey( 'save' ),
] + $saveConfig );
} else {
$buttons['save'] = Html::submitButton(
$buttonLabel,
-   $attribs + [ 'id' => 'wpSave' ],
+   $attribs + Linker::tooltipAndAccesskeyAttribs( 
'save' ) + [ 'id' => 'wpSave' ],
[ 'mw-ui-progressive' ]
);
}
@@ -4380,7 +4386,7 @@
$attribs = [
'name' => 'wpPreview',
'tabindex' => ++$tabindex,
-   ] + Linker::tooltipAndAccesskeyAttribs( 'preview' );
+   ];
if ( $this->oouiEnabled ) {
$previewConfig = 
OOUI\Element::configFromHtmlAttributes( $attribs );
$buttons['preview'] = new OOUI\ButtonInputWidget( [
@@ -4390,18 +4396,20 @@
'useInputTag' => true,
'label' => $this->context->msg( 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revert "mw.action.edit: Restore modifier keys for accesskey ...

[jenkins-bot (Code Review)]

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

Change subject: Revert "mw.action.edit: Restore modifier keys for accesskey in 
tooltip for summary field"
..


Revert "mw.action.edit: Restore modifier keys for accesskey in tooltip for 
summary field"

No longer needed after changes from T168408.

This reverts commit 0269ae0fe57f5192743e99ccd67970db989b542d.

Bug: T168408
Change-Id: I50c24a9bada19a0e7d3a009c9afec073f6ffa357
---
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.js
2 files changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index 82f285e..45a90d1 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1423,7 +1423,6 @@
'styles' => 
'resources/src/mediawiki.action/mediawiki.action.edit.css',
'dependencies' => [
'mediawiki.action.edit.styles',
-   'jquery.accessKeyLabel',
'jquery.textSelection',
'jquery.byteLimit',
'mediawiki.widgets.visibleByteLimit',
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js 
b/resources/src/mediawiki.action/mediawiki.action.edit.js
index 5b81017..5a9ed7e 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -23,10 +23,6 @@
mw.loader.using( 'oojs-ui-core' ).then( function () {
var wpSummary = OO.ui.infuse( $( 
'#wpSummaryWidget' ) );
 
-   // Restore appropriate modifier keys for the 
accesskey in the 'title' attribute
-   // TODO: This should be an OOjs UI feature, or 
somehow happen automatically after infusing.
-   wpSummary.$input.updateTooltipAccessKeys();
-
// Show a byte-counter to users with how many 
bytes are left for their edit summary.
// TODO: This looks a bit weird, as there is no 
unit in the UI, just numbers; showing
// 'bytes' confused users in testing, and 
showing 'chars' would be a lie. See T42035.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50c24a9bada19a0e7d3a009c9afec073f6ffa357
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Jforrester (Code Review)]

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

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

Update VE core submodule to master (18ae4004f)

New changes:
887ebb1a4 Clarify comments that certain 'html' parameters must be whole 
documents
cc50757ee LinearTabKeyDownHandler: Abort if modifiers are used
23f70f760 jsduck: Explcitly name library files so we don't pull in CSS files
18ae4004f Update OOjs UI to v0.22.4

Bug: T171600
Bug: T172168
Change-Id: I2510174db0f650113702674e37e768aa558f02cc
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/ve b/lib/ve
index 4d6745b..18ae400 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 4d6745b2f8ea2dc89dfb7e22855983e0469cf859
+Subproject commit 18ae4004fc776e102f90d2e7c078f8bcd98a410a

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2510174db0f650113702674e37e768aa558f02cc
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...gerrit[master]: Adding targets since we don't have a dsh list

[Chad (Code Review)]

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

Change subject: Adding targets since we don't have a dsh list
..

Adding targets since we don't have a dsh list

(This should be automated later)

Also while we're here, ignore the log directory

Change-Id: I7e50ebae99f0adf7f7dc6b182ffdd6f63295932f
---
A scap/.gitignore
M scap/scap.cfg
A scap/targets
3 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/gerrit 
refs/changes/62/369562/1

diff --git a/scap/.gitignore b/scap/.gitignore
new file mode 100644
index 000..80dd262
--- /dev/null
+++ b/scap/.gitignore
@@ -0,0 +1 @@
+log/
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 23e926c..72d5c8b 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -1,5 +1,5 @@
 [global]
 git_repo: gerrit/gerrit
 ssh_user: gerrit2
-dsh_targets: /etc/dsh/group/gerrit
+dsh_targets: /srv/deployment/gerrit/gerrit/scap/targets
 git_fat: True
diff --git a/scap/targets b/scap/targets
new file mode 100644
index 000..00381bb
--- /dev/null
+++ b/scap/targets
@@ -0,0 +1,2 @@
+cobalt.wikimedia.org
+gerrit2001.wikimedia.org

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e50ebae99f0adf7f7dc6b182ffdd6f63295932f
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/gerrit
Gerrit-Branch: master
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add 'advanced filters' label to the view selection

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Add 'advanced filters' label to the view selection
..

RCFilters: Add 'advanced filters' label to the view selection

Bug: T171894
Change-Id: I595d7d4a66eaedb76c9a4e4690be4ec4ef696a2d
---
M languages/i18n/en.json
M resources/Resources.php
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
4 files changed, 12 insertions(+), 0 deletions(-)


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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index d9bbf9a..039d617 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1451,6 +1451,7 @@
"rcfilters-tag-prefix-tags": "#$1",
"rcfilters-exclude-button-off": "Exclude selected",
"rcfilters-exclude-button-on": "Excluding selected",
+   "rcfilters-view-advanced-filters-label": "Advanced filters",
"rcfilters-view-tags": "Tagged edits",
"rcfilters-view-namespaces-tooltip": "Filter results by namespace",
"rcfilters-view-tags-tooltip": "Filter results using edit tags",
diff --git a/resources/Resources.php b/resources/Resources.php
index 82f285e..5c29e83 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1878,6 +1878,7 @@
'rcfilters-tag-prefix-tags',
'rcfilters-exclude-button-off',
'rcfilters-exclude-button-on',
+   'rcfilters-view-advanced-filters-label',
'rcfilters-view-tags',
'rcfilters-view-namespaces-tooltip',
'rcfilters-view-tags-tooltip',
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index a5cf744..076636c 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -70,6 +70,9 @@
margin-left: 0;
}
 
+   
.oo-ui-labelElement.oo-ui-optionWidget.oo-ui-buttonElement:first-child {
+   margin-left: 0;
+   }
}
}
}
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 934c7c4..08beacd 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -141,6 +141,13 @@
items: [
new OO.ui.ButtonOptionWidget( {
framed: false,
+   data: '',
+   disabled: true,
+   classes: [ 
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget-label' ],
+   label: mw.msg( 
'rcfilters-view-advanced-filters-label' )
+   } ),
+   new OO.ui.ButtonOptionWidget( {
+   framed: false,
data: 'namespaces',
icon: 'article',
title: mw.msg( 
'rcfilters-view-namespaces-tooltip' )

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Update OOjs UI to v0.22.4

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

Depends-On: I505e7c612b70a949d2b101172964bd7433fb8d5e
Change-Id: Ice2c56b035c5b9e6525d5b9c0d9b45eb07bb2943
---
M composer.json
M resources/lib/oojs-ui/i18n/as.json
M resources/lib/oojs-ui/i18n/bs.json
M resources/lib/oojs-ui/i18n/pt-br.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-core.js.map
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-widgets.js.map
M resources/lib/oojs-ui/oojs-ui-wikimediaui.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-wikimediaui.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-media.json
A resources/lib/oojs-ui/themes/apex/images/icons/play-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/play-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/play-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/play-rtl.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-ltr-invert.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-ltr-invert.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-ltr-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-ltr-progressive.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-ltr.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-ltr.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-rtl-invert.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-rtl-invert.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-rtl-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-rtl-progressive.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-rtl.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/play-rtl.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/stop-invert.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/stop-invert.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/stop-progressive.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/stop-progressive.svg
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/stop.png
M resources/lib/oojs-ui/themes/wikimediaui/images/icons/stop.svg
43 files changed, 352 insertions(+), 130 deletions(-)

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




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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: QA: Use css rather than class for finding toast

[Jdlrobson (Code Review)]

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

Change subject: QA: Use css rather than class for finding toast
..

QA: Use css rather than class for finding toast

Bug: T170890
Change-Id: I86e48e00ebb83772149da7c7f20097b5436a0cf5
---
M tests/browser/features/support/pages/article_page.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue 
refs/changes/61/369561/1

diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 2b733ae..6b146b0 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -145,7 +145,7 @@
 
   # toast
   div(:notification_area, id: 'mw-notification-area')
-  div(:toast, class: 'mw-notification')
+  div(:toast, css: 'mw-notification')
 
   # loader
   div(:content_wrapper, id: 'content')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86e48e00ebb83772149da7c7f20097b5436a0cf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Enable manage_home in scap

[Paladox (Code Review)]

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

Change subject: Gerrit: Enable manage_home in scap
..

Gerrit: Enable manage_home in scap

Needed for the ssh key to be added to the user

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/369560/1


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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add syslog-udp for logstash testing on 11515

[EBernhardson (Code Review)]

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

Change subject: Add syslog-udp for logstash testing on 11515
..

Add syslog-udp for logstash testing on 11515

Lets see if using udp directly, rather than syslog,
makes any difference for this bug.

Bug: T166126
Change-Id: I896266f2aac3ef5e41dc47e22edaf886fc7c5a89
---
M modules/role/manifests/logstash/collector.pp
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/369559/1

diff --git a/modules/role/manifests/logstash/collector.pp 
b/modules/role/manifests/logstash/collector.pp
index 38d561f..ad7a372 100644
--- a/modules/role/manifests/logstash/collector.pp
+++ b/modules/role/manifests/logstash/collector.pp
@@ -37,6 +37,13 @@
 port => 10514,
 }
 
+# T166126 Testing a different syslog method
+logstash::input::udp { 'syslog-udp':
+port  => 10515,
+type  => 'syslog',
+codec => 'plain',
+}
+
 ferm::service { 'logstash_syslog_udp':
 proto   => 'udp',
 port=> '10514',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...restbase[master]: Temporary fallback to the new storage buckets in order to tr...

[Ppchelko (Code Review)]

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

Change subject: Temporary fallback to the new storage buckets in order to 
truncate the tables
..

Temporary fallback to the new storage buckets in order to truncate the tables

Change-Id: I5d5ecc76ed288f26793ace2cc3fc9c676ac8b54c
---
M sys/parsoid.js
1 file changed, 84 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase 
refs/changes/58/369558/1

diff --git a/sys/parsoid.js b/sys/parsoid.js
index b64f638..d83ad82 100644
--- a/sys/parsoid.js
+++ b/sys/parsoid.js
@@ -213,8 +213,11 @@
 };
 }
 
-getBucketURI(rp, format, tid, useKeyRevValue) {
-const bucket = useKeyRevValue ? 'key_rev_value' : 
this.options.bucket_type;
+getBucketURI(rp, format, tid, forceKeyRevValue, useNewBucket) {
+const bucket = forceKeyRevValue ? 'key_rev_value' : 
this.options.bucket_type;
+if (useNewBucket) {
+format = `${format}-2`;
+}
 const path = [rp.domain, 'sys', bucket, `parsoid.${format}`, rp.title];
 if (rp.revision) {
 path.push(rp.revision);
@@ -223,6 +226,39 @@
 }
 }
 return new URI(path);
+}
+
+_getContentWithFallbackTEMP(hyper, req, format, tid) {
+const rp = req.params;
+return hyper.get({
+uri: this.getBucketURI(rp, format, tid, false, true)
+})
+.catch({ status: 404 }, () => {
+// On 404 we need to transfer all the content
+// from the old bucket to the new bucket
+return P.props({
+html: hyper.get({
+uri: this.getBucketURI(rp, 'html', tid, false, false)
+}),
+'data-parsoid': hyper.get({
+uri: this.getBucketURI(rp, 'html', tid, false, false)
+}),
+'section.offsets': hyper.get({
+uri: this.getBucketURI(rp, 'html', tid, false, false)
+})
+})
+.then((res) => {
+req.params.revision = 
mwUtil.parseETag(res.html.headers.etag).rev;
+return this.saveParsoidResult(hyper, req, format, tid, {
+body: res
+}, true)
+.thenReturn({
+status: 200,
+headers: res[format].headers,
+body: res[format].body
+});
+});
+});
 }
 
 pagebundle(hyper, req) {
@@ -236,23 +272,23 @@
 return hyper.request(newReq);
 }
 
-saveParsoidResult(hyper, req, format, tid, parsoidResp) {
+saveParsoidResult(hyper, req, format, tid, parsoidResp, useNewBucket) {
 const rp = req.params;
 return P.join(
 hyper.put({
-uri: this.getBucketURI(rp, 'data-parsoid', tid),
+uri: this.getBucketURI(rp, 'data-parsoid', tid, false, 
useNewBucket),
 headers: parsoidResp.body['data-parsoid'].headers,
 body: parsoidResp.body['data-parsoid'].body
 }),
 hyper.put({
-uri: this.getBucketURI(rp, 'section.offsets', tid),
+uri: this.getBucketURI(rp, 'section.offsets', tid, false, 
useNewBucket),
 headers: { 'content-type': 'application/json' },
 body: parsoidResp.body['data-parsoid'].body.sectionOffsets
 })
 )
 // Save HTML last, so that any error in metadata storage suppresses 
HTML.
 .then(() => hyper.put({
-uri: this.getBucketURI(rp, 'html', tid),
+uri: this.getBucketURI(rp, 'html', tid, false, useNewBucket),
 headers: parsoidResp.body.html.headers,
 body: parsoidResp.body.html.body
 }));
@@ -288,9 +324,8 @@
 if (reqRevision !== rp.revision) {
 // Try to fetch the HTML corresponding to the requested 
revision,
 // so that the change detection makes sense.
-return hyper.get({
-uri: this.getBucketURI(rp, format, rp.tid)
-}).then(
+return this._getContentWithFallbackTEMP(hyper, req, format, 
rp.tid)
+.then(
 (contentRes) => {
 currentContentRes = contentRes;
 },
@@ -344,7 +379,7 @@
 body: res.body[format].body
 };
 resp.headers.etag = mwUtil.makeETag(rp.revision, tid);
-return this.saveParsoidResult(hyper, req, format, tid, res)
+return this.saveParsoidResult(hyper, req, format, tid, 
res, true)
 .then(() => {
 // Extract redirect target, if any
 const redirectTarget = 

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Move gloss widget styles to separate file

[jenkins-bot (Code Review)]

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

Change subject: Move gloss widget styles to separate file
..


Move gloss widget styles to separate file

Bug: T172196
Change-Id: I1a70c1185723e0d919ae9af7ac9c723029641e21
---
M resources/lexeme.less
A resources/sense-gloss-widget.less
2 files changed, 56 insertions(+), 60 deletions(-)

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



diff --git a/resources/lexeme.less b/resources/lexeme.less
index a580f8c..f7e3c52 100644
--- a/resources/lexeme.less
+++ b/resources/lexeme.less
@@ -93,10 +93,8 @@
 
 .wb-lexeme {
@import 'lemma-widget';
-}
-
-.wb-lexeme {
@import 'form-representation-widget';
+   @import 'sense-gloss-widget';
 }
 
 .wikibase-lexeme-senses .wikibase-lexeme-sense {
@@ -115,63 +113,6 @@
float: left;
 }
 
-/* === wikibase-lexeme-sense-glosses === */
-
-.wikibase-lexeme-sense-glosses {
-   margin-right: 252px;
-}
-
-.wikibase-lexeme-sense-glosses-table {
-   color: #565a60;
-   width: 100%;
-   border-left: 6px solid #ededed;
-}
-
-.wikibase-lexeme-sense-gloss-table-header {
-   color: #000;
-}
-
-.wikibase-lexeme-sense-glosses-table td {
-   vertical-align: top;
-}
-
-.wikibase-lexeme-sense-gloss:first-of-type {
-   color: #000;
-}
-
-.wikibase-lexeme-sense-glosses-sense-id {
-   display: none;
-}
-
-.wikibase-lexeme-sense-gloss:first-of-type 
.wikibase-lexeme-sense-glosses-sense-id {
-   display: inline;
-}
-
-.wikibase-lexeme-sense-gloss-language {
-   padding: 0 5px;
-   white-space: nowrap;
-}
-
-.wikibase-lexeme-sense-gloss-value-cell {
-   width: 99%; /* ... because it is a table cell */
-}
-
-.wikibase-lexeme-sense-gloss-value-input {
-   width: 100%;
-   resize: horizontal;
-}
-
-.wikibase-lexeme-sense-glosses-control {
-   text-transform: capitalize;
-   color: #1f66cc;
-   background: transparent;
-   border: none;
-   cursor: pointer;
-}
-
-.wikibase-lexeme-sense-glosses-control:hover {
-   text-decoration: underline;
-}
 
 .wikibase-lexeme-sense .wikibase-statementgrouplistview::after {
/* This is clearfix */
diff --git a/resources/sense-gloss-widget.less 
b/resources/sense-gloss-widget.less
new file mode 100644
index 000..71e8855
--- /dev/null
+++ b/resources/sense-gloss-widget.less
@@ -0,0 +1,55 @@
+.wikibase-lexeme-sense-glosses {
+   margin-right: 252px;
+}
+
+.wikibase-lexeme-sense-glosses-table {
+   color: #565a60;
+   width: 100%;
+   border-left: 6px solid #ededed;
+}
+
+.wikibase-lexeme-sense-gloss-table-header {
+   color: #000;
+}
+
+.wikibase-lexeme-sense-glosses-table td {
+   vertical-align: top;
+}
+
+.wikibase-lexeme-sense-gloss:first-of-type {
+   color: #000;
+}
+
+.wikibase-lexeme-sense-glosses-sense-id {
+   display: none;
+}
+
+.wikibase-lexeme-sense-gloss:first-of-type 
.wikibase-lexeme-sense-glosses-sense-id {
+   display: inline;
+}
+
+.wikibase-lexeme-sense-gloss-language {
+   padding: 0 5px;
+   white-space: nowrap;
+}
+
+.wikibase-lexeme-sense-gloss-value-cell {
+   width: 99%; /* ... because it is a table cell */
+}
+
+.wikibase-lexeme-sense-gloss-value-input {
+   width: 100%;
+   resize: horizontal;
+}
+
+.wikibase-lexeme-sense-glosses-control {
+   text-transform: capitalize;
+   color: #1f66cc;
+   background: transparent;
+   border: none;
+   cursor: pointer;
+}
+
+.wikibase-lexeme-sense-glosses-control:hover {
+   text-decoration: underline;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a70c1185723e0d919ae9af7ac9c723029641e21
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) 
Gerrit-Reviewer: Jakob 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
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...rdf[master]: Fix backoff handling in the updater.

[jenkins-bot (Code Review)]

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

Change subject: Fix backoff handling in the updater.
..


Fix backoff handling in the updater.

If we retry change set with old changes, we should use
new batch set, to advance due to backoff overflow.

Change-Id: I37ed02ffb08d13b8b429ee4c18648a249a908629
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Updater.java
M 
tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
2 files changed, 9 insertions(+), 2 deletions(-)

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



diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Updater.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/Updater.java
index dfb442b..c954403 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Updater.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Updater.java
@@ -271,6 +271,7 @@
 continue;
 }
 if (batch.changes().isEmpty()) {
+prevBatch = batch;
 continue;
 }
 log.debug("{} changes in batch", batch.changes().size());
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
index 9da17af..640417b 100644
--- 
a/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
+++ 
b/tools/src/main/java/org/wikidata/query/rdf/tool/change/RecentChangesPoller.java
@@ -363,13 +363,18 @@
 }
 }
 final ImmutableList changes = 
ImmutableList.copyOf(changesByTitle.values());
+// Backoff overflow is when:
+// a. We use backoff
+// b. We got full batch of changes.
+// c. None of those were new changes.
+// In this case, sleeping and trying again is obviously useless.
 final boolean backoffOverflow = useBackoff && changes.size() == 0 
&& result.size() >= batchSize;
 if (backoffOverflow) {
 // We have a problem here - due to backoff, we did not fetch 
any new items
 // Try to advance one second, even though we risk to lose a 
change - in hope
 // that trailing poller will pick them up.
 nextStartTime += 1000;
-log.info("Backoff overflow, advancing to {}", 
inputDateFormat().format(new Date(nextStartTime)));
+log.info("Backoff overflow, advancing next time to {}", 
inputDateFormat().format(new Date(nextStartTime)));
 }
 
 if (changes.size() != 0) {
@@ -386,7 +391,8 @@
 long advanced = nextStartTime - lastNextStartTime.getTime();
 Batch batch = new Batch(changes, advanced, upTo, new 
Date(nextStartTime), nextContinue);
 if (backoffOverflow && nextContinue != null) {
-// We will not sleep only if continue is provided.
+// We will not sleep if continue is provided.
+log.info("Got only old changes, next is: {}", 
nextContinue.toJSONString());
 batch.hasChanges(true);
 }
 return batch;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37ed02ffb08d13b8b429ee4c18648a249a908629
Gerrit-PatchSet: 3
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Gehel 
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/core[master]: RCFilters: Trim results to allow searching for spaces after ...

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Trim results to allow searching for spaces after 
trigger
..

RCFilters: Trim results to allow searching for spaces after trigger

Recognize a search string even if there are spaces after the trigger,
for example, '#   sometag' as 'sometag' in the 'tags' view.

Bug: T168225
Change-Id: Ic31b73396d9afe8cd62398b4cf5116f8aee25e67
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/369557/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 a6a22ef..52c5bb0 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -848,6 +848,9 @@
if ( view !== 'default' ) {
query = query.substr( 1 );
}
+   // Trim again to also intercept cases where the spaces were 
after the trigger
+   // eg: '#   str'
+   query = query.trim();
 
// Check if the search if actually empty; this can be a problem 
when
// we use prefixes to denote different views

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Update OOjs UI to v0.22.4

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

Change-Id: I505e7c612b70a949d2b101172964bd7433fb8d5e
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/History.md
A oojs/oojs-ui/bin/dependencytree.rb
M oojs/oojs-ui/demos/classes/DraggableHandledItemWidget.js
M oojs/oojs-ui/demos/classes/DraggableItemWidget.js
A oojs/oojs-ui/demos/classes/DynamicLabelTextInputWidget.js
A oojs/oojs-ui/demos/classes/SimpleWidget.css
A oojs/oojs-ui/demos/classes/SimpleWidget.js
M oojs/oojs-ui/demos/index.html
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/i18n/as.json
M oojs/oojs-ui/i18n/bs.json
M oojs/oojs-ui/i18n/pt-br.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/Tag.php
M oojs/oojs-ui/php/Widget.php
M oojs/oojs-ui/php/layouts/FieldLayout.php
M oojs/oojs-ui/php/layouts/FieldsetLayout.php
M oojs/oojs-ui/php/mixins/AccessKeyedElement.php
M oojs/oojs-ui/php/mixins/TabIndexedElement.php
M oojs/oojs-ui/php/mixins/TitledElement.php
25 files changed, 412 insertions(+), 125 deletions(-)

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



diff --git a/composer.json b/composer.json
index 8410b2d..2dcfd8d 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"monolog/monolog": "1.22.1",
"mustangostang/spyc": "0.6.2",
"nmred/kafka-php": "0.1.5",
-   "oojs/oojs-ui": "0.22.3",
+   "oojs/oojs-ui": "0.22.4",
"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 f2711f6..355956c 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": "d3e0811f4f6f8eb8bd96e36bd53702ea",
+"content-hash": "301c4a097e044e617ab5b804f5b99a22",
 "packages": [
 {
 "name": "composer/semver",
@@ -516,16 +516,16 @@
 },
 {
 "name": "oojs/oojs-ui",
-"version": "v0.22.3",
+"version": "v0.22.4",
 "source": {
 "type": "git",
 "url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc"
+"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/796f52473294e923d0133bb1b0b3629d9b1332bc;,
-"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc",
+"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/bb1b15c47835468f133a56aa56a721f8793c61f7;,
+"reference": "bb1b15c47835468f133a56aa56a721f8793c61f7",
 "shasum": ""
 },
 "require": {
@@ -591,7 +591,7 @@
 ],
 "description": "Provides library of common widgets, layouts, and 
windows.",
 "homepage": "https://www.mediawiki.org/wiki/OOjs_UI;,
-"time": "2017-07-11T21:50:03+00:00"
+"time": "2017-08-01T19:55:30+00:00"
 },
 {
 "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 36c3a06..f37cf29 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -2161,87 +2161,6 @@
 ]
 },
 {
-"name": "oojs/oojs-ui",
-"version": "v0.22.3",
-"version_normalized": "0.22.3.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git;,
-"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/796f52473294e923d0133bb1b0b3629d9b1332bc;,
-"reference": "796f52473294e923d0133bb1b0b3629d9b1332bc",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-"php": ">=5.5.9"
-},
-"require-dev": {
-"jakub-onderka/php-parallel-lint": "0.9.2",
-"mediawiki/mediawiki-codesniffer": "0.10.0",
-"phpunit/phpunit": "4.8.21"
-},
-"time": "2017-07-11T21:50:03+00:00",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"classmap": [
- 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: jsduck: Explcitly name library files so we don't pull in CSS...

[jenkins-bot (Code Review)]

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

Change subject: jsduck: Explcitly name library files so we don't pull in CSS 
files
..


jsduck: Explcitly name library files so we don't pull in CSS files

Change-Id: I8ee7c8a609543237f8280c190a9806cf5079de96
---
M jsduck.json
1 file changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/jsduck.json b/jsduck.json
index cbd4676..7e59432 100644
--- a/jsduck.json
+++ b/jsduck.json
@@ -37,7 +37,12 @@
"resources/src/jquery/jquery.suggestions.js",
"resources/src/jquery/jquery.tabIndex.js",
"resources/lib/jquery.client/jquery.client.js",
-   "resources/lib/oojs",
-   "resources/lib/oojs-ui"
+   "resources/lib/oojs/oojs.jquery.js",
+   "resources/lib/oojs-ui/oojs-ui-core.js",
+   "resources/lib/oojs-ui/oojs-ui-widgets.js",
+   "resources/lib/oojs-ui/oojs-ui-toolbars.js",
+   "resources/lib/oojs-ui/oojs-ui-windows.js",
+   "resources/lib/oojs-ui/oojs-ui-wikimediaui.js",
+   "resources/lib/oojs-ui/oojs-ui-apex.js"
]
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ee7c8a609543237f8280c190a9806cf5079de96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Scroll widget to top when switching view

[Mooeypoo (Code Review)]

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

Change subject: RCFilters: Scroll widget to top when switching view
..

RCFilters: Scroll widget to top when switching view

Bug: T170651
Change-Id: I19865b0af73e88c2893ba688476aa505d7730947
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 934c7c4..530429e 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -29,6 +29,7 @@
this.queriesModel = savedQueriesModel;
this.$overlay = config.$overlay || this.$element;
this.matchingQuery = null;
+   this.currentView = this.model.getCurrentView();
 
// Parent
mw.rcfilters.ui.FilterTagMultiselectWidget.parent.call( this, 
$.extend( true, {
@@ -360,6 +361,11 @@
 
// Update input
this.input.setValue( inputValue );
+
+   if ( this.currentView !== view ) {
+   this.scrollToTop( this.$element );
+   this.currentView = view;
+   }
};
 
/**

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Update OOjs UI to v0.22.4

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

Change-Id: I505e7c612b70a949d2b101172964bd7433fb8d5e
---
M lib/oojs-ui/i18n/as.json
M lib/oojs-ui/i18n/bs.json
M lib/oojs-ui/i18n/pt-br.json
M lib/oojs-ui/oojs-ui-apex-icons-alerts.css
M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-content.css
M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.css
M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.css
M lib/oojs-ui/oojs-ui-apex-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-media.css
M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.css
M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.css
M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css
M lib/oojs-ui/oojs-ui-apex-icons-user.css
M lib/oojs-ui/oojs-ui-apex-icons-user.rtl.css
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-apex.css
M lib/oojs-ui/oojs-ui-core-apex.rtl.css
M lib/oojs-ui/oojs-ui-core-mediawiki.css
M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.css
M lib/oojs-ui/oojs-ui-core-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-core.js
M lib/oojs-ui/oojs-ui-core.js.map
M lib/oojs-ui/oojs-ui-images-apex.css
M lib/oojs-ui/oojs-ui-images-apex.rtl.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.css
M lib/oojs-ui/oojs-ui-images-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css
M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-apex.css
M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.css
M lib/oojs-ui/oojs-ui-toolbars-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-toolbars.js
M lib/oojs-ui/oojs-ui-widgets-apex.css
M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.css
M lib/oojs-ui/oojs-ui-widgets-wikimediaui.rtl.css
M lib/oojs-ui/oojs-ui-widgets.js
M lib/oojs-ui/oojs-ui-widgets.js.map
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-accessibility.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-alerts.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-content.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-advanced.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-core.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-list.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-editing-styling.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-interactions.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-layout.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-location.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-media.rtl.css
M lib/oojs-ui/oojs-ui-wikimediaui-icons-moderation.css
M 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 

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: Update Wikidata - fix constraint type checks

[Lucas Werkmeister (WMDE) (Code Review)]

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/369555 )

Change subject: Update Wikidata - fix constraint type checks
..

Update Wikidata - fix constraint type checks

This adds change I2aaf3d6fa6 to the Constraints extension.

Bug: T169326
Change-Id: I49b0f4342b9060bf189f17561e7e3e2e02f536de
---
M composer.lock
M extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php
M 
extensions/Constraints/tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php
M vendor/composer/installed.json
4 files changed, 113 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/55/369555/1

diff --git a/composer.lock b/composer.lock
index 9cd6b13..878c16b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -965,7 +965,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;,
-"reference": "7b42a909fabb4a2abccdc913cffedd74937a62c4"
+"reference": "6c32f105be631dcbf876c713bf298381428afea4"
 },
 "require": {
 "php": ">=5.5.9",
@@ -1026,7 +1026,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/;
 },
-"time": "2017-08-01T11:10:09+00:00"
+"time": "2017-08-01T14:04:16+00:00"
 },
 {
 "name": "wikibase/data-model",
diff --git 
a/extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php 
b/extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php
index d7cb13a..b3b698a 100644
--- 
a/extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php
+++ 
b/extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php
@@ -4,6 +4,7 @@
 
 use Config;
 use MediaWiki\MediaWikiServices;
+use OverflowException;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdValue;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -68,31 +69,19 @@
 * of one of the item ID serializations in $classesToCheck.
 * If the class hierarchy is not exhausted before
 * the configured limit (WBQualityConstraintsTypeCheckMaxEntities) is 
reached,
-* the injected {@link SparqlHelper} is consulted if present,
-* otherwise the check aborts and returns false.
+* an OverflowException is thrown.
 *
 * @param EntityId $comparativeClass
 * @param string[] $classesToCheck
 * @param int &$entitiesChecked
 *
 * @return bool
-*
-* @throws SparqlHelperException if SPARQL is used and the query times 
out or some other error occurs
+* @throws OverflowException if $entitiesChecked exceeds the configured 
limit
 */
-   public function isSubclassOf( EntityId $comparativeClass, array 
$classesToCheck, &$entitiesChecked = 0 ) {
+   private function isSubclassOf( EntityId $comparativeClass, array 
$classesToCheck, &$entitiesChecked = 0 ) {
$maxEntities = $this->config->get( 
'WBQualityConstraintsTypeCheckMaxEntities' );
if ( ++$entitiesChecked > $maxEntities ) {
-   if ( $entitiesChecked === $maxEntities + 1 && 
$this->sparqlHelper !== null ) {
-   
MediaWikiServices::getInstance()->getStatsdDataFactory()
-   ->increment( 
'wikibase.quality.constraints.sparql.typeFallback' );
-   return $this->sparqlHelper->hasType(
-   $comparativeClass->getSerialization(),
-   $classesToCheck,
-   /* withInstance = */ false
-   );
-   } else {
-   return false;
-   }
+   throw new OverflowException( 'Too many entities to 
check' );
}
 
$item = $this->entityLookup->getEntity( $comparativeClass );
@@ -127,6 +116,39 @@
}
 
/**
+* Checks if $comparativeClass is a subclass
+* of one of the item ID serializations in $classesToCheck.
+* If isSubclassOf() aborts due to hitting the configured limit,
+* the injected {@link SparqlHelper} is consulted if present,
+* otherwise the check returns false.
+*
+* @param EntityId $comparativeClass
+* @param string[] $classesToCheck
+* @param int &$entitiesChecked
+*
+* @return bool
+*
+* @throws SparqlHelperException if SPARQL is used and the query times 
out or some other error occurs
+*/
+   public function 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up 31be7d0: send tags list if experimental mode is di...

[Catrope (Code Review)]

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

Change subject: Follow-up 31be7d0: send tags list if experimental mode is 
disabled
..

Follow-up 31be7d0: send tags list if experimental mode is disabled

Change-Id: Ia9f44ed47d79f02c5d14ce756133e64c7ae926f9
---
M includes/specials/SpecialRecentchanges.php
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/54/369554/1

diff --git a/includes/specials/SpecialRecentchanges.php 
b/includes/specials/SpecialRecentchanges.php
index 1f8e3c5..157c3ed 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -189,12 +189,10 @@
'wgStructuredChangeFiltersEnableLiveUpdate',
$this->getConfig()->get( 
'StructuredChangeFiltersEnableLiveUpdate' )
);
-   if ( $experimentalStructuredChangeFilters ) {
-   $out->addJsConfigVars(
-   'wgRCFiltersChangeTags',
-   $this->buildChangeTagList()
-   );
-   }
+   $out->addJsConfigVars(
+   'wgRCFiltersChangeTags',
+   $this->buildChangeTagList()
+   );
}
}
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit/deployment_server: fix scap for Gerrit

[Dzahn (Code Review)]

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

Change subject: gerrit/deployment_server: fix scap for Gerrit
..


gerrit/deployment_server: fix scap for Gerrit

The group name is gerrit_root, but the name of the key
is just "gerrit".

"invalid secret keyholder/gerrit_root"

Bug: T157414
Change-Id: I250b07b5781dee5ac23babd6e19697779eaac58b
---
M hieradata/role/common/deployment_server.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index c07c2e2..3c6a86d 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -52,7 +52,7 @@
 trusted_groups:
   - deploy-phabricator
 
-  gerrit-root:
+  gerrit:
 trusted_groups:
   - gerrit-root
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I250b07b5781dee5ac23babd6e19697779eaac58b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: gerrit/deployment_server: fix scap for Gerrit

[Dzahn (Code Review)]

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

Change subject: gerrit/deployment_server: fix scap for Gerrit
..

gerrit/deployment_server: fix scap for Gerrit

The group name is gerrit_root, but the name of the key
is just "gerrit".

"invalid secret keyholder/gerrit_root"

Bug: T157414
Change-Id: I250b07b5781dee5ac23babd6e19697779eaac58b
---
M hieradata/role/common/deployment_server.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index c07c2e2..3c6a86d 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -52,7 +52,7 @@
 trusted_groups:
   - deploy-phabricator
 
-  gerrit-root:
+  gerrit:
 trusted_groups:
   - gerrit-root
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I250b07b5781dee5ac23babd6e19697779eaac58b
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] labs/private[master]: nvm I'm dumb: Revert "gerrit: Copy gerrit ssh keys into gerr...

[Chad (Code Review)]

Hello Paladox,

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

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

to review the following change.


Change subject: nvm I'm dumb: Revert "gerrit: Copy gerrit ssh keys into 
gerrit_root"
..

nvm I'm dumb: Revert "gerrit: Copy gerrit ssh keys into gerrit_root"

This reverts commit 868e9bc655c06add2b0379ed66ff3eb00a9cfa4c.

Change-Id: I2f1deda9231ec82d3552dc6ad8e04eb6162413c5
---
D modules/secret/secrets/keyholder/gerrit_root
D modules/secret/secrets/keyholder/gerrit_root.pub
2 files changed, 0 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/52/369552/1

diff --git a/modules/secret/secrets/keyholder/gerrit_root 
b/modules/secret/secrets/keyholder/gerrit_root
deleted file mode 100644
index d1752da..000
--- a/modules/secret/secrets/keyholder/gerrit_root
+++ /dev/null
@@ -1,51 +0,0 @@
--BEGIN RSA PRIVATE KEY-
-MIIJKAIBAAKCAgEAmLaBhRzWSZF3x8l4QW0tDLi9rHbkmTFbfdwZ3BvSv2rpZRHg
-W/iNbHBJSmkNHSxIr4ofx+IBHF826Kta8/4Osx4d5nSqK8Knjx4v9KBHY3SdPN1N
-flV13ChDc5HNB4reTeBPk9qMJ1AtN+6wzoDoSM93Of7zPewvEzEocSN+P6NM559S
-bJs1AiNVl7UsWQPODh/jHCj9rC+HbLwili8yXWxBCsJwX8+Ia3iQ0G6R5oFabqFb
-65B+IteticSWE/sQZxRvsFhkPwUkIva+xzJGiqFKabzrOXw+9I3wclhawyMjKMsJ
-8srIppGop2e9cZNE992h9SBScvwyK2tErd7w98bn3Auu26kNjwTC4NIcMRRrd/UO
-ftA7P1wKdP4lN2Zq5N6qXpS6nW3DStkBXF6It2rCVuibr68EKMbVk+RjZZU0ief9
-em61R/o9kqPGi2CGPUcNxhpMY4U/vRNS1x9qQv+bWVhRljMSpMQosoo5QOo7xmYu
-crmGa5MqRRmyAh4xe7P+Lk404q9DwQpl/C58cb006ycwHhBXpXV+v71PqqgWLwfJ
-TLZVs70754dDl92fiFaL1HXCAn0xa5OK5LbuBiPGpjMksxoi2UQ9Slby4ID4wNCn
-2TDKDCXg5hkZZQPfkDDLMmBrS8SSEJT6CMcnn7lzjKykNpPQXVtF1t0cU7kCAwEA
-AQKCAgA0uP2qWTRaHdC+tv2/iNO+yqEhQ8LUaMfvgeejqC9wSpbdf/h3iC47O+Dx
-wab3ZWyKviMOvSYpB25Lka1LA3FLwaANCkYd6YwzyvY/fH5pBb+rXbP9Y7/XDEeN
-RM8GRZlORZzzrMYqZHHYF54PDU4kpQvCiBSuUjZGZ/hQZzKVAenxJX4tZMA+Rris
-Ma5n5PpkwfmEpVo+8gHNNn6yXwUCX/dsoYhua5XrlKpaa3IPpKT2ANtdTntdyBxv
-reEqcMlO7S1KMpoZb8r0Dz/6QY89GUY5jzGenRiXEdHriDl9mUnwMXjzy7LOXwdd
-FGHBLljnQitCF7CfZhZkCxqg9JE4UXcyIGEeJg3EV9KLg4uuBAbugDVD5011yiV2
-7AqXr2uualh2wqxxqnm9l980+XkwiMz+UP5uZdX34DQA62u5NhFoiXTHxeJpSqI9
-L87AqZeLQ6tct16o0111Wf95zzI69+65Lqdn9hR/f20tDccP4MpK2MPAhkpr30Dm
-o2DDHmtw+WMgHvJstoQ9PiGYUDtUtW8rB3By/HKuslDsi4cCLGEOWVGaJf6E4BqE
-Cunzgm0qOrv62EYLLkc70wtYj9D42bRTZXu1tJOTxPUJJv0AKf+akkXYz0yKwqLF
-dW2xpCusSWoigUyaOUx0+L3VZ5RXmptlH4JmCWY5OniLc+SvaQKCAQEAyJm9HkT6
-HqZyxSzpDjBSqgUq5AdiS4LVi2N7kq5v6zUkZkQKkAsh0yPkFcZ4TX9rDGKB5mfa
-MeNiWhYypaKciOVVs2B+g8eYbem3zbTxHXFA5eUOWGvpbbPjB+twi5RAQ9pPC6Ne
-eU2aF64gAHnijnn2uUqdvBU6IMIPJvnzY2rcP0aXEFc607i49k7qqGZS8Io8LLad
-mEHQ4yQ9JjK7crX5cOosSN2c6nzxVpBdXs7+nNXr9joBX5HTWMw3Cy0oOWnpyQEx
-AUY167+DNCrrFtzPwilKjcQL39KoXVR9ksVq6V0YTx4eLJr5/zAlQipNCuf7yV4F
-2dO+GFhT7gI4dwKCAQEAwuMor2tM+BXvrJn7C6QpukqTIpckhcqG1GT5/bg5k2J9
-q3C/YRaH28FSPh5BfklWe910aABK1sG28doL6xZFGgm/ywMd4ESoXOzrFUteYdrX
-us6yKOPv2iarjGbKuaAswNlahpqL18U0coqWk+3f7swciJYnvkBy5Ka8RQypP5+Y
-UYc3RZ8RdKlhKfw/jYM/oBES4LqZpRM821AufxYUzUq58O9VvucYq/eOA3cThjTj
-suWdUoMwyoDF5C0iWsrt3HRwRU8fhc4hCvSw78vtpDj9mCnYXwf4F2CtSpbdazQp
-4gxS070PecsSc/6iiT8jCZHWU1CgmxKnzqnUWPsRTwKCAQEApdjtUWRHwiVtB/Wc
-bR2oimahUkuEideOg6JpHRlY8IZMJLymWvbJLU4kGZiwB6qLr36V1Q8Rh2NuAfsO
-PoDVmBy7IQVrM7pGHME5NDofim8C787TcGkvYYJy9i5CKzQTecW4ym90ASgWePN+
-A8bBd3gAcqrtA/4sw76NVnUaM5y6oRnUdS8ZNMgpK4KNYVLPyY0QOQt1+daYQ+LH
-J5iT/z/SDfedS1Tlkbxgr2fFuke6m6IFZtoIHqJqsKSN8ZCRC/6zyXpRsLMCi3kX
-mX7ORGWk4urOd6yZAKCikB71fu32+R79pRPKcKhkfgWpGC3u6lBni9FPVwtHw8rr
-AQEW+wKCAQBTs2I+7POyvSEh3UQv/MKbKvpEaeuatp/vyqp/qMa5oRxeLF9VoGqb
-HE1pNm9kgLTvH+6l2DJMSAh9mOtzfS4Sf8tqspz7PCGfP3W7wJH5rxbmOW3VGAhk
-hiU5eNBqpvtxnChAFVIoSp867oC7afe6RNmgY/UPxfhScbX8ZfKuy6mMomk/spC5
-rSF4+ciFy6/g3FRiRmJEvp1th+NgW6h1fzma2//UrMYw3XKV1GeDRWXh6LIHxSaI
-YoQberL9kZhVDYFGkzPzsNMKNItlgg0/ceagmqA+OFr6F2B135ObPl0ao7ZTECj8
-YxY60UsXbRFsQ8FsKP3BfGKr5M65pKMLAoIBADr1/3QEH1dMxdN/BV9+UytEal2G
-A6j6fTsiiR1pDSrI4GYa0LSQFvIjLlPfL0ZYtZVfSWJ7ADjYletGSSwo8FPA25Qa
-ol7ucaZxPqMjDqQhe5AeswK5vgSktagRERGj1lTJ3MXeB+rkDtd4s213ACsWLvtF
-Si05mb3s9tth2wCD3HoAgW299y3Jz3EW3gb0S3/vBF9LoB65ApbguY6WcMuHW+em
-qGlYBXGmwSUGI90xam7UnQjwKxpWeLNsbPoqIA1aUYW95f/4McQxyKDjj+AJaq3c
-svKRnWp0heIIGl9n8iMECdoawtSTgUN9WKR2DQFyTEwgaYGzRkFx1M1a7t8=
--END RSA PRIVATE KEY-
\ No newline at end of file
diff --git a/modules/secret/secrets/keyholder/gerrit_root.pub 
b/modules/secret/secrets/keyholder/gerrit_root.pub
deleted file mode 100644
index 1d77bde..000
--- a/modules/secret/secrets/keyholder/gerrit_root.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa 

[MediaWiki-commits] [Gerrit] labs/private[master]: nvm I'm dumb: Revert "gerrit: Copy gerrit ssh keys into gerr...

[Chad (Code Review)]

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

Change subject: nvm I'm dumb: Revert "gerrit: Copy gerrit ssh keys into 
gerrit_root"
..


nvm I'm dumb: Revert "gerrit: Copy gerrit ssh keys into gerrit_root"

This reverts commit 868e9bc655c06add2b0379ed66ff3eb00a9cfa4c.

Change-Id: I2f1deda9231ec82d3552dc6ad8e04eb6162413c5
---
D modules/secret/secrets/keyholder/gerrit_root
D modules/secret/secrets/keyholder/gerrit_root.pub
2 files changed, 0 insertions(+), 52 deletions(-)

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



diff --git a/modules/secret/secrets/keyholder/gerrit_root 
b/modules/secret/secrets/keyholder/gerrit_root
deleted file mode 100644
index d1752da..000
--- a/modules/secret/secrets/keyholder/gerrit_root
+++ /dev/null
@@ -1,51 +0,0 @@
--BEGIN RSA PRIVATE KEY-
-MIIJKAIBAAKCAgEAmLaBhRzWSZF3x8l4QW0tDLi9rHbkmTFbfdwZ3BvSv2rpZRHg
-W/iNbHBJSmkNHSxIr4ofx+IBHF826Kta8/4Osx4d5nSqK8Knjx4v9KBHY3SdPN1N
-flV13ChDc5HNB4reTeBPk9qMJ1AtN+6wzoDoSM93Of7zPewvEzEocSN+P6NM559S
-bJs1AiNVl7UsWQPODh/jHCj9rC+HbLwili8yXWxBCsJwX8+Ia3iQ0G6R5oFabqFb
-65B+IteticSWE/sQZxRvsFhkPwUkIva+xzJGiqFKabzrOXw+9I3wclhawyMjKMsJ
-8srIppGop2e9cZNE992h9SBScvwyK2tErd7w98bn3Auu26kNjwTC4NIcMRRrd/UO
-ftA7P1wKdP4lN2Zq5N6qXpS6nW3DStkBXF6It2rCVuibr68EKMbVk+RjZZU0ief9
-em61R/o9kqPGi2CGPUcNxhpMY4U/vRNS1x9qQv+bWVhRljMSpMQosoo5QOo7xmYu
-crmGa5MqRRmyAh4xe7P+Lk404q9DwQpl/C58cb006ycwHhBXpXV+v71PqqgWLwfJ
-TLZVs70754dDl92fiFaL1HXCAn0xa5OK5LbuBiPGpjMksxoi2UQ9Slby4ID4wNCn
-2TDKDCXg5hkZZQPfkDDLMmBrS8SSEJT6CMcnn7lzjKykNpPQXVtF1t0cU7kCAwEA
-AQKCAgA0uP2qWTRaHdC+tv2/iNO+yqEhQ8LUaMfvgeejqC9wSpbdf/h3iC47O+Dx
-wab3ZWyKviMOvSYpB25Lka1LA3FLwaANCkYd6YwzyvY/fH5pBb+rXbP9Y7/XDEeN
-RM8GRZlORZzzrMYqZHHYF54PDU4kpQvCiBSuUjZGZ/hQZzKVAenxJX4tZMA+Rris
-Ma5n5PpkwfmEpVo+8gHNNn6yXwUCX/dsoYhua5XrlKpaa3IPpKT2ANtdTntdyBxv
-reEqcMlO7S1KMpoZb8r0Dz/6QY89GUY5jzGenRiXEdHriDl9mUnwMXjzy7LOXwdd
-FGHBLljnQitCF7CfZhZkCxqg9JE4UXcyIGEeJg3EV9KLg4uuBAbugDVD5011yiV2
-7AqXr2uualh2wqxxqnm9l980+XkwiMz+UP5uZdX34DQA62u5NhFoiXTHxeJpSqI9
-L87AqZeLQ6tct16o0111Wf95zzI69+65Lqdn9hR/f20tDccP4MpK2MPAhkpr30Dm
-o2DDHmtw+WMgHvJstoQ9PiGYUDtUtW8rB3By/HKuslDsi4cCLGEOWVGaJf6E4BqE
-Cunzgm0qOrv62EYLLkc70wtYj9D42bRTZXu1tJOTxPUJJv0AKf+akkXYz0yKwqLF
-dW2xpCusSWoigUyaOUx0+L3VZ5RXmptlH4JmCWY5OniLc+SvaQKCAQEAyJm9HkT6
-HqZyxSzpDjBSqgUq5AdiS4LVi2N7kq5v6zUkZkQKkAsh0yPkFcZ4TX9rDGKB5mfa
-MeNiWhYypaKciOVVs2B+g8eYbem3zbTxHXFA5eUOWGvpbbPjB+twi5RAQ9pPC6Ne
-eU2aF64gAHnijnn2uUqdvBU6IMIPJvnzY2rcP0aXEFc607i49k7qqGZS8Io8LLad
-mEHQ4yQ9JjK7crX5cOosSN2c6nzxVpBdXs7+nNXr9joBX5HTWMw3Cy0oOWnpyQEx
-AUY167+DNCrrFtzPwilKjcQL39KoXVR9ksVq6V0YTx4eLJr5/zAlQipNCuf7yV4F
-2dO+GFhT7gI4dwKCAQEAwuMor2tM+BXvrJn7C6QpukqTIpckhcqG1GT5/bg5k2J9
-q3C/YRaH28FSPh5BfklWe910aABK1sG28doL6xZFGgm/ywMd4ESoXOzrFUteYdrX
-us6yKOPv2iarjGbKuaAswNlahpqL18U0coqWk+3f7swciJYnvkBy5Ka8RQypP5+Y
-UYc3RZ8RdKlhKfw/jYM/oBES4LqZpRM821AufxYUzUq58O9VvucYq/eOA3cThjTj
-suWdUoMwyoDF5C0iWsrt3HRwRU8fhc4hCvSw78vtpDj9mCnYXwf4F2CtSpbdazQp
-4gxS070PecsSc/6iiT8jCZHWU1CgmxKnzqnUWPsRTwKCAQEApdjtUWRHwiVtB/Wc
-bR2oimahUkuEideOg6JpHRlY8IZMJLymWvbJLU4kGZiwB6qLr36V1Q8Rh2NuAfsO
-PoDVmBy7IQVrM7pGHME5NDofim8C787TcGkvYYJy9i5CKzQTecW4ym90ASgWePN+
-A8bBd3gAcqrtA/4sw76NVnUaM5y6oRnUdS8ZNMgpK4KNYVLPyY0QOQt1+daYQ+LH
-J5iT/z/SDfedS1Tlkbxgr2fFuke6m6IFZtoIHqJqsKSN8ZCRC/6zyXpRsLMCi3kX
-mX7ORGWk4urOd6yZAKCikB71fu32+R79pRPKcKhkfgWpGC3u6lBni9FPVwtHw8rr
-AQEW+wKCAQBTs2I+7POyvSEh3UQv/MKbKvpEaeuatp/vyqp/qMa5oRxeLF9VoGqb
-HE1pNm9kgLTvH+6l2DJMSAh9mOtzfS4Sf8tqspz7PCGfP3W7wJH5rxbmOW3VGAhk
-hiU5eNBqpvtxnChAFVIoSp867oC7afe6RNmgY/UPxfhScbX8ZfKuy6mMomk/spC5
-rSF4+ciFy6/g3FRiRmJEvp1th+NgW6h1fzma2//UrMYw3XKV1GeDRWXh6LIHxSaI
-YoQberL9kZhVDYFGkzPzsNMKNItlgg0/ceagmqA+OFr6F2B135ObPl0ao7ZTECj8
-YxY60UsXbRFsQ8FsKP3BfGKr5M65pKMLAoIBADr1/3QEH1dMxdN/BV9+UytEal2G
-A6j6fTsiiR1pDSrI4GYa0LSQFvIjLlPfL0ZYtZVfSWJ7ADjYletGSSwo8FPA25Qa
-ol7ucaZxPqMjDqQhe5AeswK5vgSktagRERGj1lTJ3MXeB+rkDtd4s213ACsWLvtF
-Si05mb3s9tth2wCD3HoAgW299y3Jz3EW3gb0S3/vBF9LoB65ApbguY6WcMuHW+em
-qGlYBXGmwSUGI90xam7UnQjwKxpWeLNsbPoqIA1aUYW95f/4McQxyKDjj+AJaq3c
-svKRnWp0heIIGl9n8iMECdoawtSTgUN9WKR2DQFyTEwgaYGzRkFx1M1a7t8=
--END RSA PRIVATE KEY-
\ No newline at end of file
diff --git a/modules/secret/secrets/keyholder/gerrit_root.pub 
b/modules/secret/secrets/keyholder/gerrit_root.pub
deleted file mode 100644
index 1d77bde..000
--- a/modules/secret/secrets/keyholder/gerrit_root.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa 

[MediaWiki-commits] [Gerrit] labs/private[master]: gerrit: Copy gerrit ssh keys into gerrit_root

[Chad (Code Review)]

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

Change subject: gerrit: Copy gerrit ssh keys into gerrit_root
..


gerrit: Copy gerrit ssh keys into gerrit_root

Change-Id: I1135b6596d37acffab15fb902ed7030320d12c97
---
A modules/secret/secrets/keyholder/gerrit_root
A modules/secret/secrets/keyholder/gerrit_root.pub
2 files changed, 52 insertions(+), 0 deletions(-)

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



diff --git a/modules/secret/secrets/keyholder/gerrit_root 
b/modules/secret/secrets/keyholder/gerrit_root
new file mode 100644
index 000..d1752da
--- /dev/null
+++ b/modules/secret/secrets/keyholder/gerrit_root
@@ -0,0 +1,51 @@
+-BEGIN RSA PRIVATE KEY-
+MIIJKAIBAAKCAgEAmLaBhRzWSZF3x8l4QW0tDLi9rHbkmTFbfdwZ3BvSv2rpZRHg
+W/iNbHBJSmkNHSxIr4ofx+IBHF826Kta8/4Osx4d5nSqK8Knjx4v9KBHY3SdPN1N
+flV13ChDc5HNB4reTeBPk9qMJ1AtN+6wzoDoSM93Of7zPewvEzEocSN+P6NM559S
+bJs1AiNVl7UsWQPODh/jHCj9rC+HbLwili8yXWxBCsJwX8+Ia3iQ0G6R5oFabqFb
+65B+IteticSWE/sQZxRvsFhkPwUkIva+xzJGiqFKabzrOXw+9I3wclhawyMjKMsJ
+8srIppGop2e9cZNE992h9SBScvwyK2tErd7w98bn3Auu26kNjwTC4NIcMRRrd/UO
+ftA7P1wKdP4lN2Zq5N6qXpS6nW3DStkBXF6It2rCVuibr68EKMbVk+RjZZU0ief9
+em61R/o9kqPGi2CGPUcNxhpMY4U/vRNS1x9qQv+bWVhRljMSpMQosoo5QOo7xmYu
+crmGa5MqRRmyAh4xe7P+Lk404q9DwQpl/C58cb006ycwHhBXpXV+v71PqqgWLwfJ
+TLZVs70754dDl92fiFaL1HXCAn0xa5OK5LbuBiPGpjMksxoi2UQ9Slby4ID4wNCn
+2TDKDCXg5hkZZQPfkDDLMmBrS8SSEJT6CMcnn7lzjKykNpPQXVtF1t0cU7kCAwEA
+AQKCAgA0uP2qWTRaHdC+tv2/iNO+yqEhQ8LUaMfvgeejqC9wSpbdf/h3iC47O+Dx
+wab3ZWyKviMOvSYpB25Lka1LA3FLwaANCkYd6YwzyvY/fH5pBb+rXbP9Y7/XDEeN
+RM8GRZlORZzzrMYqZHHYF54PDU4kpQvCiBSuUjZGZ/hQZzKVAenxJX4tZMA+Rris
+Ma5n5PpkwfmEpVo+8gHNNn6yXwUCX/dsoYhua5XrlKpaa3IPpKT2ANtdTntdyBxv
+reEqcMlO7S1KMpoZb8r0Dz/6QY89GUY5jzGenRiXEdHriDl9mUnwMXjzy7LOXwdd
+FGHBLljnQitCF7CfZhZkCxqg9JE4UXcyIGEeJg3EV9KLg4uuBAbugDVD5011yiV2
+7AqXr2uualh2wqxxqnm9l980+XkwiMz+UP5uZdX34DQA62u5NhFoiXTHxeJpSqI9
+L87AqZeLQ6tct16o0111Wf95zzI69+65Lqdn9hR/f20tDccP4MpK2MPAhkpr30Dm
+o2DDHmtw+WMgHvJstoQ9PiGYUDtUtW8rB3By/HKuslDsi4cCLGEOWVGaJf6E4BqE
+Cunzgm0qOrv62EYLLkc70wtYj9D42bRTZXu1tJOTxPUJJv0AKf+akkXYz0yKwqLF
+dW2xpCusSWoigUyaOUx0+L3VZ5RXmptlH4JmCWY5OniLc+SvaQKCAQEAyJm9HkT6
+HqZyxSzpDjBSqgUq5AdiS4LVi2N7kq5v6zUkZkQKkAsh0yPkFcZ4TX9rDGKB5mfa
+MeNiWhYypaKciOVVs2B+g8eYbem3zbTxHXFA5eUOWGvpbbPjB+twi5RAQ9pPC6Ne
+eU2aF64gAHnijnn2uUqdvBU6IMIPJvnzY2rcP0aXEFc607i49k7qqGZS8Io8LLad
+mEHQ4yQ9JjK7crX5cOosSN2c6nzxVpBdXs7+nNXr9joBX5HTWMw3Cy0oOWnpyQEx
+AUY167+DNCrrFtzPwilKjcQL39KoXVR9ksVq6V0YTx4eLJr5/zAlQipNCuf7yV4F
+2dO+GFhT7gI4dwKCAQEAwuMor2tM+BXvrJn7C6QpukqTIpckhcqG1GT5/bg5k2J9
+q3C/YRaH28FSPh5BfklWe910aABK1sG28doL6xZFGgm/ywMd4ESoXOzrFUteYdrX
+us6yKOPv2iarjGbKuaAswNlahpqL18U0coqWk+3f7swciJYnvkBy5Ka8RQypP5+Y
+UYc3RZ8RdKlhKfw/jYM/oBES4LqZpRM821AufxYUzUq58O9VvucYq/eOA3cThjTj
+suWdUoMwyoDF5C0iWsrt3HRwRU8fhc4hCvSw78vtpDj9mCnYXwf4F2CtSpbdazQp
+4gxS070PecsSc/6iiT8jCZHWU1CgmxKnzqnUWPsRTwKCAQEApdjtUWRHwiVtB/Wc
+bR2oimahUkuEideOg6JpHRlY8IZMJLymWvbJLU4kGZiwB6qLr36V1Q8Rh2NuAfsO
+PoDVmBy7IQVrM7pGHME5NDofim8C787TcGkvYYJy9i5CKzQTecW4ym90ASgWePN+
+A8bBd3gAcqrtA/4sw76NVnUaM5y6oRnUdS8ZNMgpK4KNYVLPyY0QOQt1+daYQ+LH
+J5iT/z/SDfedS1Tlkbxgr2fFuke6m6IFZtoIHqJqsKSN8ZCRC/6zyXpRsLMCi3kX
+mX7ORGWk4urOd6yZAKCikB71fu32+R79pRPKcKhkfgWpGC3u6lBni9FPVwtHw8rr
+AQEW+wKCAQBTs2I+7POyvSEh3UQv/MKbKvpEaeuatp/vyqp/qMa5oRxeLF9VoGqb
+HE1pNm9kgLTvH+6l2DJMSAh9mOtzfS4Sf8tqspz7PCGfP3W7wJH5rxbmOW3VGAhk
+hiU5eNBqpvtxnChAFVIoSp867oC7afe6RNmgY/UPxfhScbX8ZfKuy6mMomk/spC5
+rSF4+ciFy6/g3FRiRmJEvp1th+NgW6h1fzma2//UrMYw3XKV1GeDRWXh6LIHxSaI
+YoQberL9kZhVDYFGkzPzsNMKNItlgg0/ceagmqA+OFr6F2B135ObPl0ao7ZTECj8
+YxY60UsXbRFsQ8FsKP3BfGKr5M65pKMLAoIBADr1/3QEH1dMxdN/BV9+UytEal2G
+A6j6fTsiiR1pDSrI4GYa0LSQFvIjLlPfL0ZYtZVfSWJ7ADjYletGSSwo8FPA25Qa
+ol7ucaZxPqMjDqQhe5AeswK5vgSktagRERGj1lTJ3MXeB+rkDtd4s213ACsWLvtF
+Si05mb3s9tth2wCD3HoAgW299y3Jz3EW3gb0S3/vBF9LoB65ApbguY6WcMuHW+em
+qGlYBXGmwSUGI90xam7UnQjwKxpWeLNsbPoqIA1aUYW95f/4McQxyKDjj+AJaq3c
+svKRnWp0heIIGl9n8iMECdoawtSTgUN9WKR2DQFyTEwgaYGzRkFx1M1a7t8=
+-END RSA PRIVATE KEY-
\ No newline at end of file
diff --git a/modules/secret/secrets/keyholder/gerrit_root.pub 
b/modules/secret/secrets/keyholder/gerrit_root.pub
new file mode 100644
index 000..1d77bde
--- /dev/null
+++ b/modules/secret/secrets/keyholder/gerrit_root.pub
@@ -0,0 +1 @@
+ssh-rsa 

[MediaWiki-commits] [Gerrit] labs/private[master]: gerrit: Copy gerrit sh keys into gerrit_root

[Paladox (Code Review)]

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

Change subject: gerrit: Copy gerrit sh keys into gerrit_root
..

gerrit: Copy gerrit sh keys into gerrit_root

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


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/51/369551/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1135b6596d37acffab15fb902ed7030320d12c97
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] mediawiki...SemanticTasks[master]: Do some maintenance

[Kghbln (Code Review)]

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

Change subject: Do some maintenance
..

Do some maintenance

* Remove I18n php shim
* Update extension's group
* Extend author's array
* Update RELEASE-NOTES
* Update INSTALL
* Improve code documentation
* Bump version

Note: This is breaking for MW 1.22.x and lower.

Bug:T123943
Bug:T168353
Change-Id: Idfb9e11d91bcc26c5e7f832e25b8dc33828945b0
---
M INSTALL
M RELEASE-NOTES
D SemanticTasks.i18n.php
M SemanticTasks.php
4 files changed, 49 insertions(+), 79 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticTasks 
refs/changes/50/369550/1

diff --git a/INSTALL b/INSTALL
index c2d3a8d..7447853 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,33 +1,28 @@
-These is the install file for the Semantic Tasks extension.
+These is the install file for the Semantic Tasks extension. See also
+the extension's page on mediawiki.org:

-Extension page on mediawiki.org: 
https://www.mediawiki.org/wiki/Extension:Semantic_Tasks
-Latest version of the install file: 
http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticTasks/INSTALL?view=co
-
+* https://www.mediawiki.org/wiki/Extension:Semantic_Tasks
 
 == Requirements ==
 
 Semantic Tasks requires:
 
-* MediaWiki 1.16 or above, 1.18 or above recommended
-* PHP 5.2 or above, 5.3 or above recommended
-* Semantic MediaWiki 1.5 or above, 1.7 or above recommended
+* MediaWiki 1.23 or above
+* PHP 5.3 or above
+* Semantic MediaWiki 1.7 or above
 
 == Download ==
 
-You can get the code directly from SVN. Tags can be obtained via
+You can get the code directly from Git. It can be obtained via
 
- svn checkout 
http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/SemanticTasks/REL_version
+ git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/SemanticTasks.git
 
-Where 'version' is the version number of the tag, such as 0_1 (see the 
available tags at 
http://svn.wikimedia.org/svnroot/mediawiki/tags/extensions/SemanticTasks/).
-The latest code can be obtained from trunk:
-
- svn checkout 
http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/SemanticTasks/
+or use MediaWiki's extension distributor.
 
 == Installation ==
 
 Once you have downloaded the code, place the ''SemanticTasks'' directory 
within your MediaWiki
-'extensions' directory. Then add the following code to your 
[[Manual:LocalSettings.php|LocalSettings.php]] file:
+'extensions' directory. Then add the following code to your 
"LocalSettings.php" file:
 
 # Semantic Tasks
-require_once( "$IP/extensions/SemanticTasks/SemanticTasks.php" );
-  
\ No newline at end of file
+require_once "$IP/extensions/SemanticTasks/SemanticTasks.php";
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c36674f..566efcf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,22 +1,33 @@
-These are the release notes for the Semantic Tasks extension.
+These are the release notes for the Semantic Tasks extension. See also
+the extension's page on mediawiki.org:

-Extension page on mediawiki.org: 
https://www.mediawiki.org/wiki/Extension:Semantic_Tasks
-Latest version of the release notes: 
http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticTasks/RELEASE-NOTES?view=co
+* https://www.mediawiki.org/wiki/Extension:Semantic_Tasks
 
-=== Version 1.6.0 ===
-2015-4-09
+== Version 1.7.0 ==
+Released on 2017-08-01
 
-* Made compatible with MediaWiki 1.24.
+* Removed I18n php shim
+* Dropped support for MediaWiki 1.22.x and earlier.
+
+== Version 1.6.0 ==
+Released on 2015-4-09
+
+* Made compatible with MediaWiki 1.24.x and later.
 * Removed deprecated code.
 * Added option to notify users when unassigned from a task.
 
-=== Version 1.4.1 ===
-2011-12-06
+== Version 1.5.0 ==
+Released on 2014-04-01
 
-* Added support for Semantic MediaWiki 1.7 and later.
+* Migrated to JSON i18n
+
+== Version 1.4.1 ==
+Released on 2011-12-06
+
+* Added support for Semantic MediaWiki 1.7.x and later.
 * Dropped support for MediaWiki 1.15.x and earlier.
 
-=== Version 1.4 ===
-June 2010
+== Version 1.4.0 ==
+Released in June 2010
 
-* Fixed bug that caused notifications to fail in non-main namespaces.
\ No newline at end of file
+* Fixed bug that caused notifications to fail in non-main namespaces.
diff --git a/SemanticTasks.i18n.php b/SemanticTasks.i18n.php
deleted file mode 100644
index 9103498..000
--- a/SemanticTasks.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to 

[MediaWiki-commits] [Gerrit] mediawiki...SemanticImageInput[master]: Remove I18n php shim and bump version

[jenkins-bot (Code Review)]

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

Change subject: Remove I18n php shim and bump version
..


Remove I18n php shim and bump version

Note: This is breaking for MW 1.22.x and earlier.

Bug:T168353
Change-Id: Id766f034b7d6ce8a17685ff795fc67d45428bf38
---
M INSTALL
M RELEASE-NOTES
D SemanticImageInput.i18n.php
M SemanticImageInput.php
4 files changed, 28 insertions(+), 49 deletions(-)

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



diff --git a/INSTALL b/INSTALL
index afed7c2..92b9030 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,7 +8,7 @@
 
 Semantic Image Input requires:
 
-* MediaWiki 1.17 or above
+* MediaWiki 1.23 or above
 * Semantic Forms 2.2 or above
 * PHP 5.3 or above
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9390a56..60d24fb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,19 +1,33 @@
-These are the release notes for the Semantic Image Input extension.
-   
-Extension page on mediawiki.org: 
https://www.mediawiki.org/wiki/Extension:Semantic_Image_Input
-Latest version of the release notes: 
http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/SemanticImageInput/RELEASE-NOTES?view=co
+These are the release notes for the Semantic Image Input extension. See also
+the extension's page on mediawiki.org:
 
+* https://www.mediawiki.org/wiki/Extension:Semantic_Image_Input
 
-=== Version 0.2 ===
-201x-xx-xx
+== Version 0.4.0 ==
+Released on 2017-08-01
+
+* Removed I18n php shim
+
+== Version 0.3.0 ==
+Released on 2014-04-01
+
+* Migrated to JSON i18n
+
+== Version 0.2.0 ==
+Release on 2011-12-13
 
 * Fixed some Internet Explorer specific JavaScript issues.
+* Fixed title of Special page does not contain "subpages"
+* Fixed anon functions not available in php pre5.3
+* Fixed width attrib of html elements must not contain unit (px)
+* Fixed width of wikitext image link must contain unit (px)
+* Tweaked jquery
 
-=== Version 0.1 ===
-2011-11-10
+== Version 0.1.0 ==
+Released on 2011-11-10
 
 Initial release with these features:
 
 * Image input that automatically fetches the first image from a Wikipedia page.
 * Wikipedia redirect resolving.
-* Support for multiple instance templates in forms.
\ No newline at end of file
+* Support for multiple instance templates in forms.
diff --git a/SemanticImageInput.i18n.php b/SemanticImageInput.i18n.php
deleted file mode 100644
index 8c301b8..000
--- a/SemanticImageInput.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://phabricator.wikimedia.org/source/mediawiki/browse/master/maintenance/generateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimcc13f2f0da3fd726' ) ) {
-   function wfJsonI18nShimcc13f2f0da3fd726( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimcc13f2f0da3fd726';
-}
diff --git a/SemanticImageInput.php b/SemanticImageInput.php
index c21876a..1e573ed 100644
--- a/SemanticImageInput.php
+++ b/SemanticImageInput.php
@@ -19,8 +19,8 @@
die( 'Not an entry point.' );
 }
 
-if ( version_compare( $wgVersion, '1.17c', '<' ) ) { // Needs to be 1.17c 
because version_compare() works in confusing ways
-   die( 'Error: Semantic Image Input requires MediaWiki 1.17 or 
above.' );
+if ( version_compare( $wgVersion, '1.23c', '<' ) ) { // Needs to be 1.23c 
because version_compare() works in confusing ways
+   die( 'Error: Semantic Image Input requires MediaWiki 1.23 or 
above.' );
 }
 
 // Show an error if Semantic MediaWiki is not loaded.
@@ -33,7 +33,7 

[MediaWiki-commits] [Gerrit] mediawiki...SemanticPageSeries[master]: Remove I18n php shim and bump version

[jenkins-bot (Code Review)]

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

Change subject: Remove I18n php shim and bump version
..


Remove I18n php shim and bump version

Note: This is breaking for MW 1.22.x and earlier.

Bug:T168353
Change-Id: I13da638f2475264735c449d0efb3c357dab31401
---
D SemanticPageSeries.i18n.php
M SemanticPageSeries.php
2 files changed, 2 insertions(+), 38 deletions(-)

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



diff --git a/SemanticPageSeries.i18n.php b/SemanticPageSeries.i18n.php
deleted file mode 100644
index aa04fff..000
--- a/SemanticPageSeries.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShima687f0ed3ad61483' ) ) {
-   function wfJsonI18nShima687f0ed3ad61483( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShima687f0ed3ad61483';
-}
diff --git a/SemanticPageSeries.php b/SemanticPageSeries.php
index e7e7398..302aa7b 100644
--- a/SemanticPageSeries.php
+++ b/SemanticPageSeries.php
@@ -30,7 +30,7 @@
 }
 
 // Set the extension's version
-define( 'SPS_VERSION', '0.3.0' );
+define( 'SPS_VERSION', '0.4.0' );
 
 // register the extension
 $wgExtensionCredits['semantic'][] = array(
@@ -48,7 +48,6 @@
 
 // register message files
 $wgMessagesDirs['SemanticPageSeries'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['SemanticPageSeries'] = __DIR__ . 
'/SemanticPageSeries.i18n.php';
 $wgExtensionMessagesFiles['SemanticPageSeriesMagic'] = __DIR__ . 
'/SemanticPageSeries.magic.php';
 $wgExtensionMessagesFiles['SemanticPageSeriesAlias'] = __DIR__ . 
'/SemanticPageSeries.alias.php';
 
@@ -64,7 +63,7 @@
 $wgAutoloadClasses['SPSPageIterator'] = __DIR__ . 
'/includes/iterators/SPSPageIterator.php';
 
 // register Special page
-$wgSpecialPages['SeriesEdit'] = 'SPSSpecialSeriesEdit'; # Tell MediaWiki about 
the new special page and its class name
+$wgSpecialPages['SeriesEdit'] = 'SPSSpecialSeriesEdit'; // Tell MediaWiki 
about the new special page and its class name
 
 // register hook handlers
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I13da638f2475264735c449d0efb3c357dab31401
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageSeries
Gerrit-Branch: master
Gerrit-Owner: Kghbln 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Add support for scap

[Dzahn (Code Review)]

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

Change subject: Gerrit: Add support for scap
..


Gerrit: Add support for scap

This adds support for scap using a config for now to prevent problems
and allow testing in labs before doing it in prod.

Bug: T157414
Change-Id: I73ef6bddd6c6450ce2543c20657e837d9a7baffe
---
M hieradata/role/common/deployment_server.yaml
M modules/gerrit/manifests/jetty.pp
2 files changed, 26 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index 8fc5810..c07c2e2 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -15,6 +15,7 @@
   - deploy-aqs
   - deploy-phabricator
   - analytics-admins
+  - gerrit-root
 
 # Newer git version, not needed on stretch - T140927
 apt::use_experimental: true
@@ -50,6 +51,10 @@
   phabricator:
 trusted_groups:
   - deploy-phabricator
+
+  gerrit-root:
+trusted_groups:
+  - gerrit-root
 
   eventlogging:
 trusted_groups:
@@ -101,6 +106,8 @@
   # Public EventStreams service
   eventstreams/deploy:
 repository: mediawiki/services/eventstreams/deploy
+  gerrit/gerrit:
+repository: operations/software/gerrit
   graphoid/deploy: {}
 #lvs_service: graphoid
   jobrunner/jobrunner:
diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 2bb5444..55dbac3 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -14,6 +14,19 @@
 $config = 'gerrit.config.erb',
 ) {
 
+group { 'gerrit2':
+ensure => present,
+}
+
+user { 'gerrit2':
+ensure => 'present',
+gid=> 'gerrit2',
+shell  => '/bin/bash',
+home   => '/var/lib/gerrit2',
+system => true,
+managehome => false,
+}
+
 include ::nrpe
 
 # Private config
@@ -52,6 +65,12 @@
 'libmysql-java',
 ])
 
+scap::target { 'gerrit/gerrit':
+deploy_user => 'gerrit2',
+manage_user => false,
+key_name=> 'gerrit',
+}
+
 file { '/srv/gerrit':
 ensure => directory,
 owner  => 'gerrit2',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73ef6bddd6c6450ce2543c20657e837d9a7baffe
Gerrit-PatchSet: 35
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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