[MediaWiki-commits] [Gerrit] integration/config[master]: Generic tests for mediawiki/skins/Amethyst

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390950 )

Change subject: Generic tests for mediawiki/skins/Amethyst
..


Generic tests for mediawiki/skins/Amethyst

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 09736ae..e5314d0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1795,6 +1795,12 @@
 postmerge:
  - mediawiki-selenium-bundle-yard-publish
 
+  - name: mediawiki/skins/Amethyst
+template:
+ - name: mwgate-composer
+ - name: mwgate-npm
+ - name: skin-tests
+
   - name: mediawiki/skins/Athena
 template:
  - name: mwgate-composer

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic501cd3682f81dffe4bd6bc2fcb58d61b049f28f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
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]: Generic tests for mediawiki/skins/Amethyst

2017-11-12 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390950 )

Change subject: Generic tests for mediawiki/skins/Amethyst
..

Generic tests for mediawiki/skins/Amethyst

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/50/390950/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 09736ae..e5314d0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1795,6 +1795,12 @@
 postmerge:
  - mediawiki-selenium-bundle-yard-publish
 
+  - name: mediawiki/skins/Amethyst
+template:
+ - name: mwgate-composer
+ - name: mwgate-npm
+ - name: skin-tests
+
   - name: mediawiki/skins/Athena
 template:
  - name: mwgate-composer

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: VectorTemplate: Some consistency in mixed PHP/HTML formatting

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390186 )

Change subject: VectorTemplate: Some consistency in mixed PHP/HTML formatting
..


VectorTemplate: Some consistency in mixed PHP/HTML formatting

Consistently do the following in this file:
* Consider '


-
data['sitenotice'] ) {
?>
@@ -137,7 +136,6 @@


msg( 'navigation-heading' ) ?>
-

renderNavigation( 'PERSONAL' ); ?>

@@ -159,16 +157,16 @@
html( 
'userlangattributes' ) ?>>
getFooterLinks() as $category => 
$links ) {
+   ?>
+   
+   
-   
-   
-   html( $link ) ?>
-   
-   
+   html( $link ) ?>
+   
+   

@@ -178,14 +176,14 @@

 
$footerIcons ) {
+   ?>
+   
+   getSkin()->makeFooterIcon( $icon );
+   }
?>
-   
-   getSkin()->makeFooterIcon( $icon );
-   }
-   ?>
-   
+   

@@ -193,7 +191,7 @@

-   
+   

printTrail(); ?>
 
@@ -266,23 +264,22 @@
 
id=''>exists() ? 
$msgObj->text() : $msg );
?>
-


+   
+$val ) {
+   echo $this->makeListItem( $key, 
$val );
+   }
+   if ( $hook !== null ) {
+   // Avoid PHP 7.1 warning
+   $skin = $this;
+   Hooks::run( $hook, [ &$skin, 
true ] );
+   }
?>
-   
-
$val ) {
-   echo 
$this->makeListItem( $key, $val );
-   }
-   if ( $hook !== null ) {
-   // Avoid PHP 7.1 warning
-   $skin = $this;
-   Hooks::run( $hook, [ 
&$skin, true ] );
-   }
-   ?>
-   
+   
html( 
'userlangattributes' ) ?>>
data['namespace_urls'] as $key => $item ) {
-   echo 
"\t\t\t\t\t\t\t" . $this->makeListItem( $key, $item, [
+   echo 
$this->makeListItem( $key, $item, [

'vector-wrap' => true,
-   ] ) . "\n";
+   ] );
}
?>

@@ -351,12 +348,11 @@



-


data['variant_urls'] as $key => $item ) {
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Change the rfcurl from protocol relative to HTTPS

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/313217 )

Change subject: Change the rfcurl from protocol relative to HTTPS
..


Change the rfcurl from protocol relative to HTTPS

http://tools.ietf.org/html/rfc redirects to https://tools.ietf.org/html/rfc

This change avoids the redirect on HTTP Wiki installations.

Change-Id: Ic00b38b04ce78178c64c13bab7f1b2e4b6c5b803
---
M languages/i18n/en.json
M tests/parser/parserTests.txt
2 files changed, 36 insertions(+), 36 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 606203b..923ab62 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2038,7 +2038,7 @@
"magiclink-tracking-pmid-desc": "This page uses PMID magic links. See 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Magic_links 
mediawiki.org] on how to migrate.",
"magiclink-tracking-isbn": "Pages using ISBN magic links",
"magiclink-tracking-isbn-desc": "This page uses ISBN magic links. See 
[https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Magic_links 
mediawiki.org] on how to migrate.",
-   "rfcurl": "//tools.ietf.org/html/rfc$1",
+   "rfcurl": "https://tools.ietf.org/html/rfc$1;,
"pubmedurl": "//www.ncbi.nlm.nih.gov/pubmed/$1?dopt=Abstract",
"specialloguserlabel": "Performer:",
"speciallogtitlelabel": "Target (title or {{ns:user}}:username for 
user):",
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 44bcdff..97bff34 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -5623,7 +5623,7 @@
 
 !! html/php
 http://[2404:130:0:1000::187:2]/index.php;>http://[2404:130:0:1000::187:2]/index.php
-Examples from RFC 2373, section 2.2:
+Examples from https://tools.ietf.org/html/rfc2373;>RFC 2373, section 2.2:
 
  http://[1080::8:800:200C:417A]/unicast;>http://[1080::8:800:200C:417A]/unicast
  http://[FF01::101]/multicast;>http://[FF01::101]/multicast
@@ -5631,7 +5631,7 @@
  http://[::]/unspecified;>http://[::]/unspecified
  http://[::13.1.68.3]/ipv4compat;>http://[::13.1.68.3]/ipv4compat
  http://[:::129.144.52.38]/ipv4compat;>http://[:::129.144.52.38]/ipv4compat
-Examples from RFC 2732, section 2:
+Examples from https://tools.ietf.org/html/rfc2732;>RFC 2732, section 2:
 
  http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html;>http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html
  http://[1080:0:0:0:8:800:200C:417A]/index.html;>http://[1080:0:0:0:8:800:200C:417A]/index.html
@@ -5644,7 +5644,7 @@
 !! html/parsoid
 http://[2404:130:0:1000::187:2]/index.php;>http://[2404:130:0:1000::187:2]/index.php
 
-Examples from RFC 
2373, section 2.2:
+Examples from https://tools.ietf.org/html/rfc2373; 
rel="mw:ExtLink">RFC 2373, section 2.2:
  http://[1080::8:800:200C:417A]/unicast;>http://[1080::8:800:200C:417A]/unicast
  http://[FF01::101]/multicast;>http://[FF01::101]/multicast
  http://[::1]/loopback;>http://[::1]/loopback
@@ -5652,7 +5652,7 @@
  http://[::13.1.68.3]/ipv4compat;>http://[::13.1.68.3]/ipv4compat
  http://[:::129.144.52.38]/ipv4compat;>http://[:::129.144.52.38]/ipv4compat
 
-Examples from RFC 
2732, section 2:
+Examples from https://tools.ietf.org/html/rfc2732; 
rel="mw:ExtLink">RFC 2732, section 2:
  http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html;>http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html
  http://[1080:0:0:0:8:800:200C:417A]/index.html;>http://[1080:0:0:0:8:800:200C:417A]/index.html
  http://[3ffe:2a00:100:7031::1];>http://[3ffe:2a00:100:7031::1]
@@ -5686,7 +5686,7 @@
 
 !! html/php
 http://[2404:130:0:1000::187:2]/index.php;>test
-Examples from RFC 2373, section 2.2:
+Examples from https://tools.ietf.org/html/rfc2373;>RFC 2373, section 2.2:
 
  http://[1080::8:800:200C:417A];>unicast
  http://[FF01::101];>multicast
@@ -5694,7 +5694,7 @@
  http://[::];>unspecified
  http://[::13.1.68.3];>ipv4compat
  http://[:::129.144.52.38];>ipv4compat
-Examples from RFC 2732, section 2:
+Examples from https://tools.ietf.org/html/rfc2732;>RFC 2732, section 2:
 
  http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html;>1
  http://[1080:0:0:0:8:800:200C:417A]/index.html;>2
@@ -5707,7 +5707,7 @@
 !! html/parsoid
 http://[2404:130:0:1000::187:2]/index.php;>test
 
-Examples from RFC 
2373, section 2.2:
+Examples from https://tools.ietf.org/html/rfc2373; 
rel="mw:ExtLink">RFC 2373, section 2.2:
  http://[1080::8:800:200C:417A];>unicast
  http://[FF01::101];>multicast
  http://[::1]/;>loopback
@@ -5715,7 +5715,7 @@
  http://[::13.1.68.3];>ipv4compat
  http://[:::129.144.52.38];>ipv4compat
 
-Examples from RFC 
2732, section 2:
+Examples from https://tools.ietf.org/html/rfc2732; 
rel="mw:ExtLink">RFC 2732, section 2:
  http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html;>1

[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Assets build - 2017-11-13 07:24:11+00:00

2017-11-12 Thread PortalsBuilder (Code Review) 
PortalsBuilder has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390949 )

Change subject: Assets build - 2017-11-13 07:24:11+00:00
..

Assets build - 2017-11-13 07:24:11+00:00

Change-Id: Ic06f46903a55f0c6cabded8427245cdc4ca5e2e7
---
M data/site-stats.json
M dev/wikipedia.org/assets/css/sprite.css
M dev/wikipedia.org/assets/css/style.css
D dev/wikipedia.org/assets/img/sprite-2b30cd2d.png
D dev/wikipedia.org/assets/img/sprite-2b30cd2d.svg
A dev/wikipedia.org/assets/img/sprite-6e35f464.png
A dev/wikipedia.org/assets/img/sprite-6e35f464.svg
A prod/wikipedia.org/assets/img/Wikinews-logo_sister.png
A prod/wikipedia.org/assets/img/wikinews-logo_sis...@2x.png
M prod/wikipedia.org/assets/img/Wikipedia-logo-v2.png
M prod/wikipedia.org/assets/img/wikipedia-logo...@1.5x.png
M prod/wikipedia.org/assets/img/wikipedia-logo...@2x.png
A prod/wikipedia.org/assets/img/sprite-6e35f464.svg
A prod/wikipedia.org/assets/l10n/ab-98e4296f.json
D prod/wikipedia.org/assets/l10n/ab-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ace-98e4296f.json
D prod/wikipedia.org/assets/l10n/ace-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/af-98e4296f.json
D prod/wikipedia.org/assets/l10n/af-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ak-98e4296f.json
D prod/wikipedia.org/assets/l10n/ak-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/als-98e4296f.json
D prod/wikipedia.org/assets/l10n/als-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/am-98e4296f.json
D prod/wikipedia.org/assets/l10n/am-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/an-98e4296f.json
D prod/wikipedia.org/assets/l10n/an-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ang-98e4296f.json
D prod/wikipedia.org/assets/l10n/ang-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ar-98e4296f.json
D prod/wikipedia.org/assets/l10n/ar-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/arc-98e4296f.json
D prod/wikipedia.org/assets/l10n/arc-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/arz-98e4296f.json
D prod/wikipedia.org/assets/l10n/arz-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/as-98e4296f.json
D prod/wikipedia.org/assets/l10n/as-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ast-98e4296f.json
D prod/wikipedia.org/assets/l10n/ast-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/av-98e4296f.json
D prod/wikipedia.org/assets/l10n/av-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ay-98e4296f.json
D prod/wikipedia.org/assets/l10n/ay-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/az-98e4296f.json
D prod/wikipedia.org/assets/l10n/az-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/azb-98e4296f.json
D prod/wikipedia.org/assets/l10n/azb-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ba-98e4296f.json
D prod/wikipedia.org/assets/l10n/ba-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bar-98e4296f.json
D prod/wikipedia.org/assets/l10n/bar-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bat-smg-98e4296f.json
D prod/wikipedia.org/assets/l10n/bat-smg-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bcl-98e4296f.json
D prod/wikipedia.org/assets/l10n/bcl-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/be-98e4296f.json
D prod/wikipedia.org/assets/l10n/be-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bg-98e4296f.json
D prod/wikipedia.org/assets/l10n/bg-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bh-98e4296f.json
D prod/wikipedia.org/assets/l10n/bh-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bi-98e4296f.json
D prod/wikipedia.org/assets/l10n/bi-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bjn-98e4296f.json
D prod/wikipedia.org/assets/l10n/bjn-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bm-98e4296f.json
D prod/wikipedia.org/assets/l10n/bm-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bn-98e4296f.json
D prod/wikipedia.org/assets/l10n/bn-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bo-98e4296f.json
D prod/wikipedia.org/assets/l10n/bo-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bpy-98e4296f.json
D prod/wikipedia.org/assets/l10n/bpy-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/br-98e4296f.json
D prod/wikipedia.org/assets/l10n/br-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bs-98e4296f.json
D prod/wikipedia.org/assets/l10n/bs-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bug-98e4296f.json
D prod/wikipedia.org/assets/l10n/bug-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bxr-98e4296f.json
D prod/wikipedia.org/assets/l10n/bxr-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ca-98e4296f.json
D prod/wikipedia.org/assets/l10n/ca-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/cbk-zam-98e4296f.json
D prod/wikipedia.org/assets/l10n/cbk-zam-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/cdo-98e4296f.json
D prod/wikipedia.org/assets/l10n/cdo-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ce-98e4296f.json
D prod/wikipedia.org/assets/l10n/ce-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ceb-98e4296f.json
D prod/wikipedia.org/assets/l10n/ceb-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ch-98e4296f.json
D

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove fonts for Malayalam from font repo

2017-11-12 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390948 )

Change subject: Remove fonts for Malayalam from font repo
..

Remove fonts for Malayalam from font repo

* I maintain these fonts in upstream and there we several releases
  since these fonts were added.
* Malayalam has better support in operating systems compared to 2012
  when these fonts were added.
* Reduce font metadata size for wikipedia pages when webfonts are
  enabled.

Change-Id: Ie5b54cc866b1c67849b094a9701b2c80d876b55f
---
D data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
D data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
D data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
D data/fontrepo/fonts/AnjaliOldLipi/font.ini
D data/fontrepo/fonts/Meera/Meera.ttf
D data/fontrepo/fonts/Meera/Meera.woff
D data/fontrepo/fonts/Meera/Meera.woff2
D data/fontrepo/fonts/Meera/font.ini
M resources/js/ext.uls.webfonts.repository.js
9 files changed, 0 insertions(+), 27 deletions(-)


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

diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
deleted file mode 100644
index 6c76fa7..000
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
deleted file mode 100644
index 835a05e..000
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2 
b/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
deleted file mode 100644
index 5feffa1..000
--- a/data/fontrepo/fonts/AnjaliOldLipi/AnjaliOldLipi.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/AnjaliOldLipi/font.ini 
b/data/fontrepo/fonts/AnjaliOldLipi/font.ini
deleted file mode 100644
index b3852fa..000
--- a/data/fontrepo/fonts/AnjaliOldLipi/font.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[AnjaliOldLipi]
-languages=ml
-version=.0.730
-license=OFL-1.1
-licensefile=OFL.txt
-url=https://sites.google.com/site/cibu/anjalioldlipi-font
diff --git a/data/fontrepo/fonts/Meera/Meera.ttf 
b/data/fontrepo/fonts/Meera/Meera.ttf
deleted file mode 100644
index c54a55b..000
--- a/data/fontrepo/fonts/Meera/Meera.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.woff 
b/data/fontrepo/fonts/Meera/Meera.woff
deleted file mode 100644
index cef8b92..000
--- a/data/fontrepo/fonts/Meera/Meera.woff
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/Meera.woff2 
b/data/fontrepo/fonts/Meera/Meera.woff2
deleted file mode 100644
index e638955..000
--- a/data/fontrepo/fonts/Meera/Meera.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Meera/font.ini 
b/data/fontrepo/fonts/Meera/font.ini
deleted file mode 100644
index 1b56134..000
--- a/data/fontrepo/fonts/Meera/font.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Meera]
-languages=ml
-version=6.0
-license=GPL-3.0.0+-with-font-exception
-licensefile=gpl-3.0.txt
-url=https://savannah.nongnu.org/projects/smc
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 97d9c96..5ed0715 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -260,11 +260,6 @@
"system",
"OpenDyslexic"
],
-   "ml": [
-   "system",
-   "AnjaliOldLipi",
-   "Meera"
-   ],
"ms": [
"system",
"ComicNeue",
@@ -467,11 +462,6 @@
"woff": "amiri/amiri-slanted.woff?7d658",
"woff2": "amiri/amiri-slanted.woff2?a90a0"
},
-   "AnjaliOldLipi": {
-   "ttf": "AnjaliOldLipi/AnjaliOldLipi.ttf?b47e8",
-   "woff": "AnjaliOldLipi/AnjaliOldLipi.woff?1f259",
-   "woff2": "AnjaliOldLipi/AnjaliOldLipi.woff2?7db63"
-   },
"Artaxerxes": {
"ttf": "Artaxerxes/Artaxerxes.ttf?79a74",
"woff": "Artaxerxes/Artaxerxes.woff?c1ed7",
@@ -671,11 +661,6 @@
"ttf": "madan/madan.ttf?a9297",
"woff": "madan/madan.woff?cee7d",
"woff2": "madan/madan.woff2?81dd1"
-   },
-   "Meera": {
-   "ttf": "Meera/Meera.ttf?8895f",
-   "woff": "Meera/Meera.woff?9e162",
-   "woff2": "Meera/Meera.woff2?b597d"
},

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Pool db1103 as rc for s2, s4

2017-11-12 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390947 )

Change subject: db-eqiad,db-codfw.php: Pool db1103 as rc for s2,s4
..

db-eqiad,db-codfw.php: Pool db1103 as rc for s2,s4

db1103 is a multi-instance slave that will serve recentchanges service
on s2 and s4.
After pooling all the codfw hosts without any issues (config-wise), it
is time to pool the first eqiad server and see how it copes and how it
serves traffic.

Bug: T178359
Change-Id: I00a1c0673653c4ff0c18cc08bc06541cb784a2d1
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 16 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index c64e691..af0fa6f 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -602,7 +602,8 @@
'db1099' => '10.64.16.84', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
'db1101' => '10.64.32.198', # do not remove or comment out
-   'db1103' => '10.64.0.164', # do not remove or comment out
+   'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out
+   'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out
'db1104' => '10.64.16.85', # do not remove or comment out
'db1105' => '10.64.32.222', # do not remove or comment out
'db1106' => '10.64.48.13', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index caea47d..998ef72 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -120,6 +120,7 @@
'db1076' => 500, # B1 3.6TB 512GB
'db1090' => 500, # C3 3.6TB 512GB
'db1101' => 1,   # C2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager, old master 2
+   'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
],
/* s3 */ 'DEFAULT' => [
'db1075' => 0,   # A2 3.6TB 512GB, master
@@ -137,7 +138,7 @@
'db1084' => 500, # B1 3.6TB 512GB
'db1091' => 500, # D2 3.6TB 512GB
'db1097' => 1,   # D1 3.6TB 512GB, api, old master
-   # 'db1103' => 0,  # A3 3.6TB 512GB, #DO NOT POOL - 
multi-instance host being built
+   'db1103:3314' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
],
's5' => [
'db1063' => 0,   # C5 2.8TB 128GB, master
@@ -289,18 +290,23 @@
],
'watchlist' => [
'db1101' => 1,
+   'db1103:3312' => 1,
],
'recentchanges' => [
'db1101' => 1,
+   'db1103:3312' => 1,
],
'recentchangeslinked' => [
'db1101' => 1,
+   'db1103:3312' => 1,
],
'contributions' => [
'db1101' => 1,
+   'db1103:3312' => 1,
],
'logpager' => [
'db1101' => 1,
+   'db1103:3312' => 1,
],
],
/* s3 */ 'DEFAULT' => [
@@ -340,22 +346,27 @@
'watchlist' => [
'db1053' => 1,
'db1056' => 1,
+   'db1103:3314' => 1,
],
'recentchanges' => [
'db1053' => 1,
'db1056' => 1,
+   'db1103:3314' => 1,
],
'recentchangeslinked' => [
'db1053' => 1,
'db1056' => 1,
+   'db1103:3314' => 1,
],
'contributions' => [
'db1053' => 1,
'db1056' => 1,
+   'db1103:3314' => 1,
],
'logpager' => [
'db1053' => 1,
'db1056' => 1,
+   'db1103:3314' => 1,
],
],
's5' => [
@@ -510,7 +521,8 @@
'db1099' => '10.64.16.84', # do not remove or comment out
'db1100' => '10.64.32.197', # do not remove or comment out
'db1101' => '10.64.32.198', # do not remove or comment out
-   'db1103' => '10.64.0.164', # do not remove or comment out
+   'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out
+   'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out
'db1104' => '10.64.16.85', # do not remove or comment out
'db1105' => '10.64.32.222', # do not remove or comment out
'db1106' => '10.64.48.13', # do not remove or comment out

-- 
To view, visit

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove Lohit family of fonts from fontrepo

2017-11-12 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390946 )

Change subject: Remove Lohit family of fonts from fontrepo
..

Remove Lohit family of fonts from fontrepo

* The languages covered by these fonts are now available in all
operating systems.
* These fonts are not updated for years in our repo
* Saves the amount of font repo data we deliver for *every wikipedia
  page* when webfonts is enabled

