[MediaWiki-commits] [Gerrit] integration/config[master]: Publish extension coverage to cover-extensions/

[jenkins-bot (Code Review)]

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

Change subject: Publish extension coverage to cover-extensions/
..


Publish extension coverage to cover-extensions/

Change-Id: I76b8c1aa98c9346837c1fd72d6f23bd4720d8ee6
---
M jjb/mediawiki-extensions.yaml
M jjb/publish.yaml
2 files changed, 23 insertions(+), 2 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index ed106aa..396f266 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -511,9 +511,9 @@
 cp log/clover.xml "$WORKSPACE/cover/clover.xml"
 fi
 
- - cover-publish:
+ - cover-extensions-publish:
  src: 'cover'
- dest: 'extensions/$DOC_BASENAME'
+ dest: '$DOC_BASENAME'
 publishers:
  - archive:
  artifacts: 'log/*'
diff --git a/jjb/publish.yaml b/jjb/publish.yaml
index 4235c13..0d5ba64 100644
--- a/jjb/publish.yaml
+++ b/jjb/publish.yaml
@@ -54,6 +54,27 @@
WMF_CI_PUB_DEST=cover/{dest}
PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
 
+# Variant of cover-publish that publishes to cover-extensions/
+- builder:
+name: cover-extensions-publish
+builders:
+ # rsync folder to integration-publishing.eqiad.wmflabs
+ - shell: |
+ set -u
+ echo "Making sure that destination does not contain unset variables 
(like DOC_SUBPATH, see zuul/doc_functions.py): {dest}"
+ rsync --recursive "{src}/" 
"rsync://10.68.23.254/doc/$JOB_NAME-$BUILD_NUMBER"
+ echo
+ echo "Publishing to 
https://doc.wikimedia.org/cover-extensions/{dest}/;
+ - trigger-builds:
+   - project: publish-on-contint1001
+ block: true
+ current-parameters: true  # Pass Zuul parameters
+ predefined-parameters: |
+   WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+   WMF_CI_PUB_DEST=cover-extensions/{dest}
+   PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
+
+
 # rsync a directory from integration-publishing.eqiad.wmflabs to a website on
 # contint1001.wikimedia.org.
 #

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

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

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Rename to cover-extensions/ to avoid issues with subdirectories

[jenkins-bot (Code Review)]

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

Change subject: Rename to cover-extensions/ to avoid issues with subdirectories
..


Rename to cover-extensions/ to avoid issues with subdirectories

Page is designed to work for top-level directories, subdirectories don't
really work. So just rename the directory to cover-extensions to make
the URL look like I want it, but work properly :)

Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
---
R org/wikimedia/doc/cover-extensions/dir.php
R org/wikimedia/doc/cover-extensions/index.php
M shared/CoveragePage.php
3 files changed, 3 insertions(+), 10 deletions(-)

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



diff --git a/org/wikimedia/doc/cover/extensions/dir.php 
b/org/wikimedia/doc/cover-extensions/dir.php
similarity index 90%
rename from org/wikimedia/doc/cover/extensions/dir.php
rename to org/wikimedia/doc/cover-extensions/dir.php
index f31f804..879af75 100644
--- a/org/wikimedia/doc/cover/extensions/dir.php
+++ b/org/wikimedia/doc/cover-extensions/dir.php
@@ -17,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once __DIR__ . '/../../../../../shared/DocPage.php';
+require_once __DIR__ . '/../../../../shared/DocPage.php';
 
 $p = DocPage::newDirIndex(
'MediaWiki extension test coverage: ',
Page::INDEX_PREFIX | Page::INDEX_ALLOW_SKIP
 );
 $p->setRootDir( dirname( __DIR__ ) );
-$p->setLibPath( __DIR__ . '/../../lib' );
 $p->handleDirIndex();
 $p->flush();
diff --git a/org/wikimedia/doc/cover/extensions/index.php 
b/org/wikimedia/doc/cover-extensions/index.php
similarity index 86%
rename from org/wikimedia/doc/cover/extensions/index.php
rename to org/wikimedia/doc/cover-extensions/index.php
index 1af3043..dec1f54 100644
--- a/org/wikimedia/doc/cover/extensions/index.php
+++ b/org/wikimedia/doc/cover-extensions/index.php
@@ -18,13 +18,11 @@
  *
  */
 
-require_once __DIR__ . '/../../../../../shared/CoveragePage.php';
+require_once __DIR__ . '/../../../../shared/CoveragePage.php';
 
 /** @var CoveragePage $p */
 $p = CoveragePage::newDirIndex( 'MediaWiki extension test coverage' );
 $p->setCoverageDir( __DIR__ );
-// XXX: Not sure if there's a better way to do this
-$p->setLibPath( '../../lib' );
 $p->handleCoverageIndex();
 $p->handleDirIndex();
 $p->flush();
diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index cd67474..01fad1d 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -157,11 +157,7 @@
$dirs = parent::getDirIndexDirectories();
$noClover = [];
foreach ( $dirs as $dir ) {
-   // Ignore "extensions" subdirectory, it is linked to
-   // separately
-   if ( !file_exists( "$dir/clover.xml" )
-   && basename( $dir ) !== 'extensions'
-   ) {
+   if ( !file_exists( "$dir/clover.xml" ) ) {
$noClover[] = $dir;
}
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1094

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Repool db1094
..

db-eqiad.php: Repool db1094

Alter table is finished

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index b2ad44c..6ef81cd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
+   'db1094' => 500, # D2 3.6TB 512GB
# 'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7 
# T163190
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1094"

[Marostegui (Code Review)]

Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1094"
..

Revert "db-eqiad.php: Depool db1094"

This reverts commit c38fb887cdc53e195bf34bc8b93dace6e77b840f.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4fe5899..cf47536 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
+   'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f9a3fac145858f6b8c622046518c1828a787522
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Publish extension coverage to cover-extensions/

[Legoktm (Code Review)]

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

Change subject: Publish extension coverage to cover-extensions/
..

Publish extension coverage to cover-extensions/

Change-Id: I76b8c1aa98c9346837c1fd72d6f23bd4720d8ee6
---
M jjb/mediawiki-extensions.yaml
M jjb/publish.yaml
2 files changed, 22 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/86/402186/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index ed106aa..80d0e24 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -511,7 +511,7 @@
 cp log/clover.xml "$WORKSPACE/cover/clover.xml"
 fi
 
- - cover-publish:
+ - cover-extensions-publish:
  src: 'cover'
  dest: 'extensions/$DOC_BASENAME'
 publishers:
diff --git a/jjb/publish.yaml b/jjb/publish.yaml
index 4235c13..0d5ba64 100644
--- a/jjb/publish.yaml
+++ b/jjb/publish.yaml
@@ -54,6 +54,27 @@
WMF_CI_PUB_DEST=cover/{dest}
PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
 
+# Variant of cover-publish that publishes to cover-extensions/
+- builder:
+name: cover-extensions-publish
+builders:
+ # rsync folder to integration-publishing.eqiad.wmflabs
+ - shell: |
+ set -u
+ echo "Making sure that destination does not contain unset variables 
(like DOC_SUBPATH, see zuul/doc_functions.py): {dest}"
+ rsync --recursive "{src}/" 
"rsync://10.68.23.254/doc/$JOB_NAME-$BUILD_NUMBER"
+ echo
+ echo "Publishing to 
https://doc.wikimedia.org/cover-extensions/{dest}/;
+ - trigger-builds:
+   - project: publish-on-contint1001
+ block: true
+ current-parameters: true  # Pass Zuul parameters
+ predefined-parameters: |
+   WMF_CI_PUB_DOCROOT=org/wikimedia/doc
+   WMF_CI_PUB_DEST=cover-extensions/{dest}
+   PUBLISHER_PATH=$JOB_NAME-$BUILD_NUMBER
+
+
 # rsync a directory from integration-publishing.eqiad.wmflabs to a website on
 # contint1001.wikimedia.org.
 #

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

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

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Rename to cover-extensions/ to avoid issues with subdirectories

[Legoktm (Code Review)]

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

Change subject: Rename to cover-extensions/ to avoid issues with subdirectories
..

Rename to cover-extensions/ to avoid issues with subdirectories

Page is designed to work for top-level directories, subdirectories don't
really work. So just rename the directory to cover-extensions to make
the URL look like I want it, but work properly :)

Change-Id: If845635c6329b0e39b6f14145d41ee47908127f5
---
R org/wikimedia/doc/cover-extensions/dir.php
R org/wikimedia/doc/cover-extensions/index.php
M shared/CoveragePage.php
3 files changed, 3 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/84/402184/1

diff --git a/org/wikimedia/doc/cover/extensions/dir.php 
b/org/wikimedia/doc/cover-extensions/dir.php
similarity index 90%
rename from org/wikimedia/doc/cover/extensions/dir.php
rename to org/wikimedia/doc/cover-extensions/dir.php
index f31f804..879af75 100644
--- a/org/wikimedia/doc/cover/extensions/dir.php
+++ b/org/wikimedia/doc/cover-extensions/dir.php
@@ -17,13 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once __DIR__ . '/../../../../../shared/DocPage.php';
+require_once __DIR__ . '/../../../../shared/DocPage.php';
 
 $p = DocPage::newDirIndex(
'MediaWiki extension test coverage: ',
Page::INDEX_PREFIX | Page::INDEX_ALLOW_SKIP
 );
 $p->setRootDir( dirname( __DIR__ ) );
-$p->setLibPath( __DIR__ . '/../../lib' );
 $p->handleDirIndex();
 $p->flush();
diff --git a/org/wikimedia/doc/cover/extensions/index.php 
b/org/wikimedia/doc/cover-extensions/index.php
similarity index 86%
rename from org/wikimedia/doc/cover/extensions/index.php
rename to org/wikimedia/doc/cover-extensions/index.php
index 1af3043..dec1f54 100644
--- a/org/wikimedia/doc/cover/extensions/index.php
+++ b/org/wikimedia/doc/cover-extensions/index.php
@@ -18,13 +18,11 @@
  *
  */
 
-require_once __DIR__ . '/../../../../../shared/CoveragePage.php';
+require_once __DIR__ . '/../../../../shared/CoveragePage.php';
 
 /** @var CoveragePage $p */
 $p = CoveragePage::newDirIndex( 'MediaWiki extension test coverage' );
 $p->setCoverageDir( __DIR__ );
-// XXX: Not sure if there's a better way to do this
-$p->setLibPath( '../../lib' );
 $p->handleCoverageIndex();
 $p->handleDirIndex();
 $p->flush();
diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index cd67474..01fad1d 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -157,11 +157,7 @@
$dirs = parent::getDirIndexDirectories();
$noClover = [];
foreach ( $dirs as $dir ) {
-   // Ignore "extensions" subdirectory, it is linked to
-   // separately
-   if ( !file_exists( "$dir/clover.xml" )
-   && basename( $dir ) !== 'extensions'
-   ) {
+   if ( !file_exists( "$dir/clover.xml" ) ) {
$noClover[] = $dir;
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Prevent page scroll to top while clicking on language settin...

[jenkins-bot (Code Review)]

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

Change subject: Prevent page scroll to top while clicking on language settings 
icon
..


Prevent page scroll to top while clicking on language settings icon

If the language settings window is not visible, all calculations
will go wrong and page will scroll to 0 position.

So call scrollIntoView only when the element is visible.

The $.fn.scrollIntoView defined in jquery.uls core may be unnecessary
now since it is available natively on DOM elements.

Bug: T178188
Change-Id: I461fa9eb7c51cd277bebd3a04cfcc0eed9793c4e
---
M resources/js/ext.uls.languagesettings.js
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/resources/js/ext.uls.languagesettings.js 
b/resources/js/ext.uls.languagesettings.js
index e39f3a6..b806d19 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -149,7 +149,9 @@
var $this = $( this );
 
$this.data( 'module' ).render();
-   languageSettings.$window.scrollIntoView();
+   if ( languageSettings.$window.is( ':visible' ) 
) {
+   
languageSettings.$window.scrollIntoView();
+   }
$settingsMenuItems.find( '.menu-section' 
).removeClass( 'active' );
$this.addClass( 'active' );
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I461fa9eb7c51cd277bebd3a04cfcc0eed9793c4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
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] translatewiki[master]: Update ve-wmf path

[jenkins-bot (Code Review)]

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

Change subject: Update ve-wmf path
..


Update ve-wmf path

Change-Id: Ica2d375fd06b54484e14ee60b9490df977bcfe0a
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 93c6f1c..8b52fbb 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2513,7 +2513,7 @@
 VisualEditor (WMF)
 id = ext-visualeditor-ve-wmf
 descmsg = visualeditor-desc
-file = VisualEditor/modules/ve-wmf/i18n/%CODE%.json
+file = VisualEditor/i18n/ve-wmf/%CODE%.json
 optional = visualeditor-help-link
 
 Vote NY

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica2d375fd06b54484e14ee60b9490df977bcfe0a
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Update ve-wmf path

[Nikerabbit (Code Review)]

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

Change subject: Update ve-wmf path
..

Update ve-wmf path

Change-Id: Ica2d375fd06b54484e14ee60b9490df977bcfe0a
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/83/402183/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 93c6f1c..8b52fbb 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2513,7 +2513,7 @@
 VisualEditor (WMF)
 id = ext-visualeditor-ve-wmf
 descmsg = visualeditor-desc
-file = VisualEditor/modules/ve-wmf/i18n/%CODE%.json
+file = VisualEditor/i18n/ve-wmf/%CODE%.json
 optional = visualeditor-help-link
 
 Vote NY

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica2d375fd06b54484e14ee60b9490df977bcfe0a
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1098:3317

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Depool db1098:3317
..


db-eqiad.php: Depool db1098:3317

Fixing data drifts

Bug: T163190
Change-Id: I40d471aa4c686a98bd4397836ec2bef3d4056506
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4fe5899..b2ad44c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -166,7 +166,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
# 'db1094' => 500, # D2 3.6TB 512GB # T174569
-   'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
+   # 'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7 
# T163190
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
@@ -455,23 +455,23 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'contributions' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'logpager' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40d471aa4c686a98bd4397836ec2bef3d4056506
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1098:3317

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Depool db1098:3317
..

db-eqiad.php: Depool db1098:3317

Fixing data drifts

Bug: T163190
Change-Id: I40d471aa4c686a98bd4397836ec2bef3d4056506
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4fe5899..b2ad44c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -166,7 +166,7 @@
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
# 'db1094' => 500, # D2 3.6TB 512GB # T174569
-   'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
+   # 'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7 
# T163190
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
@@ -455,23 +455,23 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'contributions' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
'logpager' => [
-   'db1098:3317' => 1,
+   # 'db1098:3317' => 1,
'db1101:3317' => 1,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: service::node: Fix RESTBase port

[jenkins-bot (Code Review)]

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

Change subject: service::node: Fix RESTBase port
..


service::node: Fix RESTBase port

Bug: T183854
Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
---
M puppet/modules/service/manifests/node.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/puppet/modules/service/manifests/node.pp 
b/puppet/modules/service/manifests/node.pp
index d7d80da..7c95493 100644
--- a/puppet/modules/service/manifests/node.pp
+++ b/puppet/modules/service/manifests/node.pp
@@ -96,9 +96,9 @@
 default => $log_level
 }
 # ensure the RB port is defined for the config
-$restbase_port = $::restbase::port ? {
-undef   => 7231,
-default => $::restbase::port
+$restbase_port = defined(Class['restbase']) ? {
+true=> $::restbase::port,
+default => 7231,
 }
 
 # the repo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1812c17222863268fc7a8d176b196f540a162e95
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1094

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Depool db1094
..


db-eqiad.php: Depool db1094

Needs alter table

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..4fe5899 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   'db1094' => 500, # D2 3.6TB 512GB
+   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d782d9a775866e6d2cc4a59f0eef4214f407ead
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Document PHP version requirement in composer.json

[Legoktm (Code Review)]

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

Change subject: Document PHP version requirement in composer.json
..

Document PHP version requirement in composer.json

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/79/402179/1

diff --git a/composer.json b/composer.json
index 3812cea..c8ae29a 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
}
],
"require": {
+   "php": ">=5.5.9",
"ext-mbstring": "*",
"wikimedia/utfnormal": "1.1.0"
},

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fad61a3ef33fd4a0a66371f7967b9c395b13b00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Turn PropGuard into a trait

[Legoktm (Code Review)]

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

Change subject: Turn PropGuard into a trait
..

Turn PropGuard into a trait

This makes it easier to use, as you don't need to copy the __set function
into every class to take advantage of it.

Change-Id: I8ab0f99d0149f3a04ada6564c3e871775590d722
---
M RemexHtml/PropGuard.php
M RemexHtml/Serializer/Serializer.php
M RemexHtml/Serializer/SerializerNode.php
M RemexHtml/Tokenizer/Attribute.php
M RemexHtml/Tokenizer/Tokenizer.php
M RemexHtml/TreeBuilder/Element.php
M RemexHtml/TreeBuilder/InsertionMode.php
M RemexHtml/TreeBuilder/Marker.php
M RemexHtml/TreeBuilder/TreeBuilder.php
9 files changed, 20 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/80/402180/1

diff --git a/RemexHtml/PropGuard.php b/RemexHtml/PropGuard.php
index 00c3c4d..111c09a 100644
--- a/RemexHtml/PropGuard.php
+++ b/RemexHtml/PropGuard.php
@@ -7,15 +7,15 @@
  * undeclared properties on objects. The point of it is to detect programmer
  * errors.
  */
-class PropGuard {
+trait PropGuard {
public static $armed = true;
 
-   public static function set( $obj, $name, $value ) {
+   public function __set( $name, $value ) {
if ( self::$armed ) {
-   throw new \Exception( "Property \"$name\" on object of 
class " . get_class( $obj ) .
+   throw new \Exception( "Property \"$name\" on object of 
class " . get_class( $this ) .
" is undeclared" );
} else {
-   $obj->$name = $value;
+   $this->$name = $value;
}
}
 }
diff --git a/RemexHtml/Serializer/Serializer.php 
b/RemexHtml/Serializer/Serializer.php
index 786c969..b46a18e 100644
--- a/RemexHtml/Serializer/Serializer.php
+++ b/RemexHtml/Serializer/Serializer.php
@@ -14,6 +14,8 @@
  * a DOM and then serializing it, even if you use DOMDocument::saveHTML().
  */
 class Serializer implements AbstractSerializer {
+   use PropGuard;
+
/**
 * A node corresponding to the Document
 * @var SerializerNode
@@ -67,10 +69,6 @@
public function __construct( Formatter $formatter, $errorCallback = 
null ) {
$this->formatter = $formatter;
$this->errorCallback = $errorCallback;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 
/**
diff --git a/RemexHtml/Serializer/SerializerNode.php 
b/RemexHtml/Serializer/SerializerNode.php
index 2944732..6739b27 100644
--- a/RemexHtml/Serializer/SerializerNode.php
+++ b/RemexHtml/Serializer/SerializerNode.php
@@ -4,6 +4,8 @@
 use RemexHtml\PropGuard;
 
 class SerializerNode {
+   use PropGuard;
+
public $id;
public $parentId;
public $namespace;
@@ -24,9 +26,5 @@
$this->name = $name;
$this->attrs = $attrs;
$this->void = $void;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 }
diff --git a/RemexHtml/Tokenizer/Attribute.php 
b/RemexHtml/Tokenizer/Attribute.php
index 293b075..9346783 100644
--- a/RemexHtml/Tokenizer/Attribute.php
+++ b/RemexHtml/Tokenizer/Attribute.php
@@ -7,6 +7,8 @@
  * A namespaced attribute, as returned by Attributes::getObjects()
  */
 class Attribute {
+   use PropGuard;
+
public $qualifiedName;
public $namespaceURI;
public $prefix;
@@ -19,9 +21,5 @@
$this->prefix = $prefix;
$this->localName = $localName;
$this->value = $value;
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 }
diff --git a/RemexHtml/Tokenizer/Tokenizer.php 
b/RemexHtml/Tokenizer/Tokenizer.php
index 3567dab..b998f8b 100644
--- a/RemexHtml/Tokenizer/Tokenizer.php
+++ b/RemexHtml/Tokenizer/Tokenizer.php
@@ -11,6 +11,8 @@
  * https://www.w3.org/TR/2016/REC-html51-20161101/
  */
 class Tokenizer {
+   use PropGuard;
+
// States
const STATE_START = 1;
const STATE_DATA = 2;
@@ -111,10 +113,6 @@
$this->ignoreCharRefs = !empty( $options['ignoreCharRefs'] );
$this->ignoreNulls = !empty( $options['ignoreNulls'] );
$this->skipPreprocess = !empty( $options['skipPreprocess'] );
-   }
-
-   public function __set( $name, $value ) {
-   PropGuard::set( $this, $name, $value );
}
 
public function setEnableCdataCallback( $cb ) {
diff --git a/RemexHtml/TreeBuilder/Element.php 
b/RemexHtml/TreeBuilder/Element.php
index 18e2166..59029eb 100644
--- a/RemexHtml/TreeBuilder/Element.php
+++ b/RemexHtml/TreeBuilder/Element.php
@@ -14,6 +14,8 @@
  * 

[MediaWiki-commits] [Gerrit] mediawiki...RemexHtml[master]: Add tests for PropGuard

[Legoktm (Code Review)]

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

Change subject: Add tests for PropGuard
..

Add tests for PropGuard

Change-Id: Id7f711cc31ba4b4a455beb4e307b11995967ee0e
---
A tests/phpunit/PropGuardTest.php
1 file changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/libs/RemexHtml 
refs/changes/81/402181/1

diff --git a/tests/phpunit/PropGuardTest.php b/tests/phpunit/PropGuardTest.php
new file mode 100644
index 000..a335624
--- /dev/null
+++ b/tests/phpunit/PropGuardTest.php
@@ -0,0 +1,35 @@
+real = true;
+   // Will throw
+   $this->setExpectedException( Exception::class );
+   $mock->fake = true;
+   }
+
+   public function testDisarmed() {
+   MockPropGuard::$armed = false;
+   $mock = new MockPropGuard();
+   $mock->fake = true;
+   $this->assertTrue( $mock->fake );
+   }
+
+}
+
+class MockPropGuard {
+   use PropGuard;
+
+   public $real;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7f711cc31ba4b4a455beb4e307b11995967ee0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/libs/RemexHtml
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1094

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Depool db1094
..

db-eqiad.php: Depool db1094

Needs alter table

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index cf47536..4fe5899 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -165,7 +165,7 @@
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
-   'db1094' => 500, # D2 3.6TB 512GB
+   # 'db1094' => 500, # D2 3.6TB 512GB # T174569
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Fix 1 change

[Mattflaschen (Code Review)]

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

Change subject: RCFilters: Fix 1 change
..

RCFilters: Fix 1 change

Fix typo so it's '1 change' instead of 'change'.

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


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

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 5e206ef..931e7e1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1366,7 +1366,7 @@
"rcfilters-activefilters": "Active filters",
"rcfilters-advancedfilters": "Advanced filters",
"rcfilters-limit-title": "Results to show",
-   "rcfilters-limit-and-date-label": "{{PLURAL:$1|change|$1 changes}}, $2",
+   "rcfilters-limit-and-date-label": "$1 {{PLURAL:$1|change|changes}}, $2",
"rcfilters-date-popup-title": "Time period to search",
"rcfilters-days-title": "Recent days",
"rcfilters-hours-title": "Recent hours",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Set timezone

[BryanDavis (Code Review)]

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

Change subject: Set timezone
..

Set timezone

Bug: T184215
Change-Id: I16067dba5dc586a77c8f70b28d8bb21b78cd964a
---
M puppet/hieradata/common.yaml
M puppet/modules/mwv/manifests/init.pp
M puppet/modules/mwv/manifests/packages.pp
3 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/76/402176/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 2ef5d23..fabf5cf 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -259,6 +259,7 @@
 mwv::services_dir: /vagrant/srv
 mwv::vendor_dir: /srv
 mwv::tld: '.local.wmftest.net'
+mwv::timezone: Etc/UTC
 mwv::cachefilesd::enable: true
 
 nginx::variant: extras
diff --git a/puppet/modules/mwv/manifests/init.pp 
b/puppet/modules/mwv/manifests/init.pp
index 9c19aa1..6b55118 100644
--- a/puppet/modules/mwv/manifests/init.pp
+++ b/puppet/modules/mwv/manifests/init.pp
@@ -21,12 +21,16 @@
 #   Top level domain to use when creating hostnames. Value should include
 #   leading '.' (example: '.local.wmftest.net').
 #
+# [*timezone*]
+#   Timezone for the VM. (example: 'Etc/UTC')
+#
 class mwv (
 $files_dir,
 $etc_dir,
 $services_dir,
 $vendor_dir,
 $tld,
+$timezone,
 ) {
 include ::apt
 include ::env
@@ -65,4 +69,28 @@
 } -> File <| |>
 }
 
+# Why is this so hard?
+$tzparts = split($timezone, '/')
+$tzarea = $tzparts[0]
+$tzzone = $tzparts[1]
+exec { 'debconf tzarea':
+command => "/bin/echo tzdata tzdata/Areas select ${tzarea} | 
/usr/bin/debconf-set-selections",
+unless  => "/usr/bin/debconf-get-selections | /bin/grep -q -E 
\"^tzdata\\s+tzdata/Areas\\s+select\\s+${tzarea}\"",
+before  => Package['tzdata'],
+}
+exec { 'debconf tzzone':
+command => "/bin/echo tzdata tzdata/Zones/${tzarea} select ${timezone} 
| /usr/bin/debconf-set-selections",
+unless  => "/usr/bin/debconf-get-selections | /bin/grep -q -E 
\"^tzdata\\s+tzdata/Zones/${tzarea}\\s+select\\s+${timezone}\"",
+before  => Package['tzdata'],
+}
+file { '/etc/localtime':
+ensure  => 'link',
+target  => "/usr/share/zoneinfo/${timezone}",
+require => Package['tzdata'],
+}
+file { '/etc/timezone':
+ensure  => 'present',
+content => $timezone,
+require => Package['tzdata'],
+}
 }
diff --git a/puppet/modules/mwv/manifests/packages.pp 
b/puppet/modules/mwv/manifests/packages.pp
index f85d745..b3a1c05 100644
--- a/puppet/modules/mwv/manifests/packages.pp
+++ b/puppet/modules/mwv/manifests/packages.pp
@@ -15,6 +15,7 @@
 'gdb',
 'python-dev',
 'ruby-dev',
+'tzdata',
 )
 
 # Cron resources need a cron provider installed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16067dba5dc586a77c8f70b28d8bb21b78cd964a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Generate clover.xml files for tox-py27-coverage-publish

[jenkins-bot (Code Review)]

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

Change subject: Generate clover.xml files for tox-py27-coverage-publish
..


Generate clover.xml files for tox-py27-coverage-publish

coverage.py can generate cobertura files, so we use a script to turn it
into
a clover.xml file, and publish that. Both the original cobertura XML
file and
the generated clover.xml file are kept as artifacts.

Bug: T179054
Change-Id: I697d130e8c27189636bf0783ce100a5c82c19359
---
M jjb/python-jobs.yaml
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 40b283b..66e377d 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -112,8 +112,11 @@
  rm -fR coverage log
  mkdir -p log
  set -o pipefail
- TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ | tee "log/tox-coverage.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ --cover-xml | tee "log/tox-coverage.log"
  set +o pipefail
+ mv coverage.xml log/coverage.xml
+ 
/srv/deployment/integration/slave-scripts/bin/cobertura-clover-transform.py 
log/coverage.xml -o log/clover.xml
+ cp log/clover.xml coverage/clover.xml
  - cover-publish:
 src: 'coverage'
 dest: '$DOC_PROJECT'

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Generate clover.xml files for tox-py27-coverage-publish

[Legoktm (Code Review)]

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

Change subject: Generate clover.xml files for tox-py27-coverage-publish
..

Generate clover.xml files for tox-py27-coverage-publish

coverage.py can generate cobertura files, so we use a script to turn it
into
a clover.xml file, and publish that. Both the original cobertura XML
file and
the generated clover.xml file are kept as artifacts.

Bug: T179054
Change-Id: I697d130e8c27189636bf0783ce100a5c82c19359
---
M jjb/python-jobs.yaml
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/75/402175/1

diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 40b283b..66e377d 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -112,8 +112,11 @@
  rm -fR coverage log
  mkdir -p log
  set -o pipefail
- TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ | tee "log/tox-coverage.log"
+ TOX_TESTENV_PASSENV=PY_COLORS PY_COLORS=1 tox -e py27 -- --cover-html 
--cover-html-dir=coverage/ --cover-xml | tee "log/tox-coverage.log"
  set +o pipefail
+ mv coverage.xml log/coverage.xml
+ 
/srv/deployment/integration/slave-scripts/bin/cobertura-clover-transform.py 
log/coverage.xml -o log/clover.xml
+ cp log/clover.xml coverage/clover.xml
  - cover-publish:
 src: 'coverage'
 dest: '$DOC_PROJECT'

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

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

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Safely handle incomplete clover.xml files

[jenkins-bot (Code Review)]

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

Change subject: Safely handle incomplete clover.xml files
..


Safely handle incomplete clover.xml files

The script to convert cobertura reports into clover format (863aceaf408)
doesn't include everything, so check that XML properties are isset()
before trying to read them.

Change-Id: I51a0e12dd7d3e9f88e59b0a6d5f7df0b92b85c16
---
M shared/CoveragePage.php
1 file changed, 18 insertions(+), 10 deletions(-)

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



diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index a48f996..cd67474 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -98,23 +98,31 @@
return false;
}
 
+   $types = [ 'methods', 'conditionals', 'statements', 'elements' 
];
+   $total = 0;
$xml = new SimpleXMLElement( $contents );
$metrics = $xml->project->metrics;
-   $total = (int)$metrics['methods'] +
-   (int)$metrics['conditionals'] +
-   (int)$metrics['statements'] +
-   (int)$metrics['elements'];
+   // A proper clover.xml file will have all of the four types, but
+   // we're also converting other types into clover.xml, that don't
+   // have all the keys we expect. Using isset() should make this 
safe.
+   foreach ( $types as $type ) {
+   if ( isset( $metrics[$type] ) ) {
+   $total += (int)$metrics[$type];
+   }
+   }
if ( $total === 0 ) {
// Avoid division by 0 warnings, and treat 0/0 as 100%
// to match the PHPUnit behavior
$percent = 1;
} else {
-   $percent = (
-   (int)$metrics['coveredmethods'] +
-   (int)$metrics['coveredconditionals'] +
-   (int)$metrics['coveredstatements'] +
-   (int)$metrics['coveredelements']
-   ) / $total;
+   $covered = 0;
+   foreach ( $types as $type ) {
+   if ( isset( $metrics["covered$type"] ) ) {
+   $covered += 
(int)$metrics["covered$type"];
+   }
+
+   }
+   $percent = $covered / $total;
}
// TODO: Figure out how to get a more friendly name
return [

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

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

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: Safely handle incomplete clover.xml files

[Legoktm (Code Review)]

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

Change subject: Safely handle incomplete clover.xml files
..

Safely handle incomplete clover.xml files

The script to convert cobertura reports into clover format (863aceaf408)
doesn't include everything, so check that XML properties are isset()
before trying to read them.

Change-Id: I51a0e12dd7d3e9f88e59b0a6d5f7df0b92b85c16
---
M shared/CoveragePage.php
1 file changed, 18 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/74/402174/1

diff --git a/shared/CoveragePage.php b/shared/CoveragePage.php
index a48f996..cd67474 100644
--- a/shared/CoveragePage.php
+++ b/shared/CoveragePage.php
@@ -98,23 +98,31 @@
return false;
}
 
+   $types = [ 'methods', 'conditionals', 'statements', 'elements' 
];
+   $total = 0;
$xml = new SimpleXMLElement( $contents );
$metrics = $xml->project->metrics;
-   $total = (int)$metrics['methods'] +
-   (int)$metrics['conditionals'] +
-   (int)$metrics['statements'] +
-   (int)$metrics['elements'];
+   // A proper clover.xml file will have all of the four types, but
+   // we're also converting other types into clover.xml, that don't
+   // have all the keys we expect. Using isset() should make this 
safe.
+   foreach ( $types as $type ) {
+   if ( isset( $metrics[$type] ) ) {
+   $total += (int)$metrics[$type];
+   }
+   }
if ( $total === 0 ) {
// Avoid division by 0 warnings, and treat 0/0 as 100%
// to match the PHPUnit behavior
$percent = 1;
} else {
-   $percent = (
-   (int)$metrics['coveredmethods'] +
-   (int)$metrics['coveredconditionals'] +
-   (int)$metrics['coveredstatements'] +
-   (int)$metrics['coveredelements']
-   ) / $total;
+   $covered = 0;
+   foreach ( $types as $type ) {
+   if ( isset( $metrics["covered$type"] ) ) {
+   $covered += 
(int)$metrics["covered$type"];
+   }
+
+   }
+   $percent = $covered / $total;
}
// TODO: Figure out how to get a more friendly name
return [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: peopleweb: re-add ferm rule for http

[Dzahn (Code Review)]

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

Change subject: peopleweb: re-add ferm rule for http
..


peopleweb: re-add ferm rule for http

re-add the ferm rule for http that was removed
in I0e48f233d1c5ca but not re-added in Ife9544fdd63a3bb536a
as intended

Change-Id: I58c10e97e1c5f1e11e24fbb1706f38906ee9b0ad
---
M modules/profile/manifests/microsites/peopleweb.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
index bf40a6c..e06b638 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -1,6 +1,12 @@
 # let users publish their own HTML in their home dirs
 class profile::microsites::peopleweb {
 
+ferm::service { 'people-http':
+proto  => 'tcp',
+port   => '80',
+srange => '$CACHE_MISC',
+}
+
 class { '::httpd':
 modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: peopleweb: re-add ferm rule for http

[Dzahn (Code Review)]

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

Change subject: peopleweb: re-add ferm rule for http
..

peopleweb: re-add ferm rule for http

re-add the ferm rule for http that was removed
in I0e48f233d1c5ca but not re-added in Ife9544fdd63a3bb536a
as intended

Change-Id: I58c10e97e1c5f1e11e24fbb1706f38906ee9b0ad
---
M modules/profile/manifests/microsites/peopleweb.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/402173/1

diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
index bf40a6c..e06b638 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -1,6 +1,12 @@
 # let users publish their own HTML in their home dirs
 class profile::microsites::peopleweb {
 
+ferm::service { 'people-http':
+proto  => 'tcp',
+port   => '80',
+srange => '$CACHE_MISC',
+}
+
 class { '::httpd':
 modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: peopleweb/publichtml: use module httpd

[Dzahn (Code Review)]

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

Change subject: peopleweb/publichtml: use module httpd
..


peopleweb/publichtml: use module httpd

Change-Id: Ife9544fdd63a3bb536a876fed9a5c5306b918277
---
M modules/profile/manifests/microsites/peopleweb.pp
M modules/publichtml/manifests/init.pp
2 files changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
index 8ccebb2..bf40a6c 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -1,6 +1,10 @@
 # let users publish their own HTML in their home dirs
 class profile::microsites::peopleweb {
 
+class { '::httpd':
+modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
+}
+
 class { '::publichtml':
 sitename => 'people.wikimedia.org',
 server_admin => 'n...@wikimedia.org',
diff --git a/modules/publichtml/manifests/init.pp 
b/modules/publichtml/manifests/init.pp
index bbc46fc..bcc4f3f 100644
--- a/modules/publichtml/manifests/init.pp
+++ b/modules/publichtml/manifests/init.pp
@@ -5,17 +5,12 @@
 $docroot  = '/srv/org/wikimedia/publichtml',
 $server_admin = undef,
 ) {
-include ::apache::mod::userdir
-include ::apache::mod::cgi
-include ::apache::mod::php5
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 system::role { 'publichtml':
 description => 'web server of public_html directories',
 }
 
-apache::site { $sitename:
+httpd::site { $sitename:
 content => template('publichtml/apacheconfig.erb'),
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife9544fdd63a3bb536a876fed9a5c5306b918277
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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/puppet[production]: peopleweb/publichtml: use module httpd

[Dzahn (Code Review)]

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

Change subject: peopleweb/publichtml: use module httpd
..

peopleweb/publichtml: use module httpd

Change-Id: Ife9544fdd63a3bb536a876fed9a5c5306b918277
---
M modules/publichtml/manifests/init.pp
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/402172/1

diff --git a/modules/publichtml/manifests/init.pp 
b/modules/publichtml/manifests/init.pp
index bbc46fc..927a48f 100644
--- a/modules/publichtml/manifests/init.pp
+++ b/modules/publichtml/manifests/init.pp
@@ -5,17 +5,16 @@
 $docroot  = '/srv/org/wikimedia/publichtml',
 $server_admin = undef,
 ) {
-include ::apache::mod::userdir
-include ::apache::mod::cgi
-include ::apache::mod::php5
-include ::apache::mod::rewrite
-include ::apache::mod::headers
+
+class { '::httpd':
+modules => ['userdir', 'cgi', 'php5', 'rewrite', 'headers'],
+}
 
 system::role { 'publichtml':
 description => 'web server of public_html directories',
 }
 
-apache::site { $sitename:
+httpd::site { $sitename:
 content => template('publichtml/apacheconfig.erb'),
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webserver_misc_static: switch apache to module httpd

[Dzahn (Code Review)]

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

Change subject: webserver_misc_static: switch apache to module httpd
..


webserver_misc_static: switch apache to module httpd

Now that we have the new module httpd we can convert
this host with multiple Apache sites on a single node as well.

Using one "base" profile for the httpd declaration and ferm rule
to avoid duplicate declarations.

Also we can save code lines by removing a ferm section in each
class for each site.

Change-Id: I0e48f233d1c5ca3e43d259120fc66bc57bbb9f9d
---
M modules/bugzilla_static/manifests/init.pp
M modules/profile/manifests/microsites/annualreport.pp
A modules/profile/manifests/microsites/httpd.pp
M modules/profile/manifests/microsites/peopleweb.pp
M modules/profile/manifests/microsites/static_bugzilla.pp
M modules/profile/manifests/microsites/transparency.pp
M modules/profile/manifests/microsites/wikibase.pp
M modules/role/manifests/webserver_misc_static.pp
8 files changed, 23 insertions(+), 52 deletions(-)

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



diff --git a/modules/bugzilla_static/manifests/init.pp 
b/modules/bugzilla_static/manifests/init.pp
index efb45b7..0a6cf66 100644
--- a/modules/bugzilla_static/manifests/init.pp
+++ b/modules/bugzilla_static/manifests/init.pp
@@ -14,10 +14,7 @@
 source => 'puppet:///modules/bugzilla_static/static-bz-index.html';
 }
 
-include ::apache::mod::rewrite
-include ::apache::mod::headers
-
-apache::site { 'static-bugzilla.wikimedia.org':
+httpd::site { 'static-bugzilla.wikimedia.org':
 content  => 
template('bugzilla_static/apache/static-bugzilla.wikimedia.org.erb'),
 priority => 20,
 }
diff --git a/modules/profile/manifests/microsites/annualreport.pp 
b/modules/profile/manifests/microsites/annualreport.pp
index 2aa9ff7..a3f20d4 100644
--- a/modules/profile/manifests/microsites/annualreport.pp
+++ b/modules/profile/manifests/microsites/annualreport.pp
@@ -4,20 +4,11 @@
 # T599 - https://15.wikipedia.org (aka. annual report 2015)
 class profile::microsites::annualreport {
 
-include ::apache
-include ::apache::mod::headers
-
-ferm::service { 'annualreport_http':
-proto  => 'tcp',
-port   => '80',
-srange => '$CACHE_MISC',
-}
-
-apache::site { 'annual.wikimedia.org':
+httpd::site { 'annual.wikimedia.org':
 source => 
'puppet:///modules/profile/annualreport/annual.wikimedia.org',
 }
 
-apache::site { '15.wikipedia.org':
+httpd::site { '15.wikipedia.org':
 source => 'puppet:///modules/profile/annualreport/15.wikipedia.org',
 }
 
diff --git a/modules/profile/manifests/microsites/httpd.pp 
b/modules/profile/manifests/microsites/httpd.pp
new file mode 100644
index 000..6fbdf88
--- /dev/null
+++ b/modules/profile/manifests/microsites/httpd.pp
@@ -0,0 +1,13 @@
+# webserver for misc. static sites
+class profile::microsites::httpd {
+
+class {'::httpd':
+modules => ['headers', 'rewrite', 'authnz_ldap'],
+}
+
+ferm::service { 'microsites_http':
+proto  => 'tcp',
+port   => '80',
+srange => '$CACHE_MISC',
+}
+}
diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
index 0514bb9..8ccebb2 100644
--- a/modules/profile/manifests/microsites/peopleweb.pp
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -6,12 +6,6 @@
 server_admin => 'n...@wikimedia.org',
 }
 
-ferm::service { 'people-http':
-proto  => 'tcp',
-port   => '80',
-srange => '$CACHE_MISC',
-}
-
 motd::script { 'people-motd':
 ensure  => present,
 content => "#!/bin/sh\necho '\nThis is people.wikimedia.org.\nFiles 
you put in 'public_html' in your home dir will be accessible on the web.\nMore 
info on https://wikitech.wikimedia.org/wiki/People.wikimedia.org.\n'",
diff --git a/modules/profile/manifests/microsites/static_bugzilla.pp 
b/modules/profile/manifests/microsites/static_bugzilla.pp
index fd0babc..6b0e7fa 100644
--- a/modules/profile/manifests/microsites/static_bugzilla.pp
+++ b/modules/profile/manifests/microsites/static_bugzilla.pp
@@ -3,12 +3,6 @@
 
 include ::bugzilla_static
 
-ferm::service { 'bugzilla_static_http':
-proto  => 'tcp',
-port   => '80',
-srange => '$CACHE_MISC',
-}
-
 include ::profile::backup::host
 backup::set { 'bugzilla-static' : }
 backup::set { 'bugzilla-backup' : }
diff --git a/modules/profile/manifests/microsites/transparency.pp 
b/modules/profile/manifests/microsites/transparency.pp
index 7606b99..c90fe33 100644
--- a/modules/profile/manifests/microsites/transparency.pp
+++ b/modules/profile/manifests/microsites/transparency.pp
@@ -39,13 +39,7 @@
 ],
 }
 
-apache::site { 'transparency.wikimedia.org':

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Added FancyBox fix for jQuery 3

[Yaron Koren (Code Review)]

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

Change subject: Added FancyBox fix for jQuery 3
..


Added FancyBox fix for jQuery 3

Based on this fix: https://github.com/nvidoni/fancybox/issues/2

The FancyBox library used by PF still needs to be updated.

Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
---
M libs/jquery.fancybox.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/libs/jquery.fancybox.js b/libs/jquery.fancybox.js
index 68d2865..81f1406 100644
--- a/libs/jquery.fancybox.js
+++ b/libs/jquery.fancybox.js
@@ -577,8 +577,8 @@
 
_finish = function () {
if (!$.support.opacity) {
-   content.get(0).style.removeAttribute('filter');
-   wrap.get(0).style.removeAttribute('filter');
+   content.css('filter', 0);
+   wrap.css('filter', 0);
}
 
if (selectedOpts.autoDimensions) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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...PageForms[master]: Added FancyBox fix for jQuery 3

[Yaron Koren (Code Review)]

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

Change subject: Added FancyBox fix for jQuery 3
..

Added FancyBox fix for jQuery 3

Based on this fix: https://github.com/nvidoni/fancybox/issues/2

The FancyBox library used by PF still needs to be updated.

Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
---
M libs/jquery.fancybox.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/71/402171/2

diff --git a/libs/jquery.fancybox.js b/libs/jquery.fancybox.js
index 68d2865..81f1406 100644
--- a/libs/jquery.fancybox.js
+++ b/libs/jquery.fancybox.js
@@ -577,8 +577,8 @@
 
_finish = function () {
if (!$.support.opacity) {
-   content.get(0).style.removeAttribute('filter');
-   wrap.get(0).style.removeAttribute('filter');
+   content.css('filter', 0);
+   wrap.css('filter', 0);
}
 
if (selectedOpts.autoDimensions) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39d19cfb708ff10db657205d458d3785b908c448
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undeploy EducationProgram from test2wiki

[jenkins-bot (Code Review)]

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

Change subject: Undeploy EducationProgram from test2wiki
..


Undeploy EducationProgram from test2wiki

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7aa293d..d42d744 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17411,7 +17411,6 @@
'ruwiki' => true, // T89588
'srwiki' => true, // T110619
'svwiki' => true, // T51009
-   'test2wiki' => true,
'ukwiki' => true, // T66143
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice08fb61eb83a43a8fb7f5576f0ee9c0982c8004
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]: Undeploy EducationProgram from test2wiki

[Chad (Code Review)]

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

Change subject: Undeploy EducationProgram from test2wiki
..

Undeploy EducationProgram from test2wiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7aa293d..d42d744 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17411,7 +17411,6 @@
'ruwiki' => true, // T89588
'srwiki' => true, // T110619
'svwiki' => true, // T51009
-   'test2wiki' => true,
'ukwiki' => true, // T66143
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice08fb61eb83a43a8fb7f5576f0ee9c0982c8004
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] mediawiki...luasandbox[master]: Fix README again

[Tim Starling (Code Review)]

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

Change subject: Fix README again
..

Fix README again

Change-Id: Ifcb2445b7fc076ba5f9f20e7c59aba9ca361139f
---
M README
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/69/402169/1

diff --git a/README b/README
index ad31810..144b9ad 100644
--- a/README
+++ b/README
@@ -1,4 +1 @@
-This is a PHP extension. To compile it:
-
 For installation instructions, see 
https://www.mediawiki.org/wiki/Extension:Scribunto#LuaSandbox
-

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcb2445b7fc076ba5f9f20e7c59aba9ca361139f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for jQuery 3 - removeAttr('disabled') deprecated

[Yaron Koren (Code Review)]

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

Change subject: Fix for jQuery 3 - removeAttr('disabled') deprecated
..


Fix for jQuery 3 - removeAttr('disabled') deprecated

Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
---
M libs/PF_submit.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/libs/PF_submit.js b/libs/PF_submit.js
index 3a2ccf4..598ef32 100644
--- a/libs/PF_submit.js
+++ b/libs/PF_submit.js
@@ -15,7 +15,7 @@
 
function setChanged( event ) {
sacButtons
-   .removeAttr( 'disabled' )
+   .prop( 'disabled', false )
.addClass( 'pf-save_and_continue-changed' );
 
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
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]: webserver_misc_static: switch apache to module httpd

[Dzahn (Code Review)]

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

Change subject: webserver_misc_static: switch apache to module httpd
..

webserver_misc_static: switch apache to module httpd

Change-Id: I0e48f233d1c5ca3e43d259120fc66bc57bbb9f9d
---
M modules/profile/manifests/microsites/annualreport.pp
M modules/profile/manifests/microsites/static_bugzilla.pp
M modules/profile/manifests/microsites/transparency.pp
M modules/profile/manifests/microsites/wikibase.pp
M modules/role/manifests/webserver_misc_static.pp
5 files changed, 22 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/402168/1

diff --git a/modules/profile/manifests/microsites/annualreport.pp 
b/modules/profile/manifests/microsites/annualreport.pp
index 2aa9ff7..89fb2b0 100644
--- a/modules/profile/manifests/microsites/annualreport.pp
+++ b/modules/profile/manifests/microsites/annualreport.pp
@@ -4,8 +4,9 @@
 # T599 - https://15.wikipedia.org (aka. annual report 2015)
 class profile::microsites::annualreport {
 
-include ::apache
-include ::apache::mod::headers
+class {'::httpd':
+modules => ['headers'],
+}
 
 ferm::service { 'annualreport_http':
 proto  => 'tcp',
@@ -13,11 +14,11 @@
 srange => '$CACHE_MISC',
 }
 
-apache::site { 'annual.wikimedia.org':
+httpd::site { 'annual.wikimedia.org':
 source => 
'puppet:///modules/profile/annualreport/annual.wikimedia.org',
 }
 
-apache::site { '15.wikipedia.org':
+httpd::site { '15.wikipedia.org':
 source => 'puppet:///modules/profile/annualreport/15.wikipedia.org',
 }
 
diff --git a/modules/profile/manifests/microsites/static_bugzilla.pp 
b/modules/profile/manifests/microsites/static_bugzilla.pp
index fd0babc..e7799b5 100644
--- a/modules/profile/manifests/microsites/static_bugzilla.pp
+++ b/modules/profile/manifests/microsites/static_bugzilla.pp
@@ -1,6 +1,10 @@
 # static HTML archive of old Bugzilla tickets
 class profile::microsites::static_bugzilla {
 
+class {'::httpd':
+modules => ['headers', 'rewrite'],
+}
+
 include ::bugzilla_static
 
 ferm::service { 'bugzilla_static_http':
diff --git a/modules/profile/manifests/microsites/transparency.pp 
b/modules/profile/manifests/microsites/transparency.pp
index 7606b99..46a8984 100644
--- a/modules/profile/manifests/microsites/transparency.pp
+++ b/modules/profile/manifests/microsites/transparency.pp
@@ -3,6 +3,10 @@
 #
 class profile::microsites::transparency {
 
+class {'::httpd':
+modules => ['headers', 'authnz_ldap'],
+}
+
 include ::passwords::misc::private_static_site
 include ::passwords::ldap::production
 
@@ -39,7 +43,7 @@
 ],
 }
 
-apache::site { 'transparency.wikimedia.org':
+httpd::site { 'transparency.wikimedia.org':
 content => 
template('role/apache/sites/transparency.wikimedia.org.erb'),
 }
 
diff --git a/modules/profile/manifests/microsites/wikibase.pp 
b/modules/profile/manifests/microsites/wikibase.pp
index c7df33c..316f487 100644
--- a/modules/profile/manifests/microsites/wikibase.pp
+++ b/modules/profile/manifests/microsites/wikibase.pp
@@ -4,8 +4,9 @@
   $server_admin = hiera('profile::microsites::wikibase::server_admin'),
 ) {
 
-include ::apache
-include ::apache::mod::headers
+class {'::httpd':
+modules => ['headers'],
+}
 
 ferm::service { 'wikibase_http':
 proto  => 'tcp',
@@ -13,7 +14,7 @@
 srange => '$CACHE_MISC',
 }
 
-apache::site { 'wikiba.se':
+httpd::site { 'wikiba.se':
 content => template('profile/wikibase/apache-wikibase.erb'),
 }
 
diff --git a/modules/role/manifests/webserver_misc_static.pp 
b/modules/role/manifests/webserver_misc_static.pp
index 435616d..0b457c9 100644
--- a/modules/role/manifests/webserver_misc_static.pp
+++ b/modules/role/manifests/webserver_misc_static.pp
@@ -1,20 +1,16 @@
 # a webserver for misc. static sites
 class role::webserver_misc_static {
 
+system::role { 'webserver_misc_static':
+description => 'WMF misc sites web server'
+}
+
 include ::standard
 include ::profile::base::firewall
-
-include ::apache
-include ::apache::mod::authnz_ldap
-include ::apache::mod::rewrite
-include ::apache::mod::headers
 
 include ::profile::microsites::annualreport# 
https://annual.wikimedia.org
 include ::profile::microsites::static_bugzilla # 
https://static-bugzilla.wikimedia.org
 include ::profile::microsites::transparency# 
https://transparency.wikimedia.org
 include ::profile::microsites::wikibase# https://wikiba.se
 
-system::role { 'webserver_misc_static':
-description => 'WMF misc sites web server'
-}
 }

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserPreferences[master]: Added Minus-X Support

[Ryan10145 (Code Review)]

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

Change subject: Added Minus-X Support
..

Added Minus-X Support

Bug: T175794
Change-Id: I49c1f6fd572c6abb8da4f84cd04fc1ea47b44c6b
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUserPreferences 
refs/changes/67/402167/1

diff --git a/composer.json b/composer.json
index 18e53fb..ed52e4d 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,8 @@
"description": "Renders the BlueSpice tab in preferences",
"license": "GPL-3.0",
"require": {
-   "composer/installers": "~1.0"
+   "composer/installers": "~1.0",
+   "mediawiki/minus-x": "0.2.1"
},
"autoload": {
"psr-4": {
@@ -16,7 +17,11 @@
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49c1f6fd572c6abb8da4f84cd04fc1ea47b44c6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceUserPreferences
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added Minus-X Support

[Ryan10145 (Code Review)]

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

Change subject: Added Minus-X Support
..

Added Minus-X Support

Bug: T175794
Change-Id: Ia94b3e832ff21f9f76bd63924bf289cd2afdefbc
---
A .minus-x.json
M composer.json
2 files changed, 26 insertions(+), 2 deletions(-)


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

diff --git a/.minus-x.json b/.minus-x.json
new file mode 100644
index 000..3f725d8
--- /dev/null
+++ b/.minus-x.json
@@ -0,0 +1,19 @@
+{
+"ignore": [
+"./maintenance/dev/install.sh",
+"./maintenance/dev/installmw.sh",
+"./maintenance/dev/installphp.sh",
+"./maintenance/dev/start.sh",
+"./maintenance/hhvm/run-server",
+"./maintenance/language/zhtable/Makefile.py",
+"./maintenance/mwjsduck-gen",
+"./maintenance/postgres/compare_schemas.pl",
+"./maintenance/postgres/mediawiki_mysql2postgres.pl",
+"./maintenance/resources/update-oojs-ui.sh",
+"./maintenance/resources/update-oojs.sh",
+"./maintenance/storage/make-blobs",
+"./maintenance/update.php",
+"./tests/phan/bin/phan",
+"./tests/phpunit/phpunit.php",
+]
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index d92ffc9..926d0eb 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,7 @@
"jetbrains/phpstorm-stubs": 
"dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
"justinrainbow/json-schema": "~5.2",
"mediawiki/mediawiki-codesniffer": "15.0.0",
+   "mediawiki/minus-x": "0.2.1",
"monolog/monolog": "~1.22.1",
"nikic/php-parser": "3.1.3",
"nmred/kafka-php": "0.1.5",
@@ -95,14 +96,18 @@
"scripts": {
"lint": "parallel-lint --exclude vendor",
"phpcs": "phpcs -p -s",
-   "fix": "phpcbf",
+   "fix": [
+   "phpcbf",
+   "minus-x fix ."
+   ],
"pre-install-cmd": "ComposerHookHandler::onPreInstall",
"pre-update-cmd": "ComposerHookHandler::onPreUpdate",
"post-install-cmd": "ComposerVendorHtaccessCreator::onEvent",
"post-update-cmd": "ComposerVendorHtaccessCreator::onEvent",
"test": [
"composer lint",
-   "composer phpcs"
+   "composer phpcs",
+   "minus-x check ."
]
},
"config": {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: switch from module apache to module httpd

[Dzahn (Code Review)]

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

Change subject: planet: switch from module apache to module httpd
..


planet: switch from module apache to module httpd

The new module httpd has been added I7d8bc4c6ed8105021
to replace the apache module.

This will be the first service using it and we can fix
style issues due to inclusion of apache classes.

One little change from apache module is that the
priority parameter now must be an integer and it accepted
a string before. So i need to remove those quotes.

Change-Id: I7ee1eabea3e6528fbe15ff4799e7cda9e1b81d54
---
M modules/planet/manifests/apachesite.pp
M modules/planet/manifests/index_site.pp
M modules/profile/manifests/planet/venus.pp
M modules/role/manifests/planet_server.pp
4 files changed, 8 insertions(+), 10 deletions(-)

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



diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index 939017e..9d56219 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -2,12 +2,12 @@
 define planet::apachesite {
 
 if $title == 'en' {
-$priority = '10'
+$priority = 10
 } else {
-$priority = '50'
+$priority = 50
 }
 
-apache::site { "${title}.planet.${planet::planet_domain_name}":
+httpd::site { "${title}.planet.${planet::planet_domain_name}":
 content  => template('planet/apache/planet-language.erb'),
 priority => $priority,
 }
diff --git a/modules/planet/manifests/index_site.pp 
b/modules/planet/manifests/index_site.pp
index d0b08cb..5a14980 100644
--- a/modules/planet/manifests/index_site.pp
+++ b/modules/planet/manifests/index_site.pp
@@ -1,7 +1,7 @@
 # sets up the planet-venus index/portal site
 class planet::index_site {
 
-apache::site { "planet.${planet::planet_domain_name}":
+httpd::site { "planet.${planet::planet_domain_name}":
 content => template('planet/apache/planet.erb'),
 }
 
diff --git a/modules/profile/manifests/planet/venus.pp 
b/modules/profile/manifests/planet/venus.pp
index 4e2a6cf..058b953 100644
--- a/modules/profile/manifests/planet/venus.pp
+++ b/modules/profile/manifests/planet/venus.pp
@@ -190,6 +190,10 @@
 planet_http_proxy  => $planet_http_proxy,
 }
 
+class {'::httpd':
+modules => ['rewrite', 'headers'],
+}
+
 ferm::service { 'planet-http':
 proto  => 'tcp',
 port   => '80',
diff --git a/modules/role/manifests/planet_server.pp 
b/modules/role/manifests/planet_server.pp
index ecee04b..a5fc707 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -3,12 +3,6 @@
 
 include ::standard
 include ::profile::base::firewall
-
-class { '::apache': }
-class { '::apache::mod::rewrite': }
-# so we can vary on X-Forwarded-Proto when behind misc-web
-class { '::apache::mod::headers': }
-
 include ::profile::planet::venus
 
 system::role { 'planet_server':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee1eabea3e6528fbe15ff4799e7cda9e1b81d54
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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/puppet[production]: planet: switch from module apache to module httpd

[Dzahn (Code Review)]

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

Change subject: planet: switch from module apache to module httpd
..

planet: switch from module apache to module httpd

The new module httpd has been added I7d8bc4c6ed8105021
to replace the apache module.

This will be the first service using it and we can fix
style issues due to inclusion of apache classes.

Change-Id: I7ee1eabea3e6528fbe15ff4799e7cda9e1b81d54
---
M modules/planet/manifests/apachesite.pp
M modules/planet/manifests/index_site.pp
M modules/profile/manifests/planet/venus.pp
M modules/role/manifests/planet_server.pp
4 files changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/402165/1

diff --git a/modules/planet/manifests/apachesite.pp 
b/modules/planet/manifests/apachesite.pp
index 939017e..0d7dc7f 100644
--- a/modules/planet/manifests/apachesite.pp
+++ b/modules/planet/manifests/apachesite.pp
@@ -7,7 +7,7 @@
 $priority = '50'
 }
 
-apache::site { "${title}.planet.${planet::planet_domain_name}":
+httpd::site { "${title}.planet.${planet::planet_domain_name}":
 content  => template('planet/apache/planet-language.erb'),
 priority => $priority,
 }
diff --git a/modules/planet/manifests/index_site.pp 
b/modules/planet/manifests/index_site.pp
index d0b08cb..5a14980 100644
--- a/modules/planet/manifests/index_site.pp
+++ b/modules/planet/manifests/index_site.pp
@@ -1,7 +1,7 @@
 # sets up the planet-venus index/portal site
 class planet::index_site {
 
-apache::site { "planet.${planet::planet_domain_name}":
+httpd::site { "planet.${planet::planet_domain_name}":
 content => template('planet/apache/planet.erb'),
 }
 
diff --git a/modules/profile/manifests/planet/venus.pp 
b/modules/profile/manifests/planet/venus.pp
index 4e2a6cf..058b953 100644
--- a/modules/profile/manifests/planet/venus.pp
+++ b/modules/profile/manifests/planet/venus.pp
@@ -190,6 +190,10 @@
 planet_http_proxy  => $planet_http_proxy,
 }
 
+class {'::httpd':
+modules => ['rewrite', 'headers'],
+}
+
 ferm::service { 'planet-http':
 proto  => 'tcp',
 port   => '80',
diff --git a/modules/role/manifests/planet_server.pp 
b/modules/role/manifests/planet_server.pp
index ecee04b..a5fc707 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -3,12 +3,6 @@
 
 include ::standard
 include ::profile::base::firewall
-
-class { '::apache': }
-class { '::apache::mod::rewrite': }
-# so we can vary on X-Forwarded-Proto when behind misc-web
-class { '::apache::mod::headers': }
-
 include ::profile::planet::venus
 
 system::role { 'planet_server':

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: apache: add httpd module as a replacement

[Dzahn (Code Review)]

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

Change subject: apache: add httpd module as a replacement
..


apache: add httpd module as a replacement

The new httpd module is mostly a cherry-pick of the better parts of our
apache module, with some tweaks:

- Use puppet 4 constructs where appropriate.
- Dependencies are not injected by including the base class
  everywhere. This allows us to make our manifests more compliant with
  the role/profile pattern, and to avoid implicit hiera lookups.
- The use of classes to include for configuring apache modules is
  dropped. Instead, you're supposed to pass the list of
  configuration-less modules you want to declare to the httpd class,
  that you're supposed to declare once anyways.

Also, add the first type aliases into wmflib, ready to use for general purposes.

Change-Id: I7d8bc4c6ed8105021c6a8dbe45e288411e5d1d69
---
A modules/httpd/.fixtures.yml
A modules/httpd/Rakefile
A modules/httpd/files/apache-status
A modules/httpd/files/defaults.conf
A modules/httpd/files/dummy.conf
A modules/httpd/manifests/conf.pp
A modules/httpd/manifests/init.pp
A modules/httpd/manifests/mod_conf.pp
A modules/httpd/manifests/mpm.pp
A modules/httpd/manifests/site.pp
A modules/httpd/spec/.gitignore
A modules/httpd/spec/classes/httpd_mpm_spec.rb
A modules/httpd/spec/classes/httpd_spec.rb
A modules/httpd/spec/defines/httpd_conf_spec.rb
A modules/httpd/spec/defines/httpd_mod_conf_spec.rb
A modules/httpd/spec/spec_helper.rb
M modules/wmflib/README.md
A modules/wmflib/types/ensure.pp
A modules/wmflib/types/sourceurl.pp
19 files changed, 598 insertions(+), 1 deletion(-)

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



diff --git a/modules/httpd/.fixtures.yml b/modules/httpd/.fixtures.yml
new file mode 100644
index 000..cc6ed08
--- /dev/null
+++ b/modules/httpd/.fixtures.yml
@@ -0,0 +1,5 @@
+fixtures:
+symlinks:
+httpd: "#{source_dir}"
+stdlib: "../../../../stdlib"
+wmflib: "../../../../wmflib"
diff --git a/modules/httpd/Rakefile b/modules/httpd/Rakefile
new file mode 100644
index 000..cd3d379
--- /dev/null
+++ b/modules/httpd/Rakefile
@@ -0,0 +1 @@
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/modules/httpd/files/apache-status 
b/modules/httpd/files/apache-status
new file mode 100755
index 000..3d6e87a
--- /dev/null
+++ b/modules/httpd/files/apache-status
@@ -0,0 +1,6 @@
+#!/bin/sh
+WHITE="$(/usr/bin/tput setaf 7; /usr/bin/tput bold)"
+RESET="$(/usr/bin/tput sgr0)"
+file="/tmp/apache_status.$(/bin/hostname).$(/bin/date +%s).txt"
+/usr/bin/links -dump http://127.0.0.1/server-status -width 80 | tee "$file"
+printf "\nOutput saved to ${WHITE}${file}${RESET}.\n"
diff --git a/modules/httpd/files/defaults.conf 
b/modules/httpd/files/defaults.conf
new file mode 100644
index 000..fa3c931
--- /dev/null
+++ b/modules/httpd/files/defaults.conf
@@ -0,0 +1,47 @@
+# Global Apache defaults
+# This file is managed by Puppet
+
+# Disable accept filters for HTTP to force Apache to accept connections from
+# PyBal's IdleConnection monitor. Otherwise Apache sets the TCP_DEFER_ACCEPT
+# option on sockets, which defers the accept() until there's data on the
+# connection. See:
+#  - https://phabricator.wikimedia.org/T119372#1852767
+#  - https://httpd.apache.org/docs/2.4/mod/core.html#acceptfilter
+AcceptFilter http none
+
+# Make 'Server' response header field simply 'Apache'
+ServerTokens Prod
+
+# Reject TRACE requests with HTTP 405 error
+TraceEnable Off
+
+# Tab separated log format
+# https://wikitech.wikimedia.org/wiki/Apache_log_format
+
+LogFormat "%{%Y-%m-%dT%H:%M:%S}t   %D  %a  %R/%>s  %B  %m  
http://%{Host}i%U%q -   %{Content-Type}o%{Referer}i 
%{X-Forwarded-For}i %{User-Agent}i  %{Accept-Language}i %{X-Analytics}i 
%u  %a" wmf
+
+
+LogFormat "%{%Y-%m-%dT%H:%M:%S}t   %D  %a  %R/%>s  %B  %m  
http://%{Host}i%U%q -   %{Content-Type}o%{Referer}i 
%{X-Forwarded-For}i %{User-Agent}i  %{Accept-Language}i %{X-Analytics}i 
%u  %{c}a" wmf
+
+
+# Define an access log for VirtualHosts that don't define their own logfile
+CustomLog /var/log/apache2/other_vhosts_access.log wmf
+
+# Set default contact address to include in error messages
+ServerAdmin webmas...@wikimedia.org
+
+# When receiving a graceful-stop signal, wait up to 5 seconds for client
+# connections to close gracefully.
+GracefulShutdownTimeout 5
+
+# Add a response header with the following format:
+#
+#   Backend-Timing: D=109640 t=1454711664235870
+#
+# Where 't' is a timestamp for when the request was received and 'D'
+# is how long it took to begin serving the request, both measured in
+# microseconds. See:
+#   
+
+Header set Backend-Timing "%D %t"
+
diff --git 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Releases: Install composer alongside Jenkins

[Dzahn (Code Review)]

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

Change subject: Releases: Install composer alongside Jenkins
..


Releases: Install composer alongside Jenkins

Change-Id: Iec8034bc05f44a151c9143d8b0090d2889380241
---
M modules/profile/manifests/releases/mediawiki.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/releases/mediawiki.pp 
b/modules/profile/manifests/releases/mediawiki.pp
index 714e3f7..525689a 100644
--- a/modules/profile/manifests/releases/mediawiki.pp
+++ b/modules/profile/manifests/releases/mediawiki.pp
@@ -23,6 +23,8 @@
 prefix   => $prefix,
 }
 
+class { '::contint::composer': }
+
 class { '::apache::mod::rewrite': }
 class { '::apache::mod::headers': }
 class { '::apache::mod::proxy': }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: locales: convert to profile

[Dzahn (Code Review)]

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

Change subject: locales: convert to profile
..

locales: convert to profile

Convert the entire "locales" module into 2 profiles.

Get rid of the inclusion of "::locales" from init.pp
just include that in the profile.

locales::extended is actually used by mailman, planet
and toollabs.

locales::all seems to not be used by anything, at least
not in prod, but i keep it anyways.

Adjust the includes in mailman,planet,toollabs and fix
the style issues this way.

Move the only file into profile/files/locales/.

Change-Id: Ib1b02fcb080cdf82120e3ab1c57e56a0dbdbd3b0
---
D modules/locales/manifests/init.pp
M modules/mailman/manifests/listserve.pp
R modules/profile/files/locales/locales-extended
R modules/profile/manifests/locales/all.pp
R modules/profile/manifests/locales/extended.pp
M modules/role/manifests/lists.pp
M modules/role/manifests/planet_server.pp
M modules/toollabs/manifests/exec_environ.pp
8 files changed, 32 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/402164/1

diff --git a/modules/locales/manifests/init.pp 
b/modules/locales/manifests/init.pp
deleted file mode 100644
index 16724e3..000
--- a/modules/locales/manifests/init.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-# == Class: locales
-#
-# Provisions locale data used by the C library for localization (l10n) and
-# internationalization (i18n) support.
-
-class locales {
-package { 'locales':
-ensure => present,
-}
-
-exec { 'locale-gen':
-command => '/usr/sbin/locale-gen --purge',
-refreshonly => true,
-require => Package['locales'],
-}
-}
diff --git a/modules/mailman/manifests/listserve.pp 
b/modules/mailman/manifests/listserve.pp
index 45253e3..790e44f 100644
--- a/modules/mailman/manifests/listserve.pp
+++ b/modules/mailman/manifests/listserve.pp
@@ -10,9 +10,6 @@
 source => 'puppet:///modules/mailman/mm_cfg.py',
 }
 
-# Install as many languages as possible
-include locales::extended
-
 debconf::set { 'mailman/site_languages':
 value  => 'sk, gl, fa, ast, ar, ca, cs, da, de, en, es, et, eu, fi, 
fr, he, hr, hu, ia, it, ja, ko, lt, nl, no, pl, pt, pt_BR, ro, ru, sl, sr, sv, 
tr, uk, vi, zh_CN, zh_TW',
 notify => Exec['dpkg-reconfigure mailman'],
@@ -26,7 +23,7 @@
 exec { 'dpkg-reconfigure mailman':
 command => '/usr/sbin/dpkg-reconfigure -fnoninteractive mailman',
 refreshonly => true,
-require => Class['locales::extended'],
+require => Class['::profile::locales::extended'],
 before  => Service['mailman'],
 }
 
diff --git a/modules/locales/files/locales-extended 
b/modules/profile/files/locales/locales-extended
similarity index 100%
rename from modules/locales/files/locales-extended
rename to modules/profile/files/locales/locales-extended
diff --git a/modules/locales/manifests/all.pp 
b/modules/profile/manifests/locales/all.pp
similarity index 65%
rename from modules/locales/manifests/all.pp
rename to modules/profile/manifests/locales/all.pp
index 5a6f005..f6a3bfa 100644
--- a/modules/locales/manifests/all.pp
+++ b/modules/profile/manifests/locales/all.pp
@@ -1,11 +1,19 @@
-# == Class: locales::all
+# == Class: profile::locales::all
 #
 # Provisions all available supported locales. WARNING: this can take a very
-# long time on Ubuntu systems; consider using locales::extended.
+# long time on Ubuntu systems; consider using profile::locales::extended.
 
-class locales::all {
-include ::locales
+class profile::locales::all {
 
+package { 'locales':
+ensure => present,
+}
+
+exec { 'locale-gen':
+command => '/usr/sbin/locale-gen --purge',
+refreshonly => true,
+require => Package['locales'],
+}
 # Debian ships a locales-all package which has all locales pre-generated.
 # Ubuntu doesn't, so we're forced to generate them locally every time :(
 # lint:ignore:case_without_default
diff --git a/modules/locales/manifests/extended.pp 
b/modules/profile/manifests/locales/extended.pp
similarity index 68%
rename from modules/locales/manifests/extended.pp
rename to modules/profile/manifests/locales/extended.pp
index 21ce54e..2b02e28 100644
--- a/modules/locales/manifests/extended.pp
+++ b/modules/profile/manifests/locales/extended.pp
@@ -1,11 +1,20 @@
-# == Class: locales::extended
+# == Class: profile::locales::extended
 #
 # Provisions a set of "extended" hand-picked locales that are useful on most
 # systems. This is a tradeoff between the cost of generating all locales and
 # their relative usefulness.
 
-class locales::extended {
-include ::locales
+class profile::locales::extended {
+
+package { 'locales':
+ensure => present,
+}
+
+exec { 'locale-gen':
+command => 

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add an "unless" condition to npm downgrade

[Awight (Code Review)]

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

Change subject: Add an "unless" condition to npm downgrade
..

Add an "unless" condition to npm downgrade

This was running on every provision.

Change-Id: Iaedae6fe7c51e6cc02383a4e78388498f7c446d9
---
M puppet/modules/npm/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/63/402163/1

diff --git a/puppet/modules/npm/manifests/init.pp 
b/puppet/modules/npm/manifests/init.pp
index dde3fdd..85dc77b 100644
--- a/puppet/modules/npm/manifests/init.pp
+++ b/puppet/modules/npm/manifests/init.pp
@@ -46,6 +46,7 @@
 # Although the ticket is closed, the issue is still present, so downgrade 
to npm 2
 exec { 'downgrade_npm':
   command => '/usr/bin/npm install -g npm@latest-2',
+  unless  => '/usr/bin/npm --version | grep -qE "^2[.]"',
   user=> 'root',
   require => [
   Package['nodejs'],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update nikic/php-parser to 3.1.3

[jenkins-bot (Code Review)]

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

Change subject: Update nikic/php-parser to 3.1.3
..


Update nikic/php-parser to 3.1.3

And fix the only incompatibility in findDeprecated.php. It's OK to throw
exceptions on invalid files since we lint all PHP files so there
should be no invalid ones.

Change-Id: Ie5913c2aae4b521a4b6f805e911e4e2764386b45
---
M RELEASE-NOTES-1.31
M composer.json
M maintenance/findDeprecated.php
3 files changed, 7 insertions(+), 2 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index d18c5cf..30a174a 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -44,6 +44,8 @@
 * Updated jquery.chosen from v0.9.14 to v1.8.2.
 * Updated composer/spdx-licenses from 1.1.4 to
   1.2.0 (development dependency).
+* Updated nikic/php-parser from 2.1.0 to 3.1.3
+  (development dependency).
 * …
 
  New external libraries 
diff --git a/composer.json b/composer.json
index 6b3e8f7..d92ffc9 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,7 @@
"justinrainbow/json-schema": "~5.2",
"mediawiki/mediawiki-codesniffer": "15.0.0",
"monolog/monolog": "~1.22.1",
-   "nikic/php-parser": "2.1.0",
+   "nikic/php-parser": "3.1.3",
"nmred/kafka-php": "0.1.5",
"phpunit/phpunit": "4.8.36",
"psy/psysh": "0.8.11",
diff --git a/maintenance/findDeprecated.php b/maintenance/findDeprecated.php
index 6128d23..ec998da 100644
--- a/maintenance/findDeprecated.php
+++ b/maintenance/findDeprecated.php
@@ -132,6 +132,9 @@
$this->addDescription( 'Find deprecated interfaces' );
}
 
+   /**
+* @return SplFileInfo[]
+*/
public function getFiles() {
global $IP;
 
@@ -163,7 +166,7 @@
}
 
$finder->setCurrentFile( substr( $file->getPathname(), 
strlen( $IP ) + 1 ) );
-   $nodes = $parser->parse( $code, [ 'throwOnError' => 
false ] );
+   $nodes = $parser->parse( $code );
$traverser->traverse( $nodes );
 
if ( $i % $chunkSize === 0 ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for jQuery 3 - removeAttr('disabled') deprecated

[Yaron Koren (Code Review)]

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

Change subject: Fix for jQuery 3 - removeAttr('disabled') deprecated
..

Fix for jQuery 3 - removeAttr('disabled') deprecated

Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
---
M libs/PF_submit.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/62/402162/2

diff --git a/libs/PF_submit.js b/libs/PF_submit.js
index 3a2ccf4..598ef32 100644
--- a/libs/PF_submit.js
+++ b/libs/PF_submit.js
@@ -15,7 +15,7 @@
 
function setChanged( event ) {
sacButtons
-   .removeAttr( 'disabled' )
+   .prop( 'disabled', false )
.addClass( 'pf-save_and_continue-changed' );
 
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81b29858a9527d7565ada2006874e5ef3fe15644
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: move locales include out of module

[Dzahn (Code Review)]

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

Change subject: planet: move locales include out of module
..

planet: move locales include out of module

fixing:

Change-Id: Ic614d857df10a89d64bd01e85c23eeab74310acb
wmf-style: class 'planet_httpd' includes
locales::extended from another module.
---
M modules/planet/manifests/init.pp
M modules/role/manifests/planet_server.pp
2 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/402161/1

diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 7a3b9ac..c0403b3 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -22,10 +22,6 @@
 $planet_http_proxy,
 ) {
 
-# locales are essential for planet
-# if a new language is added check these too
-include ::locales::extended
-
 # things done once for all planet per languages
 include ::planet::packages
 include ::planet::dirs
diff --git a/modules/role/manifests/planet_server.pp 
b/modules/role/manifests/planet_server.pp
index ecee04b..9977924 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -1,17 +1,21 @@
 # server running a planet RSS feed aggregator
 class role::planet_server {
 
+system::role { 'planet_server':
+description => 'Planet-venus or rawdog RSS feed aggregator'
+}
+
 include ::standard
 include ::profile::base::firewall
+include ::profile::planet::venus
 
 class { '::apache': }
 class { '::apache::mod::rewrite': }
 # so we can vary on X-Forwarded-Proto when behind misc-web
 class { '::apache::mod::headers': }
 
-include ::profile::planet::venus
+# locales are essential for planet
+# if a new language is added check these too
+include ::locales::extended
 
-system::role { 'planet_server':
-description => 'Planet-venus or rawdog RSS feed aggregator'
-}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic614d857df10a89d64bd01e85c23eeab74310acb
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] wikidata...rdf[master]: Add Maven Central link

[jenkins-bot (Code Review)]

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

Change subject: Add Maven Central link
..


Add Maven Central link

Change-Id: I65c3926b5841a911045d9cb28dcb0e5f18417391
---
M README.md
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/README.md b/README.md
index 4c816b7..46f66ac 100644
--- a/README.md
+++ b/README.md
@@ -71,3 +71,5 @@
 The same target can be used directly from your IDE to run in debug mode and 
use all the nice IDE integration (automatic class reloading, ...). Check your 
IDE documentation for details.
 
 Note: `jetty:run` will not automatically detect changes to other modules, but 
if you run `mvn install` in the root of the project, the changes should be 
compiled and jetty should auto reload the application.
+
+Current central released version: [![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/org.wikidata.query.rdf/service/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.wikidata.query.rdf/service)
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65c3926b5841a911045d9cb28dcb0e5f18417391
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
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] wikidata...rdf[master]: Update versions for some packages

[Smalyshev (Code Review)]

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

Change subject: Update versions for some packages
..

Update versions for some packages

Current versions taken from:
https://doc.wikimedia.org/wikidata-query-rdf/parent/dependency-updates-report.html

Change-Id: I1a2429eadb06c4a5529d02af6bbda1c8718391d3
---
M pom.xml
1 file changed, 14 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/60/402160/1

diff --git a/pom.xml b/pom.xml
index 8ba2423..29d5375 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,10 +57,12 @@
 
 2.1.5-SNAPSHOT
 2.9.3
+
 9.2.3.v20140905
 1.2.3
+
 2.7.12
-1.7.10
+1.7.11
 
 
 
@@ -242,7 +244,7 @@
 
 io.dropwizard.metrics
 metrics-core
-3.1.0
+3.2.0
 
 
 javax.servlet
@@ -252,7 +254,7 @@
 
 joda-time
 joda-time
-2.7
+2.8
 
 
 org.apache.commons
@@ -267,6 +269,7 @@
 
 org.apache.httpcomponents
 httpclient
+
 4.4
 
 
@@ -278,6 +281,7 @@
 
 org.apache.httpcomponents
 httpcore
+
 4.4
 
 
@@ -394,7 +398,7 @@
 
 org.isomorphism
 token-bucket
-1.6
+1.7
 
 
 org.jolokia
@@ -539,13 +543,13 @@
 
 com.carrotsearch.randomizedtesting
 randomizedtesting-runner
-2.1.13
+2.1.14
 test
 
 
 junit
 junit
-4.11
+4.12
 test
 
 
@@ -575,7 +579,7 @@
 
 org.mockito
 mockito-core
-1.9.5
+1.10.5
 test
 
 
@@ -587,7 +591,7 @@
 
 org.springframework
 spring-test
-4.3.10.RELEASE
+4.3.11.RELEASE
 test
 
 
@@ -679,8 +683,8 @@
 
 -Xmx512m
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a2429eadb06c4a5529d02af6bbda1c8718391d3
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
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...BlueSpiceFoundation[master]: Use namespaced version of LoadBalancer

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of LoadBalancer
..

Use namespaced version of LoadBalancer

Change-Id: I303198266fa0bbfd6e6e6463bef9f751e9d27e6b
---
M src/Data/Settings/Reader.php
M src/Data/Settings/Writer.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/59/402159/1

diff --git a/src/Data/Settings/Reader.php b/src/Data/Settings/Reader.php
index 9b4899d..39e0967 100644
--- a/src/Data/Settings/Reader.php
+++ b/src/Data/Settings/Reader.php
@@ -7,7 +7,7 @@
 class Reader extends DatabaseReader {
/**
 *
-* @param \LoadBalancer $loadBalancer
+* @param \Wikimedia\Rdbms\LoadBalancer $loadBalancer
 * @param \IContextSource $context
 */
public function __construct( $loadBalancer, \IContextSource $context = 
null ) {
diff --git a/src/Data/Settings/Writer.php b/src/Data/Settings/Writer.php
index 9b67263..bd779bd 100644
--- a/src/Data/Settings/Writer.php
+++ b/src/Data/Settings/Writer.php
@@ -8,7 +8,7 @@
/**
 *
 * @param \BlueSpice\Data\IReader $reader
-* @param \LoadBalancer $loadBalancer
+* @param \Wikimedia\Rdbms\LoadBalancer $loadBalancer
 * @param \IContextSource $context
 */
public function __construct( \BlueSpice\Data\IReader $reader, 
$loadBalancer, \IContextSource $context = null ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I303198266fa0bbfd6e6e6463bef9f751e9d27e6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageVersion[master]: Use namespaced version of ResultWrapper

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of ResultWrapper
..

Use namespaced version of ResultWrapper

Change-Id: If1fdb8c21b13404d8fdf6888d05c122c2899c48a
---
M src/Hook/PageHistoryLineEnding.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageVersion 
refs/changes/58/402158/1

diff --git a/src/Hook/PageHistoryLineEnding.php 
b/src/Hook/PageHistoryLineEnding.php
index c0dcd72..1c5d7ba 100644
--- a/src/Hook/PageHistoryLineEnding.php
+++ b/src/Hook/PageHistoryLineEnding.php
@@ -16,7 +16,7 @@
/**
 *
 * @param \HistoryPager $history
-* @param \ResultWrapper $row
+* @param \Wikimedia\Rdbms\ResultWrapper $row
 * @param string $s
 * @param array $classes
 * @return boolean

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1fdb8c21b13404d8fdf6888d05c122c2899c48a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageVersion
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Use namespaced version of IDatabase and ResultWrapper

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of IDatabase and ResultWrapper
..

Use namespaced version of IDatabase and ResultWrapper

Change-Id: I971f3fec630513bf68de5e1880672017cc19adbc
---
M includes/CorporaLookup.php
M includes/Database.php
M includes/Stats.php
M includes/Translation.php
M includes/TranslationStorageManager.php
5 files changed, 20 insertions(+), 11 deletions(-)


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

diff --git a/includes/CorporaLookup.php b/includes/CorporaLookup.php
index f7770fe..bfc37d9 100644
--- a/includes/CorporaLookup.php
+++ b/includes/CorporaLookup.php
@@ -8,17 +8,20 @@
 
 namespace ContentTranslation;
 
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\ResultWrapper;
+
 class CorporaLookup {
const TYPE_SOURCE = 'source';
const TYPE_MT = 'mt';
const TYPE_USER = 'user';
 
/**
-* @var \IDatabase
+* @var IDatabase
 */
protected $db;
 
-   public function __construct( \IDatabase $db ) {
+   public function __construct( IDatabase $db ) {
$this->db = $db;
}
 
@@ -45,7 +48,7 @@
return self::format( $res );
}
 
-   protected static function format( \ResultWrapper $rows ) {
+   protected static function format( ResultWrapper $rows ) {
$sections = [];
 
foreach ( $rows as $row ) {
diff --git a/includes/Database.php b/includes/Database.php
index 6ffcafc..5bf6950 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -8,7 +8,7 @@
/**
 * Gets a database connection to the ContentTranslation database
 * @param int $type Either DB_REPLICA or DB_MASTER
-* @return \IDatabase
+* @return \Wikimedia\Rdbms\IDatabase
 */
public static function getConnection( $type ) {
global $wgContentTranslationDatabase, 
$wgContentTranslationCluster;
diff --git a/includes/Stats.php b/includes/Stats.php
index c803696..e02e879 100644
--- a/includes/Stats.php
+++ b/includes/Stats.php
@@ -7,6 +7,8 @@
  */
 namespace ContentTranslation;
 
+use Wikimedia\Rdbms\ResultWrapper;
+
 /**
  * Functions for getting ContentTranslation metrics.
  */
diff --git a/includes/Translation.php b/includes/Translation.php
index 4906f10..a8b5545 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -4,6 +4,8 @@
  */
 namespace ContentTranslation;
 
+use Wikimedia\Rdbms\IDatabase;
+
 class Translation {
private $lastSaveWasCreate = false;
 
@@ -454,7 +456,7 @@
return $this->translation;
}
 
-   public static function getPublishedCondition( \IDatabase $db ) {
+   public static function getPublishedCondition( IDatabase $db ) {
return $db->makeList(
[
'translation_status' => 'published',
diff --git a/includes/TranslationStorageManager.php 
b/includes/TranslationStorageManager.php
index 3179b99..4ecffa8 100644
--- a/includes/TranslationStorageManager.php
+++ b/includes/TranslationStorageManager.php
@@ -6,15 +6,17 @@
 
 namespace ContentTranslation;
 
+use Wikimedia\Rdbms\IDatabase;
+
 class TranslationStorageManager {
/**
 * Update a translation unit.
 *
-* @param \IDatabase $db
+* @param IDatabase $db
 * @param TranslationUnit $translationUnit
 * @param int $timestamp
 */
-   private static function update( \IDatabase $db, TranslationUnit 
$translationUnit, $timestamp ) {
+   private static function update( IDatabase $db, TranslationUnit 
$translationUnit, $timestamp ) {
$values = [
'cxc_sequence_id' => $translationUnit->getSequenceId(),
'cxc_timestamp' => $db->timestamp(),
@@ -36,10 +38,10 @@
/**
 * Insert a translation unit.
 *
-* @param \IDatabase $db
+* @param IDatabase $db
 * @param TranslationUnit $translationUnit
 */
-   private static function create( \IDatabase $db, TranslationUnit 
$translationUnit ) {
+   private static function create( IDatabase $db, TranslationUnit 
$translationUnit ) {
$values = [
'cxc_translation_id' => 
$translationUnit->getTranslationId(),
'cxc_section_id' => $translationUnit->getSectionId(),
@@ -79,7 +81,7 @@
 
$dbw->doAtomicSection(
__METHOD__,
-   function ( \IDatabase $dbw ) use ( $translationUnit, 
$newTranslation ) {
+   function ( IDatabase $dbw ) use ( $translationUnit, 
$newTranslation ) {
if ( $newTranslation ) {
 

[MediaWiki-commits] [Gerrit] mediawiki...restbase[master]: Fix duplicate pages in some on-this-day results.

[Mhurd (Code Review)]

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

Change subject: Fix duplicate pages in some on-this-day results.
..

Fix duplicate pages in some on-this-day results.

Dupe examples:

onthisday/events/09/14
"Telecommunications companies MCI Communications and WorldCom complete their 
$37 billion merger to form MCI WorldCom."

onthisday/events/09/01
"St. Petersburg, Russia, changes its name to Petrograd."

Bug: T175974
Change-Id: If3a6cfc7f4460f775663f64187ec3a540ee35549
---
M v1/onthisday.js
1 file changed, 17 insertions(+), 1 deletion(-)


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

diff --git a/v1/onthisday.js b/v1/onthisday.js
index 1eca0fa..f5e2c8d 100644
--- a/v1/onthisday.js
+++ b/v1/onthisday.js
@@ -26,7 +26,23 @@
 [req.params.type]: res.body[req.params.type]
 };
 }
-return super._hydrateResponse(hyper, req, res);
+let hydratedResponse = super._hydrateResponse(hyper, req, res);
+
+// Hydration resolves re-directs so we need to de-dupe titles here 
*after* hydration.
+const removeDuplicateTitlesFromHydratedResponsePages = (response) => {
+  Object.keys(response.body).forEach(key => {
+response.body[key].forEach(event => {
+  event.pages = event.pages.filter(
+(item1, index, self) =>
+  self.findIndex(item2 => item2.title === item1.title) === 
index
+  )
+});
+  });
+};
+
+return hydratedResponse
+.then(removeDuplicateTitlesFromHydratedResponsePages)
+.thenReturn(hydratedResponse);
 }
 
 _makeFeedRequests(hyper, req) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Use namespaced version of IDatabase

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of IDatabase
..

Use namespaced version of IDatabase

Change-Id: I44b03c2c7d5a2ffec32188693893afd01fc1af3d
---
M backend/FRDependencyUpdate.php
M backend/FlaggableWikiPage.php
2 files changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/backend/FRDependencyUpdate.php b/backend/FRDependencyUpdate.php
index 5f552b8..edc3364 100644
--- a/backend/FRDependencyUpdate.php
+++ b/backend/FRDependencyUpdate.php
@@ -3,6 +3,9 @@
  * Class containing update methods for tracking links that
  * are only in the stable version of pages. Used only for caching.
  */
+
+use Wikimedia\Rdbms\IDatabase;
+
 class FRDependencyUpdate {
protected $title;
protected $sLinks;
diff --git a/backend/FlaggableWikiPage.php b/backend/FlaggableWikiPage.php
index 49d05f6..a1ccc57 100644
--- a/backend/FlaggableWikiPage.php
+++ b/backend/FlaggableWikiPage.php
@@ -4,6 +4,9 @@
  *
  * FlaggableWikiPage::getTitleInstance() is preferred over constructor calls
  */
+
+use Wikimedia\Rdbms\IDatabase;
+
 class FlaggableWikiPage extends WikiPage {
/* Process cache variables */
protected $stable = 0;
@@ -379,7 +382,7 @@
 
/**
 * Set the page field data loaded from some source
-* @param \Database|string $data Database row object or "fromdb"
+* @param IDatabase|string $data Database row object or "fromdb"
 * @return void
 */
public function loadPageData( $data = 'fromdb' ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44b03c2c7d5a2ffec32188693893afd01fc1af3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Use namespaced version of IDatabase and ResultWrapper

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of IDatabase and ResultWrapper
..

Use namespaced version of IDatabase and ResultWrapper

Also use namespaced DBUnexpectedError and Blob

Change-Id: I68a886f485b185d2492d909c9edd56ff86a068fa
---
M Hooks.php
M includes/Data/FlowObjectCache.php
M includes/Data/Storage/BasicDbStorage.php
M includes/DbFactory.php
M includes/Formatter/AbstractQuery.php
M includes/Formatter/CategoryViewerQuery.php
M includes/Formatter/ContributionsQuery.php
M includes/Import/SourceStore/FlowRevisionsDb.php
M includes/Model/UUID.php
M includes/Repository/TreeRepository.php
M includes/Repository/UserName/OneStepUserNameQuery.php
M includes/Repository/UserName/TwoStepUserNameQuery.php
M includes/Repository/UserName/UserNameQuery.php
M includes/Search/Iterators/AbstractIterator.php
M maintenance/FlowAddMissingModerationLogs.php
M maintenance/FlowExternalStoreMoveCluster.php
M maintenance/FlowFixEditCount.php
M maintenance/FlowFixUserIp.php
M maintenance/FlowRemoveOldTopics.php
M maintenance/FlowSetUserIp.php
M maintenance/FlowUpdateRecentChanges.php
M maintenance/convertAllLqtPages.php
M tests/phpunit/Repository/TreeRepositoryTest.php
M tests/phpunit/WatchedTopicItemsTest.php
24 files changed, 42 insertions(+), 22 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index ec52bfd..249323b 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -14,6 +14,7 @@
 use Flow\TalkpageManager;
 use Flow\WorkflowLoader;
 use Flow\WorkflowLoaderFactory;
+use Wikimedia\Rdbms\IDatabase;
 
 class FlowHooks {
/**
@@ -1869,7 +1870,7 @@
}
 
$dbFactory = Container::get( 'db.factory' );
-   /** @var Database $dbr */
+   /** @var IDatabase $dbr */
$dbr = $dbFactory->getDB( DB_REPLICA );
 
// if a username is specified, search only for that user
diff --git a/includes/Data/FlowObjectCache.php 
b/includes/Data/FlowObjectCache.php
index 6ca26d0..5eed2ae 100644
--- a/includes/Data/FlowObjectCache.php
+++ b/includes/Data/FlowObjectCache.php
@@ -4,6 +4,7 @@
 
 use Flow\DbFactory;
 use WANObjectCache;
+use Wikimedia\Rdbms\Database;
 
 class FlowObjectCache {
/**
@@ -29,7 +30,7 @@
public function __construct( WANObjectCache $cache, DbFactory 
$dbFactory, $ttl = 0 ) {
$this->ttl = $ttl;
$this->cache = $cache;
-   $this->setOptions = \Database::getCacheSetOptions( 
$dbFactory->getDB( DB_REPLICA ) );
+   $this->setOptions = Database::getCacheSetOptions( 
$dbFactory->getDB( DB_REPLICA ) );
}
 
/**
diff --git a/includes/Data/Storage/BasicDbStorage.php 
b/includes/Data/Storage/BasicDbStorage.php
index fdeba24..753f10b 100644
--- a/includes/Data/Storage/BasicDbStorage.php
+++ b/includes/Data/Storage/BasicDbStorage.php
@@ -174,7 +174,7 @@
 * @param array $options
 * @return array
 * @throws DataModelException
-* @throws \DBUnexpectedError
+* @throws \Wikimedia\Rdbms\DBUnexpectedError
 * @throws \MWException
 */
public function findMulti( array $queries, array $options = [] ) {
diff --git a/includes/DbFactory.php b/includes/DbFactory.php
index b13d7d7..0857831 100644
--- a/includes/DbFactory.php
+++ b/includes/DbFactory.php
@@ -2,6 +2,8 @@
 
 namespace Flow;
 
+use Wikimedia\Rdbms\IDatabase;
+
 /**
  * All classes within Flow that need to access the Flow db will go through
  * this class.  Having it separated into an object greatly simplifies testing
@@ -47,7 +49,7 @@
 * Gets a database connection for the Flow-specific database.
 *
 * @param int $db index of the connection to get.  DB_MASTER|DB_REPLICA.
-* @return \Database
+* @return IDatabase
 */
public function getDB( $db ) {
return $this->getLB()->getConnection( $this->forceMaster ? 
DB_MASTER : $db, [], $this->wiki );
@@ -71,7 +73,7 @@
 *
 * @param int $db index of the connection to get.  DB_MASTER|DB_REPLICA.
 * @param string|bool $wiki The wiki ID, or false for the current wiki
-* @return \IDatabase
+* @return IDatabase
 */
public function getWikiDB( $db, $wiki = false ) {
return wfGetDB( $this->forceMaster ? DB_MASTER : $db, [], $wiki 
);
@@ -81,7 +83,7 @@
 * Gets a load balancer for the main wiki database. Mockable version of 
wfGetLB.
 *
 * @param string|bool $wiki wiki ID, or false for the current wiki
-* @return \LoadBalancer
+* @return \Wikimedia\Rdbms\LoadBalancer
 */
public function getWikiLB( $wiki = false ) {
return wfGetLB( $wiki );
diff --git 

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Add Maven Central link

[Smalyshev (Code Review)]

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

Change subject: Add Maven Central link
..

Add Maven Central link

Change-Id: I65c3926b5841a911045d9cb28dcb0e5f18417391
---
M README.md
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/53/402153/1

diff --git a/README.md b/README.md
index 4c816b7..46f66ac 100644
--- a/README.md
+++ b/README.md
@@ -71,3 +71,5 @@
 The same target can be used directly from your IDE to run in debug mode and 
use all the nice IDE integration (automatic class reloading, ...). Check your 
IDE documentation for details.
 
 Note: `jetty:run` will not automatically detect changes to other modules, but 
if you run `mvn install` in the root of the project, the changes should be 
compiled and jetty should auto reload the application.
+
+Current central released version: [![Maven 
Central](https://maven-badges.herokuapp.com/maven-central/org.wikidata.query.rdf/service/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.wikidata.query.rdf/service)
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65c3926b5841a911045d9cb28dcb0e5f18417391
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
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...OAuth[master]: Use namespaced version of DBError, DBConnRef and IDatabase

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of DBError, DBConnRef and IDatabase
..

Use namespaced version of DBError, DBConnRef and IDatabase

Change-Id: I5811ec246a14c482559e97cdd786fe99239ec890
---
M api/MWOAuthSessionProvider.php
M backend/MWOAuthConsumer.php
M backend/MWOAuthConsumerAcceptance.php
M backend/MWOAuthDAO.php
M backend/MWOAuthDataStore.php
M backend/MWOAuthUtils.php
M control/MWOAuthConsumerAcceptanceSubmitControl.php
M control/MWOAuthConsumerSubmitControl.php
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M frontend/specialpages/SpecialMWOAuthListConsumers.php
M frontend/specialpages/SpecialMWOAuthManageConsumers.php
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
12 files changed, 83 insertions(+), 60 deletions(-)


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

diff --git a/api/MWOAuthSessionProvider.php b/api/MWOAuthSessionProvider.php
index f821e65..c86d62c 100644
--- a/api/MWOAuthSessionProvider.php
+++ b/api/MWOAuthSessionProvider.php
@@ -7,6 +7,7 @@
 use MediaWiki\Session\SessionInfo;
 use MediaWiki\Session\UserInfo;
 use WebRequest;
+use Wikimedia\Rdbms\DBError;
 
 /**
  * Session provider for OAuth
@@ -180,7 +181,7 @@
[ 'oaac_user_id' => $id ],
__METHOD__
);
-   } catch ( \DBError $e ) {
+   } catch ( DBError $e ) {
$dbw->rollback( __METHOD__ );
throw $e;
}
diff --git a/backend/MWOAuthConsumer.php b/backend/MWOAuthConsumer.php
index 98ae243..9ef778d 100644
--- a/backend/MWOAuthConsumer.php
+++ b/backend/MWOAuthConsumer.php
@@ -2,6 +2,8 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use Wikimedia\Rdbms\DBConnRef;
+
 /**
  * (c) Aaron Schulz 2013, GPL
  *
@@ -158,12 +160,12 @@
}
 
/**
-* @param \DBConnRef $db
+* @param DBConnRef $db
 * @param string $key
 * @param int $flags MWOAuthConsumer::READ_* bitfield
 * @return MWOAuthConsumer|bool
 */
-   public static function newFromKey( \DBConnRef $db, $key, $flags = 0 ) {
+   public static function newFromKey( DBConnRef $db, $key, $flags = 0 ) {
$row = $db->selectRow( static::getTable(),
array_values( static::getFieldColumnMap() ),
[ 'oarc_consumer_key' => (string)$key ],
@@ -181,7 +183,7 @@
}
 
/**
-* @param \DBConnRef $db
+* @param DBConnRef $db
 * @param string $name
 * @param string $version
 * @param int $userId Central user ID
@@ -189,7 +191,7 @@
 * @return MWOAuthConsumer|bool
 */
public static function newFromNameVersionUser(
-   \DBConnRef $db, $name, $version, $userId, $flags = 0
+   DBConnRef $db, $name, $version, $userId, $flags = 0
) {
$row = $db->selectRow( static::getTable(),
array_values( static::getFieldColumnMap() ),
@@ -283,7 +285,7 @@
$this->grants = (array)$this->grants; // sanity
}
 
-   protected function encodeRow( \DBConnRef $db, $row ) {
+   protected function encodeRow( DBConnRef $db, $row ) {
// For compatibility with other wikis in the farm, un-remap 
some grants
foreach ( self::$mapBackCompatGrants as $old => $new ) {
while ( ( $i = array_search( $new, $row['oarc_grants'], 
true ) ) !== false ) {
@@ -300,7 +302,7 @@
return $row;
}
 
-   protected function decodeRow( \DBConnRef $db, $row ) {
+   protected function decodeRow( DBConnRef $db, $row ) {
$row['oarc_registration'] = wfTimestamp( TS_MW, 
$row['oarc_registration'] );
$row['oarc_stage_timestamp'] = wfTimestamp( TS_MW, 
$row['oarc_stage_timestamp'] );
$row['oarc_restrictions'] = \MWRestrictions::newFromJson( 
$row['oarc_restrictions'] );
diff --git a/backend/MWOAuthConsumerAcceptance.php 
b/backend/MWOAuthConsumerAcceptance.php
index 27969ec..d0ec980 100644
--- a/backend/MWOAuthConsumerAcceptance.php
+++ b/backend/MWOAuthConsumerAcceptance.php
@@ -2,6 +2,8 @@
 
 namespace MediaWiki\Extensions\OAuth;
 
+use Wikimedia\Rdbms\DBConnRef;
+
 /**
  (c) Aaron Schulz 2013, GPL
 
@@ -73,12 +75,12 @@
}
 
/**
-* @param \DBConnRef $db
+* @param DBConnRef $db
 * @param string $token Access token
 * @param int $flags MWOAuthConsumerAcceptance::READ_* bitfield
 * @return MWOAuthConsumerAcceptance|bool
 */
-   public static function newFromToken( \DBConnRef $db, $token, $flags = 0 
) {
+   public static function newFromToken( DBConnRef $db, 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make FormatMetadata::flattenArrayReal() work for for an asso...

[MarkAHershberger (Code Review)]

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

Change subject: Make FormatMetadata::flattenArrayReal() work for for an 
associative array
..

Make FormatMetadata::flattenArrayReal() work for for an associative array

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/402151/1

diff --git a/includes/media/FormatMetadata.php 
b/includes/media/FormatMetadata.php
index b008a22..f683da2 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1047,7 +1047,7 @@
 
if ( !is_array( $vals ) ) {
return $vals; // do nothing if not an array;
-   } elseif ( count( $vals ) === 1 && $type !== 'lang' ) {
+   } elseif ( count( $vals ) === 1 && $type !== 'lang' && isset( 
$vals[0] ) ) {
return $vals[0];
} elseif ( count( $vals ) === 0 ) {
wfDebug( __METHOD__ . " metadata array with 0 
elements!\n" );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19490ebbbdc3613ae2116c6890ca470bb9f332db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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...GlobalPreferences[master]: Don't globalize disabled preferences

[jenkins-bot (Code Review)]

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

Change subject: Don't globalize disabled preferences
..


Don't globalize disabled preferences

...such as email prefs when email is disabled.

Bug: T179716
Change-Id: I73af2d731844f9aa9cca9b0a400fa2ac85f76bee
---
M includes/GlobalPreferencesFactory.php
M tests/phpunit/GlobalPreferencesTest.php
2 files changed, 132 insertions(+), 4 deletions(-)

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



diff --git a/includes/GlobalPreferencesFactory.php 
b/includes/GlobalPreferencesFactory.php
index 06db523..b161269 100644
--- a/includes/GlobalPreferencesFactory.php
+++ b/includes/GlobalPreferencesFactory.php
@@ -186,7 +186,19 @@
 */
protected function isGlobalizablePreference( $name, &$info ) {
// Preferences can opt out of being globalized by setting the 
'noglobal' flag.
-   $hasOptedOut = ( isset( $info['noglobal'] ) && 
$info['noglobal'] === true );
+   if ( isset( $info['noglobal'] ) && $info['noglobal'] === true ) 
{
+   return false;
+   }
+
+   // Ignore "is global" checkboxes
+   if ( substr( $name, -strlen( '-global' ) ) === '-global' ) {
+   return false;
+   }
+
+   // If a setting can't be changed, don't bother globalizing it
+   if ( isset( $info['disabled'] ) && $info['disabled'] ) {
+   return false;
+   }
 
$isAllowedType = isset( $info['type'] )
 && !in_array( $info['type'], 
$this->typeBlacklist )
@@ -195,9 +207,7 @@
$isAllowedClass = isset( $info['class'] )
  && in_array( $info['class'], 
$this->classWhitelist );
 
-   $endsInGlobal = ( substr( $name, -strlen( '-global' ) ) === 
'-global' );
-
-   return !$hasOptedOut && !$endsInGlobal && ( $isAllowedType || 
$isAllowedClass );
+   return $isAllowedType || $isAllowedClass;
}
 
/**
diff --git a/tests/phpunit/GlobalPreferencesTest.php 
b/tests/phpunit/GlobalPreferencesTest.php
index fa43b99..4629fe4 100644
--- a/tests/phpunit/GlobalPreferencesTest.php
+++ b/tests/phpunit/GlobalPreferencesTest.php
@@ -6,6 +6,7 @@
 use GlobalPreferences\Storage;
 use MediaWiki\MediaWikiServices;
 use MediaWikiTestCase;
+use Wikimedia\TestingAccessWrapper;
 
 /**
  * @group GlobalPreferences
@@ -66,4 +67,121 @@
// @TODO Instance caching on User doesn't clear 
User::$mOptionOverrides
// $this->assertEquals( 'bn', $user->getOption( 'language' ) );
}
+
+   /**
+* @dataProvider provideIsGlobalizablePreference
+*
+* @param string $message
+* @param bool $expected
+* @param string $name
+* @param array $info
+*/
+   public function testIsGlobalizablePreference( $message, $expected, 
$name, array $info ) {
+   /** @var GlobalPreferencesFactory $globalPreferences */
+   $globalPreferences = TestingAccessWrapper::newFromObject(
+   
MediaWikiServices::getInstance()->getPreferencesFactory()
+   );
+
+   // Not calling directly because TestingAccessWrapper strips 
reference otherwise
+   $result = call_user_func_array(
+   [ $globalPreferences, 'isGlobalizablePreference' ],
+   [ $name, &$info ]
+   );
+   $this->assertEquals( $expected, $result, $message );
+   }
+
+   public function provideIsGlobalizablePreference() {
+   return [
+   // message, expected, name, info
+   [
+   'Globalize simple text preferences',
+   true,
+   'foo',
+   [
+   'type' => 'text',
+   ],
+   ],
+   [
+   'Globalize select controls',
+   true,
+   'language',
+   [
+   'type' => 'select',
+   'options' => [ 'foo' => 'bar', 'baz' => 
'quux' ],
+   ],
+   ],
+   [
+   'Globalize preferences with known class',
+   true,
+   'foo',
+   [
+   'class' => 'HTMLCheckMatrix',
+   ],
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Added Tests for ListToggle

[jenkins-bot (Code Review)]

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

Change subject: Added Tests for ListToggle
..


Added Tests for ListToggle

Bug: T183898
Change-Id: I1c6cd8ea21127db56701cc6073fa880b2180d846
---
A tests/phpunit/includes/ListToggleTest.php
1 file changed, 49 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/ListToggleTest.php 
b/tests/phpunit/includes/ListToggleTest.php
new file mode 100644
index 000..7bbf448
--- /dev/null
+++ b/tests/phpunit/includes/ListToggleTest.php
@@ -0,0 +1,49 @@
+getMockBuilder( 'OutputPage' )
+   ->setMethods( null )
+   ->disableOriginalConstructor()
+   ->getMock();
+
+   $listToggle = new ListToggle( $output );
+
+   $this->assertInstanceOf( 'ListToggle', $listToggle );
+   $this->assertContains( 'mediawiki.checkboxtoggle', 
$output->getModules() );
+   $this->assertContains( 'mediawiki.checkboxtoggle.styles', 
$output->getModuleStyles() );
+   }
+
+   /**
+* @covers ListToggle::getHTML
+*/
+   public function testGetHTML() {
+   $output = $this->createMock( 'OutputPage' );
+   $output->expects( $this->any() )
+   ->method( 'msg' )
+   ->will( $this->returnCallback( function ( $key ) {
+   return wfMessage( $key )->inLanguage( 'qqx' );
+   } ) );
+   $output->expects( $this->once() )
+   ->method( 'getLanguage' )
+   ->will( $this->returnValue( Language::factory( 'qqx' ) 
) );
+
+   $listToggle = new ListToggle( $output );
+
+   $html = $listToggle->getHTML();
+   $this->assertEquals( '' .
+   '(checkbox-select: (checkbox-all)(comma-separator)' .
+   '' .
+   '(checkbox-none)(comma-separator)(checkbox-invert))',
+   $html );
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c6cd8ea21127db56701cc6073fa880b2180d846
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ryan10145 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: tests: Add @covers tags

[jenkins-bot (Code Review)]

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

Change subject: tests: Add @covers tags
..


tests: Add @covers tags

Change-Id: Ia3e18e7149292cd23765636111acc846564bf6cc
---
M tests/phpunit/GadgetTest.php
1 file changed, 36 insertions(+), 7 deletions(-)

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



diff --git a/tests/phpunit/GadgetTest.php b/tests/phpunit/GadgetTest.php
index e0f5768..ab2fbdc 100644
--- a/tests/phpunit/GadgetTest.php
+++ b/tests/phpunit/GadgetTest.php
@@ -5,8 +5,13 @@
 /**
  * @group Gadgets
  */
-
 class GadgetsTest extends MediaWikiTestCase {
+
+   public function tearDown() {
+   GadgetRepo::setSingleton();
+   parent::tearDown();
+   }
+
/**
 * @param string $line
 * @return Gadget
@@ -14,7 +19,7 @@
private function create( $line ) {
$repo = new MediaWikiGadgetsDefinitionRepo();
$g = $repo->newFromDefinition( $line, 'misc' );
-   $this->assertInstanceOf( 'Gadget', $g );
+   $this->assertInstanceOf( Gadget::class, $g );
return $g;
}
 
@@ -26,12 +31,21 @@
return $module;
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+*/
public function testInvalidLines() {
$repo = new MediaWikiGadgetsDefinitionRepo();
$this->assertFalse( $repo->newFromDefinition( '', 'misc' ) );
$this->assertFalse( $repo->newFromDefinition( '', 
'misc' ) );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::__construct
+* @covers Gadget::getName
+* @covers Gadget::getModuleName
+*/
public function testSimpleCases() {
$g = $this->create( '* foo bar| foo.css|foo.js|foo.bar' );
$this->assertEquals( 'foo_bar', $g->getName() );
@@ -45,6 +59,11 @@
$this->assertTrue( $g->hasModule() );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::supportsResourceLoader
+* @covers Gadget::getLegacyScripts
+*/
public function testRLtag() {
$g = $this->create( '*foo [ResourceLoader]|foo.js|foo.css' );
$this->assertEquals( 'foo', $g->getName() );
@@ -52,6 +71,10 @@
$this->assertEquals( 0, count( $g->getLegacyScripts() ) );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::getDependencies
+*/
public function testDependencies() {
$g = $this->create( '* 
foo[ResourceLoader|dependencies=jquery.ui]|bar.js' );
$this->assertEquals( [ 'MediaWiki:Gadget-bar.js' ], 
$g->getScripts() );
@@ -126,6 +149,9 @@
 
/**
 * @dataProvider provideGetType
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::getType
+* @covers GadgetResourceLoaderModule::getType
 */
public function testType( $message, $definition, $gType, $mType ) {
$g = $this->create( $definition );
@@ -133,6 +159,10 @@
$this->assertEquals( $mType, $this->getModule( $g )->getType(), 
"Module: $message" );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::isHidden
+*/
public function testIsHidden() {
$g = $this->create( '* foo[hidden]|bar.js' );
$this->assertTrue( $g->isHidden() );
@@ -144,6 +174,10 @@
$this->assertFalse( $g->isHidden() );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::fetchStructuredList
+* @covers GadgetHooks::getPreferences
+*/
public function testPreferences() {
$prefs = [];
$repo = TestingAccessWrapper::newFromObject( new 
MediaWikiGadgetsDefinitionRepo() );
@@ -168,10 +202,5 @@
'Must not show empty sections' );
$this->assertArrayHasKey( '⧼gadget-section-keep-section1⧽', 
$options );
$this->assertArrayHasKey( '⧼gadget-section-keep-section2⧽', 
$options );
-   }
-
-   public function tearDown() {
-   GadgetRepo::setSingleton();
-   parent::tearDown();
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3e18e7149292cd23765636111acc846564bf6cc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Legoktm 

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Update read-html tests to use new 'section' selector

[Mholloway (Code Review)]

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

Change subject: Update read-html tests to use new 'section' selector
..

Update read-html tests to use new 'section' selector

Change-Id: I1213ee9bf4f7decaaf5b006ef02d6edf33a1b619
---
M test/features/read-html/pagecontent-base.js
M test/features/read-html/pagecontent.js
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/test/features/read-html/pagecontent-base.js 
b/test/features/read-html/pagecontent-base.js
index 8cda184..db3ed72 100644
--- a/test/features/read-html/pagecontent-base.js
+++ b/test/features/read-html/pagecontent-base.js
@@ -26,7 +26,7 @@
 return preq.get({ uri })
 .then((res) => {
 const document = domino.createDocument(res.body);
-assert.selectorExistsNTimes(document, 'div.toclevel_1', 7, 'should 
have 7 sections');
+assert.selectorExistsNTimes(document, 'section', 7, 'should have 7 
sections');
 });
 });
 });
diff --git a/test/features/read-html/pagecontent.js 
b/test/features/read-html/pagecontent.js
index a52535a..c6f7784 100644
--- a/test/features/read-html/pagecontent.js
+++ b/test/features/read-html/pagecontent.js
@@ -26,7 +26,7 @@
 return preq.get({ uri })
 .then((res) => {
 const document = domino.createDocument(res.body);
-assert.selectorExistsNTimes(document, 'div.toclevel_1', 7, 'should 
have 7 sections');
+assert.selectorExistsNTimes(document, 'section', 7, 'should have 7 
sections');
 });
 });
 });

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Revert "Skip some tests because of upstream issues"

[Mholloway (Code Review)]

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

Change subject: Revert "Skip some tests because of upstream issues"
..

Revert "Skip some tests because of upstream issues"

This reverts commit ca283c70ed81dc3496c70571f481e7c7ef2b90ea.

Change-Id: Ie6cfc2499245c24d844bd0397f69380a31c795ce
---
M test/features/mobile-sections/shared.js
M test/features/read-html/pagecontent-base.js
M test/features/read-html/pagecontent.js
3 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/test/features/mobile-sections/shared.js 
b/test/features/mobile-sections/shared.js
index c277306..59dfc83 100644
--- a/test/features/mobile-sections/shared.js
+++ b/test/features/mobile-sections/shared.js
@@ -69,7 +69,7 @@
 });
 });
 
-it.skip('Check content of fresh revision', () => { // skipped because of 
issue T182770 (RB?)
+it('Check content of fresh revision', () => {
 const title = 'Leonard_Cohen';
 const uri = localUri(title);
 return preq.get({ uri })
diff --git a/test/features/read-html/pagecontent-base.js 
b/test/features/read-html/pagecontent-base.js
index db3ed72..22b17a1 100644
--- a/test/features/read-html/pagecontent-base.js
+++ b/test/features/read-html/pagecontent-base.js
@@ -21,7 +21,7 @@
 return headers.checkHeaders(uri, headers.HTML_CONTENT_TYPE_REGEX);
 });
 
-it.skip('HTML should be sectioned', () => { // skipped because of issue 
T182770 (RB?)
+it('HTML should be sectioned', () => {
 const uri = localUri('Foobar/788941783');
 return preq.get({ uri })
 .then((res) => {
diff --git a/test/features/read-html/pagecontent.js 
b/test/features/read-html/pagecontent.js
index c6f7784..2451540 100644
--- a/test/features/read-html/pagecontent.js
+++ b/test/features/read-html/pagecontent.js
@@ -21,7 +21,7 @@
 return headers.checkHeaders(uri, headers.HTML_CONTENT_TYPE_REGEX);
 });
 
-it.skip('HTML should be sectioned', () => { // skipped because of issue 
T182770 (RB?)
+it('HTML should be sectioned', () => {
 const uri = localUri('Foobar/788941783');
 return preq.get({ uri })
 .then((res) => {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Migrate TiMidity++ to fluidsynth

[Divadsn (Code Review)]

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

Change subject: Migrate TiMidity++ to fluidsynth
..

Migrate TiMidity++ to fluidsynth

Bug: T181897
Change-Id: Idaf062f060cca823bdf11b6b0e846540eb588945
---
M README
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
5 files changed, 23 insertions(+), 13 deletions(-)


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

diff --git a/README b/README
index d3eae4c..c734e0c 100644
--- a/README
+++ b/README
@@ -41,8 +41,9 @@
$wgScoreLilyPond = '/path/to/your/lilypond/executable'; /* required */
$wgScoreAbc2Ly = '/path/to/your/abc2ly/executable'; /* if you want ABC to
   LilyPond conversion 
*/
-   $wgScoreTimidty = '/path/to/your/timidty/executable'; /* if you want MIDI to
-Vorbis conversion 
*/
+   $wgScoreFluidsynth = '/path/to/your/fluidsynth/executable'; /* if you want 
MIDI to
+  Vorbis 
conversion */
+   $wgScoreSoundfont = '/path/to/your/soundfont/file'; /* required for 
Fluidsynth */
$wgScoreTrim = true; /* Set to false if you don't want score trimming */
$wgScoreSafeMode = false; /* Set to true if the Lilypond executable is
 running in a Firejail or equivalent */
diff --git a/extension.json b/extension.json
index 11e1080..ad22b85 100644
--- a/extension.json
+++ b/extension.json
@@ -87,7 +87,8 @@
"ScoreTrim": null,
"ScoreLilyPond": "/usr/bin/lilypond",
"ScoreAbc2Ly": "/usr/bin/abc2ly",
-   "ScoreTimidity": "/usr/bin/timidity",
+   "ScoreFluidsynth": "/usr/bin/fluidsynth",
+   "ScoreSoundfont": "/usr/share/sounds/sf2/FluidR3_GM.sf2",
"ScoreSafeMode": true,
"ScorePath": false,
"ScoreDirectory": false,
diff --git a/i18n/en.json b/i18n/en.json
index 7c31ccc..91c7feb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -32,7 +32,8 @@
"score-page": "Page $1",
"score-pregreplaceerr": "PCRE regular expression replacement failed",
"score-readerr": "Unable to read file $1.",
-   "score-timiditynotexecutable": "TiMidity++ could not be executed: $1 is 
not an executable file. Make sure $wgScoreTimidity is set 
correctly.",
+   "score-fluidsynthnotexecutable": "Fluidsynth could not be executed: $1 
is not an executable file. Make sure $wgScoreFluidsynth is set 
correctly.",
+   "score-soundfontnotexists": "Soundfont could not be found: $1 does not 
exists. Make sure $wgScoreSoundfont is set correctly.",
"score-renameerr": "Error moving score files to upload directory.",
"score-trimerr": "Image could not be trimmed:\n$1\nSet 
$wgScoreTrim=false if this problem persists.",
"score-versionerr": "Unable to obtain LilyPond version:\n$1",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7072caf..3cd7303 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -38,7 +38,8 @@
"score-page": "The word \"Page\" as used in pagination. Parameters:\n* 
$1 - the page number\n{{Identical|Page}}",
"score-pregreplaceerr": "Displayed if a PCRE regular expression 
replacement failed.",
"score-readerr": "Displayed if the extension could not read a file. $1 
is the path to the file that could not be read.",
-   "score-timiditynotexecutable": "Displayed if TiMidity++ could not be 
executed. $1 is the path to the TiMidity++ binary.",
+   "score-fluidsynthnotexecutable": "Displayed if Fluidsynth could not be 
executed. $1 is the path to the Fluidsynth binary.",
+   "score-soundfontnotexists": "Displayed if soundfont could not be found. 
$1 is the path to the soundfont file.",
"score-renameerr": "Displayed if moving the resultant files from the 
working environment to the upload directory fails.",
"score-trimerr": "Displayed if the extension failed to trim an output 
image. $1 is the error (generally big block of text in a pre tag)",
"score-versionerr": "Displayed if the extension failed to obtain the 
version string of LilyPond. $1 is the LilyPond stdout output generated by the 
attempt.",
diff --git a/includes/Score.php b/includes/Score.php
index 9010605..fed7677 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -798,7 +798,7 @@
}
 
/**
-* Generates an Ogg/Vorbis file from a MIDI file using timidity.
+* Generates an Ogg/Vorbis file from a MIDI file using fluidsynth.
 *
 * @param string $sourceFile The local filename of the MIDI file
 * @param array $options array of rendering options.
@@ -808,10 +808,15 @@
 * @throws ScoreException if an error occurs.
 */
private static 

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikimediaproduction: Remove duplicate declaration conflicts

[jenkins-bot (Code Review)]

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

Change subject: wikimediaproduction: Remove duplicate declaration conflicts
..


wikimediaproduction: Remove duplicate declaration conflicts

Remove duplicate declaration errors caused by included roles that
attempted to install the same extensions.

* Include role::globalusage in role::commons
* Move some configuration from role::commons to role::globalusage
* Include role::labeledsectiontransclusion in role::proofreadpage

Also includes an update for execution of the refreshGlobalimagelinks.php
maintenance script for the I3330dc637a5f216bee7d3c36c354db9563291e0e
upstream refactor.

Bug: T184153
Change-Id: I3d18c2c5a75f84810769ba377bca122e41c8493d
---
M puppet/modules/role/manifests/commons.pp
M puppet/modules/role/manifests/globalusage.pp
M puppet/modules/role/manifests/proofreadpage.pp
3 files changed, 16 insertions(+), 14 deletions(-)

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



diff --git a/puppet/modules/role/manifests/commons.pp 
b/puppet/modules/role/manifests/commons.pp
index 8f67e6b..6ae76ff 100644
--- a/puppet/modules/role/manifests/commons.pp
+++ b/puppet/modules/role/manifests/commons.pp
@@ -8,6 +8,7 @@
 class role::commons(
 $upload_dir,
 ) {
+include ::role::globalusage
 require ::role::mediawiki
 include ::role::multimedia
 include ::role::thumb_on_404
@@ -29,17 +30,9 @@
 values => template('role/commons/foreign_repo.php.erb'),
 }
 
-mediawiki::extension { 'GlobalUsage':
-needs_update => true,
-settings => {
+mediawiki::settings { 'commons_GlobalUsage':
+values => {
 wgGlobalUsageDatabase => 'commonswiki',
-},
-require  => Mediawiki::Wiki['commons'],
-}
-
-mediawiki::maintenance { 'refresh globalusage table':
-command => '/usr/local/bin/foreachwikiwithextension GlobalUsage 
extensions/GlobalUsage/refreshGlobalimagelinks.php --pages 
existing,nonexisting',
-cwd => $::mediawiki::dir,
-require => Mediawiki::Extension['GlobalUsage'],
+}
 }
 }
diff --git a/puppet/modules/role/manifests/globalusage.pp 
b/puppet/modules/role/manifests/globalusage.pp
index 9040f41..0cee549 100644
--- a/puppet/modules/role/manifests/globalusage.pp
+++ b/puppet/modules/role/manifests/globalusage.pp
@@ -2,5 +2,15 @@
 # Configures a MediaWiki instance with
 # GlobalUsage[https://www.mediawiki.org/wiki/Extension:GlobalUsage]
 class role::globalusage {
-mediawiki::extension { 'GlobalUsage': }
+require ::role::mediawiki
+
+mediawiki::extension { 'GlobalUsage':
+needs_update => true,
+}
+
+mediawiki::maintenance { 'refresh globalusage table':
+command => '/usr/local/bin/foreachwikiwithextension GlobalUsage 
extensions/GlobalUsage/maintenance/refreshGlobalimagelinks.php --pages 
existing,nonexisting',
+cwd => $::mediawiki::dir,
+require => Mediawiki::Extension['GlobalUsage'],
+}
 }
diff --git a/puppet/modules/role/manifests/proofreadpage.pp 
b/puppet/modules/role/manifests/proofreadpage.pp
index 037fb76..57ff45d 100644
--- a/puppet/modules/role/manifests/proofreadpage.pp
+++ b/puppet/modules/role/manifests/proofreadpage.pp
@@ -3,6 +3,7 @@
 # a text in comparison with scanned images.
 class role::proofreadpage {
 include ::role::parserfunctions
+include ::role::labeledsectiontransclusion
 include ::role::cite
 
 require_package('djvulibre-bin')
@@ -15,8 +16,6 @@
 post_max_size   => '50M',
 },
 }
-
-mediawiki::extension { 'LabeledSectionTransclusion': }
 
 mediawiki::extension { 'ProofreadPage':
 needs_update => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d18c2c5a75f84810769ba377bca122e41c8493d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Cannot switch to non-English keyboard while login

[Cooltey (Code Review)]

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

Change subject: Fix: Cannot switch to non-English keyboard while login
..

Fix: Cannot switch to non-English keyboard while login

 - Simply remove textVisiblePassword to resolve the issue. (and also a 
"username" column does not need it)

 Also uploaded screens and testing steps to the related Phab ticket.

Bug: T183852
Change-Id: I54f5a3c703c4c76166654ce665aaddc330d42477
---
M app/src/main/res/layout/activity_login.xml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/src/main/res/layout/activity_login.xml 
b/app/src/main/res/layout/activity_login.xml
index 2a6e414..e28ae52 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -61,7 +61,7 @@
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:imeOptions="flagNoExtractUi"
-
android:inputType="textVisiblePassword|textNoSuggestions"
+android:inputType="textNoSuggestions"
 android:maxLines="1" />
 
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Fix GlobalUsage maintenance script URL

[Code Review]

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

Change subject: Fix GlobalUsage maintenance script URL
..

Fix GlobalUsage maintenance script URL

Fixes breakage from I3330dc637a5f216bee7d3c36c354db9563291e0e.

Change-Id: Ic7ad751b396d44a341fb9434bf9a088c9e1727ab
---
D cache/composer/.gitignore
M puppet/modules/role/manifests/commons.pp
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/46/402146/1

diff --git a/cache/composer/.gitignore b/cache/composer/.gitignore
deleted file mode 100644
index d6b7ef3..000
--- a/cache/composer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/puppet/modules/role/manifests/commons.pp 
b/puppet/modules/role/manifests/commons.pp
index 211763d..eb20fe3 100644
--- a/puppet/modules/role/manifests/commons.pp
+++ b/puppet/modules/role/manifests/commons.pp
@@ -38,7 +38,7 @@
 }
 
 mediawiki::maintenance { 'refresh globalusage table':
-command => '/usr/local/bin/foreachwikiwithextension GlobalUsage 
extensions/GlobalUsage/refreshGlobalimagelinks.php --pages 
existing,nonexisting',
+command => '/usr/local/bin/foreachwikiwithextension GlobalUsage 
extensions/GlobalUsage/maintenance/refreshGlobalimagelinks.php --pages 
existing,nonexisting',
 cwd => $::mediawiki::dir,
 require => Mediawiki::Extension['GlobalUsage'],
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: tests: Add @covers tags

[Krinkle (Code Review)]

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

Change subject: tests: Add @covers tags
..

tests: Add @covers tags

Change-Id: Ia3e18e7149292cd23765636111acc846564bf6cc
---
M tests/phpunit/GadgetTest.php
1 file changed, 37 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets 
refs/changes/45/402145/1

diff --git a/tests/phpunit/GadgetTest.php b/tests/phpunit/GadgetTest.php
index e0f5768..87c32bf 100644
--- a/tests/phpunit/GadgetTest.php
+++ b/tests/phpunit/GadgetTest.php
@@ -5,8 +5,13 @@
 /**
  * @group Gadgets
  */
-
 class GadgetsTest extends MediaWikiTestCase {
+
+   public function tearDown() {
+   GadgetRepo::setSingleton();
+   parent::tearDown();
+   }
+
/**
 * @param string $line
 * @return Gadget
@@ -14,7 +19,7 @@
private function create( $line ) {
$repo = new MediaWikiGadgetsDefinitionRepo();
$g = $repo->newFromDefinition( $line, 'misc' );
-   $this->assertInstanceOf( 'Gadget', $g );
+   $this->assertInstanceOf( Gadget::class, $g );
return $g;
}
 
@@ -26,12 +31,21 @@
return $module;
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+*/
public function testInvalidLines() {
$repo = new MediaWikiGadgetsDefinitionRepo();
$this->assertFalse( $repo->newFromDefinition( '', 'misc' ) );
$this->assertFalse( $repo->newFromDefinition( '', 
'misc' ) );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::__construct
+* @covers Gadget::getName
+* @covers Gadget::getModuleName
+*/
public function testSimpleCases() {
$g = $this->create( '* foo bar| foo.css|foo.js|foo.bar' );
$this->assertEquals( 'foo_bar', $g->getName() );
@@ -45,6 +59,11 @@
$this->assertTrue( $g->hasModule() );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::supportsResourceLoader
+* @covers Gadget::getLegacyScripts
+*/
public function testRLtag() {
$g = $this->create( '*foo [ResourceLoader]|foo.js|foo.css' );
$this->assertEquals( 'foo', $g->getName() );
@@ -52,6 +71,10 @@
$this->assertEquals( 0, count( $g->getLegacyScripts() ) );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::getDependencies
+*/
public function testDependencies() {
$g = $this->create( '* 
foo[ResourceLoader|dependencies=jquery.ui]|bar.js' );
$this->assertEquals( [ 'MediaWiki:Gadget-bar.js' ], 
$g->getScripts() );
@@ -126,6 +149,9 @@
 
/**
 * @dataProvider provideGetType
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::getType
+* @covers GadgetResourceLoaderModule::getType
 */
public function testType( $message, $definition, $gType, $mType ) {
$g = $this->create( $definition );
@@ -133,6 +159,10 @@
$this->assertEquals( $mType, $this->getModule( $g )->getType(), 
"Module: $message" );
}
 
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::newFromDefinition
+* @covers Gadget::isHidden
+*/
public function testIsHidden() {
$g = $this->create( '* foo[hidden]|bar.js' );
$this->assertTrue( $g->isHidden() );
@@ -144,6 +174,11 @@
$this->assertFalse( $g->isHidden() );
}
 
+
+   /**
+* @covers MediaWikiGadgetsDefinitionRepo::fetchStructuredList
+* @covers GadgetHooks::getPreferences
+*/
public function testPreferences() {
$prefs = [];
$repo = TestingAccessWrapper::newFromObject( new 
MediaWikiGadgetsDefinitionRepo() );
@@ -168,10 +203,5 @@
'Must not show empty sections' );
$this->assertArrayHasKey( '⧼gadget-section-keep-section1⧽', 
$options );
$this->assertArrayHasKey( '⧼gadget-section-keep-section2⧽', 
$options );
-   }
-
-   public function tearDown() {
-   GadgetRepo::setSingleton();
-   parent::tearDown();
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3e18e7149292cd23765636111acc846564bf6cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] Don't allow interwiki prefix when adding categories

[jenkins-bot (Code Review)]

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

Change subject: [bugfix] Don't allow interwiki prefix when adding categories
..


[bugfix] Don't allow interwiki prefix when adding categories

Bug: T183908
Change-Id: I4ac7aa9aef2a98f93daa9ddb77fe2eedfc2b9521
---
M pywikibot/textlib.py
1 file changed, 10 insertions(+), 13 deletions(-)

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



diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 71abed2..41595ca 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -7,7 +7,7 @@
 
 """
 #
-# (C) Pywikibot team, 2008-2017
+# (C) Pywikibot team, 2008-2018
 #
 # Distributed under the terms of the MIT license.
 #
@@ -1196,29 +1196,26 @@
 categoryRN = re.compile(
 r'^[^\S\n]*\[\[\s*(%s)\s*:\s*%s\s*((?:\|[^]]+)?\]\])[^\S\n]*\n'
 % (catNamespace, title), re.I | re.M)
+exceptions = ['nowiki', 'comment', 'math', 'pre', 'source']
 if newcat is None:
 # First go through and try the more restrictive regex that removes
 # an entire line, if the category is the only thing on that line (this
 # prevents blank lines left over in category lists following a 
removal.)
 text = replaceExcept(oldtext, categoryRN, '',
- ['nowiki', 'comment', 'math', 'pre', 'source'],
- site=site)
+ exceptions, site=site)
 text = replaceExcept(text, categoryR, '',
- ['nowiki', 'comment', 'math', 'pre', 'source'],
- site=site)
+ exceptions, site=site)
 elif add_only:
-text = replaceExcept(oldtext, categoryR,
- '{0}\n{1}'.format(
- oldcat.title(asLink=True),
- newcat.title(asLink=True)),
- ['nowiki', 'comment', 'math', 'pre', 'source'],
- site=site)
+text = replaceExcept(
+oldtext, categoryR,
+'{0}\n{1}'.format(oldcat.title(asLink=True, allowInterwiki=False),
+  newcat.title(asLink=True, allowInterwiki=False)),
+exceptions, site=site)
 else:
 text = replaceExcept(oldtext, categoryR,
  '[[%s:%s\\2' % (site.namespace(14),
  
newcat.title(withNamespace=False)),
- ['nowiki', 'comment', 'math', 'pre', 'source'],
- site=site)
+ exceptions, site=site)
 return text
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ac7aa9aef2a98f93daa9ddb77fe2eedfc2b9521
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Changed list display delimiter from "middot" to "bullet"

[Yaron Koren (Code Review)]

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

Change subject: Changed list display delimiter from "middot" to "bullet"
..


Changed list display delimiter from "middot" to "bullet"

Also added CSS class for it.

Change-Id: I7ed08996f51c04277fa69dedca0f53d8c6f7d975
---
M includes/CargoQueryDisplayer.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/CargoQueryDisplayer.php b/includes/CargoQueryDisplayer.php
index b5e384d..c509033 100644
--- a/includes/CargoQueryDisplayer.php
+++ b/includes/CargoQueryDisplayer.php
@@ -113,7 +113,7 @@
continue;
}
if ( $i > 0 ) {
-   // Use a "middle dot" as
+   // Use a bullet point as
// the list delimiter -
// it's better than 
using
// a comma, or the
@@ -122,7 +122,7 @@
// consistent and makes
// it clearer whether
// list parsing worked.
-   $text .= "  ";
+   $text .= '  ';
}
$text .= 
self::formatFieldValue( $fieldValue, $fieldType, $fieldDescription, 
$this->mParser );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ed08996f51c04277fa69dedca0f53d8c6f7d975
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use namespaced version of LoadBalancer

[jenkins-bot (Code Review)]

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

Change subject: Use namespaced version of LoadBalancer
..


Use namespaced version of LoadBalancer

Change-Id: I2b9421be4e7218abd96f93ecaf30c067ad1088fb
---
M tests/unit/Query/InCategoryFeatureTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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

Objections:
  Cindy-the-browser-test-bot: There's a problem with this change, please improve



diff --git a/tests/unit/Query/InCategoryFeatureTest.php 
b/tests/unit/Query/InCategoryFeatureTest.php
index c75bcac..a2b9e8c 100644
--- a/tests/unit/Query/InCategoryFeatureTest.php
+++ b/tests/unit/Query/InCategoryFeatureTest.php
@@ -2,8 +2,8 @@
 
 namespace CirrusSearch\Query;
 
-use LoadBalancer;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\LoadBalancer;
 
 /**
  * @group CirrusSearch

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b9421be4e7218abd96f93ecaf30c067ad1088fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Tjones 
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]: Remove unused module alias "unicodejs.wordbreak"

[jenkins-bot (Code Review)]

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

Change subject: Remove unused module alias "unicodejs.wordbreak"
..


Remove unused module alias "unicodejs.wordbreak"

Deprecated for several years, not used anywhere.

Change-Id: Iaca725f7f249119c97f0ca2cc069003409b4155e
---
M extension.json
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 635ca0d..bbcfc17 100644
--- a/extension.json
+++ b/extension.json
@@ -226,9 +226,6 @@
"mobile"
]
},
-   "unicodejs.wordbreak": {
-   "dependencies": "unicodejs"
-   },
"papaparse": {
"scripts": "lib/ve/lib/papaparse/papaparse.js",
"targets": [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Changed list display delimiter from "middot" to "bullet"

[Yaron Koren (Code Review)]

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

Change subject: Changed list display delimiter from "middot" to "bullet"
..

Changed list display delimiter from "middot" to "bullet"

Also added CSS class for it.

Change-Id: I7ed08996f51c04277fa69dedca0f53d8c6f7d975
---
M includes/CargoQueryDisplayer.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/includes/CargoQueryDisplayer.php b/includes/CargoQueryDisplayer.php
index b5e384d..c509033 100644
--- a/includes/CargoQueryDisplayer.php
+++ b/includes/CargoQueryDisplayer.php
@@ -113,7 +113,7 @@
continue;
}
if ( $i > 0 ) {
-   // Use a "middle dot" as
+   // Use a bullet point as
// the list delimiter -
// it's better than 
using
// a comma, or the
@@ -122,7 +122,7 @@
// consistent and makes
// it clearer whether
// list parsing worked.
-   $text .= "  ";
+   $text .= '  ';
}
$text .= 
self::formatFieldValue( $fieldValue, $fieldType, $fieldDescription, 
$this->mParser );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ed08996f51c04277fa69dedca0f53d8c6f7d975
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
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]: rdbms: Remove unused setServerInfo/getServerInfo methods fro...

[jenkins-bot (Code Review)]

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

Change subject: rdbms: Remove unused setServerInfo/getServerInfo methods from 
LoadBalancer
..


rdbms: Remove unused setServerInfo/getServerInfo methods from LoadBalancer

Change-Id: Iffb99c96ca77957a81f1cb8d1e6ae5b1c198e3f5
---
M includes/libs/rdbms/loadbalancer/ILoadBalancer.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
2 files changed, 0 insertions(+), 39 deletions(-)

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



diff --git a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
index 86c4335..e246b79 100644
--- a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
@@ -310,25 +310,6 @@
public function getServerType( $i );
 
/**
-* Return the server info structure for a given index, or false if the 
index is invalid.
-* @param int $i
-* @return array|bool
-*
-* @deprecated Since 1.30, no alternative
-*/
-   public function getServerInfo( $i );
-
-   /**
-* Sets the server info structure for the given index. Entry at index $i
-* is created if it doesn't exist
-* @param int $i
-* @param array $serverInfo
-*
-* @deprecated Since 1.30, construct new object
-*/
-   public function setServerInfo( $i, array $serverInfo );
-
-   /**
 * Get the current master position for chronology control purposes
 * @return DBMasterPos|bool Returns false if not applicable
 */
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 591e287..deacc42 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1080,26 +1080,6 @@
return isset( $this->mServers[$i]['type'] ) ? 
$this->mServers[$i]['type'] : 'unknown';
}
 
-   /**
-* @deprecated Since 1.30, no alternative
-*/
-   public function getServerInfo( $i ) {
-   wfDeprecated( __METHOD__, '1.30' );
-   if ( isset( $this->mServers[$i] ) ) {
-   return $this->mServers[$i];
-   } else {
-   return false;
-   }
-   }
-
-   /**
-* @deprecated Since 1.30, construct new object
-*/
-   public function setServerInfo( $i, array $serverInfo ) {
-   wfDeprecated( __METHOD__, '1.30' );
-   $this->mServers[$i] = $serverInfo;
-   }
-
public function getMasterPos() {
# If this entire request was served from a replica DB without 
opening a connection to the
# master (however unlikely that may be), then we can fetch the 
position from the replica DB.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MassMessage[master]: Breaking down the MassMessage class into three classes

[Noella94 (Code Review)]

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

Change subject: Breaking down the MassMessage class into three classes
..

Breaking down the MassMessage class into three classes

Second task of Outreachy/15 project (see here: T178431). Devided MassMessage 
class into MassMessage,
MassMessageUrl and MassMessageGetDB

Bug: T178215
Change-Id: I374decb1108530561851930c0c2d288ae612ff65
---
M extension.json
M includes/ApiQueryMMSites.php
M includes/MassMessage.php
A includes/MassMessageGetDB.php
M includes/MassMessageTargets.php
A includes/MassMessageUrl.php
M includes/SpecialEditMassMessageList.php
M includes/content/MassMessageListContent.php
M includes/content/MassMessageListContentHandler.php
M includes/job/MassMessageJob.php
M tests/phpunit/MassMessageTest.php
11 files changed, 128 insertions(+), 103 deletions(-)


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

diff --git a/extension.json b/extension.json
index 91c79ec..117aaa0 100644
--- a/extension.json
+++ b/extension.json
@@ -211,6 +211,8 @@
"MediaWiki\\MassMessage\\ApiQueryMMSites": 
"includes/ApiQueryMMSites.php",
"MediaWiki\\MassMessage\\MassMessage": 
"includes/MassMessage.php",
"MediaWiki\\MassMessage\\MassMessageTargets": 
"includes/MassMessageTargets.php",
+   "MediaWiki\\MassMessage\\MassMessageGetDB": 
"includes/MassMessageGetDB.php",
+   "MediaWiki\\MassMessage\\MassMessageUrl": 
"includes/MassMessageUrl.php",
"MediaWiki\\MassMessage\\SpecialMassMessage": 
"includes/SpecialMassMessage.php",
"MediaWiki\\MassMessage\\SpecialCreateMassMessageList": 
"includes/SpecialCreateMassMessageList.php",
"MediaWiki\\MassMessage\\SpecialEditMassMessageList": 
"includes/SpecialEditMassMessageList.php",
diff --git a/includes/ApiQueryMMSites.php b/includes/ApiQueryMMSites.php
index 050d74b..a48d901 100644
--- a/includes/ApiQueryMMSites.php
+++ b/includes/ApiQueryMMSites.php
@@ -16,7 +16,7 @@
$params = $this->extractRequestParams();
$term = strtolower( $params['term'] );
 
-   $sites = array_keys( MassMessage::getDatabases() );
+   $sites = array_keys( MassMessageGetDB::getDatabases() );
sort( $sites );
$matches = [];
foreach ( $sites as $site ) {
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index 6bedf19..2e46044 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -26,25 +26,6 @@
 
 class MassMessage {
 
-   /**
-* Function to follow redirects
-*
-* @param Title $title
-* @return Title|null null if the page is an interwiki redirect
-*/
-   public static function followRedirect( Title $title ) {
-   if ( !$title->isRedirect() ) {
-   return $title;
-   }
-   $wikipage = WikiPage::factory( $title );
-
-   $target = $wikipage->followRedirect();
-   if ( $target instanceof Title ) {
-   return $target;
-   } else {
-   return null; // Interwiki redirect
-   }
-   }
 
/**
 * Sets up the messenger account for our use if it hasn't been already.
@@ -67,70 +48,6 @@
return $user;
}
 
-   /**
-* Returns the basic hostname and port using wfParseUrl
-* @param string $url
-* @return string
-*/
-   public static function getBaseUrl( $url ) {
-   static $mapping = [];
-
-   if ( isset( $mapping[$url] ) ) {
-   return $mapping[$url];
-   }
-
-   $parse = wfParseUrl( $url );
-   $mapping[$url] = $parse['host'];
-   if ( isset( $parse['port'] ) ) {
-   $mapping[$url] .= ':' . $parse['port'];
-   }
-   return $mapping[$url];
-   }
-
-   /**
-* Get a mapping from site domains to database names
-* Requires $wgConf to be set up properly
-* Tries to read from cache if possible
-* @return array
-*/
-   public static function getDatabases() {
-   global $wgConf, $wgMemc;
-   static $mapping = null;
-   if ( $mapping === null ) {
-   $key = wfGlobalCacheKey( 'massmessage:urltodb' );
-   $data = $wgMemc->get( $key );
-   if ( $data === false ) {
-   $dbs = $wgConf->getLocalDatabases();
-   $mapping = [];
-   foreach ( $dbs as $dbname ) {
-   $url = WikiMap::getWiki( $dbname 

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Remove unused module alias "unicodejs.wordbreak"

[Esanders (Code Review)]

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

Change subject: Remove unused module alias "unicodejs.wordbreak"
..

Remove unused module alias "unicodejs.wordbreak"

Deprecated for several years, not used anywhere.

Change-Id: Iaca725f7f249119c97f0ca2cc069003409b4155e
---
M extension.json
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/extension.json b/extension.json
index 635ca0d..bbcfc17 100644
--- a/extension.json
+++ b/extension.json
@@ -226,9 +226,6 @@
"mobile"
]
},
-   "unicodejs.wordbreak": {
-   "dependencies": "unicodejs"
-   },
"papaparse": {
"scripts": "lib/ve/lib/papaparse/papaparse.js",
"targets": [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix Maintenance::output when called very early

[jenkins-bot (Code Review)]

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

Change subject: Fix Maintenance::output when called very early
..


Fix Maintenance::output when called very early

If a maintenance script is called with --help (or without
required args), this is currently failing, as MediaWikiServices
is only loaded after Maintenance::setup is initially called.
Follows 336454104d1249439e3ff97746de69c5e7b4a5f9.

Change-Id: Ied283d362675b6b98bd3144132a240b432998991
---
M maintenance/Maintenance.php
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 07f547f..8bfead3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -381,11 +381,15 @@
 * @param mixed $channel Unique identifier for the channel. See 
function outputChanneled.
 */
protected function output( $out, $channel = null ) {
-   // Try to periodically flush buffered metrics to avoid OOMs
-   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   if ( $stats->getDataCount() > 1000 ) {
-   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   // This is sometimes called very early, before Setup.php is 
included.
+   if ( class_exists( MediaWikiServices::class ) ) {
+   // Try to periodically flush buffered metrics to avoid 
OOMs
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   if ( $stats->getDataCount() > 1000 ) {
+   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   }
}
+
if ( $this->mQuiet ) {
return;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied283d362675b6b98bd3144132a240b432998991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: doc: Add link for Wikidata Query Service

[jenkins-bot (Code Review)]

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

Change subject: doc: Add link for Wikidata Query Service
..


doc: Add link for Wikidata Query Service

Change-Id: Ic73440ef1a1efd09c02942012b8808aaa0615c3e
---
M org/wikimedia/doc/default.html
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/org/wikimedia/doc/default.html b/org/wikimedia/doc/default.html
index fb2762f..323c5d3 100644
--- a/org/wikimedia/doc/default.html
+++ b/org/wikimedia/doc/default.html
@@ -90,6 +90,7 @@
 
Parsoid
https://rest.wikimedia.org/;>RESTBase
+   Wikidata Query Service
 
 Ruby Gems
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Remove TODOs we decided we don't need

[jenkins-bot (Code Review)]

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

Change subject: Remove TODOs we decided we don't need
..


Remove TODOs we decided we don't need

Bug: T175978
Change-Id: I9b1bdb91229a086bebec3865c096f2c7e8492bac
---
M includes/SpecialGlobalPreferences.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/includes/SpecialGlobalPreferences.php 
b/includes/SpecialGlobalPreferences.php
index 9cc3d6b..fc0d235 100644
--- a/includes/SpecialGlobalPreferences.php
+++ b/includes/SpecialGlobalPreferences.php
@@ -80,7 +80,6 @@
 * @throws PermissionsError
 */
protected function showGlobalPrefsResetForm() {
-   // TODO: Should we have our own userright here?
if ( !$this->getUser()->isAllowed( 'editmyoptions' ) ) {
throw new PermissionsError( 'editmyoptions' );
}
@@ -125,7 +124,6 @@
 * @throws PermissionsError
 */
public function submitReset( $formData ) {
-   // TODO: Should we have our own userright here?
if ( !$this->getUser()->isAllowed( 'editmyoptions' ) ) {
throw new PermissionsError( 'editmyoptions' );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b1bdb91229a086bebec3865c096f2c7e8492bac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Samwilson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/docroot[master]: doc: Add link for Wikidata Query Service

[Legoktm (Code Review)]

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

Change subject: doc: Add link for Wikidata Query Service
..

doc: Add link for Wikidata Query Service

Change-Id: Ic73440ef1a1efd09c02942012b8808aaa0615c3e
---
M org/wikimedia/doc/default.html
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/41/402141/1

diff --git a/org/wikimedia/doc/default.html b/org/wikimedia/doc/default.html
index fb2762f..323c5d3 100644
--- a/org/wikimedia/doc/default.html
+++ b/org/wikimedia/doc/default.html
@@ -90,6 +90,7 @@
 
Parsoid
https://rest.wikimedia.org/;>RESTBase
+   Wikidata Query Service
 
 Ruby Gems
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Use namespaced version of IDatabase and ResultWrapper

[jenkins-bot (Code Review)]

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

Change subject: Use namespaced version of IDatabase and ResultWrapper
..


Use namespaced version of IDatabase and ResultWrapper

Change-Id: Ia2db1e1e3780895b3d529191d270102e36d3eb0e
---
M src/SpecialPage.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/src/SpecialPage.php b/src/SpecialPage.php
index bcdefe1..3982c88 100644
--- a/src/SpecialPage.php
+++ b/src/SpecialPage.php
@@ -24,13 +24,13 @@
 use Html;
 use HTMLForm;
 use HTMLTextField;
-use IDatabase;
 use OutputPage;
 use QueryPage;
-use ResultWrapper;
 use Skin;
 use Status;
 use Title;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\ResultWrapper;
 
 /**
  * A special page for searching Page Assessments. Can also be transcluded (in 
which case the

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2db1e1e3780895b3d529191d270102e36d3eb0e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use namespaced version of IDatabase

[jenkins-bot (Code Review)]

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

Change subject: Use namespaced version of IDatabase
..


Use namespaced version of IDatabase

Change-Id: I49c9b462d316763f90ebf5a95caa388716d6a278
---
M tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
M 
tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
index a3f3981..78207ac 100644
--- 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
+++ 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
@@ -2,7 +2,7 @@
 
 namespace Wikimedia\Tests\Rdbms;
 
-use IDatabase;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 use PHPUnit_Framework_MockObject_MockObject;
 use Wikimedia\Rdbms\ConnectionManager;
diff --git 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
index 4e76f2a..3982ee7 100644
--- 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
+++ 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
@@ -2,7 +2,7 @@
 
 namespace Wikimedia\Tests\Rdbms;
 
-use IDatabase;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 use PHPUnit_Framework_MockObject_MockObject;
 use Wikimedia\Rdbms\SessionConsistentConnectionManager;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49c9b462d316763f90ebf5a95caa388716d6a278
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Remove TODOs we decided we don't need

[MaxSem (Code Review)]

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

Change subject: Remove TODOs we decided we don't need
..

Remove TODOs we decided we don't need

Bug: T175978
Change-Id: I9b1bdb91229a086bebec3865c096f2c7e8492bac
---
M includes/SpecialGlobalPreferences.php
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/includes/SpecialGlobalPreferences.php 
b/includes/SpecialGlobalPreferences.php
index 9cc3d6b..fc0d235 100644
--- a/includes/SpecialGlobalPreferences.php
+++ b/includes/SpecialGlobalPreferences.php
@@ -80,7 +80,6 @@
 * @throws PermissionsError
 */
protected function showGlobalPrefsResetForm() {
-   // TODO: Should we have our own userright here?
if ( !$this->getUser()->isAllowed( 'editmyoptions' ) ) {
throw new PermissionsError( 'editmyoptions' );
}
@@ -125,7 +124,6 @@
 * @throws PermissionsError
 */
public function submitReset( $formData ) {
-   // TODO: Should we have our own userright here?
if ( !$this->getUser()->isAllowed( 'editmyoptions' ) ) {
throw new PermissionsError( 'editmyoptions' );
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use namespaced version of DatabaseMysql

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of DatabaseMysql
..

Use namespaced version of DatabaseMysql

Change-Id: I272a186bbc605d27d4219b65064b3773749b0847
---
M repo/tests/phpunit/includes/Store/Sql/DatabaseSchemaUpdaterTest.php
M repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git 
a/repo/tests/phpunit/includes/Store/Sql/DatabaseSchemaUpdaterTest.php 
b/repo/tests/phpunit/includes/Store/Sql/DatabaseSchemaUpdaterTest.php
index 14ae1ef..6175cb6 100644
--- a/repo/tests/phpunit/includes/Store/Sql/DatabaseSchemaUpdaterTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/DatabaseSchemaUpdaterTest.php
@@ -2,10 +2,10 @@
 
 namespace Wikibase\Repo\Tests\Store\Sql;
 
-use DatabaseMysql;
 use MysqlUpdater;
 use Wikibase\Repo\Store\Sql\DatabaseSchemaUpdater;
 use Wikibase\Store;
+use Wikimedia\Rdbms\DatabaseMysql;
 
 /**
  * @covers Wikibase\Repo\Store\Sql\DatabaseSchemaUpdater
diff --git 
a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php 
b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
index 401a159..968a9ee 100644
--- a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityRedirectLookupTest.php
@@ -3,12 +3,12 @@
 namespace Wikibase\Repo\Tests\Store\Sql;
 
 use ContentHandler;
-use DatabaseMysql;
 use MediaWikiTestCase;
 use Title;
 use Wikibase\DataModel\Services\Lookup\EntityRedirectLookupException;
 use Wikibase\Repo\Store\EntityTitleStoreLookup;
 use Wikibase\Store\EntityIdLookup;
+use Wikimedia\Rdbms\DatabaseMysql;
 use Wikimedia\Rdbms\LoadBalancer;
 use WikiPage;
 use Wikibase\DataModel\Entity\EntityId;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I272a186bbc605d27d4219b65064b3773749b0847
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Use namespaced version of FakeResultWrapper

[jenkins-bot (Code Review)]

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

Change subject: Use namespaced version of FakeResultWrapper
..


Use namespaced version of FakeResultWrapper

Change-Id: If76eb8d5cdeac94e938c9b31946a4d7f688ae24e
---
M tests/phpunit/ApiQueryPageImagesTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index 688f454..ad8ca2b 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -4,10 +4,10 @@
 
 use ApiPageSet;
 use ApiQueryPageImages;
-use FakeResultWrapper;
 use PageImages;
 use PHPUnit_Framework_TestCase;
 use Title;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\TestingAccessWrapper;
 
 class ApiQueryPageImagesProxy extends ApiQueryPageImages {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If76eb8d5cdeac94e938c9b31946a4d7f688ae24e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Use namespaced version of IDatabase and LoadBalancer

[jenkins-bot (Code Review)]

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

Change subject: Use namespaced version of IDatabase and LoadBalancer
..


Use namespaced version of IDatabase and LoadBalancer

Change-Id: I1912c53a09f4190b852f1af76a3939d76811f935
---
M includes/Database.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/includes/Database.php b/includes/Database.php
index 551f424..d2eed79 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -20,7 +20,8 @@
 
 namespace MediaWiki\Babel;
 
-use LoadBalancer;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\LoadBalancer;
 
 class Database {
 
@@ -35,7 +36,7 @@
 
/**
 * @param int $index
-* @return \IDatabase
+* @return IDatabase
 */
protected function getDB( $index ) {
return $this->loadBalancer->getLazyConnectionRef( $index );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1912c53a09f4190b852f1af76a3939d76811f935
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix Maintenance::output when called very early

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402138 )

Change subject: Fix Maintenance::output when called very early
..

Fix Maintenance::output when called very early

If a maintenance script is called with --help (or without
required args), this is currently failing, as MediaWikiServices
is only loaded after Maintenance::setup is initially called.
Follows 336454104d1249439e3ff97746de69c5e7b4a5f9.

Change-Id: Ied283d362675b6b98bd3144132a240b432998991
---
M maintenance/Maintenance.php
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/38/402138/1

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 07f547f..8bfead3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -381,11 +381,15 @@
 * @param mixed $channel Unique identifier for the channel. See 
function outputChanneled.
 */
protected function output( $out, $channel = null ) {
-   // Try to periodically flush buffered metrics to avoid OOMs
-   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   if ( $stats->getDataCount() > 1000 ) {
-   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   // This is sometimes called very early, before Setup.php is 
included.
+   if ( class_exists( MediaWikiServices::class ) ) {
+   // Try to periodically flush buffered metrics to avoid 
OOMs
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   if ( $stats->getDataCount() > 1000 ) {
+   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   }
}
+
if ( $this->mQuiet ) {
return;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied283d362675b6b98bd3144132a240b432998991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] mediawiki...GeoData[master]: Use namespaced version of IDatabase and LoadBalancer

[jenkins-bot (Code Review)]

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

Change subject: Use namespaced version of IDatabase and LoadBalancer
..


Use namespaced version of IDatabase and LoadBalancer

Change-Id: I08cb3ffad6d715c091dd0c524ea8ef203d537120
---
M includes/Hooks.php
M tests/phpunit/GeoFeatureTest.php
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/Hooks.php b/includes/Hooks.php
index bcd0dc8..d937329 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -163,7 +163,7 @@
 * @param Coord[] $coords
 * @param int $pageId
 * @param int|null $ticket
-* @throws \DBUnexpectedError
+* @throws \Wikimedia\Rdbms\DBUnexpectedError
 */
private static function doLinksUpdate( array $coords, $pageId, $ticket 
) {
$services = MediaWikiServices::getInstance();
diff --git a/tests/phpunit/GeoFeatureTest.php b/tests/phpunit/GeoFeatureTest.php
index 69822cc..2799887 100644
--- a/tests/phpunit/GeoFeatureTest.php
+++ b/tests/phpunit/GeoFeatureTest.php
@@ -4,11 +4,11 @@
 
 use CirrusSearch\Search\SearchContext;
 use CirrusSearch\SearchConfig;
-use LoadBalancer;
-use IDatabase;
 use MediaWiki\MediaWikiServices;
 use MediaWikiTestCase;
 use Title;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\LoadBalancer;
 
 /**
  * Test GeoFeature functions.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08cb3ffad6d715c091dd0c524ea8ef203d537120
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
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]: wmcs: Add database drop support to maintain-views

[BryanDavis (Code Review)]

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

Change subject: wmcs: Add database drop support to maintain-views
..

wmcs: Add database drop support to maintain-views

Add a new `--drop` argument to maintain-views that can be used to remove
the _p database for a Wiki Replica. This option requires that
`--database` also be given to explicitly name the databases to be
dropped.

Bug: T181925
Change-Id: I91f3b49cade4ccbd822d95a906dbe738ac0d370c
---
M modules/role/files/labs/db/views/maintain-views.py
1 file changed, 36 insertions(+), 9 deletions(-)


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

diff --git a/modules/role/files/labs/db/views/maintain-views.py 
b/modules/role/files/labs/db/views/maintain-views.py
index 23a7dc9..71287bc 100644
--- a/modules/role/files/labs/db/views/maintain-views.py
+++ b/modules/role/files/labs/db/views/maintain-views.py
@@ -113,9 +113,10 @@
 if self.table_exists(view, self.db):
 # If it does, create or replace the view for it.
 logging.info("[{}] ".format(view))
-if (self.replace_all or not self.table_exists(view, self.db_p) or
-input('View already exists. Replace? [y/N] ').lower()
-in ['y', 'yes']):
+if (
+not self.table_exists(view, self.db_p) or
+self._confirm('View already exists. Replace?)
+):
 # Can't use pymysql to build this
 self.write_execute("""
 CREATE OR REPLACE
@@ -194,10 +195,10 @@
 
 if len(sources) == len(sources_checked):
 
-if (self.replace_all or
-not self.table_exists(view_name, self.db_p) or
-input('View already exists. Replace? [y/N] ').lower()
-in ['y', 'yes']):
+if (
+not self.table_exists(view_name, self.db_p) or
+self._confirm('View already exists. Replace?')
+):
 logging.info("[{}] ".format(view_name))
 self.create_customview(
 view_name,
@@ -275,6 +276,20 @@
 for view_name, view_details in customviews.items():
 self.do_customview(view_name, view_details)
 
+def drop_public_database(self):
+"""Drop a public database entirely."""
+if self.database_exists(self.db_p):
+if self._confirm('Drop {}?'.format(self.db_p):
+self.write_execute("DROP DATABASE `{}`;".format(self.db_p))
+else:
+logging.warning('DB {} does not exist'.format(self.db_p))
+
+def _confirm(self, msg):
+return (
+self.replace_all or
+input("{} [y/N] ".format(msg)).lower() in ['y', 'yes']
+)
+
 
 if __name__ == "__main__":
 
@@ -313,8 +328,12 @@
 )
 argparser.add_argument(
 "--clean",
-help=("Clean out views from _p varient that are no longer specified"
-  " make changes."),
+help="Clean out views from _p db that are no longer specified.",
+action="store_true"
+)
+argparser.add_argument(
+"--drop",
+help="Remove _p db entirely.",
 action="store_true"
 )
 argparser.add_argument(
@@ -347,6 +366,10 @@
 # argparse mutually exclusive is weird http://bugs.python.org/issue10984
 if args.table and args.clean:
 logging.critical("cannot specify a single table and cleanup")
+sys.exit(1)
+
+if args.drop and not args.databases:
+logging.critical("--drop must specify database names")
 sys.exit(1)
 
 with open(args.config_location, 'r') as stream:
@@ -449,6 +472,10 @@
 logging.critical("Definer has not been created")
 sys.exit(1)
 
+if args.drop:
+ops.drop_public_database()
+continue
+
 ops.execute(fullviews, customviews)
 
 if args.clean:

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Move logic for creating Default list to database upgrade hook.

[jenkins-bot (Code Review)]

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

Change subject: Move logic for creating Default list to database upgrade hook.
..


Move logic for creating Default list to database upgrade hook.

*** IMPORTANTZOMG: This changes the database contract without bumping the
database version. Any existing Dev and Alpha users will need to clear the
app data, otherwise they'll see unexpected behavior. ***

A couple of additional things going on here:

- Slightly updated the database upgrade logic such that the
  onUpgradeSchema() method gets called for the initial version of a table,
  as well as for subsequent versions.
- Removed the "synchronized" keyword from the methods in the DbHelper,
  since they're not really necessary (the DbHelper doesn't actually have
  any thread-unsafe state, and thread safety is guaranteed by the
  SQLiteOpenHelper anyway), and it was causing problems when trying to add
  rows to the db while inside the OnCreate() method.

Change-Id: Ia8985acc0ec498602bcb2c27d7cc14144dca05df
---
M app/src/main/java/org/wikipedia/database/DatabaseTable.java
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
M app/src/main/java/org/wikipedia/readinglist/database/ReadingList.java
M app/src/main/java/org/wikipedia/readinglist/database/ReadingListDbHelper.java
M app/src/main/java/org/wikipedia/readinglist/database/ReadingListPageTable.java
6 files changed, 61 insertions(+), 64 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/database/DatabaseTable.java 
b/app/src/main/java/org/wikipedia/database/DatabaseTable.java
index 6186ec4..c1c057a 100644
--- a/app/src/main/java/org/wikipedia/database/DatabaseTable.java
+++ b/app/src/main/java/org/wikipedia/database/DatabaseTable.java
@@ -85,6 +85,7 @@
 public void upgradeSchema(@NonNull SQLiteDatabase db, int fromVersion, int 
toVersion) {
 if (fromVersion < getDBVersionIntroducedAt()) {
 createTables(db);
+onUpgradeSchema(db, fromVersion, getDBVersionIntroducedAt());
 }
 
 for (int ver = Math.max(getDBVersionIntroducedAt(), fromVersion) + 1; 
ver <= toVersion; ++ver) {
@@ -101,7 +102,7 @@
 db.execSQL(alterTableString);
 }
 
-upgradeSchema(db, ver);
+onUpgradeSchema(db, ver - 1, ver);
 }
 }
 
@@ -109,7 +110,7 @@
 return baseContentURI;
 }
 
-protected void upgradeSchema(@NonNull SQLiteDatabase db, int toVersion) {
+protected void onUpgradeSchema(@NonNull SQLiteDatabase db, int 
fromVersion, int toVersion) {
 }
 
 private void createTables(@NonNull SQLiteDatabase db) {
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java 
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index 81f7f43..6dce4bf 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -8,7 +8,6 @@
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -218,7 +217,7 @@
 message = getString(R.string.reading_list_already_exists);
 } else {
 message = 
String.format(getString(R.string.reading_list_added_to_named),
-TextUtils.isEmpty(readingList.title()) ? 
getString(R.string.default_reading_list_name) : readingList.title());
+readingList.isDefault() ? 
getString(R.string.default_reading_list_name) : readingList.title());
 new 
ReadingListsFunnel(title.getWikiSite()).logAddToList(readingList, 
readingLists.size(), invokeSource);
 
 ReadingListDbHelper.instance().addPageToList(readingList, 
title);
@@ -244,7 +243,8 @@
 if (numAdded == 0) {
 message = 
getString(R.string.reading_list_already_contains_selection);
 } else {
-message = 
String.format(getString(R.string.reading_list_added_articles_list_titled), 
numAdded, TextUtils.isEmpty(readingList.title()) ? 
getString(R.string.default_reading_list_name) : readingList.title());
+message = 
String.format(getString(R.string.reading_list_added_articles_list_titled), 
numAdded,
+readingList.isDefault() ? 
getString(R.string.default_reading_list_name) : readingList.title());
 new ReadingListsFunnel().logAddToList(readingList, 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: network::constants: add fake CACHE_MISC for labs

[Dzahn (Code Review)]

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

Change subject: network::constants: add fake CACHE_MISC for labs
..

network::constants: add fake CACHE_MISC for labs

The CACHE_MISC variable doesn't exist in labs but we use it in
ferm rules all over the place now.

This means that none of the roles for services behind misc-web
can be used/tested on labs.

It will simply fail for not finding this variable.

Add a fake "127.0.0.1" value to unbreak the puppet runs.

Change-Id: I1b119c9170f9d709fb652976868e96816f6c46dc
---
M modules/network/manifests/constants.pp
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/402136/1

diff --git a/modules/network/manifests/constants.pp 
b/modules/network/manifests/constants.pp
index 4be6e71..820a6a9 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -217,6 +217,9 @@
 '208.80.155.120',   # 
labpuppetmaster1002.wikimedia.org
 '2620:0:861:4:208:80:155:120',  # 
labpuppetmaster1002.wikimedia.org
 ],
+'cache_misc' => [ # So that roles using it can be used in wmflabs
+'127.0.0.1',
+   ],
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Remove midi checkbox from VisualEditor

[jenkins-bot (Code Review)]

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

Change subject: Remove midi checkbox from VisualEditor
..


Remove midi checkbox from VisualEditor

It is no longer needed since midi attribute
doesn't exist now.

Bug: T183736
Change-Id: I01b71004b52677eb9fb152017875e90855c7bb6e
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ve-score/ve.ui.MWScoreInspector.js
4 files changed, 6 insertions(+), 45 deletions(-)

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



diff --git a/extension.json b/extension.json
index 762f92c..11e1080 100644
--- a/extension.json
+++ b/extension.json
@@ -37,13 +37,11 @@
"messages": [

"score-visualeditor-mwscoreinspector-card-advanced",

"score-visualeditor-mwscoreinspector-card-audio",
-   "score-visualeditor-mwscoreinspector-card-midi",

"score-visualeditor-mwscoreinspector-card-notation",
"score-visualeditor-mwscoreinspector-lang",
"score-visualeditor-mwscoreinspector-lang-abc",

"score-visualeditor-mwscoreinspector-lang-lilypond",

"score-visualeditor-mwscoreinspector-notelanguage",
-   "score-visualeditor-mwscoreinspector-midi",

"score-visualeditor-mwscoreinspector-override-midi",

"score-visualeditor-mwscoreinspector-override-midi-placeholder",

"score-visualeditor-mwscoreinspector-override-ogg",
diff --git a/i18n/en.json b/i18n/en.json
index b0697c7..7c31ccc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -38,13 +38,11 @@
"score-versionerr": "Unable to obtain LilyPond version:\n$1",
"score-visualeditor-mwscoreinspector-card-advanced": "Advanced",
"score-visualeditor-mwscoreinspector-card-audio": "Audio",
-   "score-visualeditor-mwscoreinspector-card-midi": "MIDI",
"score-visualeditor-mwscoreinspector-card-notation": "Notation",
"score-visualeditor-mwscoreinspector-lang": "Language",
"score-visualeditor-mwscoreinspector-lang-abc": "ABC",
"score-visualeditor-mwscoreinspector-lang-lilypond": "LilyPond",
"score-visualeditor-mwscoreinspector-notelanguage": "Notation Language",
-   "score-visualeditor-mwscoreinspector-midi": "A link to a MIDI file 
(auto-generated by default)",
"score-visualeditor-mwscoreinspector-override-midi": "Use an existing 
MIDI file",
"score-visualeditor-mwscoreinspector-override-midi-placeholder": "Name 
of existing MIDI file",
"score-visualeditor-mwscoreinspector-override-ogg": "Use an existing 
audio file",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7c4bb35..7072caf 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -44,13 +44,11 @@
"score-versionerr": "Displayed if the extension failed to obtain the 
version string of LilyPond. $1 is the LilyPond stdout output generated by the 
attempt.",
"score-visualeditor-mwscoreinspector-card-advanced": "Label for the 
advanced card of the score inspector\n{{Identical|Advanced}}",
"score-visualeditor-mwscoreinspector-card-audio": "Label for the audio 
card of the score inspector\n{{Identical|Audio}}",
-   "score-visualeditor-mwscoreinspector-card-midi": "Label for the MIDI 
card of the score inspector",
"score-visualeditor-mwscoreinspector-card-notation": "Label for the 
notation card of the score inspector\n{{Identical|Notation}}",
"score-visualeditor-mwscoreinspector-lang": "Label for the lang 
attribute of the score node\n{{Identical|Language}}",
"score-visualeditor-mwscoreinspector-lang-abc": "Label for the 'ABC' 
value of the lang attribute",
"score-visualeditor-mwscoreinspector-lang-lilypond": "Label for the 
'LilyPond' value of the lang attribute",
"score-visualeditor-mwscoreinspector-notelanguage": "Label for the 
notation-language attribute of the score node",
-   "score-visualeditor-mwscoreinspector-midi": "Label for the midi 
attribute of the score node",
"score-visualeditor-mwscoreinspector-override-midi": "Label for the 
override_midi attribute of the score node",
"score-visualeditor-mwscoreinspector-override-midi-placeholder": 
"Placeholder for the label for the override_midi attribute of the score node",
"score-visualeditor-mwscoreinspector-override-ogg": "Label for the 
override_ogg attribute of the score node",
diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js 
b/modules/ve-score/ve.ui.MWScoreInspector.js
index ab0fbf6..ba6ccce 100644
--- a/modules/ve-score/ve.ui.MWScoreInspector.js
+++ b/modules/ve-score/ve.ui.MWScoreInspector.js
@@ -39,11 +39,11 @@
 

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use namespaced version of LoadBalancer

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of LoadBalancer
..

Use namespaced version of LoadBalancer

Change-Id: I2b9421be4e7218abd96f93ecaf30c067ad1088fb
---
M tests/unit/Query/InCategoryFeatureTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/unit/Query/InCategoryFeatureTest.php 
b/tests/unit/Query/InCategoryFeatureTest.php
index c75bcac..a2b9e8c 100644
--- a/tests/unit/Query/InCategoryFeatureTest.php
+++ b/tests/unit/Query/InCategoryFeatureTest.php
@@ -2,8 +2,8 @@
 
 namespace CirrusSearch\Query;
 
-use LoadBalancer;
 use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\LoadBalancer;
 
 /**
  * @group CirrusSearch

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b9421be4e7218abd96f93ecaf30c067ad1088fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...Babel[master]: Use namespaced version of LoadBalancer

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of LoadBalancer
..

Use namespaced version of LoadBalancer

Change-Id: I1912c53a09f4190b852f1af76a3939d76811f935
---
M includes/Database.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/Database.php b/includes/Database.php
index 551f424..b895971 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Babel;
 
-use LoadBalancer;
+use Wikimedia\Rdbms\LoadBalancer;
 
 class Database {
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1912c53a09f4190b852f1af76a3939d76811f935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Use namespaced version of FakeResultWrapper

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of FakeResultWrapper
..

Use namespaced version of FakeResultWrapper

Change-Id: If76eb8d5cdeac94e938c9b31946a4d7f688ae24e
---
M tests/phpunit/ApiQueryPageImagesTest.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/33/402133/1

diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index 688f454..ad8ca2b 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -4,10 +4,10 @@
 
 use ApiPageSet;
 use ApiQueryPageImages;
-use FakeResultWrapper;
 use PageImages;
 use PHPUnit_Framework_TestCase;
 use Title;
+use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\TestingAccessWrapper;
 
 class ApiQueryPageImagesProxy extends ApiQueryPageImages {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If76eb8d5cdeac94e938c9b31946a4d7f688ae24e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Don't globalize disabled preferences

[MaxSem (Code Review)]

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

Change subject: Don't globalize disabled preferences
..

Don't globalize disabled preferences

...such as email prefs when email is disabled.

Bug: T179716
Change-Id: I73af2d731844f9aa9cca9b0a400fa2ac85f76bee
---
M includes/GlobalPreferencesFactory.php
M tests/phpunit/GlobalPreferencesTest.php
2 files changed, 132 insertions(+), 4 deletions(-)


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

diff --git a/includes/GlobalPreferencesFactory.php 
b/includes/GlobalPreferencesFactory.php
index 06db523..b161269 100644
--- a/includes/GlobalPreferencesFactory.php
+++ b/includes/GlobalPreferencesFactory.php
@@ -186,7 +186,19 @@
 */
protected function isGlobalizablePreference( $name, &$info ) {
// Preferences can opt out of being globalized by setting the 
'noglobal' flag.
-   $hasOptedOut = ( isset( $info['noglobal'] ) && 
$info['noglobal'] === true );
+   if ( isset( $info['noglobal'] ) && $info['noglobal'] === true ) 
{
+   return false;
+   }
+
+   // Ignore "is global" checkboxes
+   if ( substr( $name, -strlen( '-global' ) ) === '-global' ) {
+   return false;
+   }
+
+   // If a setting can't be changed, don't bother globalizing it
+   if ( isset( $info['disabled'] ) && $info['disabled'] ) {
+   return false;
+   }
 
$isAllowedType = isset( $info['type'] )
 && !in_array( $info['type'], 
$this->typeBlacklist )
@@ -195,9 +207,7 @@
$isAllowedClass = isset( $info['class'] )
  && in_array( $info['class'], 
$this->classWhitelist );
 
-   $endsInGlobal = ( substr( $name, -strlen( '-global' ) ) === 
'-global' );
-
-   return !$hasOptedOut && !$endsInGlobal && ( $isAllowedType || 
$isAllowedClass );
+   return $isAllowedType || $isAllowedClass;
}
 
/**
diff --git a/tests/phpunit/GlobalPreferencesTest.php 
b/tests/phpunit/GlobalPreferencesTest.php
index fa43b99..509e579 100644
--- a/tests/phpunit/GlobalPreferencesTest.php
+++ b/tests/phpunit/GlobalPreferencesTest.php
@@ -6,6 +6,7 @@
 use GlobalPreferences\Storage;
 use MediaWiki\MediaWikiServices;
 use MediaWikiTestCase;
+use Wikimedia\TestingAccessWrapper;
 
 /**
  * @group GlobalPreferences
@@ -66,4 +67,121 @@
// @TODO Instance caching on User doesn't clear 
User::$mOptionOverrides
// $this->assertEquals( 'bn', $user->getOption( 'language' ) );
}
+
+   /**
+* @dataProvider provideIsGlobalizablePreference
+*
+* @param string $message
+* @param bool $expected
+* @param string $name
+* @param array $info
+*/
+   public function testIsGlobalizablePreference( $message, $expected, 
$name, array $info ) {
+   /** @var GlobalPreferencesFactory $globalPreferences */
+   $globalPreferences = TestingAccessWrapper::newFromObject(
+   
MediaWikiServices::getInstance()->getPreferencesFactory()
+   );
+
+   // Not calling directly because TestingAccessWrapper strips 
reference otherwise
+   $result = call_user_func_array(
+   [ $globalPreferences, 'isGlobalizablePreference' ],
+   [ $name, &$info ]
+   );
+   $this->assertEquals( $expected, $result, $message );
+   }
+
+   public function provideIsGlobalizablePreference() {
+   return[
+   // message, expected, name, info
+   [
+   'Globalize simple text preferences',
+   true,
+   'foo',
+   [
+   'type' => 'text',
+   ],
+   ],
+   [
+   'Globalize select controls',
+   true,
+   'language',
+   [
+   'type' => 'select',
+   'options' => [ 'foo' => 'bar', 'baz' => 
'quux' ],
+   ],
+   ],
+   [
+   'Globalize preferences with known class',
+   true,
+   'foo',
+   [
+   'class' => 'HTMLCheckMatrix',
+   ],

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Remove midi checkbox from VisualEditor

[Albert221 (Code Review)]

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

Change subject: Remove midi checkbox from VisualEditor
..

Remove midi checkbox from VisualEditor

It is no longer needed since midi attribute
doesn't exist now.

Bug: T183736
Change-Id: I01b71004b52677eb9fb152017875e90855c7bb6e
---
M modules/ve-score/ve.ui.MWScoreInspector.js
1 file changed, 9 insertions(+), 31 deletions(-)


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

diff --git a/modules/ve-score/ve.ui.MWScoreInspector.js 
b/modules/ve-score/ve.ui.MWScoreInspector.js
index ab0fbf6..b1cbd99 100644
--- a/modules/ve-score/ve.ui.MWScoreInspector.js
+++ b/modules/ve-score/ve.ui.MWScoreInspector.js
@@ -39,12 +39,11 @@
  * @inheritdoc
  */
 ve.ui.MWScoreInspector.prototype.initialize = function () {
-   var inputField, langField, noteLanguageField,
-   midiField, overrideMidiField,
+   var inputField, langField,
+   noteLanguageField, overrideMidiField,
vorbisField, overrideOggField,
rawField,
-   notationTabPanel, audioTabPanel, midiTabPanel, advancedTabPanel,
-   language, languages = mw.config.get( 'wgScoreNoteLanguages' );
+   notationTabPanel, audioTabPanel, advancedTabPanel;
 
// Parent method
ve.ui.MWScoreInspector.super.prototype.initialize.call( this );
@@ -68,12 +67,6 @@
scrollable: false,
padded: true
} );
-   midiTabPanel = new OO.ui.TabPanelLayout( 'midi', {
-   label: ve.msg( 'score-visualeditor-mwscoreinspector-card-midi' 
),
-   expanded: false,
-   scrollable: false,
-   padded: true
-   } );
advancedTabPanel = new OO.ui.TabPanelLayout( 'advanced', {
label: ve.msg( 
'score-visualeditor-mwscoreinspector-card-advanced' ),
expanded: false,
@@ -84,7 +77,6 @@
this.indexLayout.addTabPanels( [
notationTabPanel,
audioTabPanel,
-   midiTabPanel,
advancedTabPanel
] );
 
@@ -112,7 +104,6 @@
}
 
// Checkboxes
-   this.midiCheckbox = new OO.ui.CheckboxInputWidget();
this.audioCheckbox = new OO.ui.CheckboxInputWidget();
this.rawCheckbox = new OO.ui.CheckboxInputWidget();
 
@@ -145,10 +136,6 @@
align: 'top',
label: ve.msg( 
'score-visualeditor-mwscoreinspector-override-ogg' )
} );
-   midiField = new OO.ui.FieldLayout( this.midiCheckbox, {
-   align: 'inline',
-   label: ve.msg( 'score-visualeditor-mwscoreinspector-midi' )
-   } );
overrideMidiField = new OO.ui.FieldLayout( this.overrideMidiInput, {
align: 'top',
label: ve.msg( 
'score-visualeditor-mwscoreinspector-override-midi' )
@@ -171,12 +158,9 @@
vorbisField.$element,
overrideOggField.$element
);
-   midiTabPanel.$element.append(
-   midiField.$element,
-   overrideMidiField.$element
-   );
advancedTabPanel.$element.append(
-   rawField.$element
+   rawField.$element,
+   overrideMidiField.$element
);
this.form.$element.append(
this.indexLayout.$element
@@ -193,7 +177,6 @@
lang = attributes.lang || 'lilypond',
noteLanguage = attributes[ 'note-language' ] || 
mw.config.get( 'wgScoreDefaultNoteLanguage' ),
raw = attributes.raw !== undefined,
-   midi = attributes.midi === '1',
vorbis = attributes.vorbis === '1',
/* eslint-disable camelcase */
overrideMidi = attributes.override_midi || '',
@@ -204,7 +187,6 @@
this.langSelect.selectItemByData( lang );
this.noteLanguageDropdown.getMenu().selectItemByData( 
noteLanguage );
this.rawCheckbox.setSelected( raw );
-   this.midiCheckbox.setSelected( midi );
// vorbis is only set to 1 if an audio file is being 
auto-generated, but
// the checkbox should be checked if an audio file is 
being auto-generated
// OR if an existing file has been specified.
@@ -222,7 +204,6 @@
this.langSelect.on( 'choose', this.onChangeHandler );
this.noteLanguageDropdown.on( 'labelChange', 
this.onChangeHandler );
this.rawCheckbox.on( 'change', this.onChangeHandler );
-   this.midiCheckbox.on( 'change', this.onChangeHandler );
  

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove `noimages` flag from MobileView API

[Jdlrobson (Code Review)]

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

Change subject: Remove `noimages` flag from MobileView API
..

Remove `noimages` flag from MobileView API

This flag currently only exists in the mobile view API - it's not
used in web page views. It thus begs the question why are we keeping
it around.

Unless it's used by apps, I think we should remove this to make the
MobileFormatter a little less complicated to maintain.

Change-Id: I6067efc97420939f73e1fd55db3e4652c4c4b58c
---
M includes/MobileFormatter.php
M includes/api/ApiMobileView.php
M includes/api/ApiParseExtender.php
M tests/phpunit/MobileFormatterTest.php
4 files changed, 3 insertions(+), 74 deletions(-)


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

diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php
index a8c2e91..fb9d636 100644
--- a/includes/MobileFormatter.php
+++ b/includes/MobileFormatter.php
@@ -179,10 +179,6 @@
$this->remove( $removableClasses );
}
 
-   if ( $this->removeMedia ) {
-   $this->doRemoveImages();
-   }
-
$transformOptions = [
'images' => $removeImages,
'references' => $removeReferences,
@@ -214,7 +210,7 @@
private function filterContentInSection(
$el, DOMDocument $doc, $sectionNumber, $options = []
) {
-   if ( !$this->removeMedia && $options['images'] && 
$sectionNumber > 0 ) {
+   if ( $options['images'] && $sectionNumber > 0 ) {
$this->doRewriteImagesForLazyLoading( $el, $doc );
}
if ( $options['references'] ) {
@@ -423,29 +419,6 @@
$noscript->appendChild( $img );
// Insert the HTML only markup before the placeholder
$parent->insertBefore( $noscript, $imgPlaceholder );
-   }
-   }
-
-   /**
-* Replaces images with [annotations from alt]
-*/
-   private function doRemoveImages() {
-   $doc = $this->getDoc();
-   $domElemsToReplace = [];
-   foreach ( $doc->getElementsByTagName( 'img' ) as $element ) {
-   $domElemsToReplace[] = $element;
-   }
-   /** @var $element DOMElement */
-   foreach ( $domElemsToReplace as $element ) {
-   $alt = $element->getAttribute( 'alt' );
-   if ( $alt === '' ) {
-   $alt = '[' . wfMessage( 
'mobile-frontend-missing-image' )->inContentLanguage() . ']';
-   } else {
-   $alt = '[' . $alt . ']';
-   }
-   $replacement = $doc->createElement( 'span', 
htmlspecialchars( $alt ) );
-   $replacement->setAttribute( 'class', 
'mw-mf-image-replacement' );
-   $element->parentNode->replaceChild( $replacement, 
$element );
}
}
 
diff --git a/includes/api/ApiMobileView.php b/includes/api/ApiMobileView.php
index 5653b7a..ad7006e 100644
--- a/includes/api/ApiMobileView.php
+++ b/includes/api/ApiMobileView.php
@@ -121,7 +121,7 @@
'ns' => $namespace,
] );
}
-   $data = $this->getData( $title, $params['noimages'], 
$params['revision'] );
+   $data = $this->getData( $title, $params['revision'] );
$plainData = [ 'lastmodified', 'lastmodifiedby', 'revision',
'languagecount', 'hasvariants', 'displaytitle', 'id', 
'contentmodel' ];
foreach ( $plainData as $name ) {
@@ -530,12 +530,11 @@
/**
 * Get data of requested article.
 * @param Title $title
-* @param boolean $noImages
 * @param null|int [$oldid] Revision ID to get the text from, passing 
null or 0 will
 *   get the current revision (default value)
 * @return array
 */
-   private function getData( Title $title, $noImages, $oldid = null ) {
+   private function getData( Title $title, $oldid = null ) {
global $wgMemc;
 
$mfConfig = MobileContext::singleton()->getMFConfig();
@@ -573,7 +572,6 @@
'mf',
'mobileview',
self::CACHE_VERSION,
-   $noImages,
$touched,
$this->noTransform,
$this->file->getSha1(),
@@ -593,7 +591,6 @@
'mf',
'mobileview',

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Show MW API requests when debug is true

[BearND (Code Review)]

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

Change subject: Show MW API requests when debug is true
..

Show MW API requests when debug is true

To make it easier to debug backend requests I think it is useful
to see the full query string made to the MW API.
There can be tons of query parameters, and it's quite tedious to
compile them manually.
To turn this on just set the DEBUG constant in api-util.js to true
and look for "outgoing request" messages in the log file.

Change-Id: Ibd8196b98d90e0431650b4fabc56ef006af16d10
---
M lib/api-util.js
1 file changed, 11 insertions(+), 1 deletion(-)


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

diff --git a/lib/api-util.js b/lib/api-util.js
index efb4686..3d053fc 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -2,13 +2,19 @@
 
 const BBPromise = require('bluebird');
 const preq = require('preq');
+const querystring = require('querystring');
 const sUtil = require('./util');
 const Template = require('swagger-router').Template;
 const HTTPError = sUtil.HTTPError;
 
 const MAX_BATCH_SIZE = 50;
+const DEBUG = false;
 
-
+function prettyMwApiReq(request) {
+// formatting it as GET request even though we use POST requests for MW 
API,
+// just because GETs are easier to run from commandline or see it in a 
browser
+return `${request.uri}?${querystring.stringify(request.body)}`;
+}
 /**
  * Calls the MW API with the supplied query as its body
  * @param {!Object} app the application object
@@ -29,6 +35,10 @@
 }
 });
 
+if (DEBUG) {
+app.logger.log(`trace/mwApiGet`, { msg: 'outgoing request', to: 
prettyMwApiReq(request) });
+}
+
 return preq(request).then((response) => {
 if (response.status < 200 || response.status > 399) {
 // there was an error when calling the upstream service, propagate 
that

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

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

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

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Fix description

[jenkins-bot (Code Review)]

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

Change subject: Fix description
..


Fix description

Change-Id: I107772888dd112e2d937e0e3cdf1231127ba15cd
---
M blazegraph/pom.xml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 091bfe5..1acffa8 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -10,6 +10,7 @@
 jar
 
 Blazegraph extension to improve performance for Wikibase
+Code that integrates into Blazegraph and implements custom 
functions, services and mappings for WDQS data types. 
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I107772888dd112e2d937e0e3cdf1231127ba15cd
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
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]: Use namespaced version of IDatabase

[Umherirrender (Code Review)]

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

Change subject: Use namespaced version of IDatabase
..

Use namespaced version of IDatabase

Change-Id: I49c9b462d316763f90ebf5a95caa388716d6a278
---
M tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
M 
tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/402128/1

diff --git 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
index a3f3981..78207ac 100644
--- 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
+++ 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php
@@ -2,7 +2,7 @@
 
 namespace Wikimedia\Tests\Rdbms;
 
-use IDatabase;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 use PHPUnit_Framework_MockObject_MockObject;
 use Wikimedia\Rdbms\ConnectionManager;
diff --git 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
index 4e76f2a..3982ee7 100644
--- 
a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
+++ 
b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php
@@ -2,7 +2,7 @@
 
 namespace Wikimedia\Tests\Rdbms;
 
-use IDatabase;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 use PHPUnit_Framework_MockObject_MockObject;
 use Wikimedia\Rdbms\SessionConsistentConnectionManager;

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

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

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