Change-Id: Ia0f1b6acc4cf8b7a354671bea47b58425ab8c08e
---
D data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.ttf
D data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff
D data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff2
D data/fontrepo/fonts/LohitAssamese/font.ini
D data/fontrepo/fonts/LohitBengali/Lohit-Bengali.ttf
D data/fontrepo/fonts/LohitBengali/Lohit-Bengali.woff
D data/fontrepo/fonts/LohitBengali/Lohit-Bengali.woff2
D data/fontrepo/fonts/LohitBengali/font.ini
D data/fontrepo/fonts/LohitDevanagari/Lohit-Devanagari.ttf
D data/fontrepo/fonts/LohitDevanagari/Lohit-Devanagari.woff
D data/fontrepo/fonts/LohitDevanagari/Lohit-Devanagari.woff2
D data/fontrepo/fonts/LohitDevanagari/font.ini
D data/fontrepo/fonts/LohitGujarati/Lohit-Gujarati.ttf
D data/fontrepo/fonts/LohitGujarati/Lohit-Gujarati.woff
D data/fontrepo/fonts/LohitGujarati/Lohit-Gujarati.woff2
D data/fontrepo/fonts/LohitGujarati/font.ini
D data/fontrepo/fonts/LohitKannada/Lohit-Kannada.ttf
D data/fontrepo/fonts/LohitKannada/Lohit-Kannada.woff
D data/fontrepo/fonts/LohitKannada/Lohit-Kannada.woff2
D data/fontrepo/fonts/LohitKannada/font.ini
D data/fontrepo/fonts/LohitMarathi/Lohit-Marathi.ttf
D data/fontrepo/fonts/LohitMarathi/Lohit-Marathi.woff
D data/fontrepo/fonts/LohitMarathi/Lohit-Marathi.woff2
D data/fontrepo/fonts/LohitMarathi/font.ini
D data/fontrepo/fonts/LohitNepali/Lohit-Nepali.ttf
D data/fontrepo/fonts/LohitNepali/Lohit-Nepali.woff
D data/fontrepo/fonts/LohitNepali/Lohit-Nepali.woff2
D data/fontrepo/fonts/LohitNepali/font.ini
D data/fontrepo/fonts/LohitOdia/Lohit-Odia.ttf
D data/fontrepo/fonts/LohitOdia/Lohit-Odia.woff
D data/fontrepo/fonts/LohitOdia/Lohit-Odia.woff2
D data/fontrepo/fonts/LohitOdia/font.ini
D data/fontrepo/fonts/LohitPunjabi/Lohit-Punjabi.ttf
D data/fontrepo/fonts/LohitPunjabi/Lohit-Punjabi.woff
D data/fontrepo/fonts/LohitPunjabi/Lohit-Punjabi.woff2
D data/fontrepo/fonts/LohitPunjabi/font.ini
D data/fontrepo/fonts/LohitTamil/Lohit-Tamil.ttf
D data/fontrepo/fonts/LohitTamil/Lohit-Tamil.woff
D data/fontrepo/fonts/LohitTamil/Lohit-Tamil.woff2
D data/fontrepo/fonts/LohitTamil/font.ini
D data/fontrepo/fonts/LohitTamilClassical/Lohit-Tamil-Classical.ttf
D data/fontrepo/fonts/LohitTamilClassical/Lohit-Tamil-Classical.woff
D data/fontrepo/fonts/LohitTamilClassical/Lohit-Tamil-Classical.woff2
D data/fontrepo/fonts/LohitTamilClassical/font.ini
D data/fontrepo/fonts/LohitTelugu/Lohit-Telugu.ttf
D data/fontrepo/fonts/LohitTelugu/Lohit-Telugu.woff
D data/fontrepo/fonts/LohitTelugu/Lohit-Telugu.woff2
D data/fontrepo/fonts/LohitTelugu/font.ini
M resources/js/ext.uls.webfonts.repository.js
49 files changed, 7 insertions(+), 191 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/46/390946/1

diff --git a/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.ttf 
b/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.ttf
deleted file mode 100644
index 729164e..000
--- a/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff 
b/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff
deleted file mode 100644
index 779550f..000
--- a/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff2 
b/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff2
deleted file mode 100644
index 310f586..000
--- a/data/fontrepo/fonts/LohitAssamese/Lohit-Assamese.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/LohitAssamese/font.ini 
b/data/fontrepo/fonts/LohitAssamese/font.ini
deleted file mode 100644
index 3470e87..000
--- a/data/fontrepo/fonts/LohitAssamese/font.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Lohit Assamese]
-languages=as
-version=2.5.3
-license=OFL-1.1
-licensefile=OFL.txt
-url=https://fedorahosted.org/lohit/
diff --git a/data/fontrepo/fonts/LohitBengali/Lohit-Bengali.ttf 
b/data/fontrepo/fonts/LohitBengali/Lohit-Bengali.ttf
deleted file mode 100644
index 2f537a1..000
--- a/data/fontrepo/fonts/LohitBengali/Lohit-Bengali.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/LohitBengali/Lohit-Bengali.woff 
b/data/fontrepo/fonts/LohitBengali/Lohit-Bengali.woff
deleted file mode 100644
index 1c42940..000
--- a/data/fontrepo/fonts/LohitBengali/Lohit-Bengali.woff
+++ /dev/null
Binary files differ
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove autonym font and its usage

2017-11-12 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390945 )

Change subject: Remove autonym font and its usage
..

Remove autonym font and its usage

I no longer maintains the Autonym font.
Also removes the tofu detection.

Bug: T135464
Bug: T135465
Change-Id: I103aab40ea5f5fc403a7ee5b23d1b634cc9c6ee1
---
M UniversalLanguageSelector.hooks.php
D data/fontrepo/fonts/Autonym/Autonym.ttf
D data/fontrepo/fonts/Autonym/Autonym.woff
D data/fontrepo/fonts/Autonym/Autonym.woff2
D data/fontrepo/fonts/Autonym/font.ini
M resources/js/ext.uls.webfonts.js
M resources/js/ext.uls.webfonts.repository.js
D tests/autonym.html
8 files changed, 9 insertions(+), 234 deletions(-)


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

diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 70135b4..3dc19ad 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -188,7 +188,7 @@
'uls' => [
'text' => Language::fetchLanguageName( 
$langCode ),
'href' => '#',
-   'class' => 'uls-trigger autonym',
+   'class' => 'uls-trigger',
'active' => true
]
] + $personal_urls;
diff --git a/data/fontrepo/fonts/Autonym/Autonym.ttf 
b/data/fontrepo/fonts/Autonym/Autonym.ttf
deleted file mode 100644
index 0565206..000
--- a/data/fontrepo/fonts/Autonym/Autonym.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/Autonym.woff 
b/data/fontrepo/fonts/Autonym/Autonym.woff
deleted file mode 100644
index 13b55d3..000
--- a/data/fontrepo/fonts/Autonym/Autonym.woff
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/Autonym.woff2 
b/data/fontrepo/fonts/Autonym/Autonym.woff2
deleted file mode 100644
index 32b38ce..000
--- a/data/fontrepo/fonts/Autonym/Autonym.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Autonym/font.ini 
b/data/fontrepo/fonts/Autonym/font.ini
deleted file mode 100644
index 14e9ee4..000
--- a/data/fontrepo/fonts/Autonym/font.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Autonym]
-languages=mul
-version=20131205
-license=OFL-1.1
-licensefile=OFL.txt
-url=https://github.com/santhoshtr/AutonymFont/
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index 0bf41b9..b536ee8 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -20,11 +20,7 @@
 ( function ( $, mw ) {
'use strict';
 
-   var ulsPreferences,
-   // Text to prepend the sample text. 0D00 is an unassigned 
unicode point.
-   tofuSalt = '\u0D00',
-   // cache languages with tofu.
-   tofuLanguages = {};
+   var ulsPreferences;
 
mw.webfonts = mw.webfonts || {};
ulsPreferences = mw.uls.preferences();
@@ -67,62 +63,6 @@
}
};
 
-   /**
-* Detect tofu
-*
-* Create a temporary span in the page with fontsize 72px and 
font-family
-* sans-serif for each letter of the text.
-* For each of these spans, calculate the width and height. If they are 
same
-* for all spans, we can understand that each of the letter is rendered 
using
-* same glyph - it must be a tofu.
-*
-* @param {string} text
-* @return {boolean}
-*/
-   function detectTofu( text ) {
-   var index,
-   $fixture,
-   width = {},
-   height = {},
-   length = Math.min( 4, text.length ),
-   detected = false;
-
-   if ( $.client.test( {
-   msie: false
-   } ) ) {
-   // IE shows a different tofu for unassigned code points!
-   text = tofuSalt + text;
-   }
-   $fixture = $( '' )
-   .css( {
-   fontSize: '72px',
-   fontFamily: 'sans-serif'
-   } )
-   .appendTo( 'body' );
-
-   for ( index = 0; index < length; index++ ) {
-   $fixture.text( text[ index ] );
-   width[ index ] = $fixture.width() || width[ index - 1 ];
-   height[ index ] = $fixture.height();
-
-   if ( index > 0 &&
-   ( width[ index ] !== width[ index - 1 ] ||
-   height[ index ] !== height[ index - 1 ] 
)
-   ) {
-   detected = false;
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: db1103.yaml: Enable notifications

2017-11-12 Thread Marostegui (Code Review) 
Marostegui has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390944 )

Change subject: db1103.yaml: Enable notifications
..


db1103.yaml: Enable notifications

Let's enable notifications on db1103 as I would like to pool it to serve
real traffic

Bug: T178359
Change-Id: I686c79cd0be53dcb97210960a4f4b9893fd417e2
---
M hieradata/hosts/db1103.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db1103.yaml b/hieradata/hosts/db1103.yaml
index 6181609..91782c6 100644
--- a/hieradata/hosts/db1103.yaml
+++ b/hieradata/hosts/db1103.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s2: '185G'
 profile::mariadb::core_multiinstance::s4: '185G'
-profile::base::notifications_enabled: '0'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I686c79cd0be53dcb97210960a4f4b9893fd417e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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]: db1103.yaml: Enable notifications

2017-11-12 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390944 )

Change subject: db1103.yaml: Enable notifications
..

db1103.yaml: Enable notifications

Let's enable notifications on db1103 as I would like to pool it to serve
real traffic

Bug: T178359
Change-Id: I686c79cd0be53dcb97210960a4f4b9893fd417e2
---
M hieradata/hosts/db1103.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/390944/1

diff --git a/hieradata/hosts/db1103.yaml b/hieradata/hosts/db1103.yaml
index 6181609..91782c6 100644
--- a/hieradata/hosts/db1103.yaml
+++ b/hieradata/hosts/db1103.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s2: '185G'
 profile::mariadb::core_multiinstance::s4: '185G'
-profile::base::notifications_enabled: '0'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I686c79cd0be53dcb97210960a4f4b9893fd417e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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]: db-eqiad.php: Depool db1098

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390943 )

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


db-eqiad.php: Depool db1098

Going to alter table on db1098, pool db1093 for recentchanges service

Bug: T174569
Change-Id: Ia283d0d7d5d132443bd71b04ea18fce5215d30f9
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 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 0de2d4d..caea47d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -158,8 +158,8 @@
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1085' => 300, # B3 3.6TB 512GB, api #master for db1102 
(sanitarium 3) - T153743
'db1088' => 500, # C2 3.6TB 512GB
-   'db1093' => 500, # D2 3.6TB 512GB
-   'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   'db1093' => 1, # D2 3.6TB 512GB #lower weight #T174569
+   # 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174569
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
@@ -401,19 +401,19 @@
'db1085' => 1,
],
'watchlist' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchanges' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchangeslinked' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'contributions' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'logpager' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
],
's7' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia283d0d7d5d132443bd71b04ea18fce5215d30f9
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

2017-11-12 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390943 )

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

db-eqiad.php: Depool db1098

Going to alter table on db1098, pool db1093 for recentchanges service

Bug: T174569
Change-Id: Ia283d0d7d5d132443bd71b04ea18fce5215d30f9
---
M wmf-config/db-eqiad.php
1 file changed, 7 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0de2d4d..caea47d 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -158,8 +158,8 @@
'db1030' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1085' => 300, # B3 3.6TB 512GB, api #master for db1102 
(sanitarium 3) - T153743
'db1088' => 500, # C2 3.6TB 512GB
-   'db1093' => 500, # D2 3.6TB 512GB
-   'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
+   'db1093' => 1, # D2 3.6TB 512GB #lower weight #T174569
+   # 'db1098' => 1,   # B5 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174569
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
@@ -401,19 +401,19 @@
'db1085' => 1,
],
'watchlist' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchanges' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'recentchangeslinked' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'contributions' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
'logpager' => [
-   'db1098' => 1,
+   'db1093' => 1,
],
],
's7' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia283d0d7d5d132443bd71b04ea18fce5215d30f9
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...Echo[master]: Set a default value for $reason in onUserGroupsChanged

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390851 )

Change subject: Set a default value for $reason in onUserGroupsChanged
..


Set a default value for $reason in onUserGroupsChanged

This will help avoiding errors in unit tests

Bug: T180292
Change-Id: I89e83bd66b7a976b7b5233c897d76000373a31ef
---
M Hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Hooks.php b/Hooks.php
index 71f490b..cdf0255 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -701,7 +701,7 @@
 * @return bool
 */
public static function onUserGroupsChanged( $user, $add, $remove, 
$performer,
-   $reason, array $oldUGMs = [], array $newUGMs = [] ) {
+   $reason = false, array $oldUGMs = [], array $newUGMs = [] ) {
if ( !$performer ) {
// TODO: Implement support for autopromotion
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89e83bd66b7a976b7b5233c897d76000373a31ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: api.py: Allow `:` in lagpattern

2017-11-12 Thread Dalba (Code Review) 
Dalba has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390942 )

Change subject: api.py: Allow `:` in lagpattern
..

api.py: Allow `:` in lagpattern

The hostname of lagpattern can be in `:` format.

Bug: T180313
Change-Id: I7b3d82379c8aa082e16e35cd9eaeff6cc4c41fbb
---
M pywikibot/data/api.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/42/390942/1

diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 540648d..b0f3865 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -93,7 +93,7 @@
 _logger = "data.api"
 
 lagpattern = re.compile(
-r'Waiting for [\w. ]+: (?P\d+)(?:\.\d+)? seconds? lagged')
+r'Waiting for [\w.: ]+: (?P\d+)(?:\.\d+)? seconds? lagged')
 
 
 class APIError(Error):

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Fix log spam and exception with empty message definitions

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/389481 )

Change subject: Fix log spam and exception with empty message definitions
..


Fix log spam and exception with empty message definitions

Trying to query translation memory for a message which has an empty
definition (rare but happens) resulted in an uncaught exception
and few warnings. The logical thing is to just to skip all queries
if the definition is empty and that also avoids the reported issues.
This caused all translation aids to show "Loading..." indefinitely
for those messages.

Did the same for MachineTranslation aid. Even though it was not
causing visible issues, it seemed that the CXServer backend request
was internally timing out if the definition was empty.

Bug: T166104
Change-Id: I8698cabf08f16055c45fc2e27ace5b3af54d8a0a
---
M translationaids/MachineTranslationAid.php
M translationaids/TTMServerAid.php
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/translationaids/MachineTranslationAid.php 
b/translationaids/MachineTranslationAid.php
index ecd0ab8..580ae81 100644
--- a/translationaids/MachineTranslationAid.php
+++ b/translationaids/MachineTranslationAid.php
@@ -21,6 +21,10 @@
$from = $this->group->getSourceLanguage();
$to = $this->handle->getCode();
 
+   if ( trim( $definition ) === '' ) {
+   return;
+   }
+
foreach ( $this->getWebServices( 'mt' ) as $service ) {
if ( $service->checkTranslationServiceFailure() ) {
continue;
diff --git a/translationaids/TTMServerAid.php b/translationaids/TTMServerAid.php
index 8a3de98..174e912 100644
--- a/translationaids/TTMServerAid.php
+++ b/translationaids/TTMServerAid.php
@@ -31,6 +31,10 @@
$from = $this->group->getSourceLanguage();
$to = $this->handle->getCode();
 
+   if ( trim( $text ) === '' ) {
+   return $suggestions;
+   }
+
// "Local" queries using a client can't be run in parallel with 
web services
global $wgTranslateTranslationServices;
foreach ( $wgTranslateTranslationServices as $name => $config ) 
{

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8698cabf08f16055c45fc2e27ace5b3af54d8a0a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Petar.petkovic 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Added "uploadable" support for tokens, combobox inputs

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390941 )

Change subject: Added "uploadable" support for tokens, combobox inputs
..


Added "uploadable" support for tokens, combobox inputs

Change-Id: I6f02c0e35760403c92c44a7d83cc81b275cfdc1f
---
M includes/forminputs/PF_ComboBoxInput.php
M includes/forminputs/PF_TokensInput.php
2 files changed, 46 insertions(+), 4 deletions(-)

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



diff --git a/includes/forminputs/PF_ComboBoxInput.php 
b/includes/forminputs/PF_ComboBoxInput.php
index 81843bc..0a2fc7e 100644
--- a/includes/forminputs/PF_ComboBoxInput.php
+++ b/includes/forminputs/PF_ComboBoxInput.php
@@ -83,9 +83,11 @@
list( $autocompleteSettings, $remoteDataType ) = 
self::setAutocompleteValues( $other_args );
}
 
+   $input_id = 'input_' . $wgPageFormsFieldNum;
+
$inputAttrs = array(
'type' => 'text',
-   'id' => "input_$wgPageFormsFieldNum",
+   'id' => $input_id,
'name' => $input_name,
'class' => $className,
'tabindex' => $wgPageFormsTabIndex,
@@ -111,6 +113,16 @@
}
 
$inputText = Html::rawElement( 'input', $inputAttrs);
+
+   if ( array_key_exists( 'uploadable', $other_args ) && 
$other_args['uploadable'] == true ) {
+   if ( array_key_exists( 'default filename', $other_args 
) ) {
+   $default_filename = $other_args['default 
filename'];
+   } else {
+   $default_filename = '';
+   }
+
+   $inputText .= PFTextInput::uploadableHTML( $input_id, 
$delimiter = null, $default_filename, $cur_value, $other_args );
+   }
 
$divClass = 'ui-widget';
if ( $is_mandatory ) {
@@ -165,6 +177,16 @@
'type' => 'boolean',
'description' => wfMessage( 
'pf_forminputs_existingvaluesonly' )->text()
);
+   $params[] = array(
+   'name' => 'uploadable',
+   'type' => 'boolean',
+   'description' => wfMessage( 'pf_forminputs_uploadable' 
)->text()
+   );
+   $params[] = array(
+   'name' => 'default filename',
+   'type' => 'string',
+   'description' => wfMessage( 
'pf_forminputs_defaultfilename' )->text()
+   );
return $params;
}
 
diff --git a/includes/forminputs/PF_TokensInput.php 
b/includes/forminputs/PF_TokensInput.php
index 2e860b8..e9db579 100644
--- a/includes/forminputs/PF_TokensInput.php
+++ b/includes/forminputs/PF_TokensInput.php
@@ -150,11 +150,21 @@
if ( array_key_exists( 'max values', $other_args ) ) {
$inputAttrs['maxvalues'] = $other_args['max values'];
}
-   if ( array_key_exists( 'namespace', $other_args ) ) {
-   $inputAttrs['data-namespace'] = 
$other_args['namespace'];
-   }
+   if ( array_key_exists( 'namespace', $other_args ) ) {
+   $inputAttrs['data-namespace'] = 
$other_args['namespace'];
+   }
 
$text = "\n\t" . Html::input( $input_name, $cur_value, 'text', 
$inputAttrs ) . "\n";
+
+   if ( array_key_exists( 'uploadable', $other_args ) && 
$other_args['uploadable'] == true ) {
+   if ( array_key_exists( 'default filename', $other_args 
) ) {
+   $default_filename = $other_args['default 
filename'];
+   } else {
+   $default_filename = '';
+   }
+
+   $text .= PFTextInput::uploadableHTML( $input_id, 
$delimiter, $default_filename, $cur_value, $other_args );
+   }
 
$spanClass = 'inputSpan';
if ( $is_mandatory ) {
@@ -189,6 +199,16 @@
'description' => wfMessage( 'pf_forminputs_maxvalues' 
)->text()
);
$params = array_merge( $params, 
PFTextWithAutocompleteInput::getAutocompletionParameters() );
+   $params[] = array(
+   'name' => 'uploadable',
+   'type' => 'boolean',
+   'description' => wfMessage( 'pf_forminputs_uploadable' 
)->text()
+   );
+   $params[] = array(
+   'name' => 'default filename',
+   'type' => 'string',
+   'description' => wfMessage( 
'pf_forminputs_defaultfilename'

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Added "uploadable" support for tokens, combobox inputs

2017-11-12 Thread Yaron Koren (Code Review) 
Yaron Koren has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390941 )

Change subject: Added "uploadable" support for tokens, combobox inputs
..

Added "uploadable" support for tokens, combobox inputs

Change-Id: I6f02c0e35760403c92c44a7d83cc81b275cfdc1f
---
M includes/forminputs/PF_ComboBoxInput.php
M includes/forminputs/PF_TokensInput.php
2 files changed, 46 insertions(+), 4 deletions(-)


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

diff --git a/includes/forminputs/PF_ComboBoxInput.php 
b/includes/forminputs/PF_ComboBoxInput.php
index 81843bc..0a2fc7e 100644
--- a/includes/forminputs/PF_ComboBoxInput.php
+++ b/includes/forminputs/PF_ComboBoxInput.php
@@ -83,9 +83,11 @@
list( $autocompleteSettings, $remoteDataType ) = 
self::setAutocompleteValues( $other_args );
}
 
+   $input_id = 'input_' . $wgPageFormsFieldNum;
+
$inputAttrs = array(
'type' => 'text',
-   'id' => "input_$wgPageFormsFieldNum",
+   'id' => $input_id,
'name' => $input_name,
'class' => $className,
'tabindex' => $wgPageFormsTabIndex,
@@ -111,6 +113,16 @@
}
 
$inputText = Html::rawElement( 'input', $inputAttrs);
+
+   if ( array_key_exists( 'uploadable', $other_args ) && 
$other_args['uploadable'] == true ) {
+   if ( array_key_exists( 'default filename', $other_args 
) ) {
+   $default_filename = $other_args['default 
filename'];
+   } else {
+   $default_filename = '';
+   }
+
+   $inputText .= PFTextInput::uploadableHTML( $input_id, 
$delimiter = null, $default_filename, $cur_value, $other_args );
+   }
 
$divClass = 'ui-widget';
if ( $is_mandatory ) {
@@ -165,6 +177,16 @@
'type' => 'boolean',
'description' => wfMessage( 
'pf_forminputs_existingvaluesonly' )->text()
);
+   $params[] = array(
+   'name' => 'uploadable',
+   'type' => 'boolean',
+   'description' => wfMessage( 'pf_forminputs_uploadable' 
)->text()
+   );
+   $params[] = array(
+   'name' => 'default filename',
+   'type' => 'string',
+   'description' => wfMessage( 
'pf_forminputs_defaultfilename' )->text()
+   );
return $params;
}
 
diff --git a/includes/forminputs/PF_TokensInput.php 
b/includes/forminputs/PF_TokensInput.php
index 2e860b8..e9db579 100644
--- a/includes/forminputs/PF_TokensInput.php
+++ b/includes/forminputs/PF_TokensInput.php
@@ -150,11 +150,21 @@
if ( array_key_exists( 'max values', $other_args ) ) {
$inputAttrs['maxvalues'] = $other_args['max values'];
}
-   if ( array_key_exists( 'namespace', $other_args ) ) {
-   $inputAttrs['data-namespace'] = 
$other_args['namespace'];
-   }
+   if ( array_key_exists( 'namespace', $other_args ) ) {
+   $inputAttrs['data-namespace'] = 
$other_args['namespace'];
+   }
 
$text = "\n\t" . Html::input( $input_name, $cur_value, 'text', 
$inputAttrs ) . "\n";
+
+   if ( array_key_exists( 'uploadable', $other_args ) && 
$other_args['uploadable'] == true ) {
+   if ( array_key_exists( 'default filename', $other_args 
) ) {
+   $default_filename = $other_args['default 
filename'];
+   } else {
+   $default_filename = '';
+   }
+
+   $text .= PFTextInput::uploadableHTML( $input_id, 
$delimiter, $default_filename, $cur_value, $other_args );
+   }
 
$spanClass = 'inputSpan';
if ( $is_mandatory ) {
@@ -189,6 +199,16 @@
'description' => wfMessage( 'pf_forminputs_maxvalues' 
)->text()
);
$params = array_merge( $params, 
PFTextWithAutocompleteInput::getAutocompletionParameters() );
+   $params[] = array(
+   'name' => 'uploadable',
+   'type' => 'boolean',
+   'description' => wfMessage( 'pf_forminputs_uploadable' 
)->text()
+   );
+   $params[] = array(
+   'name' => 'default filename',
+   'type' => 'string',
+   'description' => wfMessage(

[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Expose length limits to API

2017-11-12 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390940 )

Change subject: Expose length limits to API
..

Expose length limits to API

Change-Id: I705ddd3debad9c1934ef93015663a7e24c0032a4
Depends-On: I2e784972d7e11cad79fdef887bbcde297dbd9ce0
---
M src/Api/ApiReadingListsCreate.php
M src/Api/ApiReadingListsCreateEntry.php
M src/Api/ApiReadingListsUpdate.php
3 files changed, 15 insertions(+), 0 deletions(-)


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

diff --git a/src/Api/ApiReadingListsCreate.php 
b/src/Api/ApiReadingListsCreate.php
index 50dab69..f4f9925 100644
--- a/src/Api/ApiReadingListsCreate.php
+++ b/src/Api/ApiReadingListsCreate.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Extensions\ReadingLists\Api;
 
 use ApiBase;
+use MediaWiki\Extensions\ReadingLists\ReadingListRepository;
 use Message;
 
 /**
@@ -38,22 +39,27 @@
'name' => [
self::PARAM_TYPE => 'string',
self::PARAM_REQUIRED => true,
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_name'],
],
'description' => [
self::PARAM_TYPE => 'string',
self::PARAM_DFLT => '',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_description'],
],
'color' => [
self::PARAM_TYPE => 'string',
self::PARAM_DFLT => '',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_color'],
],
'image' => [
self::PARAM_TYPE => 'string',
self::PARAM_DFLT => '',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_image'],
],
'icon' => [
self::PARAM_TYPE => 'string',
self::PARAM_DFLT => '',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_icon'],
],
];
}
diff --git a/src/Api/ApiReadingListsCreateEntry.php 
b/src/Api/ApiReadingListsCreateEntry.php
index c98a837..8221f97 100644
--- a/src/Api/ApiReadingListsCreateEntry.php
+++ b/src/Api/ApiReadingListsCreateEntry.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Extensions\ReadingLists\Api;
 
 use ApiBase;
+use MediaWiki\Extensions\ReadingLists\ReadingListRepository;
 use Message;
 use Title;
 
@@ -55,10 +56,12 @@
'project' => [
self::PARAM_TYPE => 'string',
self::PARAM_REQUIRED => true,
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rle_project'],
],
'title' => [
self::PARAM_TYPE => 'string',
self::PARAM_REQUIRED => true,
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rle_title'],
],
];
}
diff --git a/src/Api/ApiReadingListsUpdate.php 
b/src/Api/ApiReadingListsUpdate.php
index 8c65e9d..8c81f3d 100644
--- a/src/Api/ApiReadingListsUpdate.php
+++ b/src/Api/ApiReadingListsUpdate.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Extensions\ReadingLists\Api;
 
 use ApiBase;
+use MediaWiki\Extensions\ReadingLists\ReadingListRepository;
 
 /**
  * API module for all write operations.
@@ -40,18 +41,23 @@
],
'name' => [
self::PARAM_TYPE => 'string',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_name'],
],
'description' => [
self::PARAM_TYPE => 'string',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_description'],
],
'color' => [
self::PARAM_TYPE => 'string',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_color'],
],
'image' => [
self::PARAM_TYPE => 'string',
+   self::PARAM_MAX_BYTES => 
ReadingListRepository::$fieldLength['rl_image'],
],
'icon' => [
self::PARAM_TYPE => 'string',
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add string length limits

2017-11-12 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390938 )

Change subject: Add string length limits
..

Add string length limits

Adds two new ApiBase::getAllowedParams() keys:
PARAM_MAX_BYTES and PARAM_MAX_CHARS, to set a length
limit for a (string-like) parameter.

This makes it easy to document and enforce database
field length limits (where relying on the database
would either result in unfriendly error messages or
silent truncation, depending on DB settings) and
also exposes them in structured form so API clients
can verify the length without doing roundtrips.

Change-Id: I2e784972d7e11cad79fdef887bbcde297dbd9ce0
---
M includes/api/ApiBase.php
M includes/api/ApiHelp.php
M includes/api/ApiParamInfo.php
M includes/api/i18n/en.json
M includes/api/i18n/qqq.json
5 files changed, 58 insertions(+), 3 deletions(-)


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

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 80aeff5..5f6583a 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -217,6 +217,18 @@
 */
const PARAM_ISMULTI_LIMIT2 = 22;
 
+   /**
+* (integer) Maximum length of a string in bytes.
+* @since 1.31
+*/
+   const PARAM_MAX_BYTES = 23;
+
+   /**
+* (integer) Maximum length of a string in characters.
+* @since 1.31
+*/
+   const PARAM_MAX_CHARS = 24;
+
/**@}*/
 
const ALL_DEFAULT_STRING = '*';
@@ -1173,9 +1185,9 @@
);
}
 
-   // More validation only when choices were not given
-   // choices were validated in parseMultiValue()
if ( isset( $value ) ) {
+   // More validation only when choices were not given
+   // choices were validated in parseMultiValue()
if ( !is_array( $type ) ) {
switch ( $type ) {
case 'NULL': // nothing to do
@@ -1285,6 +1297,23 @@
$value = array_unique( $value );
}
 
+   if ( in_array( $type, [ 'NULL', 'string', 'text', 
'password' ], true ) ) {
+   foreach ( (array)$value as $val ) {
+   if ( isset( 
$paramSettings[self::PARAM_MAX_BYTES] ) ) {
+   if ( strlen( $val ) > 
$paramSettings[self::PARAM_MAX_BYTES] ) {
+   $this->dieWithError( [ 
'apierror-maxbytes', $encParamName,
+   
$paramSettings[self::PARAM_MAX_BYTES] ] );
+   }
+   }
+   if ( isset( 
$paramSettings[self::PARAM_MAX_CHARS] ) ) {
+   if ( mb_strlen( $val, 'UTF-8' ) 
> $paramSettings[self::PARAM_MAX_CHARS] ) {
+   $this->dieWithError( [ 
'apierror-maxchars', $encParamName,
+   
$paramSettings[self::PARAM_MAX_CHARS] ] );
+   }
+   }
+   }
+   }
+
// Set a warning if a deprecated parameter has been 
passed
if ( $deprecated && $value !== false ) {
$feature = $encParamName;
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 318555a..b0ffdb2 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -528,6 +528,17 @@
->parse();
$hintPipeSeparated = 
false;
} else {
+   if ( in_array( $type, [ 
null, 'string', 'text', 'password' ], true ) ) {
+   if ( isset( 
$settings[self::PARAM_MAX_BYTES] ) ) {
+   $info[] 
= $context->msg( 'api-help-param-maxbytes' )
+   
->numParams( $settings[self::PARAM_MAX_BYTES] );
+   }
+   if ( isset( 
$settings[self::PARAM_MAX_CHARS] ) ) {
+   $info[] 
= $context->msg( 'api-help-param-maxchars' )
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Support MAX_CHARS / MAX_BYTES, somewhat

2017-11-12 Thread Code Review 
Gergő Tisza has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390939 )

Change subject: Support MAX_CHARS / MAX_BYTES, somewhat
..

Support MAX_CHARS / MAX_BYTES, somewhat

Display parameter length limits for ApiSandbox fields, and enforce
them in the widgets where OOUI supports it (that is, max characters
for non-multiline input).

Change-Id: I0f15afe6656765e92582e4e4cead714b31987b8a
---
M resources/Resources.php
M resources/src/mediawiki.special/mediawiki.special.apisandbox.js
2 files changed, 20 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/390939/1

diff --git a/resources/Resources.php b/resources/Resources.php
index 34b0836..adfea4a 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1972,6 +1972,8 @@
'api-help-param-integer-minmax',
'api-help-param-multi-separate',
'api-help-param-multi-max',
+   'api-help-param-maxbytes',
+   'api-help-param-maxchars',
'apisandbox-submit-invalid-fields-title',
'apisandbox-submit-invalid-fields-message',
'apisandbox-results',
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js 
b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index c62685a..4d11f7e 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -345,7 +345,8 @@
$.extend( widget, 
WidgetMethods.capsuleWidget );
} else {
widget = new 
OO.ui.TextInputWidget( {
-   required: Util.apiBool( 
pi.required )
+   required: Util.apiBool( 
pi.required ),
+   maxLength: pi.maxchars
} );
}
if ( !Util.apiBool( pi.multi ) ) {
@@ -362,7 +363,8 @@
 
case 'text':
widget = new 
OO.ui.MultilineTextInputWidget( {
-   required: Util.apiBool( 
pi.required )
+   required: Util.apiBool( 
pi.required ),
+   maxLength: pi.maxchars
} );
widget.paramInfo = pi;
$.extend( widget, 
WidgetMethods.textInputWidget );
@@ -372,7 +374,8 @@
case 'password':
widget = new OO.ui.TextInputWidget( {
type: 'password',
-   required: Util.apiBool( 
pi.required )
+   required: Util.apiBool( 
pi.required ),
+   maxLength: pi.maxchars
} );
widget.paramInfo = pi;
$.extend( widget, 
WidgetMethods.textInputWidget );
@@ -1601,6 +1604,18 @@
} ) );
}
}
+   if ( 'maxbytes' in 
pi.parameters[ i ] ) {
+   
descriptionContainer.append( $( '', {
+   addClass: 
'info',
+   append: 
Util.parseMsg( 'api-help-param-maxbytes', pi.parameters[ i ].maxbytes )
+   } ) );
+   }
+   if ( 'maxchars' in 
pi.parameters[ i ] ) {
+   
descriptionContainer.append( $( '', {
+   addClass: 
'info',
+   append: 
Util.parseMsg( 'api-help-param-maxchars', pi.parameters[ i ].maxchars )
+   } ) );
+   }
helpField = new 
OO.ui.FieldLayout(

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: RELEASE-NOTES-1.30: Add upgraded, added libraries based on g...

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390936 )

Change subject: RELEASE-NOTES-1.30: Add upgraded, added libraries based on git 
history
..


RELEASE-NOTES-1.30: Add upgraded, added libraries based on git history

Change-Id: I4d433f8f75cfe04638adbd60d94346f629cc2f18
---
M RELEASE-NOTES-1.30
1 file changed, 9 insertions(+), 3 deletions(-)

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



diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 3265884..1449dab 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -80,13 +80,19 @@
 === External library changes in 1.30 ===
 
  Upgraded external libraries 
-* mediawiki/mediawiki-codesniffer updated to 0.8.1.
-* wikimedia/composer-merge-plugin updated to 1.4.1.
-* Updated dev dependancy phpunit/phpunit from v4.8.35 to v4.8.36.
+* Updated justinrainbow/json-schema from v3.0 to v5.2.
+* Updated mediawiki/mediawiki-codesniffer from v0.7.2 to v0.12.0.
+* Updated wikimedia/composer-merge-plugin from v1.4.0 to v1.4.1.
+* Updated wikimedia/relpath from v1.0.3 to v2.0.0.
+* Updated OOjs from v2.0.0 to v2.1.0.
+* Updated OOUI from v0.21.1 to v0.23.0.
+* Updated QUnit from v1.23.1 to v2.4.0.
+* Updated phpunit/phpunit from v4.8.35 to v4.8.36.
 
  New external libraries 
 * The class \TestingAccessWrapper has been moved to the external library
   wikimedia/testing-access-wrapper and renamed \Wikimedia\TestingAccessWrapper.
+* Purtle, a fast, lightweight RDF generator.
 
  Removed and replaced external libraries 
 * …

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d433f8f75cfe04638adbd60d94346f629cc2f18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct R...

2017-11-12 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390937 )

Change subject: Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct 
RELEASE-NOTES
..

Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct RELEASE-NOTES

Change-Id: I034e234348755e6746fbd9755d070f10bf91303d
---
M RELEASE-NOTES-1.30
M RELEASE-NOTES-1.31
D composer.json
3 files changed, 2 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/390937/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index d92c38c..1449dab 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -87,6 +87,7 @@
 * Updated OOjs from v2.0.0 to v2.1.0.
 * Updated OOUI from v0.21.1 to v0.23.0.
 * Updated QUnit from v1.23.1 to v2.4.0.
+* Updated phpunit/phpunit from v4.8.35 to v4.8.36.
 
  New external libraries 
 * The class \TestingAccessWrapper has been moved to the external library
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 9ded68c..49bcbe4 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -24,7 +24,7 @@
 === External library changes in 1.31 ===
 
  Upgraded external libraries 
-* Updated dev dependancy phpunit/phpunit from v4.8.35 to v4.8.36.
+* …
 
  New external libraries 
 * …
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 71c9398..000
--- a/composer.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-   "name": "mediawiki/core",
-   "description": "Free software wiki application developed by the 
Wikimedia Foundation and others",
-   "keywords": ["mediawiki", "wiki"],
-   "homepage": "https://www.mediawiki.org/;,
-   "authors": [
-   {
-   "name": "MediaWiki Community",
-   "homepage": 
"https://www.mediawiki.org/wiki/Special:Version/Credits;
-   }
-   ],
-   "license": "GPL-2.0+",
-   "support": {
-   "issues": "https://bugs.mediawiki.org/;,
-   "irc": "irc://irc.freenode.net/mediawiki",
-   "wiki": "https://www.mediawiki.org/;
-   },
-   "require": {
-   "composer/semver": "1.4.2",
-   "cssjanus/cssjanus": "1.2.0",
-   "ext-ctype": "*",
-   "ext-iconv": "*",
-   "ext-json": "*",
-   "ext-mbstring": "*",
-   "ext-xml": "*",
-   "liuggio/statsd-php-client": "1.0.18",
-   "mediawiki/at-ease": "1.1.0",
-   "oojs/oojs-ui": "0.24.2",
-   "oyejorge/less.php": "1.7.0.14",
-   "php": ">=5.5.9",
-   "psr/log": "1.0.2",
-   "wikimedia/assert": "0.2.2",
-   "wikimedia/base-convert": "1.0.1",
-   "wikimedia/cdb": "1.4.1",
-   "wikimedia/cldr-plural-rule-parser": "1.0.0",
-   "wikimedia/composer-merge-plugin": "1.4.1",
-   "wikimedia/html-formatter": "1.0.1",
-   "wikimedia/ip-set": "1.1.0",
-   "wikimedia/php-session-serializer": "1.0.4",
-   "wikimedia/purtle": "1.0.6",
-   "wikimedia/relpath": "2.0.0",
-   "wikimedia/remex-html": "1.0.1",
-   "wikimedia/running-stat": "1.1.0",
-   "wikimedia/scoped-callback": "1.0.0",
-   "wikimedia/utfnormal": "1.1.0",
-   "wikimedia/timestamp": "1.0.0",
-   "wikimedia/wait-condition-loop": "1.0.1",
-   "wikimedia/wrappedstring": "2.2.0",
-   "zordius/lightncandy": "0.23"
-   },
-   "require-dev": {
-   "composer/spdx-licenses": "1.1.4",
-   "hamcrest/hamcrest-php": "^2.0",
-   "jakub-onderka/php-parallel-lint": "0.9.2",
-   "jetbrains/phpstorm-stubs": 
"dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
-   "justinrainbow/json-schema": "~5.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
-   "monolog/monolog": "~1.22.1",
-   "nikic/php-parser": "2.1.0",
-   "nmred/kafka-php": "0.1.5",
-   "phpunit/phpunit": "4.8.36",
-   "psy/psysh": "0.8.11",
-   "wikimedia/avro": "1.7.7",
-   "wikimedia/testing-access-wrapper": "~1.0",
-   "wmde/hamcrest-html-matchers": "^0.1.0"
-   },
-   "suggest": {
-   "ext-apc": "Local data and opcode cache",
-   "ext-curl": "Improved http communication abilities",
-   "ext-fileinfo": "Improved mime magic detection",
-   "ext-intl": "ICU integration",
-   "ext-wikidiff2": "Diff accelerator",
-   "monolog/monolog": "Flexible debug logging system",
-   "nmred/kafka-php": "Send debug log events to kafka",
-   "pear/mail": "Mail sending support",
-   "pear/mail_mime": "Mail sending

[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_30]: RELEASE-NOTES-1.30: Add upgraded, added libraries based on g...

2017-11-12 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390936 )

Change subject: RELEASE-NOTES-1.30: Add upgraded, added libraries based on git 
history
..

RELEASE-NOTES-1.30: Add upgraded, added libraries based on git history

Change-Id: I4d433f8f75cfe04638adbd60d94346f629cc2f18
---
M RELEASE-NOTES-1.30
1 file changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/390936/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index 3265884..1449dab 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -80,13 +80,19 @@
 === External library changes in 1.30 ===
 
  Upgraded external libraries 
-* mediawiki/mediawiki-codesniffer updated to 0.8.1.
-* wikimedia/composer-merge-plugin updated to 1.4.1.
-* Updated dev dependancy phpunit/phpunit from v4.8.35 to v4.8.36.
+* Updated justinrainbow/json-schema from v3.0 to v5.2.
+* Updated mediawiki/mediawiki-codesniffer from v0.7.2 to v0.12.0.
+* Updated wikimedia/composer-merge-plugin from v1.4.0 to v1.4.1.
+* Updated wikimedia/relpath from v1.0.3 to v2.0.0.
+* Updated OOjs from v2.0.0 to v2.1.0.
+* Updated OOUI from v0.21.1 to v0.23.0.
+* Updated QUnit from v1.23.1 to v2.4.0.
+* Updated phpunit/phpunit from v4.8.35 to v4.8.36.
 
  New external libraries 
 * The class \TestingAccessWrapper has been moved to the external library
   wikimedia/testing-access-wrapper and renamed \Wikimedia\TestingAccessWrapper.
+* Purtle, a fast, lightweight RDF generator.
 
  Removed and replaced external libraries 
 * …

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d433f8f75cfe04638adbd60d94346f629cc2f18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_30
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add BounceHandler role

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387158 )

Change subject: Add BounceHandler role
..


Add BounceHandler role

Add a role to provision the BounceHandler extension. The role also tries
to setup postfix to forward bounces to the BounceHandler api. This is
probably tricky to actually use however since the postfix server is
still configured to trap all messages inside the VM.

It would be neat to figure out how to make some set of addresses always
bounce, but there was no obvious means for that in the documentation
searches I've done so far.

Change-Id: Ia7a7443bbd70e7182909a5b7c163f16ffcf5bf43
---
M puppet/modules/postfix/manifests/init.pp
M puppet/modules/postfix/templates/main.cf.erb
A puppet/modules/role/manifests/bouncehandler.pp
A puppet/modules/role/templates/bouncehandler/aliases.erb
A puppet/modules/role/templates/bouncehandler/virtual.erb
5 files changed, 41 insertions(+), 2 deletions(-)

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



diff --git a/puppet/modules/postfix/manifests/init.pp 
b/puppet/modules/postfix/manifests/init.pp
index 9282bbb..b8f52c4 100644
--- a/puppet/modules/postfix/manifests/init.pp
+++ b/puppet/modules/postfix/manifests/init.pp
@@ -14,7 +14,7 @@
 install_options => [ '--force-yes' ],
 }
 
-package { 'postfix': }
+package { ['postfix', 'postfix-pcre']: }
 
 file { '/etc/postfix':
 ensure  => directory,
@@ -38,6 +38,13 @@
 mode=> '0444',
 }
 
+file { '/etc/postfix/aliases':
+content => '',
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+}
+
 exec { 'postmap_virtual':
 command => 'postmap /etc/postfix/virtual',
 subscribe   => File['/etc/postfix/virtual'],
diff --git a/puppet/modules/postfix/templates/main.cf.erb 
b/puppet/modules/postfix/templates/main.cf.erb
index 9ebd232..4affa00 100644
--- a/puppet/modules/postfix/templates/main.cf.erb
+++ b/puppet/modules/postfix/templates/main.cf.erb
@@ -1 +1,2 @@
-virtual_alias_maps = regexp:/etc/postfix/virtual
+alias_maps = hash:/etc/postfix/aliases
+virtual_alias_maps = pcre:/etc/postfix/virtual
diff --git a/puppet/modules/role/manifests/bouncehandler.pp 
b/puppet/modules/role/manifests/bouncehandler.pp
new file mode 100644
index 000..a65a834
--- /dev/null
+++ b/puppet/modules/role/manifests/bouncehandler.pp
@@ -0,0 +1,28 @@
+# == Class: role::bouncehandler
+# Installs the [BounceHandler][1] extension which allows wikis to handle
+# bounce emails efficiently.
+#
+# [1] https://www.mediawiki.org/wiki/Extension:BounceHandler
+#
+class role::bouncehandler {
+include ::postfix
+include ::role::mediawiki
+
+mediawiki::extension { 'BounceHandler':
+needs_update => true,
+}
+
+File<|title == '/etc/postfix/virtual'|> {
+content => template('role/bouncehandler/virtual.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+}
+File<|title == '/etc/postfix/aliases'|> {
+content => template('role/bouncehandler/aliases.erb'),
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+}
+}
+
diff --git a/puppet/modules/role/templates/bouncehandler/aliases.erb 
b/puppet/modules/role/templates/bouncehandler/aliases.erb
new file mode 100644
index 000..d933e43
--- /dev/null
+++ b/puppet/modules/role/templates/bouncehandler/aliases.erb
@@ -0,0 +1 @@
+curl_email: "|curl -d action=bouncehandler --data-urlencode email@- http://<%= 
scope['::role::mediawiki::hostname'] %>:<%= scope['::forwarded_port'] 
%>/w/api.php"
diff --git a/puppet/modules/role/templates/bouncehandler/virtual.erb 
b/puppet/modules/role/templates/bouncehandler/virtual.erb
new file mode 100644
index 000..d15d829
--- /dev/null
+++ b/puppet/modules/role/templates/bouncehandler/virtual.erb
@@ -0,0 +1,2 @@
+/wiki-[\w.]+-\w+-\w+-\w...@<%= 
scope['::role::mediawiki::hostname'] %>/  curl_email
+/.+/ vagrant

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7a7443bbd70e7182909a5b7c163f16ffcf5bf43
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
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/vagrant[master]: AntiSpoof: enable composer usage

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387157 )

Change subject: AntiSpoof: enable composer usage
..


AntiSpoof: enable composer usage

Change-Id: I94a8e97ecb3891448e55970dc9b45e14d6439d92
---
M puppet/modules/role/manifests/antispoof.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/puppet/modules/role/manifests/antispoof.pp 
b/puppet/modules/role/manifests/antispoof.pp
index b6f1006..5b501b2 100644
--- a/puppet/modules/role/manifests/antispoof.pp
+++ b/puppet/modules/role/manifests/antispoof.pp
@@ -5,6 +5,7 @@
 
 mediawiki::extension { 'AntiSpoof':
 needs_update => true,
+composer => true,
 }
 
 mediawiki::maintenance { 'populate_spoofuser':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94a8e97ecb3891448e55970dc9b45e14d6439d92
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
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]: StartProfiler.php: Add lots of documentation

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390548 )

Change subject: StartProfiler.php: Add lots of documentation
..


StartProfiler.php: Add lots of documentation

In preparation for refactoring. Also document reason for filtering by
X-Forwarded-For from commit 4a9aa480d8.

Bug: T180183
Change-Id: Id27227b23e2e6d70b34f686dcff85b882a88fe45
---
M wmf-config/HHVMRequestInit.php
M wmf-config/StartProfiler.php
2 files changed, 76 insertions(+), 22 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified
  Zoranzoki21: Looks good to me, but someone else must approve
  Ori.livneh: Looks good to me, but someone else must approve



diff --git a/wmf-config/HHVMRequestInit.php b/wmf-config/HHVMRequestInit.php
index 1919a72..e70040f 100644
--- a/wmf-config/HHVMRequestInit.php
+++ b/wmf-config/HHVMRequestInit.php
@@ -1,4 +1,6 @@
 https://wikitech.wikimedia.org/wiki/X-Wikimedia-Debug
+ */
 $XWD = false;
-
-// Parse X-Wikimedia-Header (if present) into an associative array.
 if ( isset( $_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) ) {
parse_str( preg_replace( '/; ?/', '&', 
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ), $XWD );
 }
 
 if ( ini_get( 'hhvm.stats.enable_hot_profiler' ) ) {
-   // Single-request profiling, via 'forceprofile=1' (web) or 
'--profiler=text' (CLI).
+   /**
+* 2) One-off profile to stdout
+*
+* MediaWiki's Profiler class can output raw profile data directly to 
the output
+* of a web response (web), or in stdout (CLI).
+*
+* For web: Set X-Wikimedia-Debug (to bypass cache) and query param 
'forceprofile=1'.
+* For CLI: Set CLI option '--profiler=text'.
+*
+* See https://www.mediawiki.org/wiki/Manual:Profiling
+*/
if (
( isset( $_GET['forceprofile'] ) && isset( 
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) )
|| PHP_SAPI === 'cli'
@@ -23,8 +55,16 @@
'flags'  => XHPROF_FLAGS_NO_BUILTINS,
'output' => 'text',
];
-   // If HTTP_FORCE_LOCAL_XHPROF is set in the shell environment,
-   // profile all requests from localhost.
+
+   /**
+* 3) One-off profile to /tmp
+*
+* When making requests to the local server using shell access,
+* setting the 'Force-Local-XHProf: 1' header will write raw profile 
data
+* directly to a local file in /tmp/xhprof/.
+*
+* Note: This is only allowed for requests within the same server.
+*/
} elseif (
isset( $_SERVER['HTTP_FORCE_LOCAL_XHPROF'] )
&& isset( $_SERVER['REMOTE_ADDR'] )
@@ -58,22 +98,18 @@
}
file_put_contents( '/tmp/xhprof/' . date( 
'Y-m-d\TH:i:s' ) . '.prof', $out );
} );
-   } else {
-   // 1:1000 request profiling
-
-   /*
-   $wgProfiler = array(
-   'class'=> 'ProfilerXhprof',
-   'exclude'  => array( 'section.*', 'run_init*' ),
-   'flags'=> ( XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY 
| XHPROF_FLAGS_NO_BUILTINS ),
-   'output'   => 'stats',
-   'prefix'   => 'xhprof',
-   'sampling' => 1,
-   );
-   */
}
 }
 
+/**
+ * 4) Sampling profiler for production traffic
+ *
+ * If Xenon is enabled, register a shutdown callback to ask HHVM for
+ * recently collected data. Will not end up yielding something every
+ * request.
+ *
+ * Based on https://github.com/wikimedia/arc-lamp
+ */
 if ( extension_loaded( 'xenon' ) && ini_get( 'hhvm.xenon.period' ) ) {
register_shutdown_function( function () {
$data = HH\xenon_get_data();
@@ -141,8 +177,24 @@
} );
 }
 
+/**
+ * 5) One-off profile to XHGui
+ *
+ * Set X-Wikimedia-Debug header with 'profile' attribute to instrument a web 
request
+ * with XHProf and save the profile to XHGui's MongoDB.
+ *
+ * To find the profile in XHGui, either browse "Recent", or use wgRequestId 
value
+ * from the mw.config data in the HTML web response, e.g. by running the
+ * `mw.config.get('wgRequestId')` snippet in JavaScript. Then look up as 
follows:
+ *
+ * https://performance.wikimedia.org/xhgui/?url=WShdaQpAIHwAAF9HkX4W
+ *
+ * See https://performance.wikimedia.org/xhgui/
+ * See https://wikitech.wikimedia.org/wiki/X-Wikimedia-Debug#Request_profiling
+ */
 if (
ini_get( 'hhvm.stats.enable_hot_profiler' ) &&
+   // Require X-Forwarded-For to ignore non-remote requests (e.g. PyBal)
!empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) &&
isset( $XWD['profile'] )
 ) {

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

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Replace database connection library MysqlDB with PyMySQL

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390895 )

Change subject: Replace database connection library MysqlDB with PyMySQL
..


Replace database connection library MysqlDB with PyMySQL

`MySQL-python` is a Python interface to MySQL that had not
been udpated in years. It also needs MySql installed locally,
typically resulting when trying to run locally with:
```
ImportError: libmysqlclient.so.18: cannot open shared object file: No such file 
or directory
```

`PyMySQL` is a pure-Python MySQL client library,
designed as a a drop-in replacement for `MySQLdb`.

See https://github.com/PyMySQL/PyMySQL

Change-Id: Iea3dfb6d71c196aceddb321b599b62bd6b5bec4c
---
M erfgoedbot/database_connection.py
M requirements.txt
M setup.cfg
M tests/test_database_connection.py
4 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/erfgoedbot/database_connection.py 
b/erfgoedbot/database_connection.py
index 1438e8a..be69e30 100644
--- a/erfgoedbot/database_connection.py
+++ b/erfgoedbot/database_connection.py
@@ -2,7 +2,7 @@
 
 import os
 
-import MySQLdb
+import pymysql
 import yaml
 
 from pywikibot import config as pywikibot_config
@@ -43,7 +43,7 @@
 db_config = get_monuments_database_config()
 username = db_config.get('username', pywikibot_config.db_username)
 password = db_config.get('password', pywikibot_config.db_password)
-conn = MySQLdb.connect(
+conn = pymysql.connect(
 host=db_config['server'], db=db_config['db_name'],
 user=username, passwd=password,
 use_unicode=True, charset='utf8')
@@ -55,7 +55,7 @@
 def connect_to_commons_database():
 """Connect to the commons mysql database."""
 db_config = get_commons_database_config()
-conn = MySQLdb.connect(
+conn = pymysql.connect(
 host=db_config['server'], db=db_config['db_name'],
 user=pywikibot_config.db_username, passwd=pywikibot_config.db_password,
 use_unicode=True, charset='latin1')
diff --git a/requirements.txt b/requirements.txt
index b698dc0..918e3d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 future
 pywikibot==3.0.20170403
-MySQL-python
+PyMySQL==0.7.11
 requests
 PyYAML
diff --git a/setup.cfg b/setup.cfg
index 6e52f56..fb416c4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@
 
 [isort]
 known_first_party = erfgoedbot
-known_third_party = mock,requests,MySQLdb,yaml
+known_third_party = mock,pymysql,requests,yaml
 known_pywikibot = pywikibot
 multi_line_output = 3
 sections = FUTURE,STDLIB,THIRDPARTY,PYWIKIBOT,FIRSTPARTY,LOCALFOLDER
diff --git a/tests/test_database_connection.py 
b/tests/test_database_connection.py
index 3e556cf..45bf24b 100644
--- a/tests/test_database_connection.py
+++ b/tests/test_database_connection.py
@@ -4,7 +4,7 @@
 import unittest
 
 import mock
-from MySQLdb.connections import Connection
+from pymysql.connections import Connection
 
 from erfgoedbot import database_connection
 
@@ -50,7 +50,7 @@
 self.mock_database_config = patcher.start()
 self.addCleanup(patcher.stop)
 self.mock_connection = mock.Mock(spec=Connection)
-patcher = mock.patch('erfgoedbot.database_connection.MySQLdb.connect')
+patcher = mock.patch('erfgoedbot.database_connection.pymysql.connect')
 self.mock_connect = patcher.start()
 self.mock_connect.return_value = self.mock_connection
 self.addCleanup(patcher.stop)
@@ -97,7 +97,7 @@
 }
 self.addCleanup(patcher.stop)
 self.mock_connection = mock.Mock(spec=Connection)
-patcher = mock.patch('erfgoedbot.database_connection.MySQLdb.connect')
+patcher = mock.patch('erfgoedbot.database_connection.pymysql.connect')
 self.mock_connect = patcher.start()
 self.mock_connect.return_value = self.mock_connection
 self.addCleanup(patcher.stop)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea3dfb6d71c196aceddb321b599b62bd6b5bec4c
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 
Gerrit-Reviewer: Lokal Profil 
Gerrit-Reviewer: Multichill 
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]: Bump dictionary version

2017-11-12 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390897 )

Change subject: Bump dictionary version
..

Bump dictionary version

Change-Id: Ic71b6554dc1d4ba74f220565a308740640f14242
---
M dist/src/script/default.properties
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/dist/src/script/default.properties 
b/dist/src/script/default.properties
index aedf2be..bf3a91d 100644
--- a/dist/src/script/default.properties
+++ b/dist/src/script/default.properties
@@ -7,7 +7,7 @@
 com.bigdata.rdf.store.AbstractTripleStore.justify=false
 com.bigdata.rdf.sail.isolatableIndices=false
 com.bigdata.rdf.store.AbstractTripleStore.geoSpatial=false
-com.bigdata.rdf.store.AbstractTripleStore.vocabularyClass=org.wikidata.query.rdf.blazegraph.WikibaseVocabulary$V002
+com.bigdata.rdf.store.AbstractTripleStore.vocabularyClass=org.wikidata.query.rdf.blazegraph.WikibaseVocabulary$V003
 
com.bigdata.rdf.store.AbstractTripleStore.inlineURIFactory=org.wikidata.query.rdf.blazegraph.WikibaseInlineUriFactory
 
com.bigdata.rdf.store.AbstractTripleStore.extensionFactoryClass=org.wikidata.query.rdf.blazegraph.WikibaseExtensionFactory
 com.bigdata.btree.writeRetentionQueue.capacity=4000

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic71b6554dc1d4ba74f220565a308740640f14242
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/core[master]: Let Html::element do the HTML encoding

2017-11-12 Thread Fomafix (Code Review) 
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390896 )

Change subject: Let Html::element do the HTML encoding
..

Let Html::element do the HTML encoding

Change-Id: I6d9063af3f4ff0a6d70f3ebbce8362122d5bb06a
---
M includes/Linker.php
M includes/installer/WebInstaller.php
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/96/390896/1

diff --git a/includes/Linker.php b/includes/Linker.php
index 403b10a..29584ce 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -721,9 +721,11 @@
 
$href = self::getUploadUrl( $title, $query );
 
-   return '' .
-   $encLabel . '';
+   return Html::element( 'a', [
+   'href' => $href,
+   'class' => 'new',
+   'title' => $title->getPrefixedText()
+   ], $label );
}
 
return self::link( $title, $encLabel, [], wfCgiToArray( $query 
), [ 'known', 'noclasses' ] );
diff --git a/includes/installer/WebInstaller.php 
b/includes/installer/WebInstaller.php
index e0e54c8..b65e85e 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1132,9 +1132,7 @@
public function docLink( $linkText, $attribs, $parser ) {
$url = $this->getDocUrl( $attribs['href'] );
 
-   return '' .
-   htmlspecialchars( $linkText ) .
-   '';
+   return Html::element( 'a', [ 'href' => $url ], $linkText );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...InterwikiMagic[refs/meta/config]: Archive the InterwikiMagic extension

2017-11-12 Thread Legoktm (Code Review) 
Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390894 )

Change subject: Archive the InterwikiMagic extension
..


Archive the InterwikiMagic extension

Bug: T180295
Change-Id: Iced14cb3dec32eed48b058776a6450c40b65167e
---
M project.config
1 file changed, 2 insertions(+), 4 deletions(-)

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



diff --git a/project.config b/project.config
index b55a44c..6167672 100644
--- a/project.config
+++ b/project.config
@@ -1,8 +1,6 @@
 [project]
-   description = "[ARCHIVED] This extension is now obsolete, as it has 
been integrated into the Interwiki extension; see bug #68241 and 
gerrit:147755."\n\
-\n\
-ShoutWiki Interwiki Magic is a MediaWiki extension that fetches interwiki 
links (as opposed to interlanguage links) from $wgSharedDB while still fetching 
interlanguge links from the local database.
-[access]
+   state = Read Only
+   description = [ARCHIVED] MediaWiki extension ShoutWiki Interwiki Magic
inheritFrom = mediawiki/extensions
 [receive]
requireChangeId = true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iced14cb3dec32eed48b058776a6450c40b65167e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/InterwikiMagic
Gerrit-Branch: refs/meta/config
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] labs...heritage[master]: Replace database connection library MysqlDB with PyMySQL

2017-11-12 Thread Code Review 
Jean-Frédéric has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390895 )

Change subject: Replace database connection library MysqlDB with PyMySQL
..

Replace database connection library MysqlDB with PyMySQL

`MySQL-python` is a Python interface to MySQL that had not
been udpated in years. It also needs MySql installed locally,
typically resulting when trying to run locally with:
```
ImportError: libmysqlclient.so.18: cannot open shared object file: No such file 
or directory
```

`PyMySQL` is a pure-Python MySQL client library,
designed as a a drop-in replacement for `MySQLdb`.

See https://github.com/PyMySQL/PyMySQL

Change-Id: Iea3dfb6d71c196aceddb321b599b62bd6b5bec4c
---
M erfgoedbot/database_connection.py
M requirements.txt
M setup.cfg
M tests/test_database_connection.py
4 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage 
refs/changes/95/390895/1

diff --git a/erfgoedbot/database_connection.py 
b/erfgoedbot/database_connection.py
index 1438e8a..be69e30 100644
--- a/erfgoedbot/database_connection.py
+++ b/erfgoedbot/database_connection.py
@@ -2,7 +2,7 @@
 
 import os
 
-import MySQLdb
+import pymysql
 import yaml
 
 from pywikibot import config as pywikibot_config
@@ -43,7 +43,7 @@
 db_config = get_monuments_database_config()
 username = db_config.get('username', pywikibot_config.db_username)
 password = db_config.get('password', pywikibot_config.db_password)
-conn = MySQLdb.connect(
+conn = pymysql.connect(
 host=db_config['server'], db=db_config['db_name'],
 user=username, passwd=password,
 use_unicode=True, charset='utf8')
@@ -55,7 +55,7 @@
 def connect_to_commons_database():
 """Connect to the commons mysql database."""
 db_config = get_commons_database_config()
-conn = MySQLdb.connect(
+conn = pymysql.connect(
 host=db_config['server'], db=db_config['db_name'],
 user=pywikibot_config.db_username, passwd=pywikibot_config.db_password,
 use_unicode=True, charset='latin1')
diff --git a/requirements.txt b/requirements.txt
index b698dc0..918e3d1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 future
 pywikibot==3.0.20170403
-MySQL-python
+PyMySQL==0.7.11
 requests
 PyYAML
diff --git a/setup.cfg b/setup.cfg
index 6e52f56..fb416c4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@
 
 [isort]
 known_first_party = erfgoedbot
-known_third_party = mock,requests,MySQLdb,yaml
+known_third_party = mock,pymysql,requests,yaml
 known_pywikibot = pywikibot
 multi_line_output = 3
 sections = FUTURE,STDLIB,THIRDPARTY,PYWIKIBOT,FIRSTPARTY,LOCALFOLDER
diff --git a/tests/test_database_connection.py 
b/tests/test_database_connection.py
index 3e556cf..45bf24b 100644
--- a/tests/test_database_connection.py
+++ b/tests/test_database_connection.py
@@ -4,7 +4,7 @@
 import unittest
 
 import mock
-from MySQLdb.connections import Connection
+from pymysql.connections import Connection
 
 from erfgoedbot import database_connection
 
@@ -50,7 +50,7 @@
 self.mock_database_config = patcher.start()
 self.addCleanup(patcher.stop)
 self.mock_connection = mock.Mock(spec=Connection)
-patcher = mock.patch('erfgoedbot.database_connection.MySQLdb.connect')
+patcher = mock.patch('erfgoedbot.database_connection.pymysql.connect')
 self.mock_connect = patcher.start()
 self.mock_connect.return_value = self.mock_connection
 self.addCleanup(patcher.stop)
@@ -97,7 +97,7 @@
 }
 self.addCleanup(patcher.stop)
 self.mock_connection = mock.Mock(spec=Connection)
-patcher = mock.patch('erfgoedbot.database_connection.MySQLdb.connect')
+patcher = mock.patch('erfgoedbot.database_connection.pymysql.connect')
 self.mock_connect = patcher.start()
 self.mock_connect.return_value = self.mock_connection
 self.addCleanup(patcher.stop)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea3dfb6d71c196aceddb321b599b62bd6b5bec4c
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric 

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

[MediaWiki-commits] [Gerrit] mediawiki...InterwikiMagic[refs/meta/config]: Archive the InterwikiMagic extension

2017-11-12 Thread MarcoAurelio (Code Review) 
MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390894 )

Change subject: Archive the InterwikiMagic extension
..

Archive the InterwikiMagic extension

Bug: T180295
Change-Id: Iced14cb3dec32eed48b058776a6450c40b65167e
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiMagic 
refs/changes/94/390894/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iced14cb3dec32eed48b058776a6450c40b65167e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiMagic
Gerrit-Branch: refs/meta/config
Gerrit-Owner: MarcoAurelio 

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

[MediaWiki-commits] [Gerrit] mediawiki...InterwikiMagic[master]: Archive the InterwikiMagic extension

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390893 )

Change subject: Archive the InterwikiMagic extension
..


Archive the InterwikiMagic extension

Bug: T180295
Change-Id: If251eac79931e6125c3c41ab56296d86628299e7
---
A ARCHIVED
D CODE_OF_CONDUCT.md
D InterwikiMagic.php
3 files changed, 3 insertions(+), 68 deletions(-)

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



diff --git a/ARCHIVED b/ARCHIVED
new file mode 100644
index 000..c6283f2
--- /dev/null
+++ b/ARCHIVED
@@ -0,0 +1,3 @@
+The functionality of the InterwikiMagic extension was merged into the 
Interwiki extension in
+September 2014 and therefore this extension has become obsolete and has been 
archived. See
+ for more details.
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index d8e5d08..000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1 +0,0 @@
-The development of this software is covered by a [Code of 
Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
diff --git a/InterwikiMagic.php b/InterwikiMagic.php
deleted file mode 100644
index e6bdd79..000
--- a/InterwikiMagic.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- * @license http://en.wikipedia.org/wiki/Public_domain Public domain
- * @link http://www.mediawiki.org/wiki/Extension:ShoutWiki_Interwiki_Magic 
Documentation
- * @see http://bugzilla.shoutwiki.com/show_bug.cgi?id=12
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( "This is not a valid entry point to MediaWiki.\n" );
-}
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['other'][] = array(
-   'name' => 'ShoutWiki Interwiki Magic',
-   'version' => '1.0',
-   'author' => 'Jack Phoenix',
-   'description' => 'Handle global interwikis and local interlanguage 
links',
-   'url' => 
'https://www.mediawiki.org/wiki/Extension:ShoutWiki_Interwiki_Magic',
-);
-
-// This hook was added in r84173, on 17:51, 17 March 2011
-$wgHooks['InterwikiLoadPrefix'][] = 'wfShoutWikiInterwikiMagic';
-
-/**
- * This function does all the magic for non-language interwikis, i.e. stuff
- * that is /not/ something like "en", "fr", etc.
- *
- * @param $prefix String: interwiki prefix we are looking for
- * @param $iwData Array: output array describing the interwiki with keys
- *   iw_url, iw_local, iw_trans and optionally iw_api and
- *   iw_wikiid.
- * @return Boolean: true by default, false when fetching interwikis from the
- *  shared database ($wgSharedDB)
- */
-function wfShoutWikiInterwikiMagic( $prefix, &$iwData ) {
-   global $wgContLang, $wgSharedDB;
-
-   $inLanguage = $wgContLang->getCode();
-   if( !Language::fetchLanguageName( $prefix, $inLanguage ) ) {
-   $dbr = wfGetDB( DB_SLAVE, array(), $wgSharedDB );
-   $res = $dbr->select(
-   'interwiki',
-   '*',
-   array( 'iw_prefix' => $prefix ),
-   __METHOD__
-   );
-   $iwData = $dbr->fetchRow( $res );
-   // docs/hooks.txt says: Return true without providing an 
interwiki to
-   // continue interwiki search.
-   // At this point, we can safely return false because we know 
that we
-   // have something
-   return false;
-   }
-   return true;
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If251eac79931e6125c3c41ab56296d86628299e7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/InterwikiMagic
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AntiSpoof[master]: Enable Composer autoloading

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390892 )

Change subject: Enable Composer autoloading
..


Enable Composer autoloading

Per :
> If an extension or skin has library dependencies, it may have
> a composer.json file as well, see Manual:Composer.json best practices.
> Use the load_composer_autoloader field to make MediaWiki use
> Composer's autoloading when appropriate.

Among other things, this makes the extension work correctly with
MediaWiki-Vagrant.

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

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



diff --git a/extension.json b/extension.json
index b7d46d7..2454207 100644
--- a/extension.json
+++ b/extension.json
@@ -62,5 +62,6 @@
"\uFF0F"
]
},
+   "load_composer_autoloader": true,
"manifest_version": 1
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8237825881b7ce12707cc754a34e96b7f3dad8dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
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...InterwikiMagic[master]: Archive the InterwikiMagic extension

2017-11-12 Thread MarcoAurelio (Code Review) 
MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390893 )

Change subject: Archive the InterwikiMagic extension
..

Archive the InterwikiMagic extension

Bug: T180295
Change-Id: If251eac79931e6125c3c41ab56296d86628299e7
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InterwikiMagic 
refs/changes/93/390893/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If251eac79931e6125c3c41ab56296d86628299e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiMagic
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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]: Document language changes for Mirandese

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390874 )

Change subject: Document language changes for Mirandese
..


Document language changes for Mirandese

Bug: T180052
Change-Id: I60d809145678a2cd523776ba8e981da21f6e3ef9
---
M RELEASE-NOTES-1.31
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 026de58..9ded68c 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -55,7 +55,7 @@
 regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Phabricator reports.
 
-* …
+* (T180052) Mirandese (mwl) now supports gendered NS_USER/NS_USER_TALK 
namespaces.
 
 === Other changes in 1.31 ===
 * MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60d809145678a2cd523776ba8e981da21f6e3ef9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
Gerrit-Reviewer: Legoktm 
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] mediawiki...AntiSpoof[master]: Enable Composer autoloading

2017-11-12 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390892 )

Change subject: Enable Composer autoloading
..

Enable Composer autoloading

Per :
> If an extension or skin has library dependencies, it may have
> a composer.json file as well, see Manual:Composer.json best practices.
> Use the load_composer_autoloader field to make MediaWiki use
> Composer's autoloading when appropriate.

Among other things, this makes the extension work correctly with
MediaWiki-Vagrant.

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


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

diff --git a/extension.json b/extension.json
index b7d46d7..2454207 100644
--- a/extension.json
+++ b/extension.json
@@ -62,5 +62,6 @@
"\uFF0F"
]
},
+   "load_composer_autoloader": true,
"manifest_version": 1
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Bouquet[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390888 )

Change subject: Remove redundant SocialProfile profile background colors styles
..


Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: I9ce4c95d92b0554294d6e3e196f8ea81ee8101fb
---
M resources/style.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/resources/style.css b/resources/style.css
index c674549..068911e 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -859,11 +859,6 @@
 }
 
 /** CSS fixes for social tools -- verbatim copypasta from 
/skins/Dusk/resources/css/main.css */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /* Special:GiveGift */
 div.g-give-container {
width: auto;
diff --git a/skin.json b/skin.json
index afd7d05..9e1edc5 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Bouquet",
-   "version": "1.3.1",
+   "version": "1.3.2",
"author": [
"[http://automattic.com Automattic]",
"Jack Phoenix",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ce4c95d92b0554294d6e3e196f8ea81ee8101fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Bouquet
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...webplatform[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390890 )

Change subject: Remove redundant SocialProfile profile background colors styles
..


Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: Ide57c3d4f5ac592dcd644009db964dcdefab3cba
---
M skin.json
M webplatform/screen.css
2 files changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/skin.json b/skin.json
index 695ad47..69c838f 100644
--- a/skin.json
+++ b/skin.json
@@ -10,7 +10,7 @@
],
"url": "https://www.mediawiki.org/wiki/Skin:WebPlatform;,
"descriptionmsg": "webplatform-desc",
-   "version": "1.2.0",
+   "version": "1.2.1",
"type": "skin",
"ValidSkinNames": {
"webplatform": "WebPlatform"
diff --git a/webplatform/screen.css b/webplatform/screen.css
index dddb7d8..a5713a9 100644
--- a/webplatform/screen.css
+++ b/webplatform/screen.css
@@ -386,10 +386,6 @@
clear: left !important;
 }
 
-.profile-info {
-   background: transparent !important;
-}
-
 #editform,
 #toolbar,
 #wpTextbox1 {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide57c3d4f5ac592dcd644009db964dcdefab3cba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/webplatform
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...webplatform[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390890 )

Change subject: Remove redundant SocialProfile profile background colors styles
..

Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: Ide57c3d4f5ac592dcd644009db964dcdefab3cba
---
M skin.json
M webplatform/screen.css
2 files changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/webplatform 
refs/changes/90/390890/1

diff --git a/skin.json b/skin.json
index 695ad47..69c838f 100644
--- a/skin.json
+++ b/skin.json
@@ -10,7 +10,7 @@
],
"url": "https://www.mediawiki.org/wiki/Skin:WebPlatform;,
"descriptionmsg": "webplatform-desc",
-   "version": "1.2.0",
+   "version": "1.2.1",
"type": "skin",
"ValidSkinNames": {
"webplatform": "WebPlatform"
diff --git a/webplatform/screen.css b/webplatform/screen.css
index dddb7d8..a5713a9 100644
--- a/webplatform/screen.css
+++ b/webplatform/screen.css
@@ -386,10 +386,6 @@
clear: left !important;
 }
 
-.profile-info {
-   background: transparent !important;
-}
-
 #editform,
 #toolbar,
 #wpTextbox1 {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide57c3d4f5ac592dcd644009db964dcdefab3cba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/webplatform
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Dusk[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390884 )

Change subject: Remove redundant SocialProfile profile background colors styles
..


Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: I5df630e10614ee1fc705e27ecf2dc6992b3cf702
---
M resources/css/main.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/resources/css/main.css b/resources/css/main.css
index 8ad8f7e..1aba7fd 100644
--- a/resources/css/main.css
+++ b/resources/css/main.css
@@ -379,11 +379,6 @@
 }
 
 /** CSS fixes for social tools */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /* Special:GiveGift */
 div.g-give-container {
width: auto;
diff --git a/skin.json b/skin.json
index 1f75bf7..cfc822e 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Dusk",
-   "version": "3.3.1",
+   "version": "3.3.2",
"author": [
"Gregory S. Hayes",
"Becca Wei",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5df630e10614ee1fc705e27ecf2dc6992b3cf702
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Dusk
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390887 )

Change subject: Remove redundant SocialProfile profile background colors styles
..


Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: Ia521bb7cdf3dcce50db33fc79ac80c29859de207
---
M resources/css/style.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/resources/css/style.css b/resources/css/style.css
index f6f174b..3bb09f2 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -945,11 +945,6 @@
 }
 
 /** CSS fixes for social tools -- verbatim copypasta from 
/skins/Dusk/resources/css/main.css */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /** PollNY */
 div.create-poll-top {
background-color: transparent;
diff --git a/skin.json b/skin.json
index 32e713e..503b485 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Gamepress",
-   "version": "1.2.1",
+   "version": "1.2.2",
"author": [
"[http://webtuts.pl/themes/ Aleksandra Łączek]",
"Jack Phoenix",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia521bb7cdf3dcce50db33fc79ac80c29859de207
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390885 )

Change subject: Remove redundant SocialProfile profile background colors styles
..


Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: I2c5dd249169d92129a4ccbd8110eb8d8a5231376
---
M resources/style.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/resources/style.css b/resources/style.css
index 273c6c8..136259d 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -708,11 +708,6 @@
 }
 
 /** CSS fixes for social tools -- verbatim copypasta from 
/skins/Dusk/resources/css/main.css */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /* Special:GiveGift */
 div.g-give-container {
width: auto;
diff --git a/skin.json b/skin.json
index bec5b2e..ffd7653 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Dusk To Dawn",
-   "version": "1.4.0",
+   "version": "1.4.1",
"author": [
"[http://automattic.com/ Automattic]",
"Jack Phoenix",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c5dd249169d92129a4ccbd8110eb8d8a5231376
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DuskToDawn
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Update the blockrange message in AbuseFilter, remove "/16" f...

2017-11-12 Thread Huji (Code Review) 
Huji has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390889 )

Change subject: Update the blockrange message in AbuseFilter, remove "/16" from 
it
..

Update the blockrange message in AbuseFilter, remove "/16" from it

This should have really been done as part of I8dfa17f55 but it's
never too late!

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


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

diff --git a/i18n/en.json b/i18n/en.json
index df36d71..757e6f6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -158,7 +158,7 @@
"abusefilter-edit-action-degroup": "Remove the user from all privileged 
groups",
"abusefilter-edit-action-block": "Block the user and/or IP address from 
editing",
"abusefilter-edit-action-throttle": "Trigger actions only if the user 
trips a rate limit",
-   "abusefilter-edit-action-rangeblock": "Block the /16 range from which 
the user originates",
+   "abusefilter-edit-action-rangeblock": "Block the respective IP range 
from which the user originates",
"abusefilter-edit-action-tag": "Tag the edit for further review",
"abusefilter-edit-throttle-count": "Number of actions to allow:",
"abusefilter-edit-throttle-period": "Period of time:",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I833df28634835c675944e3a20e123b5739e05205
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Huji 

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

[MediaWiki-commits] [Gerrit] mediawiki...Bouquet[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390888 )

Change subject: Remove redundant SocialProfile profile background colors styles
..

Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: I9ce4c95d92b0554294d6e3e196f8ea81ee8101fb
---
M resources/style.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Bouquet 
refs/changes/88/390888/1

diff --git a/resources/style.css b/resources/style.css
index c674549..068911e 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -859,11 +859,6 @@
 }
 
 /** CSS fixes for social tools -- verbatim copypasta from 
/skins/Dusk/resources/css/main.css */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /* Special:GiveGift */
 div.g-give-container {
width: auto;
diff --git a/skin.json b/skin.json
index afd7d05..9e1edc5 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Bouquet",
-   "version": "1.3.1",
+   "version": "1.3.2",
"author": [
"[http://automattic.com Automattic]",
"Jack Phoenix",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ce4c95d92b0554294d6e3e196f8ea81ee8101fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Bouquet
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390887 )

Change subject: Remove redundant SocialProfile profile background colors styles
..

Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: Ia521bb7cdf3dcce50db33fc79ac80c29859de207
---
M resources/css/style.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress 
refs/changes/87/390887/1

diff --git a/resources/css/style.css b/resources/css/style.css
index f6f174b..3bb09f2 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -945,11 +945,6 @@
 }
 
 /** CSS fixes for social tools -- verbatim copypasta from 
/skins/Dusk/resources/css/main.css */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /** PollNY */
 div.create-poll-top {
background-color: transparent;
diff --git a/skin.json b/skin.json
index 32e713e..503b485 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Gamepress",
-   "version": "1.2.1",
+   "version": "1.2.2",
"author": [
"[http://webtuts.pl/themes/ Aleksandra Łączek]",
"Jack Phoenix",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia521bb7cdf3dcce50db33fc79ac80c29859de207
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Gamepress
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Introduces IndexForPageLookup

2017-11-12 Thread Tpt (Code Review) 
Tpt has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390886 )

Change subject: Introduces IndexForPageLookup
..

Introduces IndexForPageLookup

Change-Id: I3cea1f364e36c1809a76579f64bbb83b900b0284
---
M ProofreadPage.body.php
M extension.json
M includes/Context.php
M includes/Pagination/FilePagination.php
M includes/Pagination/PaginationFactory.php
A includes/page/DatabaseIndexForPageLookup.php
A includes/page/IndexForPageLookup.php
M includes/page/PageContentBuilder.php
M includes/page/PageDisplayHandler.php
M includes/page/ProofreadPagePage.php
M tests/phpunit/ContextTest.php
M tests/phpunit/Pagination/FilePaginationTest.php
M tests/phpunit/Pagination/PagePaginationTest.php
M tests/phpunit/Pagination/PaginationFactoryTest.php
M tests/phpunit/ProofreadPageTestCase.php
A tests/phpunit/page/DatabaseIndexForPageLookupTest.php
A tests/phpunit/page/IndexForPageLookupMock.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageDisplayHandlerTest.php
M tests/phpunit/page/ProofreadPagePageTest.php
20 files changed, 346 insertions(+), 190 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/86/390886/1

diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 2b78412..c771bed 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -741,8 +741,8 @@
}
 
// Prev, Next and Index links
-   $indexPage = $page->getIndex();
-   if ( $indexPage ) {
+   $indexPage = 
Context::getDefaultContext()->getIndexForPageLookup()->getIndexForPage( $page );
+   if ( $indexPage !== null ) {
$pagination = Context::getDefaultContext()

->getPaginationFactory()->getPaginationForIndexPage( $indexPage );
try {
diff --git a/extension.json b/extension.json
index 30fff6c..ae1ab61 100644
--- a/extension.json
+++ b/extension.json
@@ -82,6 +82,8 @@
"ProofreadPage\\Page\\PageViewAction": 
"includes/page/PageViewAction.php",
"ProofreadPage\\Page\\PageDifferenceEngine": 
"includes/page/PageDifferenceEngine.php",
"ProofreadPage\\Page\\PageDisplayHandler": 
"includes/page/PageDisplayHandler.php",
+   "ProofreadPage\\Page\\IndexForPageLookup": 
"includes/page/IndexForPageLookup.php",
+   "ProofreadPage\\Page\\DatabaseIndexForPageLookup": 
"includes/page/DatabaseIndexForPageLookup.php",
"ProofreadPage\\Parser\\ParserEntryPoint": 
"includes/Parser/ParserEntryPoint.php",
"ProofreadPage\\Parser\\TagParser": 
"includes/Parser/TagParser.php",
"ProofreadPage\\Parser\\PagelistTagParser": 
"includes/Parser/PagelistTagParser.php",
@@ -92,6 +94,7 @@
"ApiQueryProofread": "ApiQueryProofread.php",
"ApiQueryProofreadInfo": "ApiQueryProofreadInfo.php",
"ProofreadPage\\FileProviderMock": 
"tests/phpunit/FileProviderMock.php",
+   "ProofreadPage\\Page\\IndexForPageLookupMock": 
"tests/phpunit/page/IndexForPageLookupMock.php",
"ProofreadPageTestCase": 
"tests/phpunit/ProofreadPageTestCase.php",
"FixProofreadPagePagesContentModel": 
"maintenance/fixProofreadPagePagesContentModel.php",
"FixProofreadIndexPagesContentModel": 
"maintenance/fixProofreadIndexPagesContentModel.php"
diff --git a/includes/Context.php b/includes/Context.php
index 0bbd60d..4644bfb 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -3,6 +3,8 @@
 namespace ProofreadPage;
 
 use ProofreadPage\Index\CustomIndexFieldsParser;
+use ProofreadPage\Page\DatabaseIndexForPageLookup;
+use ProofreadPage\Page\IndexForPageLookup;
 use ProofreadPage\Pagination\PaginationFactory;
 use RepoGroup;
 
@@ -38,19 +40,26 @@
private $customIndexFieldsParser;
 
/**
+* @var IndexForPageLookup
+*/
+   private $indexForPageLookup;
+
+   /**
 * @param int $pageNamespaceId
 * @param int $indexNamespaceId
 * @param FileProvider $fileProvider
 * @param CustomIndexFieldsParser $customIndexFieldsParser
+* @param IndexForPageLookup $indexForPageLookup
 */
public function __construct(
$pageNamespaceId, $indexNamespaceId, FileProvider $fileProvider,
-   CustomIndexFieldsParser $customIndexFieldsParser
+   CustomIndexFieldsParser $customIndexFieldsParser, 
IndexForPageLookup $indexForPageLookup
) {
$this->pageNamespaceId = $pageNamespaceId;
$this->indexNamespaceId = $indexNamespaceId;
$this->fileProvider = $fileProvider;
$this->customIndexFieldsParser = $customIndexFieldsParser;
+   $this->indexForPageLookup = $indexForPageLookup;
}

[MediaWiki-commits] [Gerrit] mediawiki...DuskToDawn[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390885 )

Change subject: Remove redundant SocialProfile profile background colors styles
..

Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: I2c5dd249169d92129a4ccbd8110eb8d8a5231376
---
M resources/style.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn 
refs/changes/85/390885/1

diff --git a/resources/style.css b/resources/style.css
index 273c6c8..136259d 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -708,11 +708,6 @@
 }
 
 /** CSS fixes for social tools -- verbatim copypasta from 
/skins/Dusk/resources/css/main.css */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /* Special:GiveGift */
 div.g-give-container {
width: auto;
diff --git a/skin.json b/skin.json
index bec5b2e..ffd7653 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Dusk To Dawn",
-   "version": "1.4.0",
+   "version": "1.4.1",
"author": [
"[http://automattic.com/ Automattic]",
"Jack Phoenix",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c5dd249169d92129a4ccbd8110eb8d8a5231376
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DuskToDawn
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Dusk[master]: Remove redundant SocialProfile profile background colors styles

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390884 )

Change subject: Remove redundant SocialProfile profile background colors styles
..

Remove redundant SocialProfile profile background colors styles

Redundant since SocialProfile patch
I529845ec6b74b59ca0c5ce1f57261f3ce456dc36.
Skins no longer need to apply these styles.

Change-Id: I5df630e10614ee1fc705e27ecf2dc6992b3cf702
---
M resources/css/main.css
M skin.json
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Dusk 
refs/changes/84/390884/1

diff --git a/resources/css/main.css b/resources/css/main.css
index 8ad8f7e..1aba7fd 100644
--- a/resources/css/main.css
+++ b/resources/css/main.css
@@ -379,11 +379,6 @@
 }
 
 /** CSS fixes for social tools */
-/* Social profiles + Special:UpdateProfile */
-#profile-top, .profile-info {
-   background-color: transparent !important;
-}
-
 /* Special:GiveGift */
 div.g-give-container {
width: auto;
diff --git a/skin.json b/skin.json
index 1f75bf7..cfc822e 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
"name": "Dusk",
-   "version": "3.3.1",
+   "version": "3.3.2",
"author": [
"Gregory S. Hayes",
"Becca Wei",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5df630e10614ee1fc705e27ecf2dc6992b3cf702
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Dusk
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toolserver_legacy: redirect /~nikola/articlesby.php

2017-11-12 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390883 )

Change subject: toolserver_legacy: redirect /~nikola/articlesby.php
..

toolserver_legacy: redirect /~nikola/articlesby.php

Add a redirect for /~nikola/articlesby.php to XTools Pages hosted at
.

Bug: T179766
Change-Id: Ibaac040e98d330623cfd847169fd04bc21c6daea
---
M modules/toolserver_legacy/templates/www.toolserver.org.erb
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/390883/1

diff --git a/modules/toolserver_legacy/templates/www.toolserver.org.erb 
b/modules/toolserver_legacy/templates/www.toolserver.org.erb
index aa80904..35a384e 100644
--- a/modules/toolserver_legacy/templates/www.toolserver.org.erb
+++ b/modules/toolserver_legacy/templates/www.toolserver.org.erb
@@ -230,6 +230,7 @@
 Redirect 301 /~mxn https://tools.wmflabs.org/tilde
 Redirect 301 /~mzmcbride/yanker 
https://tools.wmflabs.org/pirsquared/ts_archive/mzmcbride/yanker.py
 Redirect 301 /~mzmcbride https://tools.wmflabs.org/mzmcbride
+Redirect 301 /~nikola/articlesby.php https://xtools.wmflabs.org/pages
 Redirect 301 /~nlwikibots https://tools.wmflabs.org/nlwikibots
 Redirect 301 /~para/region.php 
https://tools.wmflabs.org/para/geo/worldadmin98
 Redirect 301 /~para/GeoCommons/kml.php 
https://tools.wmflabs.org/geocommons/kml

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeReview[master]: Drop code_authors.ca_repo_author index

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390311 )

Change subject: Drop code_authors.ca_repo_author index
..


Drop code_authors.ca_repo_author index

The ca_repo_author index is duplicating the PRIMARY index and as such
should be removed.

Bug: T180160
Change-Id: I8b4a372ba9d1843e92a020eaaa9ee85a2ed90623
---
M CodeReviewHooks.php
A archives/code_author-drop-ca_repo_author.sql
D archives/code_authors_repo-index.sql
M codereview.sql
4 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/CodeReviewHooks.php b/CodeReviewHooks.php
index 0d7ab0e..e16b195 100644
--- a/CodeReviewHooks.php
+++ b/CodeReviewHooks.php
@@ -88,8 +88,11 @@
$updater->addExtensionUpdate( [ 'addField', 
'code_authors', 'ca_user',
"$base/archives/code_authors_add_ca_user.sql", 
true ] );
 
-   $updater->addExtensionUpdate( [ 'addIndex', 
'code_authors', 'ca_repo_author',
-   "$base/archives/code_authors_repo-index.sql", 
true ] );
+   $updater->dropExtensionIndex(
+   'code_authors',
+   'ca_repo_author',
+   
"$base/archives/code_author-drop-ca_repo_author.sql"
+   );
break;
case 'sqlite':
$updater->addExtensionTable( 'code_rev', 
"$base/codereview.sql" );
@@ -102,8 +105,6 @@
"$base/archives/codereview-repopath.sql", true 
] );
$updater->addExtensionUpdate( [ 'addField', 
'code_authors', 'ca_user',
"$base/archives/code_authors_add_ca_user.sql", 
true ] );
-   $updater->addExtensionUpdate( [ 'addIndex', 
'code_authors', 'ca_repo_author',
-   "$base/archives/code_authors_repo-index.sql", 
true ] );
break;
case 'postgres':
// TODO
diff --git a/archives/code_author-drop-ca_repo_author.sql 
b/archives/code_author-drop-ca_repo_author.sql
new file mode 100644
index 000..985ff98
--- /dev/null
+++ b/archives/code_author-drop-ca_repo_author.sql
@@ -0,0 +1 @@
+ALTER TABLE /*_*/code_authors DROP INDEX /*i*/ca_repo_author;
\ No newline at end of file
diff --git a/archives/code_authors_repo-index.sql 
b/archives/code_authors_repo-index.sql
deleted file mode 100644
index 8a4e4f8..000
--- a/archives/code_authors_repo-index.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE INDEX /*i*/ca_repo_author ON /*_*/code_authors (ca_repo_id, ca_author);
diff --git a/codereview.sql b/codereview.sql
index bed5454..8a80995 100644
--- a/codereview.sql
+++ b/codereview.sql
@@ -99,7 +99,6 @@
  -- Note that multiple authors on the same repo may point to
  -- a single local user in some cases...
 CREATE UNIQUE INDEX /*i*/ca_user_text ON /*_*/code_authors (ca_user_text, 
ca_repo_id, ca_author);
-CREATE INDEX /*i*/ca_repo_author ON /*_*/code_authors (ca_repo_id, ca_author);
 
 --
 -- List of which files were changed in a given code revision.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b4a372ba9d1843e92a020eaaa9ee85a2ed90623
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeReview
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Remove background color from #profile-info

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390880 )

Change subject: Remove background color from #profile-info
..


Remove background color from #profile-info

Similar to I5c75ca2f0486a9140c6cd8f9e489414a8c3c9159,
if there's a problem in background colors in skins, then it should
be fixed /in/ the skin rather than inside an extension. More info
is provided in one of the comments on the Gerrit patch I posted.

Removes background color from #profile-info

Change-Id: I529845ec6b74b59ca0c5ce1f57261f3ce456dc36
---
M UserProfile/UserProfile.css
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/UserProfile/UserProfile.css b/UserProfile/UserProfile.css
index e4d7278..7f7e727 100644
--- a/UserProfile/UserProfile.css
+++ b/UserProfile/UserProfile.css
@@ -522,7 +522,6 @@
 
 /* Update Profile */
 .profile-info {
-   background-color: #fff;
padding: 25px 0;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I529845ec6b74b59ca0c5ce1f57261f3ce456dc36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
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...ProofreadPage[master]: Moves edit validation to the Content interface implementation

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372566 )

Change subject: Moves edit validation to the Content interface implementation
..


Moves edit validation to the Content interface implementation

Cleans also some details related to ContentHandler

Change-Id: I98f2527209651b6c520db1e3da1453e031b0c712
---
M ProofreadPage.body.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/index/EditIndexPage.php
M includes/index/IndexContent.php
M includes/index/IndexContentHandler.php
M includes/page/EditPagePage.php
M includes/page/PageContent.php
M includes/page/PageContentHandler.php
M tests/phpunit/index/IndexContentHandlerTest.php
M tests/phpunit/index/IndexContentTest.php
M tests/phpunit/page/PageContentBuilderTest.php
M tests/phpunit/page/PageContentHandlerTest.php
M tests/phpunit/page/PageContentTest.php
15 files changed, 235 insertions(+), 211 deletions(-)

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



diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index 39e16da..2b78412 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -21,7 +21,6 @@
 
 use ProofreadPage\Context;
 use ProofreadPage\FileNotFoundException;
-use ProofreadPage\Page\PageContent;
 use ProofreadPage\Page\PageContentBuilder;
 use ProofreadPage\Pagination\PageNotInPaginationException;
 use ProofreadPage\ProofreadPageInit;
@@ -608,58 +607,6 @@
}
 
/**
-* Make validation of the content in the edit API
-*
-* @param IContextSource $context
-* @param Content $content Content of the edit box.
-* @param Status $status Status object to represent errors, etc.
-* @param string $summary Edit summary for page.
-* @param User $user User who is performing the edit.
-* @param bool $minoredit Whether the edit was marked as minor by the 
user.
-* @return bool
-*/
-   public static function onEditFilterMergedContent( IContextSource 
$context, Content $content,
-   Status $status, $summary, User $user, $minoredit
-   ) {
-   // If the content's model isn't ours, ignore this; there's 
nothing for us to do here.
-   if ( !( $content instanceof PageContent ) ) {
-   return true;
-   }
-
-   // Fail if the content is invalid, or the level is being 
removed.
-   if ( !$content->isValid() ) {
-   $status->fatal( 'proofreadpage_badpagetext' );
-   return false;
-   }
-
-   $oldContent = $context->getWikiPage()->getContent( 
Revision::FOR_THIS_USER, $user );
-   if ( $oldContent === null ) {
-   $oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )
-   ->makeEmptyContent();
-   }
-   if ( $oldContent->getModel() !== CONTENT_MODEL_PROOFREAD_PAGE ) 
{
-   // Let's convert it to Page: page content
-   $oldContent = $oldContent->convert( 
CONTENT_MODEL_PROOFREAD_PAGE );
-   }
-   if ( !( $oldContent instanceof PageContent ) ) {
-   // We consider it as a page creation
-   $oldContent = ContentHandler::getForModelID( 
CONTENT_MODEL_PROOFREAD_PAGE )
-   ->makeEmptyContent();
-   }
-
-   $oldLevel = $oldContent->getLevel();
-   $newLevel = $content->getLevel();
-
-   // Fail if the user changed the level and the change isn't 
allowed
-   if ( !$oldLevel->isChangeAllowed( $newLevel ) ) {
-   $status->fatal( 'proofreadpage_notallowedtext' );
-   return false;
-   }
-
-   return true;
-   }
-
-   /**
 * Provides text for preload API
 *
 * @param string &$text
@@ -902,16 +849,11 @@
 * Extension registration callback
 */
public static function onRegister() {
-   global $wgContentHandlers;
-
// L10n
include_once __DIR__ . '/ProofreadPage.namespaces.php';
 
// Content handler
define( 'CONTENT_MODEL_PROOFREAD_PAGE', 'proofread-page' );
define( 'CONTENT_MODEL_PROOFREAD_INDEX', 'proofread-index' );
-   $wgContentHandlers[CONTENT_MODEL_PROOFREAD_PAGE] = 
'\ProofreadPage\Page\PageContentHandler';
-   $wgContentHandlers[CONTENT_MODEL_PROOFREAD_INDEX] =
-   '\ProofreadPage\Index\IndexContentHandler';
}
 }
diff --git a/extension.json b/extension.json
index 0d39a69..30fff6c 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,10 @@
"APIPropModules": {
"proofread":

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Separate UserGifts styles into separate ResourceLoader modules

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390882 )

Change subject: Separate UserGifts styles into separate ResourceLoader modules
..

Separate UserGifts styles into separate ResourceLoader modules

Any styles left in UserGifts.css are styles shared among
multiple special pages.

Change-Id: Ia15373f52b2d0ff84095edc12dc421b40bc80f6d
---
M UserGifts/Gifts.php
A UserGifts/SpecialGiftManager.css
M UserGifts/SpecialGiftManager.php
A UserGifts/SpecialGiveGift.css
M UserGifts/SpecialGiveGift.php
A UserGifts/SpecialViewGift.css
M UserGifts/SpecialViewGift.php
A UserGifts/SpecialViewGifts.css
M UserGifts/SpecialViewGifts.php
M UserGifts/UserGifts.css
10 files changed, 216 insertions(+), 182 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/82/390882/1

diff --git a/UserGifts/Gifts.php b/UserGifts/Gifts.php
index bb68ed9..c968a62 100644
--- a/UserGifts/Gifts.php
+++ b/UserGifts/Gifts.php
@@ -46,12 +46,40 @@
'position' => 'top'
 );
 
+$wgResourceModules['ext.socialprofile.special.giftmanager.css'] = array(
+   'styles' => 'SpecialGiftManager.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SocialProfile/UserGifts',
+);
+
+$wgResourceModules['ext.socialprofile.special.givegift.css'] = array(
+   'styles' => 'SpecialGiveGift.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SocialProfile/UserGifts',
+);
+
+$wgResourceModules['ext.socialprofile.special.viewgift.css'] = array(
+   'styles' => 'SpecialViewGift.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SocialProfile/UserGifts',
+);
+
+$wgResourceModules['ext.socialprofile.special.viewgifts.css'] = array(
+   'styles' => 'SpecialViewGifts.css',
+   'localBasePath' => __DIR__,
+   'remoteExtPath' => 'SocialProfile/UserGifts',
+);
+
+
+
 $wgResourceModules['ext.socialprofile.usergifts.js'] = array(
'scripts' => 'UserGifts.js',
'localBasePath' => __DIR__,
'remoteExtPath' => 'SocialProfile/UserGifts',
 );
 
+
+
 // Echo (Notifications) stuff
 $wgAutoloadClasses['EchoUserGiftPresentationModel'] = 
"{$wgUserGiftsDirectory}/EchoUserGiftPresentationModel.php";
 
diff --git a/UserGifts/SpecialGiftManager.css b/UserGifts/SpecialGiftManager.css
new file mode 100644
index 000..1fba5c5
--- /dev/null
+++ b/UserGifts/SpecialGiftManager.css
@@ -0,0 +1,14 @@
+.view-form {
+   color: #666;
+   font-size: 12px;
+   font-weight: 800;
+}
+
+.view-status {
+   background-color: #fffb9b;
+   color: #666;
+   font-size: 12px;
+   font-weight: 800;
+   padding: 5px;
+   margin-bottom: 5px;
+}
diff --git a/UserGifts/SpecialGiftManager.php b/UserGifts/SpecialGiftManager.php
index c0d55c9..39a6a6f 100644
--- a/UserGifts/SpecialGiftManager.php
+++ b/UserGifts/SpecialGiftManager.php
@@ -51,7 +51,10 @@
$this->checkReadOnly();
 
// Add CSS
-   $out->addModuleStyles( 'ext.socialprofile.usergifts.css' );
+   $out->addModuleStyles( [
+   'ext.socialprofile.usergifts.css',
+   'ext.socialprofile.special.giftmanager.css'
+   ] );
 
if ( $request->wasPosted() ) {
if ( !$request->getInt( 'id' ) ) {
diff --git a/UserGifts/SpecialGiveGift.css b/UserGifts/SpecialGiveGift.css
new file mode 100644
index 000..891f1b9
--- /dev/null
+++ b/UserGifts/SpecialGiveGift.css
@@ -0,0 +1,68 @@
+.g-message {
+   margin: 0 0 15px 0;
+}
+
+.g-give-container {
+   background-color: #f2f4f7;
+   border: 1px solid #d7dee8;
+   padding: 10px;
+   width: 500px;
+   margin: 0 0 20px 0;
+}
+
+.g-give-title {
+   font-size: 13px;
+   color: #888;
+   margin: 0 0 6px 0;
+   font-weight: 700;
+}
+
+.g-give-separator {
+   margin: 10px 0;
+   font-weight: 700;
+}
+
+.g-add-message {
+   margin: 15px 0 4px 0;
+   color: #666;
+   font-weight: 700;
+   font-size: 14px;
+}
+
+.g-give-all {
+   border: 1px solid #dcdcdc;
+   cursor: pointer;
+   float: left;
+   min-height: 110px;
+   margin: 0 10px 10px 0;
+   padding: 8px;
+   width: 250px;
+   overflow: hidden;
+}
+
+.g-give-all img {
+   float: left;
+   margin: 0 10px 0 0;
+   display: block;
+   border: 1px solid #dcdcdc;
+   padding: 3px;
+   background-color: #fff;
+}
+
+.g-blue {
+   color: #285c98 !important;
+}
+
+.g-give-all-message-title {
+   color: #666;
+   font-weight: 700;
+   margin: 10px 0 5px 0;
+}
+
+.g-give-all-highlight {
+   background-color: #faf9f9;
+}
+
+.g-give-all-selected {
+   border: 1px solid red;
+}
\ No newline at end of file
diff --git a/UserGifts/SpecialGiveGift.php b/UserGifts/SpecialGiveGift.php
index a0b84b4..a260d73 100644
---

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add images.collection.cooperhewitt.org to $wgCopyUploadsDomains

2017-11-12 Thread Framawiki (Code Review) 
Framawiki has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390881 )

Change subject: Add images.collection.cooperhewitt.org to $wgCopyUploadsDomains
..

Add images.collection.cooperhewitt.org to $wgCopyUploadsDomains

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 58acc2b..6f41e0c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13233,7 +13233,7 @@
'davidabian.com',
'webapi.aucklandmuseum.com',// Auckland Museum - T122995
'*.e-pics.ethz.ch', // ETH Library  - T123109
-   '*.museumvictoria.com.au',  // Victoria State (AU) 
Museum, requested in T125387
+   '*.museumvictoria.com.au',  // Victoria State (AU) 
Museum - T125387
'bio.acousti.ca',   // Natural History Museum - 
T132140
'museumcommons.wikimedia.nl',   // Museum Catharijneconvent 
- T131841
'images.unsplash.com',  // Unsplash - T132701
@@ -13262,6 +13262,7 @@
'geo.hlipp.de', // Geograph Deutschland - 
T174152
'geo-en.hlipp.de',  // Geograph Deutschland - 
T174152
'aleph500.biblacad.ro', // Domain of the Romanian 
academy - T178753
+   'images.collection.cooperhewitt.org', // Cooper Hewitt - T180241
],
 ],
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Remove background color from #profile-info

2017-11-12 Thread SamanthaNguyen (Code Review) 
SamanthaNguyen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390880 )

Change subject: Remove background color from #profile-info
..

Remove background color from #profile-info

Similar to I5c75ca2f0486a9140c6cd8f9e489414a8c3c9159,
if there's a problem in background colors in skins, then it should
be fixed /in/ the skin rather than inside an extension. More info
is provided in one of the comments on the Gerrit patch I posted.

Removes background color from #profile-info

Change-Id: I529845ec6b74b59ca0c5ce1f57261f3ce456dc36
---
M UserProfile/UserProfile.css
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/UserProfile/UserProfile.css b/UserProfile/UserProfile.css
index e4d7278..7f7e727 100644
--- a/UserProfile/UserProfile.css
+++ b/UserProfile/UserProfile.css
@@ -522,7 +522,6 @@
 
 /* Update Profile */
 .profile-info {
-   background-color: #fff;
padding: 25px 0;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I529845ec6b74b59ca0c5ce1f57261f3ce456dc36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen 

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Renders Index: pages without relying on their Wikitext seria...

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370940 )

Change subject: Renders Index: pages without relying on their Wikitext 
serialization
..


Renders Index: pages without relying on their Wikitext serialization

Change-Id: I3f3ffcae202a08acec55061dc07a20f033fa8d69
---
M extension.json
M includes/index/IndexContent.php
A includes/index/ParserHelper.php
A tests/phpunit/index/ParserHelperTest.php
4 files changed, 131 insertions(+), 5 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Samwilson: Looks good to me, but someone else must approve
  Tpt: Looks good to me, approved



diff --git a/extension.json b/extension.json
index 258a420..0d39a69 100644
--- a/extension.json
+++ b/extension.json
@@ -56,6 +56,7 @@
"ProofreadPage\\Index\\IndexDifferenceEngine": 
"includes/index/IndexDifferenceEngine.php",
"ProofreadPage\\Index\\IndexEditAction": 
"includes/index/IndexEditAction.php",
"ProofreadPage\\Index\\IndexSubmitAction": 
"includes/index/IndexSubmitAction.php",
+   "ProofreadPage\\Index\\ParserHelper": 
"includes/index/ParserHelper.php",
"ProofreadPage\\Index\\EditIndexPage": 
"includes/index/EditIndexPage.php",
"ProofreadIndexDbConnector": 
"includes/index/ProofreadIndexDbConnector.php",
"ProofreadPage\\Pagination\\PaginationFactory": 
"includes/Pagination/PaginationFactory.php",
diff --git a/includes/index/IndexContent.php b/includes/index/IndexContent.php
index 0e113e4..11bc9b9 100644
--- a/includes/index/IndexContent.php
+++ b/includes/index/IndexContent.php
@@ -5,10 +5,12 @@
 use Content;
 use MagicWord;
 use MalformedTitleException;
+use Parser;
 use ParserOptions;
 use ProofreadPage\Link;
 use ProofreadPage\Pagination\PageList;
 use Sanitizer;
+use ParserOutput;
 use TextContent;
 use Title;
 use User;
@@ -170,13 +172,34 @@
}
 
/**
-* @see Content::getParserOutput
+* @see AbstractContent::fillParserOutput
 */
-   public function getParserOutput(
-   Title $title, $revId = null, ParserOptions $options = null, 
$generateHtml = true
+   protected function fillParserOutput( Title $title, $revId,
+   ParserOptions $options, $generateHtml, ParserOutput &$output
) {
-   $wikitextContent = new WikitextContent( $this->serialize( 
CONTENT_FORMAT_WIKITEXT ) );
-   return $wikitextContent->getParserOutput( $title, $revId, 
$options, $generateHtml );
+   /** @var Parser $wgParser */
+   global $wgParser;
+   $parserHelper = new ParserHelper( $title, $options );
+
+   // We retrieve the view template
+   list( $templateText, $templateTitle ) = 
$parserHelper->fetchTemplateTextAndTitle(
+   Title::makeTitle( NS_MEDIAWIKI, 'Proofreadpage index 
template' )
+   );
+
+   // We replace the arguments calls by their values
+   $text = $parserHelper->expandTemplateArgs(
+   $templateText,
+   array_map( function ( Content $content ) {
+   return $content->serialize( 
CONTENT_FORMAT_WIKITEXT );
+   }, $this->fields )
+   );
+
+   // We do the final rendering
+   $output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
+   $output->addTemplate( $templateTitle,
+   $templateTitle->getArticleID(),
+   $templateTitle->getLatestRevID()
+   );
}
 
/**
diff --git a/includes/index/ParserHelper.php b/includes/index/ParserHelper.php
new file mode 100644
index 000..80c3af8
--- /dev/null
+++ b/includes/index/ParserHelper.php
@@ -0,0 +1,46 @@
+parser = new Parser();
+   $this->parser->startExternalParse( $title, $options, 
Parser::OT_PLAIN );
+   }
+
+   /**
+* @param string $text the wikitext that should see its template 
arguments expanded
+* @param string[] $args the arguments to use during the expansion
+* @return string
+*/
+   public function expandTemplateArgs( $text, array $args ) {
+   // We build a frame with the arguments for the template
+   $frame = $this->parser->getPreprocessor()->newCustomFrame( 
$args );
+
+   // We replace the arguments calls by their values
+   $dom = $this->parser->preprocessToDom( $text, 
Parser::PTD_FOR_INCLUSION );
+   $text = $frame->expand( $dom );
+
+   // We take care of removing the tags placeholders
+   return $this->parser->mStripState->unstripBoth( $text );
+   }
+
+   public function fetchTemplateTextAndTitle( Title

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Guess Page: pages content format if not given

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371208 )

Change subject: Guess Page: pages content format if not given
..


Guess Page: pages content format if not given

Change-Id: Ia6082626231da5894e8164a3012f9eade7ceb3b5
---
M includes/page/PageContentHandler.php
M tests/phpunit/page/PageContentHandlerTest.php
2 files changed, 13 insertions(+), 3 deletions(-)

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



diff --git a/includes/page/PageContentHandler.php 
b/includes/page/PageContentHandler.php
index d86cf58..901de41 100644
--- a/includes/page/PageContentHandler.php
+++ b/includes/page/PageContentHandler.php
@@ -6,6 +6,7 @@
 use ContentHandler;
 use FormatJson;
 use MWContentSerializationException;
+use MWException;
 use TextContentHandler;
 use Title;
 use User;
@@ -87,19 +88,28 @@
 * @see ContentHandler::unserializeContent
 */
public function unserializeContent( $text, $format = null ) {
-   $this->checkFormat( $format );
+   if ( $format === null ) {
+   $format = ( FormatJson::decode( $text, true ) === null )
+   ? CONTENT_FORMAT_WIKITEXT
+   : CONTENT_FORMAT_JSON;
+   }
 
switch ( $format ) {
case CONTENT_FORMAT_JSON:
return $this->unserializeContentInJson( $text );
-   default:
+   case CONTENT_FORMAT_WIKITEXT:
return $this->unserializeContentInWikitext( 
$text );
+   default:
+   throw new MWException(
+   "Format ' . $format . ' is not 
supported for content model " . $this->getModelID()
+   );
}
}
 
/**
 * @param string $text
 * @return PageContent
+* @throws MWContentSerializationException
 */
private function unserializeContentInJson( $text ) {
$array = FormatJson::decode( $text, true );
diff --git a/tests/phpunit/page/PageContentHandlerTest.php 
b/tests/phpunit/page/PageContentHandlerTest.php
index bd4cccb..f29eca8 100644
--- a/tests/phpunit/page/PageContentHandlerTest.php
+++ b/tests/phpunit/page/PageContentHandlerTest.php
@@ -196,7 +196,7 @@
) {
$this->assertEquals(
PageContentTest::newContent( $header, $body, $footer, 
$level, $proofreader ),
-   $this->handler->unserializeContent( $text, 
CONTENT_FORMAT_JSON )
+   $this->handler->unserializeContent( $text )
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6082626231da5894e8164a3012f9eade7ceb3b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Update families files

2017-11-12 Thread Framawiki (Code Review) 
Framawiki has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390879 )

Change subject: Update families files
..

Update families files

Change-Id: I4e0772647c855b87f2f916b2d7fdbecd218dab5c
---
M pywikibot/families/wikibooks_family.py
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wikivoyage_family.py
5 files changed, 18 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/79/390879/1

diff --git a/pywikibot/families/wikibooks_family.py 
b/pywikibot/families/wikibooks_family.py
index 43788bc..8482147 100644
--- a/pywikibot/families/wikibooks_family.py
+++ b/pywikibot/families/wikibooks_family.py
@@ -41,7 +41,7 @@
 'vi', 'th', 'ca', 'fi', 'id', 'sq', 'fa', 'zh', 'ru', 'az', 'cs',
 'sv', 'da', 'hr', 'sr', 'tr', 'ko', 'ar', 'no', 'gl', 'ba', 'ro',
 'ta', 'tl', 'mk', 'is', 'uk', 'sa', 'hi', 'ka', 'lt', 'sk', 'tt',
-'eo', 'el', 'bg', 'bn', 'li', 'hy', 'si', 'ms', 'sl', 'ur', 'la',
+'eo', 'el', 'bg', 'li', 'bn', 'hy', 'si', 'ms', 'sl', 'ur', 'la',
 'ml', 'km', 'ia', 'et', 'cv', 'mr', 'eu', 'kk', 'oc', 'be', 'pa',
 'ne', 'fy', 'tg', 'te', 'af', 'ku', 'ky', 'bs', 'mg', 'cy',
 ]
diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index c5cba30..af0c128 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -40,31 +40,31 @@
 'vi', 'ja', 'pt', 'zh', 'uk', 'fa', 'ca', 'ar', 'no', 'sh', 'fi',
 'hu', 'id', 'ko', 'cs', 'ro', 'sr', 'ms', 'tr', 'eu', 'eo', 'bg',
 'hy', 'da', 'zh-min-nan', 'sk', 'min', 'kk', 'he', 'lt', 'hr',
-'ce', 'et', 'sl', 'be', 'gl', 'el', 'nn', 'uz', 'simple', 'az',
+'ce', 'et', 'sl', 'be', 'gl', 'el', 'nn', 'simple', 'uz', 'az',
 'la', 'ur', 'hi', 'vo', 'th', 'ka', 'ta', 'cy', 'mk', 'tg', 'tl',
 'mg', 'oc', 'ky', 'lv', 'bs', 'tt', 'new', 'sq', 'te', 'pms', 'br',
-'be-tarask', 'zh-yue', 'ast', 'bn', 'ml', 'ht', 'lb', 'jv', 'mr',
+'zh-yue', 'be-tarask', 'ast', 'bn', 'ml', 'ht', 'lb', 'jv', 'mr',
 'azb', 'af', 'sco', 'pnb', 'ga', 'is', 'cv', 'ba', 'fy', 'su',
 'sw', 'my', 'lmo', 'an', 'yo', 'ne', 'gu', 'io', 'pa', 'nds',
 'scn', 'bpy', 'als', 'bar', 'ku', 'kn', 'ia', 'qu', 'ckb', 'mn',
 'arz', 'bat-smg', 'wa', 'gd', 'nap', 'yi', 'bug', 'si', 'am',
 'cdo', 'map-bms', 'or', 'fo', 'mzn', 'hsb', 'xmf', 'li', 'mai',
 'sah', 'sa', 'vec', 'ilo', 'os', 'mrj', 'hif', 'mhr', 'bh', 'eml',
-'roa-tara', 'ps', 'diq', 'pam', 'sd', 'hak', 'nso', 'se', 'ace',
-'bcl', 'mi', 'nah', 'zh-classical', 'nds-nl', 'szl', 'gan', 'wuu',
-'vls', 'rue', 'frr', 'bo', 'glk', 'km', 'vep', 'sc', 'fiu-vro',
+'roa-tara', 'ps', 'diq', 'pam', 'sd', 'hak', 'nso', 'se', 'bcl',
+'ace', 'zh-classical', 'mi', 'nah', 'nds-nl', 'szl', 'gan', 'wuu',
+'vls', 'rue', 'frr', 'km', 'bo', 'glk', 'vep', 'sc', 'fiu-vro',
 'co', 'crh', 'lrc', 'tk', 'kv', 'csb', 'so', 'gv', 'as', 'lad',
-'zea', 'ay', 'myv', 'udm', 'lez', 'stq', 'kw', 'nv', 'ie', 'nrm',
+'zea', 'ay', 'myv', 'udm', 'nv', 'lez', 'stq', 'kw', 'ie', 'nrm',
 'pcd', 'mwl', 'rm', 'koi', 'gom', 'ug', 'ab', 'lij', 'gn', 'mt',
-'fur', 'dsb', 'cbk-zam', 'dv', 'ang', 'ln', 'ext', 'sn', 'kab',
-'ksh', 'lo', 'gag', 'frp', 'pag', 'pi', 'olo', 'dty', 'av', 'xal',
+'fur', 'cbk-zam', 'dsb', 'dv', 'ang', 'ln', 'sn', 'ext', 'kab',
+'ksh', 'lo', 'gag', 'frp', 'pag', 'pi', 'dty', 'olo', 'av', 'xal',
 'pfl', 'bxr', 'haw', 'krc', 'kaa', 'pap', 'rw', 'pdc', 'bjn', 'to',
 'nov', 'kl', 'arc', 'jam', 'kbd', 'ha', 'tyv', 'tpi', 'tet', 'ig',
-'ki', 'na', 'lbe', 'roa-rup', 'jbo', 'ty', 'mdf', 'kg', 'za', 'wo',
-'lg', 'bi', 'srn', 'zu', 'chr', 'tcy', 'ltg', 'sm', 'om', 'xh',
-'tn', 'pih', 'cu', 'chy', 'rmy', 'tw', 'kbp', 'tum', 'ts', 'st',
-'got', 'rn', 'pnt', 'ss', 'fj', 'bm', 'ch', 'ady', 'iu', 'ny',
-'ee', 'ks', 'ak', 'ik', 've', 'sg', 'dz', 'ff', 'atj', 'ti', 'cr',
+'ki', 'na', 'lbe', 'roa-rup', 'jbo', 'ty', 'mdf', 'kg', 'za', 'lg',
+'wo', 'bi', 'srn', 'zu', 'chr', 'tcy', 'ltg', 'sm', 'om', 'xh',
+'tn', 'pih', 'cu', 'chy', 'rmy', 'kbp', 'tw', 'tum', 'ts', 'st',
+'got', 'rn', 'pnt', 'ss', 'bm', 'fj', 'ch', 'ady', 'iu', 'ny',
+'ee', 'ks', 'ak', 'ik', 've', 'sg', 'atj', 'dz', 'ff', 'ti', 'cr',
 'din',
 ]
 
diff --git a/pywikibot/families/wikiquote_family.py 
b/pywikibot/families/wikiquote_family.py
index

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Delete template docs

2017-11-12 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390877 )

Change subject: Hygiene: Delete template docs
..

Hygiene: Delete template docs

This is general template documentation and need not be committed to this
repo.

Change-Id: I7ba901ed556c1c73157933a314da76cd0af1dacc
---
D doc/README.md
D doc/api-design.md
D doc/coding.md
D doc/commands.md
D doc/config.md
D doc/deployment.md
D doc/template.md
7 files changed, 0 insertions(+), 918 deletions(-)


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

diff --git a/doc/README.md b/doc/README.md
deleted file mode 100644
index d837f0a..000
--- a/doc/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains the documentation for the service template, aimed at
-getting you started up and running quickly.
-
-The documentation should be read in the following order:
-
-1. [Short API design practices](api-design.md)
-2. [Service template overview](template.md)
-3. [Configuration](config.md)
-4. [Useful Commands](commands.md)
-5. [Coding Guide](coding.md)
-6. [Deployment](deployment.md)
-
-Have fun while creating RESTful API services!
-
diff --git a/doc/api-design.md b/doc/api-design.md
deleted file mode 100644
index 20f2e5b..000
--- a/doc/api-design.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# API Design
-
-Before you start coding your service, you need to think hard about your API's
-design, especially for a public service exposing its API. Below are a couple of
-practices you should follow.
-
-- [Statelessness](#statelessness)
-- [Versioning](#versioning)
-- [Hierarchical URI Layout](#hierarchical-uri-layout)
-- [HTTP Verbs](#http-verbs)
-- [Documentation](#documentation)
-- [See Also](#see-also)
-
-## Statelessness
-
-RESTful API services should be
-[stateless](https://en.wikipedia.org/wiki/Service_statelessness_principle), 
since
-they are conceptually modelled around *resources* (as opposed to *systems*).
-Accordingly, your service should take actions depending on assumptions about 
the
-caller or the current state of the service's process (e.g. that the user is
-logged in, that they are allowed to modify a resource, etc.)
-
-## Versioning
-
-You should always version all of your API. Always. Period. Applications depend 
on
-its stability and invariance. It is tolerable to add endpoints to an API
-version, but removing or modifying existing ones is not an option. Thus,
-versioning provides an easy way for you to improve upon the API while avoiding
-third-party application breakage. The template enforces this practice by
-requiring all of your [route files](../routes/) specify the API version.
-
-## Hierarchical URI Layout
-
-Use a hierarchical URI layout that is intuitive and makes sense. Grouping
-endpoints under a common URI prefix allows both you and the future API consumer
-to reason about the API. As an example, consider
-[RESTBase](https://www.mediawiki.org/wiki/RESTBase)'s API layout:
-
-```
-/{domain}
-  -- /v1
- |- /page
- |  |- /title
- |  |- /html
- |  |- /data-parsoid
- |  -- /revision
- -- /transform
-|- /html/to/wikitext
-|- /wikitext/to/html
--- /html/to/html
-```
-
-The API is grouped in two *sections* - `page` and `transform`. The former
-exposes endpoints dealing with Wiki pages, while the latter comprises endpoints
-transforming one format to another.
-
-## HTTP Verbs
-
-There are many [HTTP
-verbs](http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html) you can use and
-expose in your API. Use them appropriately. Especially, **do not allow GET
-requests to modify** any type of content.
-
-## Documentation
-
-Document your API meticulously, and keep it up to date with the code. Remember
-that API's are meant to be consumed by external applications, whose developers
-most often do not know the internal workings of your stack. A good starting
-point is to look into [Swagger](https://github.com/swagger-api/swagger-spec), a
-specification for API declaration and documentation from which nice, demo-able
-documentation such as 
[this](http://rest.wikimedia.org/en.wikipedia.org/v1/?doc)
-can be automatically generated.
-
-## See Also
-
-The above is just a short list of things you should think about when designing
-your API. Here are some resources you might find useful at this step:
-
-- https://github.com/Wikia/guidelines/tree/master/APIDesign
-- https://restful-api-design.readthedocs.org/en/latest/
-- http://www.vinaysahni.com/best-practices-for-a-pragmatic-restful-api
-- http://www.thoughtworks.com/insights/blog/rest-api-design-resource-modeling
-
diff --git a/doc/coding.md b/doc/coding.md
deleted file mode 100644
index 73cbe64..000
--- a/doc/coding.md
+++ /dev/null
@@ -1,414 +0,0 @@
-# Coding Guide
-
-Let's get started! 
-
-- [Route Set-up](#route-set-up)
-- [Routes](#routes)
-- [Promises](#promises)
-  - [I/O](#io)
-  - [External

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Update to service-template-node v0.5.2

2017-11-12 Thread Mholloway (Code Review) 
Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390878 )

Change subject: Update to service-template-node v0.5.2
..

Update to service-template-node v0.5.2

Change-Id: Id6a2fe9c8656ce9947e2b9936275a40db704e402
---
M .eslintrc.yml
M .travis.yml
M lib/api-util.js
A lib/swagger-ui.js
M package.json
M routes/root.js
M test/features/app/spec.js
M test/index.js
8 files changed, 116 insertions(+), 26 deletions(-)


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

diff --git a/.eslintrc.yml b/.eslintrc.yml
index bf9f475..312fdfd 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1 +1 @@
-extends: node-services
\ No newline at end of file
+extends: 'eslint-config-node-services'
diff --git a/.travis.yml b/.travis.yml
index c417c7f..df202fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,3 @@
 node_js:
   - "4"
   - "6"
-  - "node"
diff --git a/lib/api-util.js b/lib/api-util.js
index 9fd9959..d6059d7 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -4,7 +4,6 @@
 const preq = require('preq');
 const sUtil = require('./util');
 const Template = require('swagger-router').Template;
-
 const HTTPError = sUtil.HTTPError;
 
 
diff --git a/lib/swagger-ui.js b/lib/swagger-ui.js
new file mode 100644
index 000..9e39ff5
--- /dev/null
+++ b/lib/swagger-ui.js
@@ -0,0 +1,79 @@
+'use strict';
+
+
+const BBPromise = require('bluebird');
+const fs = BBPromise.promisifyAll(require('fs'));
+const path = require('path');
+const HTTPError = require('../lib/util.js').HTTPError;
+
+
+// Swagger-ui helpfully exporting the absolute path of its dist directory
+const docRoot = `${require('swagger-ui').dist}/`;
+
+function processRequest(app, req, res) {
+
+const reqPath = req.query.path || '/index.html';
+const filePath = path.join(docRoot, reqPath);
+
+// Disallow relative paths.
+// Test relies on docRoot ending on a slash.
+if (filePath.substring(0, docRoot.length) !== docRoot) {
+throw new HTTPError({
+status: 404,
+type: 'not_found',
+title: 'File not found',
+detail: `${reqPath} could not be found.`
+});
+}
+
+return fs.readFileAsync(filePath)
+.then((body) => {
+if (reqPath === '/index.html') {
+body = body.toString()
+.replace(/((?:src|href)=['"])/g, '$1?doc=')
+// Some self-promotion
+.replace(//,
+`${app.info.name}`)
+.replace(/[^<]*<\/title>/, 
`${app.info.name}`)
+// Replace the default url with ours, switch off validation &
+// limit the size of documents to apply syntax highlighting to
+.replace(/docExpansion: "none"/, 'docExpansion: "list", '
++ 'validatorUrl: null, '
++ 'highlightSizeThreshold: 1')
+.replace(/ url: url,/, 'url: "/?spec",');
+}
+
+let contentType = 'text/html';
+if (/\.js$/.test(reqPath)) {
+contentType = 'text/javascript';
+body = body.toString()
+.replace(/underscore-min\.map/, 
'?doc=lib/underscore-min.map');
+} else if (/\.png$/.test(reqPath)) {
+contentType = 'image/png';
+} else if (/\.map$/.test(reqPath)) {
+contentType = 'application/json';
+} else if (/\.ttf$/.test(reqPath)) {
+contentType = 'application/x-font-ttf';
+} else if (/\.css$/.test(reqPath)) {
+contentType = 'text/css';
+body = body.toString().replace(/\.\.\/(images|fonts)\//g, 
'?doc=$1/');
+}
+
+res.setHeader('Content-Type', contentType);
+res.setHeader('content-security-policy', "default-src 'none'; " +
+"script-src 'self' 'unsafe-inline'; connect-src *; " +
+"style-src 'self' 'unsafe-inline'; img-src 'self'; 
font-src 'self';");
+res.send(body.toString());
+})
+.catch({ code: 'ENOENT' }, () => {
+res.status(404)
+.type('not_found')
+.send('not found');
+});
+
+}
+
+module.exports = {
+processRequest
+};
+
diff --git a/package.json b/package.json
index f1a64ef..05712d1 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
 "lint": "eslint --cache --max-warnings 0 --ext .js --ext .json .",
 "docker-start": "service-runner docker-start",
 "docker-test": "service-runner docker-test",
+"test-build": "service-runner docker-test && service-runner build 
--deploy-repo --force",
 "coverage": "istanbul cover _mocha -- -R spec"
   },
   "repository": {
@@ -40,45 +41,47 @@
   },
   "homepage": "https://www.mediawiki.org/wiki/RESTBase_services_for_apps;,
   "dependencies": {
-"bluebird": "^3.4.6",
-"body-parser": "^1.15.2",
-"bunyan": "^1.8.5",
+"bluebird":

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-11-12T10:00:01+0000

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390871 )

Change subject: New Wikidata Build - 2017-11-12T10:00:01+
..


New Wikidata Build - 2017-11-12T10:00:01+

Change-Id: I3306af320e1c1f52dab1403706bb01a23cd76ee2
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/et.json
M extensions/Constraints/composer.json
M extensions/PropertySuggester/composer.json
M extensions/Quality/composer.json
M extensions/Quality/i18n/lki.json
M extensions/Wikibase/client/i18n/sat.json
M extensions/Wikibase/client/i18n/sr-ec.json
M extensions/Wikibase/client/i18n/sr-el.json
M extensions/Wikibase/composer.json
M extensions/Wikibase/repo/i18n/be-tarask.json
M extensions/Wikibase/repo/i18n/lki.json
M extensions/Wikidata.org/composer.json
M extensions/WikimediaBadges/composer.json
M vendor/composer/installed.json
15 files changed, 69 insertions(+), 63 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 0caa668..82b46f4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -664,12 +664,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "17248f09b47d2717d2dc9404c0d2a397acded033"
+"reference": "d3e71acf9b62d645e96528dbe21c73b6e1318bb1"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/17248f09b47d2717d2dc9404c0d2a397acded033;,
-"reference": "17248f09b47d2717d2dc9404c0d2a397acded033",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d3e71acf9b62d645e96528dbe21c73b6e1318bb1;,
+"reference": "d3e71acf9b62d645e96528dbe21c73b6e1318bb1",
 "shasum": ""
 },
 "require": {
@@ -699,7 +699,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2017-11-09 21:52:40"
+"time": "2017-11-11 21:27:16"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -707,7 +707,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/PropertySuggester;,
-"reference": "481531e05ec89a2995bab045bf36f64c1f7cc449"
+"reference": "c126d0bc6a21f34fae4d79c9a8b65fa941f4fc8c"
 },
 "require": {
 "php": ">=5.5.9",
@@ -730,7 +730,7 @@
 "minus-x fix ."
 ],
 "test": [
-"parallel-lint . --exclude vendor",
+"parallel-lint . --exclude vendor --exclude node_modules",
 "phpcs -p -s",
 "minus-x check ."
 ]
@@ -745,7 +745,7 @@
 "wikibase",
 "wikidata"
 ],
-"time": "2017-11-09 04:26:17"
+"time": "2017-11-11 17:18:39"
 },
 {
 "name": "serialization/serialization",
@@ -809,7 +809,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org;,
-"reference": "45331b50c5ba98c75e4f34de5e8901edd6e417f5"
+"reference": "dda46fddf11816c44741df965d2cdfd2474d2b65"
 },
 "require": {
 "php": ">=5.5.9"
@@ -823,7 +823,7 @@
 "type": "mediawiki-extension",
 "scripts": {
 "test": [
-"parallel-lint . --exclude vendor",
+"parallel-lint . --exclude vendor --exclude node_modules",
 "phpcs -p -s",
 "minus-x check ."
 ],
@@ -852,7 +852,7 @@
 "support": {
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2017-11-09 19:46:47"
+"time": "2017-11-11 18:42:50"
 },
 {
 "name": "wikibase/constraints",
@@ -860,7 +860,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;,
-"reference": "123b1b6e6773ac7af32ef926ac603717b9aee62a"
+"reference": "45b9e1d225bb2284af71c73b9c5ec799e1922add"
 },
 "require": {
 "php": ">=5.5.9",
@@ -897,7 +897,7 @@

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix insertion annotations in source mode

2017-11-12 Thread Esanders (Code Review) 
Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390876 )

Change subject: Fix insertion annotations in source mode
..

Fix insertion annotations in source mode

By default, do nothing if no text is selected.
NB ve-mw overrides these tools to insert placeholder text.

Change-Id: I84f28821bb00b4d61a824af5f4d0f64514641563
---
M src/ui/actions/ve.ui.AnnotationAction.js
M src/ui/ve.ui.Tool.js
2 files changed, 16 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/76/390876/1

diff --git a/src/ui/actions/ve.ui.AnnotationAction.js 
b/src/ui/actions/ve.ui.AnnotationAction.js
index f6c47c9..e0bd7fa 100644
--- a/src/ui/actions/ve.ui.AnnotationAction.js
+++ b/src/ui/actions/ve.ui.AnnotationAction.js
@@ -101,6 +101,8 @@
} else {
fragment.annotateContent( 'clear', name );
}
+   } else if ( surfaceModel.sourceMode ) {
+   return false;
} else {
insertionAnnotations = surfaceModel.getInsertionAnnotations();
existingAnnotations = 
insertionAnnotations.getAnnotationsByName( annotation.name );
diff --git a/src/ui/ve.ui.Tool.js b/src/ui/ve.ui.Tool.js
index 96cf8ac..0a63bd1 100644
--- a/src/ui/ve.ui.Tool.js
+++ b/src/ui/ve.ui.Tool.js
@@ -104,23 +104,31 @@
  * @inheritdoc
  */
 ve.ui.Tool.prototype.onSelect = function () {
-   var command = this.getCommand(),
-   surface = this.toolbar.getSurface();
+   var contextClosePromise,
+   command = this.getCommand(),
+   surface = this.toolbar.getSurface(),
+   tool = this;
+
if ( command instanceof ve.ui.Command ) {
if ( surface.context.inspector ) {
-   surface.context.inspector.close().closed.done( function 
() {
-   command.execute( surface );
-   } );
+   contextClosePromise = 
surface.context.inspector.close().closed;
} else {
+   contextClosePromise = $.Deferred().resolve().promise();
command.execute( surface );
}
}
if ( this.constructor.static.deactivateOnSelect ) {
-   // Even if the promise route was taken above, it's fine to call 
setActive here; it
+   // It's fine to call setActive here before the promise 
resolves; it
// just disables the button, stopping double-clicks and making 
it feel more responsive
// if the promise is slow.
this.setActive( false );
}
+   contextClosePromise.done( function () {
+   if ( !command.execute( surface ) ) {
+   // If the command fails, ensure the tool is not active
+   tool.setActive( false );
+   }
+   } );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84f28821bb00b4d61a824af5f4d0f64514641563
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/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] translatewiki[master]: [BlueSpiceChecklist] Register extension

2017-11-12 Thread Raimond Spekking (Code Review) 
Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390875 )

Change subject: [BlueSpiceChecklist] Register extension
..


[BlueSpiceChecklist] Register extension

Change-Id: I1b999fcd3b11e3dc89fad7ef18c1b641628999aa
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index f72f269..bc1de49 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -363,6 +363,9 @@
 Blue Spice Category Manager
 aliasfile = 
BlueSpiceCategoryManager/includes/specials/SpecialBlueSpiceCategoryManager.alias.php
 
+Blue Spice Checklist
+descmsg = bs-checklist-desc
+
 Blue Spice Config Manager
 descmsg = bs-preferences-desc
 aliasfile = 
BlueSpiceConfigManager/includes/specials/SpecialBlueSpicePreferences.alias.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b999fcd3b11e3dc89fad7ef18c1b641628999aa
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [BlueSpiceChecklist] Register extension

2017-11-12 Thread Raimond Spekking (Code Review) 
Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390875 )

Change subject: [BlueSpiceChecklist] Register extension
..

[BlueSpiceChecklist] Register extension

Change-Id: I1b999fcd3b11e3dc89fad7ef18c1b641628999aa
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/75/390875/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index f72f269..bc1de49 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -363,6 +363,9 @@
 Blue Spice Category Manager
 aliasfile = 
BlueSpiceCategoryManager/includes/specials/SpecialBlueSpiceCategoryManager.alias.php
 
+Blue Spice Checklist
+descmsg = bs-checklist-desc
+
 Blue Spice Config Manager
 descmsg = bs-preferences-desc
 aliasfile = 
BlueSpiceConfigManager/includes/specials/SpecialBlueSpicePreferences.alias.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b999fcd3b11e3dc89fad7ef18c1b641628999aa
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Document language changes for Mirandese

2017-11-12 Thread MarcoAurelio (Code Review) 
MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390874 )

Change subject: Document language changes for Mirandese
..

Document language changes for Mirandese

Bug: T180052
Change-Id: I60d809145678a2cd523776ba8e981da21f6e3ef9
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [Planet Wikimedia] Remove EndPoint from English planet feeds

2017-11-12 Thread Nemo bis (Code Review) 
Nemo bis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390873 )

Change subject: [Planet Wikimedia] Remove EndPoint from English planet feeds
..

[Planet Wikimedia] Remove EndPoint from English planet feeds

The tag feeds disappeared and now it's spamming the whole blog.

Change-Id: I2ac77864f6edca545d6a93bd4f1896c02be545ec
---
M modules/planet/templates/feeds/en_config.erb
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index 7e9fad1..bf78459 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -482,9 +482,6 @@
 [https://blog.legoktm.com/feeds/mediawiki.atom.xml]
 name=User:Legoktm
 
-[http://blog.endpoint.com/feeds/posts/default/-/mediawiki/]
-name=Greg Sabino Mullane
-
 [http://thewikipedian.net/feed/]
 name=William Beutler
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ac77864f6edca545d6a93bd4f1896c02be545ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Normalize wikibase related URIs to 'https'

2017-11-12 Thread Dalba (Code Review) 
Dalba has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390872 )

Change subject: Normalize wikibase related URIs to 'https'
..

Normalize wikibase related URIs to 'https'

This patch is a follow-up to cf84e4f616372289239e76fa0ac08896c4eb2f26 which
was causing some tests.

Wikibase API responses may contain 'http://' URIs, normalize them
to 'https://'.

Change-Id: I769dca0bb9e62c2c5695f344d2757ea3ad50f53a
---
M pywikibot/__init__.py
M pywikibot/page.py
M tests/pages/Q60.wd
3 files changed, 52 insertions(+), 52 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/72/390872/1

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 6404b19..6c7f74d 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -333,7 +333,7 @@
 return {'latitude': self.lat,
 'longitude': self.lon,
 'altitude': self.alt,
-'globe': self.entity,
+'globe': self.entity.replace('http://', 'https://', 1),
 'precision': self.precision,
 }
 
@@ -556,7 +556,7 @@
 if site is None:
 raise ValueError('Site %s has no data repository' % Site())
 calendarmodel = site.calendarmodel()
-self.calendarmodel = calendarmodel
+self.calendarmodel = calendarmodel.replace('http://', 'https://', 1)
 
 # if precision is given it overwrites the autodetection above
 if precision is not None:
@@ -840,7 +840,7 @@
 json = {'amount': self._fromdecimal(self.amount),
 'upperBound': self._fromdecimal(self.upperBound),
 'lowerBound': self._fromdecimal(self.lowerBound),
-'unit': self.unit
+'unit': self.unit.replace('http://', 'https://', 1)
 }
 return json
 
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 10144b8..71132e3 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4243,8 +4243,8 @@
 if not isinstance(site, DataSite):
 raise TypeError('{0} is not a data repository.'.format(site))
 
-base_uri, _, qid = uri.rpartition('/')
-if base_uri != site.concept_base_uri.rstrip('/'):
+base_uri, _, qid = uri.partition('//')[2].rpartition('/')
+if base_uri != site.concept_base_uri.partition('//')[2].rstrip('/'):
 raise ValueError(
 'The supplied data repository ({repo}) does not correspond to '
 'that of the item ({item})'.format(
diff --git a/tests/pages/Q60.wd b/tests/pages/Q60.wd
index b242c7d..b21fcd8 100644
--- a/tests/pages/Q60.wd
+++ b/tests/pages/Q60.wd
@@ -1916,7 +1916,7 @@
 "before": 0,
 "after": 0,
 "precision": 11,
-"calendarmodel": 
"http://www.wikidata.org/entity/Q1985727;
+"calendarmodel": 
"https://www.wikidata.org/entity/Q1985727;
 },
 "type": "time"
 }
@@ -1935,7 +1935,7 @@
 "before": 0,
 "after": 0,
 "precision": 11,
-"calendarmodel": 
"http://www.wikidata.org/entity/Q1985727;
+"calendarmodel": 
"https://www.wikidata.org/entity/Q1985727;
 },
 "type": "time"
 }
@@ -1977,7 +1977,7 @@
 "before": 0,
 "after": 0,
 "precision": 11,
-"calendarmodel": 
"http://www.wikidata.org/entity/Q1985727;
+"calendarmodel": 
"https://www.wikidata.org/entity/Q1985727;
 },
 "type": "time"
 }
@@ -1996,7 +1996,7 @@
 "before": 0,
 "after": 0,
 "precision": 11,
-"calendarmodel": 
"http://www.wikidata.org/entity/Q1985727;
+"calendarmodel": 
"https://www.wikidata.org/entity/Q1985727;
 },
 "type": "time"
 }
@@ -2038,7 +2038,7 @@
 "before": 0,
 "after": 0,
 "precision": 11,
-"calendarmodel": 
"http://www.wikidata.org/entity/Q1985727;
+

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-11-12T10:00:01+0000

2017-11-12 Thread WikidataBuilder (Code Review) 
WikidataBuilder has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390871 )

Change subject: New Wikidata Build - 2017-11-12T10:00:01+
..

New Wikidata Build - 2017-11-12T10:00:01+

Change-Id: I3306af320e1c1f52dab1403706bb01a23cd76ee2
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/et.json
M extensions/Constraints/composer.json
M extensions/PropertySuggester/composer.json
M extensions/Quality/composer.json
M extensions/Quality/i18n/lki.json
M extensions/Wikibase/client/i18n/sat.json
M extensions/Wikibase/client/i18n/sr-ec.json
M extensions/Wikibase/client/i18n/sr-el.json
M extensions/Wikibase/composer.json
M extensions/Wikibase/repo/i18n/be-tarask.json
M extensions/Wikibase/repo/i18n/lki.json
M extensions/Wikidata.org/composer.json
M extensions/WikimediaBadges/composer.json
M vendor/composer/installed.json
15 files changed, 69 insertions(+), 63 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 0caa668..82b46f4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -664,12 +664,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git;,
-"reference": "17248f09b47d2717d2dc9404c0d2a397acded033"
+"reference": "d3e71acf9b62d645e96528dbe21c73b6e1318bb1"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/17248f09b47d2717d2dc9404c0d2a397acded033;,
-"reference": "17248f09b47d2717d2dc9404c0d2a397acded033",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d3e71acf9b62d645e96528dbe21c73b6e1318bb1;,
+"reference": "d3e71acf9b62d645e96528dbe21c73b6e1318bb1",
 "shasum": ""
 },
 "require": {
@@ -699,7 +699,7 @@
 ],
 "description": "Provides a special page with Wikibase information 
about a certain topic, with invitation to create an article for the topic",
 "homepage": 
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder;,
-"time": "2017-11-09 21:52:40"
+"time": "2017-11-11 21:27:16"
 },
 {
 "name": "propertysuggester/property-suggester",
@@ -707,7 +707,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/PropertySuggester;,
-"reference": "481531e05ec89a2995bab045bf36f64c1f7cc449"
+"reference": "c126d0bc6a21f34fae4d79c9a8b65fa941f4fc8c"
 },
 "require": {
 "php": ">=5.5.9",
@@ -730,7 +730,7 @@
 "minus-x fix ."
 ],
 "test": [
-"parallel-lint . --exclude vendor",
+"parallel-lint . --exclude vendor --exclude node_modules",
 "phpcs -p -s",
 "minus-x check ."
 ]
@@ -745,7 +745,7 @@
 "wikibase",
 "wikidata"
 ],
-"time": "2017-11-09 04:26:17"
+"time": "2017-11-11 17:18:39"
 },
 {
 "name": "serialization/serialization",
@@ -809,7 +809,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org;,
-"reference": "45331b50c5ba98c75e4f34de5e8901edd6e417f5"
+"reference": "dda46fddf11816c44741df965d2cdfd2474d2b65"
 },
 "require": {
 "php": ">=5.5.9"
@@ -823,7 +823,7 @@
 "type": "mediawiki-extension",
 "scripts": {
 "test": [
-"parallel-lint . --exclude vendor",
+"parallel-lint . --exclude vendor --exclude node_modules",
 "phpcs -p -s",
 "minus-x check ."
 ],
@@ -852,7 +852,7 @@
 "support": {
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2017-11-09 19:46:47"
+"time": "2017-11-11 18:42:50"
 },
 {
 "name": "wikibase/constraints",
@@ -860,7 +860,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;,
-"reference": "123b1b6e6773ac7af32ef926ac603717b9aee62a"
+"reference": "45b9e1d225bb2284af71c73b9c5ec799e1922add"
 },
 "require": {
 "php": ">=5.5.9",
@@ -897,7 +897,7

[MediaWiki-commits] [Gerrit] mediawiki...MultiUpload[master]: Removing my email address

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390859 )

Change subject: Removing my email address
..


Removing my email address

Change-Id: I93f4ae1ff24b0333ea0779ad826061ef5486c7d8
---
M i18n/fi.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/fi.json b/i18n/fi.json
index d920bab..de2da88 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -1,7 +1,7 @@
 {
"@metadata": {
"authors": [
-   "Jack Phoenix ",
+   "Jack Phoenix",
"Hopea"
]
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93f4ae1ff24b0333ea0779ad826061ef5486c7d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiUpload
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...NoBogusUserpages[master]: Removing my email address

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390868 )

Change subject: Removing my email address
..


Removing my email address

Change-Id: I362f74d65174a845409058a6459e8f8dff9033c9
---
M i18n/fi.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/i18n/fi.json b/i18n/fi.json
index 263398d..0434f93 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -1,7 +1,7 @@
 {
"@metadata": {
"authors": [
-   "Jack Phoenix "
+   "Jack Phoenix"
]
},
"nobogususerpages-desc": "Rajoittaa käyttäjäsivujen luontia sellaisille 
käyttäjätunnuksille, joita ei ole olemassa",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I362f74d65174a845409058a6459e8f8dff9033c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NoBogusUserpages
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] keeping categories from non-english sites

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390777 )

Change subject: [bugfix] keeping categories from non-english sites
..


[bugfix] keeping categories from non-english sites

Adds the site for the text on the call to textlib.getCategoryLinks
to keep categories already in the page when using CategoryAddBot
(ammend for negliting to type a self.)

Bug: T180289
Change-Id: I361a17a82931b09a7a8659d02b9a5eea21802c46
---
M scripts/category.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scripts/category.py b/scripts/category.py
index c244114..263b92d 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -362,7 +362,7 @@
 return
 # store old text, so we don't have reload it every time
 old_text = text
-cats = textlib.getCategoryLinks(text)
+cats = textlib.getCategoryLinks(text, self.current_page.site)
 pywikibot.output(u"Current categories:")
 for cat in cats:
 pywikibot.output(u"* %s" % cat.title())

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I361a17a82931b09a7a8659d02b9a5eea21802c46
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Chico Venancio 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
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...ImageRating[master]: Removing my email address

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390869 )

Change subject: Removing my email address
..


Removing my email address

Change-Id: I3aa56c7baef9c34d1c07ad29e184a8c7f74615c0
---
M includes/api/ApiImageRating.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/includes/api/ApiImageRating.php b/includes/api/ApiImageRating.php
index 9c74fc9..6b26e28 100644
--- a/includes/api/ApiImageRating.php
+++ b/includes/api/ApiImageRating.php
@@ -4,8 +4,6 @@
  *
  * @file
  * @ingroup API
- * @author Jack Phoenix 
- * @date 14 January 2017
  * @see https://www.mediawiki.org/wiki/API:Extensions#ApiSampleApiExtension.php
  */
 class ApiImageRating extends ApiBase {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3aa56c7baef9c34d1c07ad29e184a8c7f74615c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageRating
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...grabbers[master]: Removing my email address

2017-11-12 Thread Jack Phoenix (Code Review) 
Jack Phoenix has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390870 )

Change subject: Removing my email address
..


Removing my email address

Change-Id: I73b3ee66ed31bd4233b0593d1eff57bae32c9378
---
M grabUserBlocks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jack Phoenix: Verified; Looks good to me, approved



diff --git a/grabUserBlocks.php b/grabUserBlocks.php
index 0f25579..ce9865e 100644
--- a/grabUserBlocks.php
+++ b/grabUserBlocks.php
@@ -5,7 +5,7 @@
  *
  * @file
  * @ingroup Maintenance
- * @author Jack Phoenix 
+ * @author Jack Phoenix
  * @author Jesús Martínez 
  * @version 1.0
  * @date 28 July 2013

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73b3ee66ed31bd4233b0593d1eff57bae32c9378
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/grabbers
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...grabbers[master]: Removing my email address

2017-11-12 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390870 )

Change subject: Removing my email address
..

Removing my email address

Change-Id: I73b3ee66ed31bd4233b0593d1eff57bae32c9378
---
M grabUserBlocks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/grabbers 
refs/changes/70/390870/1

diff --git a/grabUserBlocks.php b/grabUserBlocks.php
index 0f25579..ce9865e 100644
--- a/grabUserBlocks.php
+++ b/grabUserBlocks.php
@@ -5,7 +5,7 @@
  *
  * @file
  * @ingroup Maintenance
- * @author Jack Phoenix 
+ * @author Jack Phoenix
  * @author Jesús Martínez 
  * @version 1.0
  * @date 28 July 2013

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73b3ee66ed31bd4233b0593d1eff57bae32c9378
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/grabbers
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...ImageRating[master]: Removing my email address

2017-11-12 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390869 )

Change subject: Removing my email address
..

Removing my email address

Change-Id: I3aa56c7baef9c34d1c07ad29e184a8c7f74615c0
---
M includes/api/ApiImageRating.php
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ImageRating 
refs/changes/69/390869/1

diff --git a/includes/api/ApiImageRating.php b/includes/api/ApiImageRating.php
index 9c74fc9..6b26e28 100644
--- a/includes/api/ApiImageRating.php
+++ b/includes/api/ApiImageRating.php
@@ -4,8 +4,6 @@
  *
  * @file
  * @ingroup API
- * @author Jack Phoenix 
- * @date 14 January 2017
  * @see https://www.mediawiki.org/wiki/API:Extensions#ApiSampleApiExtension.php
  */
 class ApiImageRating extends ApiBase {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aa56c7baef9c34d1c07ad29e184a8c7f74615c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ImageRating
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...NoBogusUserpages[master]: Removing my email address

2017-11-12 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390868 )

Change subject: Removing my email address
..

Removing my email address

Change-Id: I362f74d65174a845409058a6459e8f8dff9033c9
---
M i18n/fi.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/i18n/fi.json b/i18n/fi.json
index 263398d..0434f93 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -1,7 +1,7 @@
 {
"@metadata": {
"authors": [
-   "Jack Phoenix "
+   "Jack Phoenix"
]
},
"nobogususerpages-desc": "Rajoittaa käyttäjäsivujen luontia sellaisille 
käyttäjätunnuksille, joita ei ole olemassa",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I362f74d65174a845409058a6459e8f8dff9033c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NoBogusUserpages
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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

[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Removing my email address

2017-11-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390867 )

Change subject: Removing my email address
..


Removing my email address

Change-Id: Iddf616b3e904d8b2166d8ef642c39b8fcbcf
---
M i18n/fi.json
M includes/DeskMessMirroredTemplate.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/i18n/fi.json b/i18n/fi.json
index b5b7158..88bdb7d 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -1,7 +1,7 @@
 {
"@metadata": {
"authors": [
-   "Jack Phoenix "
+   "Jack Phoenix"
]
},
"deskmessmirrored-skin-desc": "Marmorinen pöytä, jonka päällä on 
sekoitus erinäisiä uusia ja vanhoja esineitä, kuten vanhoja papereita, 
ruostumattomasta teräksestä valmistettu kynä ja kuppi kuumaa kahvia!"
diff --git a/includes/DeskMessMirroredTemplate.php 
b/includes/DeskMessMirroredTemplate.php
index 44f4f31..6a8a181 100644
--- a/includes/DeskMessMirroredTemplate.php
+++ b/includes/DeskMessMirroredTemplate.php
@@ -6,7 +6,7 @@
  *
  * @file
  * @author Edward Caissie  -- original WordPress 
theme
- * @author Jack Phoenix  -- MediaWiki port
+ * @author Jack Phoenix -- MediaWiki port
  * @see http://wordpress.org/themes/desk-mess-mirrored
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public 
License version 2
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddf616b3e904d8b2166d8ef642c39b8fcbcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeskMessMirrored
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DeskMessMirrored[master]: Removing my email address

2017-11-12 Thread Jack Phoenix (Code Review) 
Jack Phoenix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390867 )

Change subject: Removing my email address
..

Removing my email address

Change-Id: Iddf616b3e904d8b2166d8ef642c39b8fcbcf
---
M i18n/fi.json
M includes/DeskMessMirroredTemplate.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DeskMessMirrored 
refs/changes/67/390867/1

diff --git a/i18n/fi.json b/i18n/fi.json
index b5b7158..88bdb7d 100644
--- a/i18n/fi.json
+++ b/i18n/fi.json
@@ -1,7 +1,7 @@
 {
"@metadata": {
"authors": [
-   "Jack Phoenix "
+   "Jack Phoenix"
]
},
"deskmessmirrored-skin-desc": "Marmorinen pöytä, jonka päällä on 
sekoitus erinäisiä uusia ja vanhoja esineitä, kuten vanhoja papereita, 
ruostumattomasta teräksestä valmistettu kynä ja kuppi kuumaa kahvia!"
diff --git a/includes/DeskMessMirroredTemplate.php 
b/includes/DeskMessMirroredTemplate.php
index 44f4f31..6a8a181 100644
--- a/includes/DeskMessMirroredTemplate.php
+++ b/includes/DeskMessMirroredTemplate.php
@@ -6,7 +6,7 @@
  *
  * @file
  * @author Edward Caissie  -- original WordPress 
theme
- * @author Jack Phoenix  -- MediaWiki port
+ * @author Jack Phoenix -- MediaWiki port
  * @see http://wordpress.org/themes/desk-mess-mirrored
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public 
License version 2
  */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddf616b3e904d8b2166d8ef642c39b8fcbcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/DeskMessMirrored
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 

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