[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Refactored CollaborationKitImage to use parser

[jenkins-bot (Code Review)]

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

Change subject: Refactored CollaborationKitImage to use parser
..


Refactored CollaborationKitImage to use parser

This helps with HiDPI support by recycling what the parser is already doing.

Bug: T158146
Change-Id: Ie6a12381b574e0d384182f61757dbe0a9b434b87
---
M includes/content/CollaborationKitImage.php
1 file changed, 33 insertions(+), 43 deletions(-)

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



diff --git a/includes/content/CollaborationKitImage.php 
b/includes/content/CollaborationKitImage.php
index c7afe56..ac2fb7f 100644
--- a/includes/content/CollaborationKitImage.php
+++ b/includes/content/CollaborationKitImage.php
@@ -30,25 +30,16 @@
 */
public static function makeImage( $image, $width, $options = [] ) {
 
-   // Default options
-   if ( !isset( $options['classes'] ) ) {
-   $options['classes'] = [];
-   }
-   if ( !isset( $options['link'] ) ) {
-   $options['link'] = true;
-   }
-   if ( !isset( $options['colour'] ) ) {
-   $options['colour'] = '';
-   }
-   if ( !isset( $options['css'] ) ) {
-   $options['css'] = '';
-   }
-   if ( !isset( $options['renderAsWikitext'] ) ) {
-   $options['renderAsWikitext'] = false;
-   }
-   if ( !isset( $options['label'] ) ) {
-   $options['label'] = '';
-   }
+   $cannedIcons = self::getCannedIcons();
+
+   // Setting up options
+   $classes = isset( $options['classes'] ) ? $options['classes'] : 
[];
+   $link = isset( $options['link'] ) ? $options['link'] : true;
+   $colour = isset( $options['colour'] ) ? $options['colour'] : '';
+   $css = isset( $options['css'] ) ? $options['css'] : '';
+   $renderAsWikitext = isset( $options['renderAsWikitext'] ) ? 
$options['renderAsWikitext'] : false;
+   $label = isset( $options['label'] ) ? $options['label'] : '';
+
if ( !isset( $options['fallback'] ) ) {
if ( isset( $options['label'] ) ) {
$options['fallback'] = $options['label'];
@@ -56,8 +47,6 @@
$options['fallback'] = 'none';
}
}
-
-   $cannedIcons = self::getCannedIcons();
 
// Use fallback icon or random icon if stated image doesn't 
exist
if ( $image === null || $image == '' || ( !wfFindFile( $image ) 
&& !in_array( $image, $cannedIcons ) ) ) {
@@ -72,15 +61,15 @@
 
// Are we loading an image file or constructing a div based on 
an icon class?
if ( wfFindFile( $image ) ) {
-   $imageCode = self::makeImageFromFile( $image, 
$options['classes'], $width, $options[ 'link' ],
-   $options['renderAsWikitext'], $options['label'] 
);
+   $imageCode = self::makeImageFromFile( $image, $classes, 
$width, $link,
+   $renderAsWikitext, $label );
} elseif ( in_array( $image, $cannedIcons ) ) {
-   $imageCode = self::makeImageFromIcon( $image, 
$options['classes'], $width, $options[ 'colour' ],
-   $options['link'], $options['renderAsWikitext'], 
$options['label'] );
+   $imageCode = self::makeImageFromIcon( $image, $classes, 
$width, $colour,
+   $link, $renderAsWikitext, $label );
}
 
// Finishing up
-   $wrapperAttributes = [ 'class' => $options['classes'], 'style' 
=> $options['css'] ];
+   $wrapperAttributes = [ 'class' => $classes, 'style' => $css ];
$imageBlock = Html::rawElement( 'div', $wrapperAttributes, 
$imageCode );
return $imageBlock;
}
@@ -93,24 +82,26 @@
// This assumes that colours cannot be assigned to images.
// This is currently true, but who knows what the future might 
hold!
 
+   global $wgParser;
+
$imageObj = wfFindFile( $image );
-   $imageFullName = $imageObj->getTitle()->getFullText();
+   $imageTitle = $imageObj->getTitle();
+   $imageFullName = $imageTitle->getFullText();
+
+   $wikitext = "[[{$imageFullName}|{$width}px";
+
+   if ( $link === false || $label != '' ) {
+   $wikitext .= '|link=]]';
+   } elseif ( is_string( $link ) ) {
+   $wikitext .= "|link={$link}]]";
+   

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: stylelint: Fix spaces and extra semi-colon issues

[KartikMistry (Code Review)]

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

Change subject: stylelint: Fix spaces and extra semi-colon issues
..

stylelint: Fix spaces and extra semi-colon issues

Change-Id: Id800a25a93d0d9cb57cd23159ca1ef8236dc397c
---
M modules/tools/styles/ext.cx.tools.link.less
M modules/tools/styles/ext.cx.tools.template.less
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/modules/tools/styles/ext.cx.tools.link.less 
b/modules/tools/styles/ext.cx.tools.link.less
index b2386a8..738d7c8 100644
--- a/modules/tools/styles/ext.cx.tools.link.less
+++ b/modules/tools/styles/ext.cx.tools.link.less
@@ -16,7 +16,7 @@
.mw-ui-item;
padding: 0;
 
-   &:nth-of-type(1) {
+   &:nth-of-type( 1 ) {
position: absolute;
top: 0;
left: 0;
@@ -24,12 +24,12 @@
transition: top 0.15s;
 
// On mouse over of first card, push the second card a 
bit down.
-   &:hover + .card:nth-of-type(2) {
+   &:hover + .card:nth-of-type( 2 ) {
top: 60px;
}
}
 
-   &:nth-of-type(2) {
+   &:nth-of-type( 2 ) {
position: relative;
top: 30px;
transition: top 0.3s;
diff --git a/modules/tools/styles/ext.cx.tools.template.less 
b/modules/tools/styles/ext.cx.tools.template.less
index cb910a3..b3809b9 100644
--- a/modules/tools/styles/ext.cx.tools.template.less
+++ b/modules/tools/styles/ext.cx.tools.template.less
@@ -31,5 +31,5 @@
a[about] {
// Disable all links that are template fragments.
pointer-events: none;
-   };
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id800a25a93d0d9cb57cd23159ca1ef8236dc397c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: stylelint: Bump stylelint

[KartikMistry (Code Review)]

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

Change subject: stylelint: Bump stylelint
..

stylelint: Bump stylelint

* grunt-stylelint 0.6.0 → 0.7.0
* stylelint-config-wikimedia 0.3.0 → 0.4.1

Bug: T155669
Change-Id: I5f4544f3d52bd3f94f6094f89d9a6257ec388681
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/package.json b/package.json
index 7265735..51ffab6 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
 "grunt-banana-checker": "0.5.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.0.8",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0",
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1",
 "stylelint": "^7.8.0"
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f4544f3d52bd3f94f6094f89d9a6257ec388681
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...PollNY[master]: Remove commented out reference to 'ajax-loader.gif'

[SamanthaNguyen (Code Review)]

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

Change subject: Remove commented out reference to 'ajax-loader.gif'
..

Remove commented out reference to 'ajax-loader.gif'

Bug: T158460
Change-Id: Ib2694a94ac0aa43eaf951aea8a5ac0962609348e
---
M Poll.js
M extension.json
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PollNY 
refs/changes/12/338512/1

diff --git a/Poll.js b/Poll.js
index 1d10d45..fc40518 100644
--- a/Poll.js
+++ b/Poll.js
@@ -40,7 +40,6 @@
loadingLightBox: function() {
// pop up the lightbox
var objLink = {};
-   //objLink.href = wgServer + wgScriptPath + 
'/extensions/PollNY/images/ajax-loader.gif';
objLink.href = '';
objLink.title = '';
 
@@ -526,4 +525,4 @@
PollNY.create();
} );
}
-} );
\ No newline at end of file
+} );
diff --git a/extension.json b/extension.json
index 15ccc92..87c7df3 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "PollNY",
-   "version": "3.3.4",
+   "version": "3.3.5",
"author": [
"Aaron Wright",
"David Pean",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2694a94ac0aa43eaf951aea8a5ac0962609348e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PollNY
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...SocialProfile[master]: Remove unused file, 'ajax-loader.gif`

[SamanthaNguyen (Code Review)]

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

Change subject: Remove unused file, 'ajax-loader.gif`
..

Remove unused file, 'ajax-loader.gif`

Bug: T158460
Change-Id: I60f06d332dc79aa586096d44d0bed71b6a17
---
D images/ajax-loader.gif
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/images/ajax-loader.gif b/images/ajax-loader.gif
deleted file mode 100644
index 88e5c71..000
--- a/images/ajax-loader.gif
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60f06d332dc79aa586096d44d0bed71b6a17
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] integration/config[master]: NavigationTiming: Re-add extension-qunit-generic

[jenkins-bot (Code Review)]

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

Change subject: NavigationTiming: Re-add extension-qunit-generic
..


NavigationTiming: Re-add extension-qunit-generic

Change-Id: Ia45b23c274436cb247912f3ae3b64fce5ec61caf
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1f07709..8ec508e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4267,6 +4267,7 @@
 template:
   - name: extension-gate
   - name: extension-unittests-generic
+  - name: extension-qunit-generic
   - name: npm
 check:
   - jsonlint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia45b23c274436cb247912f3ae3b64fce5ec61caf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
M resources/css/ext.uls.pt.less
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 369d09c..a2a0960 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 "grunt-banana-checker": "0.5.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/resources/css/ext.uls.pt.less b/resources/css/ext.uls.pt.less
index 05982b1..f6734e0 100644
--- a/resources/css/ext.uls.pt.less
+++ b/resources/css/ext.uls.pt.less
@@ -26,11 +26,13 @@
 /* Opera for some inexplicable reason confuses right and left padding with */
 /* RTL text direction here (bug T47142). x:-o-prefocus won't match anything, */
 /* but will make other browsers ignore this rule. */
+/* stylelint-disable selector-type-no-unknown */
 x:-o-prefocus,
 body.rtl li#pt-uls {
/* @noflip */
direction: ltr;
 }
+/* stylelint-enable selector-type-no-unknown */
 
 /* Don't show it to users who disabled JS */
 .client-nojs #pt-uls {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M components/search.less
M components/tabs.less
M components/watchstar.less
M package.json
M variables.less
5 files changed, 9 insertions(+), 9 deletions(-)

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



diff --git a/components/search.less b/components/search.less
index 1e07004..81297d0 100644
--- a/components/search.less
+++ b/components/search.less
@@ -53,7 +53,7 @@
direction: ltr;
 
&:focus {
-   outline: none;
+   outline: 0;
}
 
// These rules MAY NOT be merged because of how CSS requires 
browsers
diff --git a/components/tabs.less b/components/tabs.less
index 915198b..0801ca2 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -203,7 +203,7 @@
text-align: left;
 }
 
-// stylelint-disable selector-no-vendor-prefix
+// stylelint-disable selector-no-vendor-prefix, selector-type-no-unknown
 
 /* Fixes old versions of FireFox */
 div.vectorMenu ul,
@@ -218,7 +218,7 @@
min-width: 0;
 }
 
-// stylelint-enable selector-no-vendor-prefix
+// stylelint-enable selector-no-vendor-prefix, selector-type-no-unknown
 
 div.vectorMenu li {
padding: 0;
diff --git a/components/watchstar.less b/components/watchstar.less
index 5143ab1..17bcbd7 100644
--- a/components/watchstar.less
+++ b/components/watchstar.less
@@ -35,7 +35,7 @@
.background-image-svg( 'images/watch-icon-loading.svg', 
'images/watch-icon-loading.png' );
.rotation( 700ms );
/* Suppress the hilarious rotating focus outline on Firefox */
-   outline: none;
+   outline: 0;
cursor: default;
pointer-events: none;
background-position: 50% 60%;
diff --git a/package.json b/package.json
index 3f10785..cb1671c 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,12 @@
 "doc": "jsduck"
   },
   "devDependencies": {
-"grunt": "1.0.1",
-"grunt-eslint": "19.0.0",
 "eslint-config-wikimedia": "0.3.0",
+"grunt": "1.0.1",
 "grunt-banana-checker": "0.5.0",
+"grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/variables.less b/variables.less
index d6a7e02..45f1044 100644
--- a/variables.less
+++ b/variables.less
@@ -10,7 +10,7 @@
 @content-line-height: 1.6;
 @content-padding: 1em;
 @content-heading-font-size: 1.8em;
-@content-heading-font-family: 'Linux Libertine', Georgia, Times, serif;
+@content-heading-font-family: 'Linux Libertine', 'Georgia', 'Times', serif;
 @content-heading-font-family-generic: sans-serif;
 @body-background-color: #fff;
 @heading-line-height: 1.3;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M modules/ext.RevisionSlider.css
M package.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index 085c838..4be6066 100644
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -361,7 +361,7 @@
height: 17px;
 }
 
-.mw-revslider-pointer-newer  .mw-revslider-pointer-line-upper {
+.mw-revslider-pointer-newer .mw-revslider-pointer-line-upper {
height: 71px;
 }
 
diff --git a/package.json b/package.json
index 84b5fd4..83e2afb 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
 "grunt-banana-checker": "0.5.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
M resources/screen.css
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/package.json b/package.json
index e75aa12..0fb6831 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-jscs": "2.8.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/resources/screen.css b/resources/screen.css
index c72f11f..247582c 100644
--- a/resources/screen.css
+++ b/resources/screen.css
@@ -498,7 +498,7 @@
 }
 #searchInput:focus {
width: 12em;
-   outline: none;
+   outline: 0;
 }
 #searchButton {
background-color: transparent;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M .stylelintrc
M package.json
2 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/.stylelintrc b/.stylelintrc
index 2c90730..533d1c4 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,3 +1,6 @@
 {
-   "extends": "stylelint-config-wikimedia"
+   "extends": "stylelint-config-wikimedia",
+   "rules": {
+   "value-keyword-case": null
+   }
 }
diff --git a/package.json b/package.json
index 9b31714..2c70c54 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-jscs": "2.8.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/wikihiero
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M modules/page/ext.proofreadpage.page.navigation.vector.css
M package.json
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/page/ext.proofreadpage.page.navigation.vector.css 
b/modules/page/ext.proofreadpage.page.navigation.vector.css
index a469376..3c3172d 100644
--- a/modules/page/ext.proofreadpage.page.navigation.vector.css
+++ b/modules/page/ext.proofreadpage.page.navigation.vector.css
@@ -4,7 +4,7 @@
 .prp-tabs #ca-proofreadPageIndexLink.icon a {
margin: 0;
padding: 0;
-   outline: none;
+   outline: 0;
display: block;
width: 26px;
/* This hides the text but shows the background image */
diff --git a/package.json b/package.json
index d29dbcc..b2a9718 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 "grunt-contrib-jshint": "1.0.0",
 "grunt-jscs": "2.8.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Citoid[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M .stylelintrc
M package.json
2 files changed, 3 insertions(+), 12 deletions(-)

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



diff --git a/.stylelintrc b/.stylelintrc
index 87325ff..2c90730 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,12 +1,3 @@
 {
-   "extends": "stylelint-config-wikimedia",
-   "rules": {
-   "no-browser-hacks": [ true, {
-   "browsers": [ ">5%", "Chrome >= 1", "Firefox >= 15", 
"Explorer >= 9", "Edge >= 1", "iOS >= 7", "Opera >= 12", "Safari >= 7", 
"ExplorerMobile >= 10", "Android >= 3", "not BlackBerry >= 1", "ChromeAndroid 
>= 1", "FirefoxAndroid >= 1", "OperaMobile >= 12", "not OperaMini >= 1" ]
-   } ],
-
-   "no-unsupported-browser-features": [ true, {
-   "browsers": [ ">5%", "Chrome >= 1", "Firefox >= 15", 
"Explorer >= 9", "Edge >= 12", "iOS >= 7", "Opera >= 12", "Safari >= 7", 
"ExplorerMobile >= 10", "Android >= 4", "not BlackBerry >= 1", "ChromeAndroid 
>= 1", "FirefoxAndroid >= 1", "OperaMobile >= 12", "not OperaMini >= 1" ]
-   } ],
-   }
+   "extends": "stylelint-config-wikimedia"
 }
diff --git a/package.json b/package.json
index 4e12a0f..d05cc60 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
 "grunt-banana-checker": "0.5.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/package.json b/package.json
index 09ae647..1fb2b94 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ChangeAuthor[master]: Add grunt-jsonlint and grunt-banana-checker

[Umherirrender (Code Review)]

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

Change subject: Add grunt-jsonlint and grunt-banana-checker
..

Add grunt-jsonlint and grunt-banana-checker

jsonlint and banana-checker will test for valid i18n files

Bug: T94547
Change-Id: Id1ef45c1c88611ef137f6d82671413867816276d
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 33 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ChangeAuthor 
refs/changes/03/338503/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..7e5da87
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..bc7fca9
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   var conf = grunt.file.readJSON( 'extension.json' );
+   grunt.initConfig( {
+   banana: conf.MessagesDirs,
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+   "private": true,
+   "scripts": {
+   "test": "grunt test"
+   },
+   "devDependencies": {
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.5.0",
+   "grunt-jsonlint": "1.1.0"
+   }
+}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M components/search.less
M components/tabs.less
M components/watchstar.less
M package.json
M variables.less
5 files changed, 9 insertions(+), 9 deletions(-)


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

diff --git a/components/search.less b/components/search.less
index 1e07004..81297d0 100644
--- a/components/search.less
+++ b/components/search.less
@@ -53,7 +53,7 @@
direction: ltr;
 
&:focus {
-   outline: none;
+   outline: 0;
}
 
// These rules MAY NOT be merged because of how CSS requires 
browsers
diff --git a/components/tabs.less b/components/tabs.less
index 915198b..0801ca2 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -203,7 +203,7 @@
text-align: left;
 }
 
-// stylelint-disable selector-no-vendor-prefix
+// stylelint-disable selector-no-vendor-prefix, selector-type-no-unknown
 
 /* Fixes old versions of FireFox */
 div.vectorMenu ul,
@@ -218,7 +218,7 @@
min-width: 0;
 }
 
-// stylelint-enable selector-no-vendor-prefix
+// stylelint-enable selector-no-vendor-prefix, selector-type-no-unknown
 
 div.vectorMenu li {
padding: 0;
diff --git a/components/watchstar.less b/components/watchstar.less
index 5143ab1..17bcbd7 100644
--- a/components/watchstar.less
+++ b/components/watchstar.less
@@ -35,7 +35,7 @@
.background-image-svg( 'images/watch-icon-loading.svg', 
'images/watch-icon-loading.png' );
.rotation( 700ms );
/* Suppress the hilarious rotating focus outline on Firefox */
-   outline: none;
+   outline: 0;
cursor: default;
pointer-events: none;
background-position: 50% 60%;
diff --git a/package.json b/package.json
index 3f10785..cb1671c 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,12 @@
 "doc": "jsduck"
   },
   "devDependencies": {
-"grunt": "1.0.1",
-"grunt-eslint": "19.0.0",
 "eslint-config-wikimedia": "0.3.0",
+"grunt": "1.0.1",
 "grunt-banana-checker": "0.5.0",
+"grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/variables.less b/variables.less
index d6a7e02..45f1044 100644
--- a/variables.less
+++ b/variables.less
@@ -10,7 +10,7 @@
 @content-line-height: 1.6;
 @content-padding: 1em;
 @content-heading-font-size: 1.8em;
-@content-heading-font-family: 'Linux Libertine', Georgia, Times, serif;
+@content-heading-font-family: 'Linux Libertine', 'Georgia', 'Times', serif;
 @content-heading-font-family-generic: sans-serif;
 @body-background-color: #fff;
 @heading-line-height: 1.3;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
M resources/screen.css
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/apex 
refs/changes/00/338500/1

diff --git a/package.json b/package.json
index e75aa12..0fb6831 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-jscs": "2.8.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/resources/screen.css b/resources/screen.css
index c72f11f..247582c 100644
--- a/resources/screen.css
+++ b/resources/screen.css
@@ -498,7 +498,7 @@
 }
 #searchInput:focus {
width: 12em;
-   outline: none;
+   outline: 0;
 }
 #searchButton {
background-color: transparent;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
M resources/css/ext.uls.pt.less
2 files changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/package.json b/package.json
index 369d09c..a2a0960 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 "grunt-banana-checker": "0.5.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/resources/css/ext.uls.pt.less b/resources/css/ext.uls.pt.less
index 05982b1..f6734e0 100644
--- a/resources/css/ext.uls.pt.less
+++ b/resources/css/ext.uls.pt.less
@@ -26,11 +26,13 @@
 /* Opera for some inexplicable reason confuses right and left padding with */
 /* RTL text direction here (bug T47142). x:-o-prefocus won't match anything, */
 /* but will make other browsers ignore this rule. */
+/* stylelint-disable selector-type-no-unknown */
 x:-o-prefocus,
 body.rtl li#pt-uls {
/* @noflip */
direction: ltr;
 }
+/* stylelint-enable selector-type-no-unknown */
 
 /* Don't show it to users who disabled JS */
 .client-nojs #pt-uls {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...wikihiero[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M .stylelintrc
M package.json
2 files changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/.stylelintrc b/.stylelintrc
index 2c90730..533d1c4 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,3 +1,6 @@
 {
-   "extends": "stylelint-config-wikimedia"
+   "extends": "stylelint-config-wikimedia",
+   "rules": {
+   "value-keyword-case": null
+   }
 }
diff --git a/package.json b/package.json
index 9b31714..2c70c54 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-jscs": "2.8.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...SyntaxHighlight_GeSHi[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi 
refs/changes/95/338495/1

diff --git a/package.json b/package.json
index 3b8521c..7faf559 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.0.8",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M modules/page/ext.proofreadpage.page.navigation.vector.css
M package.json
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/page/ext.proofreadpage.page.navigation.vector.css 
b/modules/page/ext.proofreadpage.page.navigation.vector.css
index a469376..3c3172d 100644
--- a/modules/page/ext.proofreadpage.page.navigation.vector.css
+++ b/modules/page/ext.proofreadpage.page.navigation.vector.css
@@ -4,7 +4,7 @@
 .prp-tabs #ca-proofreadPageIndexLink.icon a {
margin: 0;
padding: 0;
-   outline: none;
+   outline: 0;
display: block;
width: 26px;
/* This hides the text but shows the background image */
diff --git a/package.json b/package.json
index d29dbcc..b2a9718 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
 "grunt-contrib-jshint": "1.0.0",
 "grunt-jscs": "2.8.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Math[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M modules/ve-math/.stylelintrc
M package.json
2 files changed, 3 insertions(+), 12 deletions(-)

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



diff --git a/modules/ve-math/.stylelintrc b/modules/ve-math/.stylelintrc
index 87325ff..2c90730 100644
--- a/modules/ve-math/.stylelintrc
+++ b/modules/ve-math/.stylelintrc
@@ -1,12 +1,3 @@
 {
-   "extends": "stylelint-config-wikimedia",
-   "rules": {
-   "no-browser-hacks": [ true, {
-   "browsers": [ ">5%", "Chrome >= 1", "Firefox >= 15", 
"Explorer >= 9", "Edge >= 1", "iOS >= 7", "Opera >= 12", "Safari >= 7", 
"ExplorerMobile >= 10", "Android >= 3", "not BlackBerry >= 1", "ChromeAndroid 
>= 1", "FirefoxAndroid >= 1", "OperaMobile >= 12", "not OperaMini >= 1" ]
-   } ],
-
-   "no-unsupported-browser-features": [ true, {
-   "browsers": [ ">5%", "Chrome >= 1", "Firefox >= 15", 
"Explorer >= 9", "Edge >= 12", "iOS >= 7", "Opera >= 12", "Safari >= 7", 
"ExplorerMobile >= 10", "Android >= 4", "not BlackBerry >= 1", "ChromeAndroid 
>= 1", "FirefoxAndroid >= 1", "OperaMobile >= 12", "not OperaMini >= 1" ]
-   } ],
-   }
+   "extends": "stylelint-config-wikimedia"
 }
diff --git a/package.json b/package.json
index 09ae647..1fb2b94 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update bundled CSS

[Mholloway (Code Review)]

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

Change subject: Update bundled CSS
..

Update bundled CSS

Applies the changes deployed to the production wikis up to this week.

Change-Id: I0c28a09db4013409da67b0978fb73e1fd0427c5a
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 18 insertions(+), 20 deletions(-)


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

diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index 5d1966b..7011f04 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -133,18 +133,10 @@
 }
 .content .thumb {
   margin: 0.6em 0;
-  /* bug 20030 */
 }
 .content .thumb .thumbinner {
   margin: 0 auto;
   max-width: 100% !important;
-}
-.content .thumb .noresize {
-  width: 100%;
-  overflow-x: auto;
-}
-.content .thumb .noresize img {
-  max-width: none !important;
 }
 .content .thumbcaption {
   margin: 0.5em 0 0;
@@ -156,6 +148,9 @@
 }
 .content .thumbborder {
   border: 1px solid #c8ccd1;
+}
+.content .magnify {
+  display: none;
 }
 .content img {
   vertical-align: middle;
@@ -180,8 +175,12 @@
   max-width: 100% !important;
   height: auto !important;
 }
-.content div.magnify {
-  display: none;
+.content .noresize {
+  max-width: 100%;
+  overflow-x: auto;
+}
+.content .noresize a > img {
+  max-width: none !important;
 }
 h1 {
   font-size: 1.7em;
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 5bd44b4..f96261e 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -133,18 +133,10 @@
 }
 .content .thumb {
   margin: 0.6em 0;
-  /* bug 20030 */
 }
 .content .thumb .thumbinner {
   margin: 0 auto;
   max-width: 100% !important;
-}
-.content .thumb .noresize {
-  width: 100%;
-  overflow-x: auto;
-}
-.content .thumb .noresize img {
-  max-width: none !important;
 }
 .content .thumbcaption {
   margin: 0.5em 0 0;
@@ -156,6 +148,9 @@
 }
 .content .thumbborder {
   border: 1px solid #c8ccd1;
+}
+.content .magnify {
+  display: none;
 }
 .content img {
   vertical-align: middle;
@@ -180,8 +175,12 @@
   max-width: 100% !important;
   height: auto !important;
 }
-.content div.magnify {
-  display: none;
+.content .noresize {
+  max-width: 100%;
+  overflow-x: auto;
+}
+.content .noresize a > img {
+  max-width: none !important;
 }
 h1 {
   font-size: 1.7em;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
M styles/control-scale.less
M styles/dialog.less
M styles/leaflet-overrides.less
M styles/specialMap.less
5 files changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/package.json b/package.json
index 486502c..a67a88e 100644
--- a/package.json
+++ b/package.json
@@ -16,13 +16,13 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
+"grunt-stylelint": "0.7.0",
 "mapbox.js": "2.3.0",
 "prunecluster": "^2.0.0-beta.3",
 "rollup": "^0.36.1",
 "rollup-plugin-commonjs": "^5.0.4",
-"stylelint": "^7.0.2",
-"stylelint-config-wikimedia": "^0.3.0"
+"stylelint": "7.8.0",
+"stylelint-config-wikimedia": "0.4.1"
   },
   "dependencies": {
 "leaflet": "^0.7.7",
diff --git a/styles/control-scale.less b/styles/control-scale.less
index 71dac25..d0bedf8 100644
--- a/styles/control-scale.less
+++ b/styles/control-scale.less
@@ -26,7 +26,7 @@
}
 
/** Override initial properties */
-   &:not(:first-child) {
+   &:not( :first-child ) {
border: 1px solid #999;
border-color: #000;
border-top: 0;
diff --git a/styles/dialog.less b/styles/dialog.less
index 70f57bf..d14a813 100644
--- a/styles/dialog.less
+++ b/styles/dialog.less
@@ -112,7 +112,7 @@
text-align: left;
}
 
-   tr:nth-child(even) {
+   tr:nth-child( even ) {
background-color: @wmui-color-base100;
}
}
diff --git a/styles/leaflet-overrides.less b/styles/leaflet-overrides.less
index 06f26a4..6ba5790 100644
--- a/styles/leaflet-overrides.less
+++ b/styles/leaflet-overrides.less
@@ -92,7 +92,7 @@
border-radius: @border-radius-base;
}
.leaflet-bar > a:first-child {
-   &:not(:only-of-type) {
+   &:not( :only-of-type ) {
border-radius: @border-radius-base @border-radius-base 
0 0;
}
}
@@ -106,7 +106,7 @@
border-bottom: @border-base;
border-color: @border-color-base--active;
}
-   &:not(:only-of-type) {
+   &:not( :only-of-type ) {
border-radius: 0 0 @border-radius-base 
@border-radius-base;
}
}
diff --git a/styles/specialMap.less b/styles/specialMap.less
index f2cb16c..71c4fe8 100644
--- a/styles/specialMap.less
+++ b/styles/specialMap.less
@@ -26,21 +26,21 @@
width: @mapWidth;
height: @mapHeight;
/* stylelint-disable function-parentheses-space-inside */
-   background-image: url(//maps.wikimedia.org/osm-intl/0/0/0.png);
+   background-image: url(https://maps.wikimedia.org/osm-intl/0/0/0.png);
/* stylelint-enable function-parentheses-space-inside */
background-position: center;
background-repeat: no-repeat;
background-size: @mapWidth @mapHeight;
 }
 
-/* stylelint-disable media-feature-name-no-vendor-prefix */
+/* stylelint-disable media-feature-name-no-vendor-prefix, 
media-feature-name-no-unknown */
 @media ( -webkit-min-device-pixel-ratio: 1.5 ),
( min--moz-device-pixel-ratio: 1.5 ),
( min-resolution: 1.5dppx ),
( min-resolution: 144dpi ) {
div#mw-specialMap-map {
/* stylelint-disable function-parentheses-space-inside */
-   background-image: 
url(//maps.wikimedia.org/osm-intl/0/0/0...@1.5x.png);
+   background-image: 
url(https://maps.wikimedia.org/osm-intl/0/0/0...@1.5x.png);
/* stylelint-enable function-parentheses-space-inside */
}
 }
@@ -51,11 +51,11 @@
( min-resolution: 192dpi ) {
div#mw-specialMap-map {
/* stylelint-disable function-parentheses-space-inside */
-   background-image: 
url(//maps.wikimedia.org/osm-intl/0/0/0...@2x.png);
+   background-image: 
url(https://maps.wikimedia.org/osm-intl/0/0/0...@2x.png);
/* stylelint-enable function-parentheses-space-inside */
}
 }
-/* stylelint-enable media-feature-name-no-vendor-prefix */
+/* stylelint-enable media-feature-name-no-vendor-prefix, 
media-feature-name-no-unknown */
 
 div#mw-specialMap-marker {
position: absolute;

-- 
To 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M .stylelintrc
M modules/styles/board/menu.less
M modules/styles/board/topic/titlebar.less
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
M package.json
5 files changed, 12 insertions(+), 11 deletions(-)

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



diff --git a/.stylelintrc b/.stylelintrc
index 69319a4..c89f6af 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -2,6 +2,7 @@
"extends": "stylelint-config-wikimedia",
"rules": {
"no-descending-specificity": null,
-   "selector-no-vendor-prefix": null
+   "selector-no-vendor-prefix": null,
+   "value-keyword-case": null
}
 }
diff --git a/modules/styles/board/menu.less b/modules/styles/board/menu.less
index 614fb23..a4a1065 100644
--- a/modules/styles/board/menu.less
+++ b/modules/styles/board/menu.less
@@ -22,7 +22,7 @@
}
 
a:focus {
-   outline: none;
+   outline: 0;
}
 
// Hide the menu trigger completely in no-js mode
@@ -93,7 +93,7 @@
}
 
.flow-menu-js-drop a {
-   outline: none;
+   outline: 0;
border-color: transparent;
background: transparent;
background: rgba( 0, 0, 0, 0.05 );
@@ -113,8 +113,8 @@
background: #fff;
border-radius: 2px;
 
-   > section:not(:first-of-type) > li:first-of-type,
-   li.flow-menu-section:not(:first-of-type) {
+   > section:not( :first-of-type ) > li:first-of-type,
+   li.flow-menu-section:not( :first-of-type ) {
border-top: 1px solid @colorGray13;
}
 
diff --git a/modules/styles/board/topic/titlebar.less 
b/modules/styles/board/topic/titlebar.less
index 6e85a2d..cf0761e 100644
--- a/modules/styles/board/topic/titlebar.less
+++ b/modules/styles/board/topic/titlebar.less
@@ -8,7 +8,7 @@
padding: 0.5em 0;
background-color: @colorGray14;
border-radius: 3px;
-   outline: none;
+   outline: 0;
 
// use child selector to block ie6
.flow-menu {
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
index 3a49125..0e682da 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
@@ -6,7 +6,7 @@
 .flow-component {
.ve-init-target {
&.flow-ui-focused {
-   outline: none;
+   outline: 0;
border-color: #a7dcff;
box-shadow: 0 0 0.3em #a7dcff, 0 0 0 #fff;
}
@@ -48,7 +48,7 @@
// Undo border & box-shadow on textarea and re-apply it on the
// div that contains textarea + legal text + switch button
&.flow-ui-focused {
-   outline: none;
+   outline: 0;
border-color: #a7dcff;
box-shadow: 0 0 0.3em #a7dcff, 0 0 0 #fff;
}
@@ -56,7 +56,7 @@
 
 .flow-ui-editorSwitcherWidget {
&-focused {
-   outline: none;
+   outline: 0;
border-color: #a7dcff;
box-shadow: 0 0 0.3em #a7dcff, 0 0 0 #fff;
}
diff --git a/package.json b/package.json
index ce094e4..19b70af 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
+"grunt-stylelint": "0.7.0",
 "grunt-tyops": "0.1.0",
-"stylelint-config-wikimedia": "0.3.0"
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M .stylelintrc
M package.json
M src/styles/common.less
M src/themes/apex/elements.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/windows.less
6 files changed, 16 insertions(+), 12 deletions(-)

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



diff --git a/.stylelintrc b/.stylelintrc
index 0e2a672..06a77ac 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -4,7 +4,6 @@
"at-rule-empty-line-before": null,
"block-closing-brace-space-after": null,
"block-no-empty": null,
-   "block-no-single-line": null,
"no-descending-specificity": null
}
 }
diff --git a/package.json b/package.json
index 7e7e97f..83b2d0b 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
 "grunt-jsonlint": "1.1.0",
 "grunt-karma": "2.0.0",
 "grunt-promise-q": 
"git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1",
-"grunt-stylelint": "0.6.0",
+"grunt-stylelint": "0.7.0",
 "grunt-svg2png": 
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1",
 "grunt-tyops": "0.1.0",
 "karma": "1.1.1",
@@ -55,6 +55,6 @@
 "karma-qunit": "1.1.0",
 "q": "1.4.1",
 "qunitjs": "1.22.0",
-"stylelint-config-wikimedia": "0.3.0"
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/src/styles/common.less b/src/styles/common.less
index e65a34a..06add49 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -44,14 +44,14 @@
 }
 
 .oo-ui-animation( @value1, @value2: X, ... ) {
-   @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // 
stylelint-disable-line function-comma-space-after, function-whitespace-after, 
string-quotes
+   @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // 
stylelint-disable-line function-comma-space-after, function-whitespace-after, 
string-quotes, value-keyword-case
-webkit-animation: @value;
-moz-animation: @value;
animation: @value;
 }
 
 .oo-ui-transition( @value1, @value2: X, ... ) {
-   @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // 
stylelint-disable-line function-comma-space-after, function-whitespace-after, 
string-quotes
+   @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // 
stylelint-disable-line function-comma-space-after, function-whitespace-after, 
string-quotes, value-keyword-case
-webkit-transition: @value;
-moz-transition: @value;
transition: @value;
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index fb724de..78900ca 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -28,7 +28,7 @@
 
&:hover,
&:focus {
-   outline: none;
+   outline: 0;
 
> .oo-ui-iconElement-icon {
opacity: 1;
@@ -98,7 +98,8 @@
&:hover,
&:focus {
border-color: #aaa;
-   outline: none;
+   outline: 0;
+
}
}
 
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index c1837b7..7c1bb6d 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -340,7 +340,8 @@
select:hover,
select:focus {
border-color: rgba( 0, 0, 0, 0.2 );
-   outline: none;
+   outline: 0;
+
}
}
 
@@ -386,7 +387,8 @@
&.oo-ui-widget-enabled {
input:focus,
textarea:focus {
-   outline: none;
+   outline: 0;
+
border-color: #a7dcff;
box-shadow: 0 0 0.3em #a7dcff, 0 0 0 #fff;
}
@@ -533,7 +535,8 @@
 
> .oo-ui-capsuleMultiselectWidget-content > input:focus {
// For Chrome
-   outline: none;
+   outline: 0;
+
}
}
 
@@ -596,7 +599,8 @@
border-radius: 0.25em;
 
&:focus {
-   outline: none;
+   outline: 0;
+
border-color: @progressive;
}
 
diff --git a/src/themes/mediawiki/windows.less 
b/src/themes/mediawiki/windows.less
index a443250..bc8bff6 100644
--- a/src/themes/mediawiki/windows.less
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: build: Bump stylelint and make pass

[jenkins-bot (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..


build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
M resources/uploadWizard.css
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/package.json b/package.json
index 196df70..1160262 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
-"stylelint-config-wikimedia": "0.3.0"
+"grunt-stylelint": "0.7.0",
+"stylelint-config-wikimedia": "0.4.1"
   }
 }
diff --git a/resources/uploadWizard.css b/resources/uploadWizard.css
index 8c80111..c1a842c 100644
--- a/resources/uploadWizard.css
+++ b/resources/uploadWizard.css
@@ -445,7 +445,7 @@
 .mwe-upwiz-deed-license-group-head {
padding-left: 1.5em;
cursor: pointer;
-   outline: none;
+   outline: 0;
display: block;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Graph[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/package.json b/package.json
index 7b1ab5d..9354c45 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
 "grunt-contrib-watch": "1.0.0",
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
+"grunt-stylelint": "0.7.0",
 "jquery.splitter": "^0.20.1",
-"stylelint-config-wikimedia": "0.3.0"
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M package.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/package.json b/package.json
index 983da09..b868295 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,12 @@
 "grunt-eslint": "19.0.0",
 "grunt-jsonlint": "1.1.0",
 "grunt-karma": "2.0.0",
-"grunt-stylelint": "0.6.0",
+"grunt-stylelint": "0.7.0",
 "karma": "1.1.0",
 "karma-chrome-launcher": "2.0.0",
 "karma-firefox-launcher": "1.0.0",
 "karma-qunit": "1.0.0",
 "qunitjs": "1.22.0",
-"stylelint-config-wikimedia": "0.3.0"
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: build: Bump stylelint and make pass

[Jforrester (Code Review)]

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

Change subject: build: Bump stylelint and make pass
..

build: Bump stylelint and make pass

 grunt-stylelint  0.6.0  →   0.7.0
 stylelint-config-wikimedia   0.3.0  →   0.4.1

Change-Id: Id87b8df04d415e1f1058a4042a31408236402037
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
M package.json
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
index 60be98c..2984d33 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
@@ -73,4 +73,4 @@
 
 .ve-ui-mwSaveDialog-messages:empty {
display: none;
-};
+}
diff --git a/package.json b/package.json
index 81d5e31..4de813d 100644
--- a/package.json
+++ b/package.json
@@ -19,11 +19,11 @@
 "grunt-jsonlint": "1.0.8",
 "grunt-image": "2.2.3",
 "grunt-mocha-test": "0.12.7",
-"grunt-stylelint": "0.6.0",
+"grunt-stylelint": "0.7.0",
 "grunt-tyops": "0.1.0",
 "jimp": "0.2.24",
 "mocha": "2.5.3",
 "selenium-webdriver": "2.53.2",
-"stylelint-config-wikimedia": "0.3.0"
+"stylelint-config-wikimedia": "0.4.1"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: k8s: Attempt to fix puppet circular dependency cycle

[Yuvipanda (Code Review)]

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

Change subject: k8s: Attempt to fix puppet circular dependency cycle
..

k8s: Attempt to fix puppet circular dependency cycle

Change-Id: Ia21a182d0518f2dc3578841505ad0318f2f297d3
---
M modules/k8s/manifests/apiserver.pp
M modules/role/manifests/toollabs/k8s/master.pp
2 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/338471/1

diff --git a/modules/k8s/manifests/apiserver.pp 
b/modules/k8s/manifests/apiserver.pp
index 24a2321..5bf8970 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -24,14 +24,11 @@
 ) {
 include ::k8s::users
 
-if !defined(File['/etc/kubernetes']) {
-# because base::expose_puppet_certs also does this
-file { '/etc/kubernetes':
-ensure => directory,
-owner  => 'kubernetes',
-group  => 'kubernetes',
-mode   => '0700',
-}
+file { '/etc/kubernetes':
+ensure => directory,
+owner  => 'kubernetes',
+group  => 'kubernetes',
+mode   => '0700',
 }
 
 if $use_package {
diff --git a/modules/role/manifests/toollabs/k8s/master.pp 
b/modules/role/manifests/toollabs/k8s/master.pp
index a55d077..109cec7 100644
--- a/modules/role/manifests/toollabs/k8s/master.pp
+++ b/modules/role/manifests/toollabs/k8s/master.pp
@@ -9,12 +9,15 @@
 $etcd_url = join(prefix(suffix(hiera('k8s::etcd_hosts'), ':2379'), 
'https://'), ',')
 
 if $use_puppet_certs {
+# Do not explicitly set a before here, since it
+# seems to make puppet think there's a circular
+# dependency cycle?!
 base::expose_puppet_certs { '/etc/kubernetes':
 provide_private => true,
 user=> 'kubernetes',
 group   => 'kubernetes',
-before  => Class['::k8s::apiserver']
 }
+
 $ssl_cert_path = '/etc/kubernetes/ssl/cert.pem'
 $ssl_key_path = '/etc/kubernetes/ssl/server.key'
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "tools: store verbose logrotate logs"

[Yuvipanda (Code Review)]

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

Change subject: Revert "tools: store verbose logrotate logs"
..


Revert "tools: store verbose logrotate logs"

The changes to the cron file apparently did not produce debugging
output, and the underlying issue has mostly gone away, if not
completely.  Restoring /etc/cron.daily/logrotate will be done by
manually running:

| sudo rm -f /etc/cron.daily/logrotate &&
| sudo apt-get --reinstall -o Dpkg::Options::=--force-confask -o 
Dpkg::Options::=--force-confnew install logrotate

on all Tools instances with clush after this change has been merged.

Bug: T96007
Change-Id: Ia1a045952b34ed16d774c3e26a8b24dfd503724d
---
D modules/toollabs/files/logrotate.crondaily
M modules/toollabs/manifests/init.pp
2 files changed, 0 insertions(+), 25 deletions(-)

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



diff --git a/modules/toollabs/files/logrotate.crondaily 
b/modules/toollabs/files/logrotate.crondaily
deleted file mode 100644
index 964b2b2..000
--- a/modules/toollabs/files/logrotate.crondaily
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# This file is managed by Puppet.
-# Based on logrotate-bundled cron file, Version: 3.8.7-1ubuntu1
-# Clean non existent log file entries from status file
-cd /var/lib/logrotate
-test -e status || touch status
-head -1 status > status.clean
-sed 's/"//g' status | while read logfile date
-do
-[ -e "$logfile" ] && echo "\"$logfile\" $date"
-done >> status.clean
-mv status.clean status
-
-test -x /usr/sbin/logrotate || exit 0
-# > instead of >> to clear logrotate.log daily
-# copy output to stderr on non-zero exit code to trigger a cron email
-/usr/sbin/logrotate -v /etc/logrotate.conf > /var/log/logrotate.log 2>&1 || 
cat /var/log/logrotate.log >&2
diff --git a/modules/toollabs/manifests/init.pp 
b/modules/toollabs/manifests/init.pp
index 49cdebd..3ef6e56 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -181,14 +181,6 @@
 source => 'puppet:///modules/toollabs/40-tools-sudoers-no-warning.sh',
 }
 
-file { '/etc/cron.daily/logrotate':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-source => 'puppet:///modules/toollabs/logrotate.crondaily',
-}
-
 file { '/usr/local/bin/log-command-invocation':
 ensure => present,
 owner  => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1a045952b34ed16d774c3e26a8b24dfd503724d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
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]: Protect -{...}- variant constructs in definition lists.

[jenkins-bot (Code Review)]

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

Change subject: Protect -{...}- variant constructs in definition lists.
..


Protect -{...}- variant constructs in definition lists.

Given the wikitext:

;-{zh-cn:AAA;zh-tw:BBB}-

Prevent `doBlockLevels` from trying to split the definition list at the
embedded colon and using `AAA;zh-tw:BBB}-` as the `` portion.

Bug: T153135
Change-Id: I3a4d02f1fbd0d0fe8278d6b7c66005f0dd3dd36b
---
M includes/parser/BlockLevelPass.php
M tests/parser/parserTests.txt
2 files changed, 89 insertions(+), 34 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  C. Scott Ananian: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/parser/BlockLevelPass.php 
b/includes/parser/BlockLevelPass.php
index cbacd34..e16cfd4 100644
--- a/includes/parser/BlockLevelPass.php
+++ b/includes/parser/BlockLevelPass.php
@@ -38,6 +38,7 @@
const COLON_STATE_COMMENT = 5;
const COLON_STATE_COMMENTDASH = 6;
const COLON_STATE_COMMENTDASHDASH = 7;
+   const COLON_STATE_LC = 8;
 
/**
 * Make lists from lines starting with ':', '*', '#', etc.
@@ -389,15 +390,14 @@
 * @return string The position of the ':', or false if none found
 */
private function findColonNoLinks( $str, &$before, &$after ) {
-   $colonPos = strpos( $str, ':' );
-   if ( $colonPos === false ) {
+   if ( !preg_match( '/:|<|-\{/', $str, $m, PREG_OFFSET_CAPTURE ) 
) {
# Nothing to find!
return false;
}
 
-   $ltPos = strpos( $str, '<' );
-   if ( $ltPos === false || $ltPos > $colonPos ) {
+   if ( $m[0][0] === ':' ) {
# Easy; no tag nesting to worry about
+   $colonPos = $m[0][1];
$before = substr( $str, 0, $colonPos );
$after = substr( $str, $colonPos + 1 );
return $colonPos;
@@ -405,9 +405,10 @@
 
# Ugly state machine to walk through avoiding tags.
$state = self::COLON_STATE_TEXT;
-   $level = 0;
+   $ltLevel = 0;
+   $lcLevel = 0;
$len = strlen( $str );
-   for ( $i = 0; $i < $len; $i++ ) {
+   for ( $i = $m[0][1]; $i < $len; $i++ ) {
$c = $str[$i];
 
switch ( $state ) {
@@ -418,7 +419,7 @@
$state = self::COLON_STATE_TAGSTART;
break;
case ":":
-   if ( $level === 0 ) {
+   if ( $ltLevel === 0 ) {
# We found it!
$before = substr( $str, 0, $i );
$after = substr( $str, $i + 1 );
@@ -428,35 +429,44 @@
break;
default:
# Skip ahead looking for something 
interesting
-   $colonPos = strpos( $str, ':', $i );
-   if ( $colonPos === false ) {
+   if ( !preg_match( '/:|<|-\{/', $str, 
$m, PREG_OFFSET_CAPTURE, $i ) ) {
# Nothing else interesting
return false;
}
-   $ltPos = strpos( $str, '<', $i );
-   if ( $level === 0 ) {
-   if ( $ltPos === false || 
$colonPos < $ltPos ) {
-   # We found it!
-   $before = substr( $str, 
0, $colonPos );
-   $after = substr( $str, 
$colonPos + 1 );
-   return $i;
-   }
+   if ( $m[0][0] === '-{' ) {
+   $state = self::COLON_STATE_LC;
+   $lcLevel++;
+   $i = $m[0][1] + 1;
+   } else {
+   # Skip ahead to next 
interesting character.
+   $i = $m[0][1] - 1;
}
-   if ( $ltPos === false ) {
-   

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: WIP: Upgrade to Mapbox 5.0.x

[Dbrant (Code Review)]

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

Change subject: WIP: Upgrade to Mapbox 5.0.x
..

WIP: Upgrade to Mapbox 5.0.x

This pulls in the very latest version of the Mapbox SDK, and updates our
usage of it to conform with any refactors:

- The public token must now be fed into the Mapbox class via
  getInstance().
- A marker icon can no longer be created fromDrawable(), and now must be
  created fromBitmap(). (that is, when creating from a vector drawable.)
- Added onStart() and onStop() methods that need to be fed into the
  MapView.
- The style URL is now given to MapboxMap instead of MapView.
- Renaming of telemetry service.

BLOCKED: It seems to be crashing when disabling telemetry. Otherwise it
works correctly.
https://github.com/mapbox/mapbox-gl-native/issues/8101

Change-Id: I0d939f7ae5e2550f25f3f10b60ec532165f690cc
---
M app/build.gradle
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java
M app/src/main/java/org/wikipedia/util/ResourceUtil.java
M app/src/main/res/layout/fragment_nearby.xml
6 files changed, 46 insertions(+), 26 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 2fae41a..36da49b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -192,7 +192,7 @@
 compile 'com.mobsandgeeks:android-saripaar:2.0.3'
 compile 'com.github.ryanjohn1:onboarding:1.0.3'
 compile "com.jakewharton:butterknife:$butterKnifeVersion"
-compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.0.1@aar') {
+compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.0-beta.1@aar') {
 transitive = true
 }
 compile 'net.hockeyapp.android:HockeySDK:4.0.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0674bbe..ef3123d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -269,7 +269,7 @@
 
 
 
-
+
 
 
 
diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 0421f57..f83ef45 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -13,13 +13,13 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
-import android.support.graphics.drawable.VectorDrawableCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.annotations.Icon;
 import com.mapbox.mapboxsdk.annotations.IconFactory;
 import com.mapbox.mapboxsdk.annotations.Marker;
@@ -33,7 +33,7 @@
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.Projection;
-import com.mapbox.mapboxsdk.telemetry.MapboxEventManager;
+import com.mapbox.services.android.telemetry.MapboxTelemetry;
 
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
@@ -47,6 +47,7 @@
 import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.FeedbackUtil;
 import org.wikipedia.util.PermissionUtil;
+import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.util.log.L;
 
 import java.util.ArrayList;
@@ -92,6 +93,10 @@
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
 client = new NearbyClient();
+
+Mapbox.getInstance(getContext().getApplicationContext(),
+getString(R.string.mapbox_public_token));
+
 disableTelemetry();
 }
 
@@ -100,8 +105,9 @@
 View view = inflater.inflate(R.layout.fragment_nearby, container, 
false);
 unbinder = ButterKnife.bind(this, view);
 
-VectorDrawableCompat markerIconDrawable = 
VectorDrawableCompat.create(getResources(), R.drawable.ic_map_marker, null);
-markerIconPassive = 
IconFactory.getInstance(getContext()).fromDrawable(markerIconDrawable);
+markerIconPassive = IconFactory.getInstance(getContext())
+.fromBitmap(ResourceUtil.bitmapFromVectorDrawable(getContext(),
+R.drawable.ic_map_marker));
 
 mapView.onCreate(savedInstanceState);
 
@@ -110,13 +116,19 @@
 if (savedInstanceState != null) {
 currentLocation = 
savedInstanceState.getParcelable(NEARBY_CURRENT_LOCATION);
 if (currentLocation != null) {
-lastResult =  GsonUnmarshaller.unmarshal(NearbyResult.class, 
savedInstanceState.getString(NEARBY_LAST_RESULT));
+

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Replace abandoned blue with `#36c` of other projects beta fe...

[jenkins-bot (Code Review)]

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

Change subject: Replace abandoned blue with `#36c` of other projects beta 
feature images
..


Replace abandoned blue with `#36c` of other projects beta feature images

Bug: T158407
Change-Id: I1ad32cb815e9044ae7ee9e4bd03b7dd5d90f51fe
---
M client/resources/images/wb-otherprojects-beta-ltr.svg
M client/resources/images/wb-otherprojects-beta-rtl.svg
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/client/resources/images/wb-otherprojects-beta-ltr.svg 
b/client/resources/images/wb-otherprojects-beta-ltr.svg
index 776d642..796720f 100644
--- a/client/resources/images/wb-otherprojects-beta-ltr.svg
+++ b/client/resources/images/wb-otherprojects-beta-ltr.svg
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 
diff --git a/client/resources/images/wb-otherprojects-beta-rtl.svg 
b/client/resources/images/wb-otherprojects-beta-rtl.svg
index b444b54..e10c85f 100644
--- a/client/resources/images/wb-otherprojects-beta-rtl.svg
+++ b/client/resources/images/wb-otherprojects-beta-rtl.svg
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ad32cb815e9044ae7ee9e4bd03b7dd5d90f51fe
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WebPlatformAuth[master]: Remove composer.lock

[Umherirrender (Code Review)]

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

Change subject: Remove composer.lock
..

Remove composer.lock

Change-Id: I01d05ea12c5711b42096484edd1489b5b0b83fd3
---
M .gitignore
D composer.lock
D vendor/.gitkeep
3 files changed, 2 insertions(+), 177 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 95894af..9dfe80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 node_modules/
+vendor/
+composer.lock
 
 .svn
 *~
 *.kate-swp
 .*.swp
-vendor/*
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 4aba2e3..000
--- a/composer.lock
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-"_readme": [
-"This file locks the dependencies of your project to a known state",
-"Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;
-],
-"hash": "c635d4c923295de15a39b2d5cc345712",
-"packages": [
-{
-"name": "guzzlehttp/guzzle",
-"version": "v3.8.1",
-"source": {
-"type": "git",
-"url": "https://github.com/guzzle/guzzle.git;,
-"reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba;,
-"reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba",
-"shasum": ""
-},
-"require": {
-"ext-curl": "*",
-"php": ">=5.3.3",
-"symfony/event-dispatcher": ">=2.1"
-},
-"replace": {
-"guzzle/batch": "self.version",
-"guzzle/cache": "self.version",
-"guzzle/common": "self.version",
-"guzzle/http": "self.version",
-"guzzle/inflection": "self.version",
-"guzzle/iterator": "self.version",
-"guzzle/log": "self.version",
-"guzzle/parser": "self.version",
-"guzzle/plugin": "self.version",
-"guzzle/plugin-async": "self.version",
-"guzzle/plugin-backoff": "self.version",
-"guzzle/plugin-cache": "self.version",
-"guzzle/plugin-cookie": "self.version",
-"guzzle/plugin-curlauth": "self.version",
-"guzzle/plugin-error-response": "self.version",
-"guzzle/plugin-history": "self.version",
-"guzzle/plugin-log": "self.version",
-"guzzle/plugin-md5": "self.version",
-"guzzle/plugin-mock": "self.version",
-"guzzle/plugin-oauth": "self.version",
-"guzzle/service": "self.version",
-"guzzle/stream": "self.version"
-},
-"require-dev": {
-"doctrine/cache": "*",
-"monolog/monolog": "1.*",
-"phpunit/phpunit": "3.7.*",
-"psr/log": "1.0.*",
-"symfony/class-loader": "*",
-"zendframework/zend-cache": "<2.3",
-"zendframework/zend-log": "<2.3"
-},
-"type": "library",
-"extra": {
-"branch-alias": {
-"dev-master": "3.8-dev"
-}
-},
-"autoload": {
-"psr-0": {
-"Guzzle": "src/",
-"Guzzle\\Tests": "tests/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name": "Michael Dowling",
-"email": "mtdowl...@gmail.com",
-"homepage": "https://github.com/mtdowling;
-},
-{
-"name": "Guzzle Community",
-"homepage": "https://github.com/guzzle/guzzle/contributors;
-}
-],
-"description": "Guzzle is a PHP HTTP client library and framework 
for building RESTful web service clients",
-"homepage": "http://guzzlephp.org/;,
-"keywords": [
-"client",
-"curl",
-"framework",
-"http",
-"http client",
-"rest",
-"web service"
-],
-"time": "2014-01-28 22:29:15"
-},
-{
-"name": "symfony/event-dispatcher",
-"version": "v2.5.0",
-"target-dir": "Symfony/Component/EventDispatcher",
-"source": {
-   

[MediaWiki-commits] [Gerrit] mediawiki...LinkedWiki[master]: Fix alias for SpecialRDFSave

[jenkins-bot (Code Review)]

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

Change subject: Fix alias for SpecialRDFSave
..


Fix alias for SpecialRDFSave

Seems to be a copy from SpecialRDFUnit

Fixed alias for en, removed from translations

Change-Id: I58ef8782675fb1835a7bb7baee91c1faa8d5ac6b
---
M specialpages/SpecialRDFSave.alias.php
1 file changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/specialpages/SpecialRDFSave.alias.php 
b/specialpages/SpecialRDFSave.alias.php
index 44c1fe6..65ead8d 100644
--- a/specialpages/SpecialRDFSave.alias.php
+++ b/specialpages/SpecialRDFSave.alias.php
@@ -21,10 +21,5 @@
 
 /** English */
 $specialPageAliases['en'] = array(
-   'linkedwiki-specialrdfunit' => array('RDFUnit', 'RDF test cases'),
-);
-
-/** Français */
-$specialPageAliases['fr'] = array(
-   'linkedwiki-specialrdfunit' => array( 'RDFUnit', 'Tests unitaires RDF'),
+   'linkedwiki-specialrdfsave' => array( 'RDFSave' ),
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58ef8782675fb1835a7bb7baee91c1faa8d5ac6b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/LinkedWiki
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Use puppet-syntax gem for syntax checking

[Hashar (Code Review)]

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

Change subject: Use puppet-syntax gem for syntax checking
..

Use puppet-syntax gem for syntax checking

The puppet-syntax gem lets one validate puppet manifests, erb temlates
and hiera yaml file.  That lets one easily validate locally before
sending a patch for review and would let us remove the Wikimedia Jenkins
job erblint-HEAD and pplint-HEAD.

Add the gem puppetlabs_spec_helper which provides rake tasks wrapping
around puppet-syntax. Flag it with require: false, there is no need to
have bundler to always require it, it is sufficient to just require it
in the Rakefile.

The puppetlabs_spec_helper provides:

rake syntax # Syntax check Puppet manifests and templates
rake syntax:hiera   # Syntax check Hiera config files
rake syntax:manifests   # Syntax check Puppet manifests
rake syntax:templates   # Syntax check Puppet templates

Make the 'syntax' task a prerequisites of the 'test' task in order to
have CI to run it for us.

Note: the submodules are validated, though they each have their own
validation as well and overall it is probably a good idea to make sure
they have proper puppet manifests.

For the Jessie branch use puppet 3.8.x instead of 3.7.x.

Bug: T154894
Change-Id: I29de3b2b49db245a46b1acdc862701f6b872a54d
---
M Gemfile
M Gemfile.lock
M Rakefile
3 files changed, 27 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/15/338415/1

diff --git a/Gemfile b/Gemfile
index e08627e..b2c339c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,9 @@
   gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
 
   gem 'rubocop', '~> 0.35.1', require: false
+  gem 'puppet', '~> 3.8.0'
   gem 'puppet-lint', '1.1.0'
+  gem 'puppetlabs_spec_helper', '< 2.0.0', require: false
   gem 'rake', '~> 10.4.2'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bb8848a..dbeecb1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,7 @@
 domain_name (0.5.20160615)
   unf (>= 0.0.5, < 1.0.0)
 erubis (2.7.0)
+facter (2.4.6)
 fakefs (0.6.7)
 ffi (1.9.12)
 gherkin (2.12.2)
@@ -59,10 +60,13 @@
 gyoku (1.3.1)
   builder (>= 2.1.2)
 hashicorp-checkpoint (0.1.4)
+hiera (1.3.4)
+  json_pure
 http-cookie (1.0.2)
   domain_name (~> 0.5)
 httpclient (2.8.0)
 i18n (0.7.0)
+json_pure (2.0.3)
 listen (3.0.8)
   rb-fsevent (~> 0.9, >= 0.9.4)
   rb-inotify (~> 0.9, >= 0.9.7)
@@ -71,9 +75,12 @@
 logging (1.8.2)
   little-plugger (>= 1.1.3)
   multi_json (>= 1.8.4)
+metaclass (0.0.4)
 method_source (0.8.2)
 mime-types (2.99.2)
 mini_portile (0.6.0)
+mocha (1.2.1)
+  metaclass (~> 0.0.1)
 multi_json (1.12.1)
 multi_test (0.1.2)
 net-scp (1.1.2)
@@ -95,7 +102,19 @@
 pry-byebug (3.4.0)
   byebug (~> 9.0)
   pry (~> 0.10)
+puppet (3.8.7)
+  facter (> 1.6, < 3)
+  hiera (~> 1.0)
+  json_pure
 puppet-lint (1.1.0)
+puppet-syntax (2.3.0)
+  rake
+puppetlabs_spec_helper (1.1.1)
+  mocha
+  puppet-lint
+  puppet-syntax
+  rake
+  rspec-puppet
 rainbow (2.1.0)
 rake (10.4.2)
 rb-fsevent (0.9.7)
@@ -119,6 +138,8 @@
 rspec-mocks (3.5.0)
   diff-lcs (>= 1.2.0, < 2.0)
   rspec-support (~> 3.5.0)
+rspec-puppet (2.5.0)
+  rspec
 rspec-support (3.5.0)
 rubocop (0.35.1)
   astrolabe (~> 1.3)
@@ -161,7 +182,9 @@
   fakefs (~> 0.6.5)
   mediawiki-vagrant!
   pry-byebug
+  puppet (~> 3.8.0)
   puppet-lint (= 1.1.0)
+  puppetlabs_spec_helper (< 2.0.0)
   rake (~> 10.4.2)
   rspec (~> 3.1, >= 3.1.0)
   rubocop (~> 0.35.1)
diff --git a/Rakefile b/Rakefile
index 30de9ed..c32e105 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,6 +11,7 @@
 require 'cucumber'
 require 'cucumber/rake/task'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppet-syntax/tasks/puppet-syntax'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'yard'
@@ -34,7 +35,7 @@
 task default: [:test]
 
 desc 'Run all build/tests commands (CI entry point)'
-task test: [:spec, :rubocop, :cucumber, :lint, :doc]
+task test: [:syntax, :spec, :rubocop, :cucumber, :lint, :doc]
 
 desc 'Generate all documentations'
 task doc: [:yard]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29de3b2b49db245a46b1acdc862701f6b872a54d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...UserExport[master]: Fix case of special page alias

[jenkins-bot (Code Review)]

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

Change subject: Fix case of special page alias
..


Fix case of special page alias

Change-Id: I7056cb6265f70ef26d44fefdb0c015479768f779
---
M UserExport.alias.php
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/UserExport.alias.php b/UserExport.alias.php
index d2ae521..bec10fb 100644
--- a/UserExport.alias.php
+++ b/UserExport.alias.php
@@ -8,16 +8,17 @@
 // @codingStandardsIgnoreFile
 
 $specialPageAliases = array();
+
 /** English
  * @author Rodrigoprimo
  */
 $specialPageAliases['en'] = array(
-   'userexport' => array( 'userexport' ),
+   'UserExport' => array( 'Userexport' ),
 );
 
 /** German (Deutsch)
  * @author Kghbln
  */
 $specialPageAliases['de'] = array(
-   'userexport' => array( 'Benutzerdatenexport' ),
+   'UserExport' => array( 'Benutzerdatenexport' ),
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7056cb6265f70ef26d44fefdb0c015479768f779
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserExport
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptrepo: kill ref to cloudera from precise-wikimedia

[Faidon Liambotis (Code Review)]

Faidon Liambotis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338412 )

Change subject: aptrepo: kill ref to cloudera from precise-wikimedia
..

aptrepo: kill ref to cloudera from precise-wikimedia

Broken since f823c50db2fb408868e4c4f865c0f5cde5fe2dba which removed the
cloudera source in favor of cloudera-trusty/jessie. Remove entirely
since we don't have any precise CDH box at all.

Change-Id: I46defbbbf60f531ec68dcb00ae33c16d926547ff
---
M modules/aptrepo/files/distributions-wikimedia
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/12/338412/1

diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index bdff9b7..e1e6fd2 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -6,7 +6,7 @@
 Architectures: source amd64 i386
 Components: main universe non-free thirdparty mariadb
 UDebComponents: main
-Update: jenkins cloudera hwraid elasticsearch logstash hp-mcp-precise
+Update: jenkins hwraid elasticsearch logstash hp-mcp-precise
 Description: Wikimedia specific packages for Ubuntu Precise
 SignWith: 09DBD9F93F6CD44A
 DebOverride: deb-override

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46defbbbf60f531ec68dcb00ae33c16d926547ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: process payment before popping out of iframe

[Cdentinger (Code Review)]

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

Change subject: process payment before popping out of iframe
..

process payment before popping out of iframe

Change-Id: I92ef647303985f4edb3bdbeb3a1d354c3f3b9857
---
M gateway_common/GatewayPage.php
1 file changed, 7 insertions(+), 19 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/10/338410/1

diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index f3bcb40..0ce5f8c 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -373,22 +373,6 @@
 
$request = $this->getRequest();
$referrer = $request->getHeader( 'referer' );
-   $liberated = false;
-   if ( $this->adapter->session_getData( 'order_status', $oid ) 
=== 'liberated' ) {
-   $liberated = true;
-   }
-
-   // XXX need to know whether we were in an iframe or not.
-   global $wgServer;
-   if ( $this->isReturnFramed() && ( strpos( $referrer, $wgServer 
) === false ) && !$liberated ) {
-   $sessionOrderStatus = $request->getSessionData( 
'order_status' );
-   $sessionOrderStatus[$oid] = 'liberated';
-   $request->setSessionData( 'order_status', 
$sessionOrderStatus );
-   $this->logger->info( "Resultswitcher: Popping out of 
iframe for Order ID " . $oid );
-   $this->getOutput()->allowClickjacking();
-   $this->getOutput()->addModules( 'iframe.liberator' );
-   return;
-   }
 
$this->setHeaders();
 
@@ -418,13 +402,17 @@
$this->logger->info( "Resultswitcher: OK to process Order ID: " 
. $oid );
 
if ( $this->adapter->checkTokens() ) {
-   $this->getOutput()->allowClickjacking();
-   // FIXME: do we really need this again?
-   $this->getOutput()->addModules( 'iframe.liberator' );
// feed processDonorReturn all the GET and POST vars
$requestValues = $this->getRequest()->getValues();
$this->adapter->processDonorReturn( $requestValues );
$status = $this->adapter->getFinalStatus();
+
+   $this->logger->info(
+   "Resultswitcher: Popping out of iframe for 
Order ID " . $oid
+   );
+   $this->getOutput()->allowClickjacking();
+   $this->getOutput()->addModules( 'iframe.liberator' );
+
switch ( $status ) {
case FinalStatus::COMPLETE:
case FinalStatus::PENDING:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92ef647303985f4edb3bdbeb3a1d354c3f3b9857
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 

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

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: remove page_info_t now that we have id_info_t, and convert u...

[ArielGlenn (Code Review)]

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

Change subject: remove page_info_t now that we have id_info_t, and convert 
utils using it
..

remove page_info_t now that we have id_info_t, and convert utils using it

Change-Id: Icf133ccb79707ef621436414335ce3497e592a4d
---
M xmldumps-backup/mwbzutils/findpageidinbz2xml.c
M xmldumps-backup/mwbzutils/mwbzutils.h
2 files changed, 15 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/05/338405/1

diff --git a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c 
b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
index 4218660..9553f88 100644
--- a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
+++ b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
@@ -308,7 +308,7 @@
   0 if no pageid found,
   -1 on error
 */
-int get_first_page_id_after_offset(int fin, off_t position, page_info_t 
*pinfo, int use_api, int use_stub, char *stubfilename, int verbose) {
+int get_first_page_id_after_offset(int fin, off_t position, id_info_t *pinfo, 
int use_api, int use_stub, char *stubfilename, int verbose) {
   int res;
   regmatch_t *match_page, *match_page_id, *match_rev, *match_rev_id;
   regex_t compiled_page, compiled_page_id, compiled_rev, compiled_rev_id;
@@ -342,7 +342,7 @@
 
   pinfo->bits_shifted = -1;
   pinfo->position = (off_t)-1;
-  pinfo->page_id = -1;
+  pinfo->id = -1;
 
   bfile.bytes_read = 0;
 
@@ -363,7 +363,7 @@
fwrite(b->next_to_read+match_page_id[2].rm_so, sizeof(unsigned 
char), match_page_id[2].rm_eo - match_page_id[2].rm_so, stderr);
fwrite("\n",1,1,stderr);
  }
- pinfo->page_id = atoi((char 
*)(b->next_to_read+match_page_id[2].rm_so));
+ pinfo->id = atoi((char *)(b->next_to_read+match_page_id[2].rm_so));
  pinfo->position = bfile.block_start;
  pinfo->bits_shifted = bfile.bits_shifted;
  return(1);
@@ -405,7 +405,7 @@
  else { /* use_stub */
page_id_found = get_page_id_from_rev_id_via_stub(rev_id, 
stubfilename);
  }
- pinfo->page_id = page_id_found +1; /* want the page after this 
offset, not the one we're in */
+ pinfo->id = page_id_found +1; /* want the page after this offset, not 
the one we're in */
  pinfo->position = bfile.block_start;
  pinfo->bits_shifted = bfile.bits_shifted;
  return(1);
@@ -482,7 +482,7 @@
 
return value from guess, or -1 on error. 
  */
-int do_iteration(iter_info_t *iinfo, int fin, page_info_t *pinfo, int use_api, 
int use_stub, char *stubfilename, int verbose) {
+int do_iteration(iter_info_t *iinfo, int fin, id_info_t *pinfo, int use_api, 
int use_stub, char *stubfilename, int verbose) {
   int res;
   off_t new_position;
   off_t interval;
@@ -523,9 +523,9 @@
   res = get_first_page_id_after_offset(fin, new_position, pinfo, use_api, 
use_stub, stubfilename, verbose);
   if (res >0) {
 /* caller wants the new value */
-iinfo->last_value = pinfo->page_id;
+iinfo->last_value = pinfo->id;
 iinfo->last_position = new_position;
-return(pinfo->page_id);
+return(pinfo->id);
   }
   else {
 /* here is the tough case, if we didn't find anything then we are prolly 
too close to the end, truncation or
@@ -546,7 +546,7 @@
 int main(int argc, char **argv) {
   int fin, res, page_id=0;
   off_t position, interval, file_size;
-  page_info_t pinfo;
+  id_info_t pinfo;
   iter_info_t iinfo;
   char *filename = NULL;
   int optindex=0;
@@ -612,7 +612,7 @@
   position = (off_t)0;
   pinfo.bits_shifted = -1;
   pinfo.position = (off_t)-1;
-  pinfo.page_id = -1;
+  pinfo.id = -1;
 
   iinfo.left_end = (off_t)0;
   iinfo.right_end = file_size;
@@ -620,19 +620,19 @@
 
   res = get_first_page_id_after_offset(fin, (off_t)0, , use_api, 
use_stub, stubfile, verbose);
   if (res > 0) {
-iinfo.last_value = pinfo.page_id;
+iinfo.last_value = pinfo.id;
 iinfo.last_position = (off_t)0;
   }
   else {
 fprintf(stderr,"Failed to find any page from start of file, exiting\n");
 exit(1);
   }
-  if (pinfo.page_id == page_id) {
+  if (pinfo.id == page_id) {
 if (verbose) fprintf(stderr,"found the page id right away, no iterations 
needed.\n");
-fprintf(stdout,"position:%"PRId64" page_id:%d\n",pinfo.position, 
pinfo.page_id);
+fprintf(stdout,"position:%"PRId64" page_id:%d\n",pinfo.position, pinfo.id);
 exit(0);
   }
-  if (pinfo.page_id > page_id) {
+  if (pinfo.id > page_id) {
 fprintf(stderr,"Page requested is less than first page id in file\n");
 exit(-1);
   }
@@ -643,8 +643,8 @@
   exit(-1);
 }
 else if (iinfo.left_end == iinfo.right_end) {
-  if ( pinfo.page_id <= page_id) {
-   fprintf(stdout,"position:%"PRId64" page_id:%d\n",pinfo.position, 
pinfo.page_id);
+  if ( pinfo.id <= page_id) {
+   fprintf(stdout,"position:%"PRId64" 

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: update README with docs on the new utility and script

[ArielGlenn (Code Review)]

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

Change subject: update README with docs on the new utility and script
..

update README with docs on the new utility and script

Change-Id: I4839c34b8e908c88de65cb0e883afd93aab5a152
---
M xmldumps-backup/mwbzutils/README
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/06/338406/1

diff --git a/xmldumps-backup/mwbzutils/README b/xmldumps-backup/mwbzutils/README
index 4cac1b6..6762049 100644
--- a/xmldumps-backup/mwbzutils/README
+++ b/xmldumps-backup/mwbzutils/README
@@ -13,11 +13,21 @@
 LICENSE_BZ; all other files in the package are released under the GPL, 
 see the file COPYING for details.
 
+Scripts:
+
+check_bz2_pagerange.py - Checks that the first and last page of a bz2 content
+ checkpoint filename match the contents in the file,
+i.e. the first page id in the name is the first page
+id contained in the file, and the same for the last
+page id. This uses the MediaWiki api as well as
+the getlastidinbz2xml utility for which see below.
+
 Utilities:
 
 checkforbz2footer - Tests to see if the bz2 file specified on the command 
line
has a bz2 footer (if it does it is likely to be intact).
Exits with 0 if found, 1 otherwise.
+
 dumpbz2filefromoffset - Uncompresses the file from the first bz2 block found 
after
the specified offset, and dumps the results to stdout.
 This will first look for and dump the  
header, 
@@ -25,6 +35,7 @@
find the first  tag in the first bz2 block after
the specified output and dump the contents from that 
point
on.
+
 dumplastbz2block  - Finds the last bz2 block marker in a file and dumps 
whatever 
can be decompressed after that point;  the header of 
the file 
must be intact in order for any output to be produced. 
This 
@@ -42,6 +53,10 @@
 position:x pageid:nnn
It exits with 0 on success, -1 on error.
 
+getlastidinbz2xml - Given a bzipped xml content file and a page or rev id 
and the
+type (either 'page' or 'rev'), return the last such id 
in the
+   xml file.
+
 recompresszml - Reads an xml stream of pages and writes multiple bz2 
compressed
streams, concatenated, to stdout, with the specified 
number of 
pages per stream. The mediawiki site info header is in 
its

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4839c34b8e908c88de65cb0e883afd93aab5a152
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/mwbzutils
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: add function to dump parts of bz_info_t structure

[ArielGlenn (Code Review)]

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

Change subject: add function to dump parts of bz_info_t structure
..

add function to dump parts of bz_info_t structure

Change-Id: I4987992be432f0a1daa7b401cf45e17e0857
---
M xmldumps-backup/mwbzutils/mwbzlib.c
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/07/338407/1

diff --git a/xmldumps-backup/mwbzutils/mwbzlib.c 
b/xmldumps-backup/mwbzutils/mwbzlib.c
index 16bc409..1a1e5c6 100644
--- a/xmldumps-backup/mwbzutils/mwbzlib.c
+++ b/xmldumps-backup/mwbzutils/mwbzlib.c
@@ -110,11 +110,24 @@
   }
 }
 
+void dump_bfile_info(bz_info_t *bfile) {
+  fprintf(stderr, "bfile->bufin_size: %d\n", bfile->bufin_size);
+  fprintf(stderr, "bfile->buffout_size: %d\n", bfile->bufout_size);
+  fprintf(stderr, "bfile->initialized: %d\n", bfile->initialized);
+  fprintf(stderr, "bfile->block_start: %"PRId64"\n", bfile->block_start);
+  fprintf(stderr, "bfile->something: %d\n", bfile->bits_shifted);
+  fprintf(stderr, "bfile->position: %"PRId64"\n", bfile->position);
+  fprintf(stderr, "bfile->bytes_written: %d\n", bfile->bytes_written);
+  fprintf(stderr, "bfile->eof: %d\n", bfile->eof);
+  fprintf(stderr, "bfile->file_size: %"PRId64"\n", bfile->file_size);
+}
+
 /* return -1 if no match
return number of bits rightshifted otherwise */
 int check_buffer_for_bz2_block_marker(bz_info_t *bfile) {
   int result, i;
 
+  /* dump_bfile_info(bfile); */
   result = bytes_compare(bfile->marker[0],bfile->marker_buffer+1,6,0);
   if (!result) {
 return(0);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4987992be432f0a1daa7b401cf45e17e0857
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/mwbzutils
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: bump version to 0.0.6

[ArielGlenn (Code Review)]

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

Change subject: bump version to 0.0.6
..

bump version to 0.0.6

Change-Id: I361ec6f6755bddc5f5d66e1481d340c0742acdb3
---
M xmldumps-backup/mwbzutils/Makefile
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/09/338409/1

diff --git a/xmldumps-backup/mwbzutils/Makefile 
b/xmldumps-backup/mwbzutils/Makefile
index 0b869ee..ae68fad 100644
--- a/xmldumps-backup/mwbzutils/Makefile
+++ b/xmldumps-backup/mwbzutils/Makefile
@@ -16,7 +16,7 @@
 # 2010-2013: see the file COPYING for details.
 # --
 
-VERSION= "0.0.5"
+VERSION= "0.0.6"
 CC?= gcc
 BIGFILES   = -D_FILE_OFFSET_BITS=64
 CPPFLAGS  += $(BIGFILES) -DVERSION=\"$(VERSION)\"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I361ec6f6755bddc5f5d66e1481d340c0742acdb3
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/mwbzutils
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: deprecate globalcollect resultswitcher

[jenkins-bot (Code Review)]

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

Change subject: deprecate globalcollect resultswitcher
..


deprecate globalcollect resultswitcher

TODO test coverage

Change-Id: I5efd3db3c477e28dddef23f61bf0859a005369a0
---
M gateway_common/GatewayPage.php
M globalcollect_gateway/globalcollect.adapter.php
M globalcollect_gateway/globalcollect_resultswitcher.body.php
3 files changed, 47 insertions(+), 145 deletions(-)

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



diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index ae0fff4..f3bcb40 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -428,6 +428,7 @@
switch ( $status ) {
case FinalStatus::COMPLETE:
case FinalStatus::PENDING:
+   case FinalStatus::PENDING_POKE:
$this->displayThankYouPage( $status );
return;
}
diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index 2970e7e..afae840 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1264,6 +1264,50 @@
return $return;
}
 
+   public function processDonorReturn( $requestValues ) {
+
+   $oid = null;
+   if ( array_key_exists( 'order_id', $requestValues ) ) {
+   $oid = $requestValues['order_id'];
+   } else if ( array_key_exists( 'REF', $requestValues ) ) {
+   $oid = $requestValues['REF'];
+   }
+
+   if (! $oid) {
+   $this->finalizeInternalStatus( FinalStatus::FAILED );
+   $this->logger->error( 'Missing Order ID' );
+   return;
+   }
+
+   if ( $this->getData_Unstaged_Escaped( 'payment_method' ) !== 
'cc' ) {
+   $this->finalizeInternalStatus( FinalStatus::FAILED );
+   $this->logger->error( "Payment method is not CC, OID: 
{$oid}" );
+   return;
+   }
+
+   $session_oid = $this->session_getData( 'Donor', 'order_id' );
+
+   if (! $session_oid ) {
+   $this->logger->info( "Missing Session Order ID for OID: 
{$oid}" );
+   // Donor has made two payment attempts, and we have the 
wrong one's
+   // info in session. To avoid recording the wrong 
details, leave the
+   // attempt in PENDING status, which will show the thank 
you page
+   // but leave the payment to be resolved by the orphan 
rectifier.
+   // FIXME: should use finalizeInternalStatus() but there 
are side effects.
+   $this->final_status = FinalStatus::PENDING;
+   return;
+   }
+
+   if ( $oid !== $session_oid ) {
+   $this->logger->info( "Order ID mismatch 
'{$oid}'/'{$session_oid}'" );
+   // FIXME: should use finalizeInternalStatus() but there 
are side effects
+   $this->final_status = FinalStatus::PENDING;
+   return;
+   }
+
+   $this->do_transaction( 'Confirm_CreditCard' );
+   }
+
/**
 * Process the response and set transaction_response properties
 *
diff --git a/globalcollect_gateway/globalcollect_resultswitcher.body.php 
b/globalcollect_gateway/globalcollect_resultswitcher.body.php
index bcf88d3..c34114d 100644
--- a/globalcollect_gateway/globalcollect_resultswitcher.body.php
+++ b/globalcollect_gateway/globalcollect_resultswitcher.body.php
@@ -23,151 +23,8 @@
 
protected $gatewayIdentifier = GlobalCollectAdapter::IDENTIFIER;
 
-   /**
-* Show the special page
-*/
-   protected function handleRequest() {
-   $req = $this->getRequest();
-   // TODO: Don't do that.
-   $fake = $req->getBool( 'fake' );
-   $fail = $req->getBool( 'fail' );
-
-   if ( $fake ) {
-   if ( $fail ) {
-   $this->displayFailPage();
-   return;
-   } else {
-   $go = ResultPages::getThankYouPage( 
$this->adapter );
-   }
-
-   $this->getOutput()->addHTML( "Redirecting to page 
$go" );
-   $this->getOutput()->redirect( $go );
-   return;
-   }
-
-   $forbidden = false;
-   $this->qs_oid = $req->getText( 'order_id', 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: nfs-mount-manager throw notice if symlink

[Rush (Code Review)]

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

Change subject: labstore: nfs-mount-manager throw notice if symlink
..


labstore: nfs-mount-manager throw notice if symlink

We need to surface when this is the case and then
convert to an fail exit condition.

Change-Id: Id9c335aa7475bfedb6b0752e67359271f0dff020
---
M modules/labstore/files/nfs-mount-manager
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/modules/labstore/files/nfs-mount-manager 
b/modules/labstore/files/nfs-mount-manager
index c4bc5d7..43d28f0 100644
--- a/modules/labstore/files/nfs-mount-manager
+++ b/modules/labstore/files/nfs-mount-manager
@@ -20,6 +20,15 @@
 case "$1" in
 check)
 
+# notify if check path is a symlink
+if /usr/bin/test -L $2; then
+/usr/bin/file -s $2
+
+   # TODO: it should be safe to exit if link is
+   # true but there are some legacy cases we
+   # need to verify are removed.
+fi
+
 if cat /proc/mounts | /usr/bin/awk '{print $2}' \
 | /bin/grep -qs "^$2$"; then
 echo "It's mounted."

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Update list of host aliases for mail relay

[Andrew Bogott (Code Review)]

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

Change subject: Tools: Update list of host aliases for mail relay
..


Tools: Update list of host aliases for mail relay

Change-Id: I16588eb97e09929d47c3b0a70e64cef5a01fc67d
---
M modules/toollabs/templates/mail-relay.exim4.conf.erb
1 file changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/modules/toollabs/templates/mail-relay.exim4.conf.erb 
b/modules/toollabs/templates/mail-relay.exim4.conf.erb
index 1b7f3ba..eb301ef 100644
--- a/modules/toollabs/templates/mail-relay.exim4.conf.erb
+++ b/modules/toollabs/templates/mail-relay.exim4.conf.erb
@@ -30,17 +30,14 @@
# host_aliases has been decommissioned
# (T109485), this list should be empty.
tools-bastion-01.eqiad.wmflabs : \
-   tools-bastion-02.eqiad.wmflabs : \
-   tools-checker-01.eqiad.wmflabs : \
tools-checker-02.eqiad.wmflabs : \
tools-mail.eqiad.wmflabs : \
tools-precise-dev.eqiad.wmflabs : \
-   tools-services-02.eqiad.wmflabs : \
+   tools-services-01.eqiad.wmflabs : \
tools-submit.eqiad.wmflabs : \
tools-webgrid-generic-1401.eqiad.wmflabs : \
tools-webgrid-generic-1402.eqiad.wmflabs : \
tools-webgrid-generic-1403.eqiad.wmflabs : \
-   tools-webgrid-generic-1404.eqiad.wmflabs : \
tools-webgrid-lighttpd-1201.eqiad.wmflabs : \
tools-webgrid-lighttpd-1202.eqiad.wmflabs : \
tools-webgrid-lighttpd-1203.eqiad.wmflabs : \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16588eb97e09929d47c3b0a70e64cef5a01fc67d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Coren 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
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...Kartographer[master]: Fix Y offset not being applied correctly

[JGirault (Code Review)]

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

Change subject: Fix Y offset not being applied correctly
..

Fix Y offset not being applied correctly

Bug: T158438
Change-Id: Ia604c4a8cb109497557cbafff08812eab1bc9db2
---
M modules/dialog/dialog.js
1 file changed, 12 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/99/338399/1

diff --git a/modules/dialog/dialog.js b/modules/dialog/dialog.js
index 89ff03d..a75dd8f 100644
--- a/modules/dialog/dialog.js
+++ b/modules/dialog/dialog.js
@@ -138,7 +138,8 @@
MapDialog.prototype.offsetMap = function ( isSidebarOpen ) {
var map = this.map,
offsetX = isSidebarOpen ? SIDEBAR_WIDTH / -2 : 0,
-   targetPoint = map.project( map.getCenter(), 
map.getZoom() ).subtract( [ offsetX, -1 * FOOTER_HEIGHT ] ),
+   offsetY = FOOTER_HEIGHT / -2,
+   targetPoint = map.project( map.getCenter(), 
map.getZoom() ).subtract( [ offsetX, offsetY ] ),
targetLatLng = map.unproject( targetPoint, 
map.getZoom() );
 
map.setView( targetLatLng, map.getZoom() );
@@ -181,7 +182,9 @@
MapDialog.prototype.getSetupProcess = function ( options ) {
return MapDialog.super.prototype.getSetupProcess.call( this, 
options )
.next( function () {
-   var dialog = this;
+   var dialog = this,
+   isFirstTimeOpen = 
!dialog.$mapDetailsButton,
+   isSideBarVisible = dialog.sideBar;
 
if ( options.map && options.map !== dialog.map 
) {
 
@@ -204,24 +207,22 @@
.text( 
dialog.map.captionText );
}
 
-   if ( !dialog.$mapDetailsButton ) {
+   if ( isFirstTimeOpen ) {
// The button does not exist 
yet, add it
dialog.addFooterButton();
-
-   } else if ( dialog.sideBar ) {
+   } else if ( isSideBarVisible ) {
// The button exists, the 
sidebar was open, call `tearDown` and reopen it.
dialog.sideBar.tearDown();
dialog.map.doWhenReady( 
function () {
dialog.offsetMap( true 
);
dialog.toggleSideBar( 
true );
} );
-
-   } else {
-   // The button exists, the 
sidebar was not open, simply run `offsetMap`
-   dialog.map.doWhenReady( 
function () {
-   dialog.offsetMap( false 
);
-   } );
+   return;
}
+   // The button exists, the sidebar was 
not open, simply run `offsetMap`
+   dialog.map.doWhenReady( function () {
+   dialog.offsetMap( false );
+   } );
}
}, this );
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia604c4a8cb109497557cbafff08812eab1bc9db2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: toollabs: Update tools.wmflabs.org links to use HTTPS

[Andrew Bogott (Code Review)]

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

Change subject: toollabs: Update tools.wmflabs.org links to use HTTPS
..


toollabs: Update tools.wmflabs.org links to use HTTPS

Change-Id: Ie06a68aad7af622b029747e035ddc56486c5290d
---
M modules/toollabs/files/40-tools-bastion-banner.sh
M modules/toollabs/files/40-toolsbeta-bastion-banner.sh
M modules/toollabs/manifests/admin_web_updater.pp
M modules/toollabs/manifests/dev_environ.pp
4 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Tim Landscheidt: Looks good to me, but someone else must approve
  BryanDavis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/toollabs/files/40-tools-bastion-banner.sh 
b/modules/toollabs/files/40-tools-bastion-banner.sh
index 56b18d9..f3505d8 100644
--- a/modules/toollabs/files/40-tools-bastion-banner.sh
+++ b/modules/toollabs/files/40-tools-bastion-banner.sh
@@ -16,9 +16,9 @@
  ##  '   """###  ##  
  ##  ### # ###   #<<###  ##  Use of this system is 
subject to the Tool Labs
   ##  ### ### ,# #  ##   Terms of Use and Privacy 
Policies:
-   ###    ###- 
http://tools.wmflabs.org/?Rules
+   ###    ###- 
https://tools.wmflabs.org/?Rules
    ##    
   #  #   General guidance and help can 
be found at:
-     - 
http://tools.wmflabs.org/?Help
+     - 
https://tools.wmflabs.org/?Help
 
 EOF
diff --git a/modules/toollabs/files/40-toolsbeta-bastion-banner.sh 
b/modules/toollabs/files/40-toolsbeta-bastion-banner.sh
index f2cf11c..d2a0466 100644
--- a/modules/toollabs/files/40-toolsbeta-bastion-banner.sh
+++ b/modules/toollabs/files/40-toolsbeta-bastion-banner.sh
@@ -16,9 +16,9 @@
  ##  '   """###  ##  
  ##  ### # ###   #<<###  ##  Use of this system is 
subject to the Tool Labs
   ##  ### ### ,# #  ##   Terms of Use and Privacy 
Policies:
-   ###    ###- 
http://tools.wmflabs.org/?Rules
+   ###    ###- 
https://tools.wmflabs.org/?Rules
    ##    
   #  #   General guidance and help can 
be found at:
-     - 
http://tools.wmflabs.org/?Help
+     - 
https://tools.wmflabs.org/?Help
 
 EOF
diff --git a/modules/toollabs/manifests/admin_web_updater.pp 
b/modules/toollabs/manifests/admin_web_updater.pp
index fe9b2af..6293748 100644
--- a/modules/toollabs/manifests/admin_web_updater.pp
+++ b/modules/toollabs/manifests/admin_web_updater.pp
@@ -1,4 +1,4 @@
-# This is responsible for http://tools.wmflabs.org/
+# This is responsible for https://tools.wmflabs.org/
 class toollabs::admin_web_updater(
 $active
 ) {
diff --git a/modules/toollabs/manifests/dev_environ.pp 
b/modules/toollabs/manifests/dev_environ.pp
index c4d1986..f511376 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -107,7 +107,7 @@
 ensure => latest,
 }
 
-# pastebinit configuration for http://tools.wmflabs.org/paste/.
+# pastebinit configuration for https://tools.wmflabs.org/paste/.
 file { '/etc/pastebin.d':
 ensure  => 'directory',
 require => Package['pastebinit'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie06a68aad7af622b029747e035ddc56486c5290d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
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...VisualChat[master]: Remove unused messages

[Umherirrender (Code Review)]

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

Change subject: Remove unused messages
..


Remove unused messages

The message keys have wrong prefix and seems to be a copy over from
another extension.

Leave the files to allow easier readd of i18n support.

Change-Id: I2494b36bdc0bbe4eb02879ec404699f6443ecf77
---
M i18n/en.json
M i18n/es.json
M visualchat.php
3 files changed, 0 insertions(+), 31 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index dd05680..4c9f8b3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,19 +4,4 @@
"Miguel2706"
]
},
-   "updatemediawiki": "Update MediaWiki",
-   "updatemediawiki-desc": "Allows updating MediaWiki via a special page",
-   "updatemediawiki-current": "Current version",
-   "updatemediawiki-update-nofound": "No update is available",
-   "updatemediawiki-update-found": "New update found",
-   "updatemediawiki-update-downloading": "Downloading new update",
-   "updatemediawiki-update-saved": "Update downloaded and saved",
-   "updatemediawiki-update-exist": "Update already downloaded",
-   "updatemediawiki-update-copyready": "Copy ready",
-   "updatemediawiki-update-database": "Update the data base now?",
-   "updatemediawiki-update-updateready": "Update ready",
-   "updatemediawiki-update-install": "Install now?",
-   "updatemediawiki-update-updated": "MediaWiki updated to version $1",
-   "updatemediawiki-update-error": "Could not find latest realeases",
-   "updatemediawiki-update-aborted": "Could not save new update. Operation 
aborted"
 }
diff --git a/i18n/es.json b/i18n/es.json
index 10a86e6..7ac6c2f 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -4,19 +4,4 @@
 "Miguel2706"
 ]
 },
-"updatemediawiki": "Actualizar MediaWiki",
-"updatemediawiki-desc": "Permite a los administradores y usuarios 
autorizados actualizar MediaWiki desde una página especial.",
-"updatemediawiki-current": "Versión Actual",
-"updatemediawiki-update-nofound": "No hay actualizaciones disponibles",
-"updatemediawiki-update-found": "Nueva actualización encontrada",
-"updatemediawiki-update-downloading": "Descargando nueva actualización",
-"updatemediawiki-update-saved": "Nueva actualización descargada y 
guardada",
-"updatemediawiki-update-exist": "La actualización ya se había descargado",
-"updatemediawiki-update-copyready": "Copia lista",
-"updatemediawiki-update-database": "¿Actualizar la base de datos ahora?",
-"updatemediawiki-update-updateready": "Actualización lista",
-"updatemediawiki-update-install": "¿Instalar ahora?",
-"updatemediawiki-update-updated": "MediaWiki actualizado a la versión",
-"updatemediawiki-update-error": "No se pudo obtener las últimas 
actualizaciones",
-"updatemediawiki-update-aborted": "No se pudo descargar la actualización. 
Operación abortada"
 }
diff --git a/visualchat.php b/visualchat.php
index 012ea13..c6c4ab8 100644
--- a/visualchat.php
+++ b/visualchat.php
@@ -25,7 +25,6 @@
'name' => 'VisualChat',
'author' =>'Miguel Peláez',
'url' => 'https://www.mediawiki.org/wiki/Extension:VisualChat',
-   'descriptionmsg' => 'visualchat-desc',
'version'  => '0.3.0',
 );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2494b36bdc0bbe4eb02879ec404699f6443ecf77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualChat
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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...Popups[master]: Remove duplicate config key from extension.json

[Umherirrender (Code Review)]

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

Change subject: Remove duplicate config key from extension.json
..

Remove duplicate config key from extension.json

Having PopupsConflictingNavPopupsGadgetName once is enough

Change-Id: I59c15162e20ba209e4bd8e292e2b223ee3cf6638
---
M extension.json
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index c47f3c5..41af07a 100644
--- a/extension.json
+++ b/extension.json
@@ -58,7 +58,6 @@
"PopupsOptInDefaultState" : "0",
"@PopupsConflictingNavPopupsGadgetName": "@var string: 
Navigation popups gadget name",
"PopupsConflictingNavPopupsGadgetName": "Navigation_popups",
-   "PopupsConflictingNavPopupsGadgetName": "Navigation_popups",
"@PopupsAPIUseRESTBase": "Whether to use RESTBase rather than 
the MediaWiki API for fetching Popups data.",
"PopupsAPIUseRESTBase": false
},

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prevent user from creating a list with an empty title

[jenkins-bot (Code Review)]

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

Change subject: Prevent user from creating a list with an empty title
..


Prevent user from creating a list with an empty title

It's currently possible for a user to create a reading list with an empty
string as the title.  When this happens, "Untitled" will be displayed as
the list title, but the true title will be an empty string, and pages will
disappear from the reading list almost immediately.

Let's prevent users from creating reading lists with empty titles.

Change-Id: If330328a60b60db96f5ccaa7af2237bcbc65a37d
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
3 files changed, 28 insertions(+), 15 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
index 08a3719..89686df 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
@@ -13,6 +13,7 @@
 import android.view.WindowManager;
 import android.widget.EditText;
 
+import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.R;
 import org.wikipedia.util.DeviceUtil;
 import org.wikipedia.util.DimenUtil;
@@ -27,8 +28,9 @@
 }
 
 private interface TitleTextCallback {
-void onMatchesExistingTitle(@NonNull String title);
-void onDoesNotMatchExistingTitle();
+void onEntryMatchesExistingTitle(@NonNull String title);
+void onEntryEmpty();
+void onEntryOk();
 }
 
 private static class TitleTextWatcher implements TextWatcher {
@@ -44,13 +46,17 @@
 }
 
 @Override public void onTextChanged(CharSequence charSequence, int i, 
int i1, int i2) {
-for (String title : titles) {
-if (title.equals(charSequence.toString())) {
-cb.onMatchesExistingTitle(title);
-return;
-}
+if (StringUtils.isEmpty(charSequence)) {
+cb.onEntryEmpty();
+return;
 }
-cb.onDoesNotMatchExistingTitle();
+
+if (titles.contains(charSequence.toString())) {
+cb.onEntryMatchesExistingTitle(charSequence.toString());
+return;
+}
+
+cb.onEntryOk();
 }
 
 @Override public void afterTextChanged(Editable editable) {
@@ -96,18 +102,23 @@
 @Override
 public void onShow(DialogInterface dialogInterface) {
 titleView.addTextChangedListener(new 
TitleTextWatcher(otherTitles, new TitleTextCallback() {
-@Override
-public void onMatchesExistingTitle(@NonNull String title) {
-
titleContainer.setError(context.getString(R.string.reading_list_title_exists, 
title));
-
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
-
+@Override public void onEntryMatchesExistingTitle(@NonNull 
String title) {
+
setError(context.getString(R.string.reading_list_title_exists, title));
 }
 
-@Override
-public void onDoesNotMatchExistingTitle() {
+@Override public void onEntryEmpty() {
+
setError(context.getString(R.string.reading_list_entry_empty));
+}
+
+@Override public void onEntryOk() {
 titleContainer.setError(null);
 
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(true);
 }
+
+private void setError(@NonNull String error) {
+titleContainer.setError(error);
+
alertDialog.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
+}
 }));
 
 titleView.setText(readingList.getTitle());
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index 1e8e3d5..394b474 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -381,6 +381,7 @@
   Menu item label for saving the current 
article to a reading list.
   Dialog title for creating a new 
reading list.
   Error text shown when a user 
attempts to create a new list with the same title as an existing list. The 
\"%s\" symbol is replaced with the title of the existing list.
+  An error message shown to the user 
when the user attempts to create a reading list with an empty title.
   Message shown when an 

[MediaWiki-commits] [Gerrit] mediawiki...PictureGame[master]: Fix duplicate message key in qqq.json

[Umherirrender (Code Review)]

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

Change subject: Fix duplicate message key in qqq.json
..

Fix duplicate message key in qqq.json

Do the same as in I5ad45e8d22cc36ad654363bda19614b2d95f6f4d
Follows If98f901cd3d090e9a1fd2450ad9957582b3da455

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


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

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6643f32..1f7cba1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -3,7 +3,7 @@
"authors": []
},
"picturegame-adminpanelunflag-confirm": "Confirmation message shown in 
the un-flag dialog.",
-   "picturegame-adminpanelunflag-confirm": "Confirmation message shown in 
the delete dialog.",
+   "picturegame-adminpaneldelete-confirm": "Confirmation message shown in 
the delete dialog.",
"picturegame-flagimgconfirm": "Confirmation message shown in the report 
dialog.",
"picturegame-error-socialprofile": "Error message shown when 
SocialProfle extension is not installed.",
"picturegame-error-socialprofile-title": "Title for 
quizgame-error-socialprofile."

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Prevent user attempting to create a duplicate-titled reading...

[jenkins-bot (Code Review)]

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

Change subject: Prevent user attempting to create a duplicate-titled reading 
list
..


Prevent user attempting to create a duplicate-titled reading list

Checks the title in the reading list creation dialog against the list
of existing list titles, disabling the positive button and displaying
error text in the case of a match.

My personal preference and sense of what a user intends favor this
solution over something like creating a new list and  appending a " (1)"
to the title.

Bug: T156017
Change-Id: I8a46db35724104434053a802408ffc58c4d800b7
---
M app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
M app/src/main/java/org/wikipedia/readinglist/ReadingList.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListDetailView.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListDialogs.java
A app/src/main/java/org/wikipedia/readinglist/ReadingLists.java
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
M app/src/main/res/layout/dialog_reading_list_edit.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
9 files changed, 193 insertions(+), 88 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java 
b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
index 69e5784..6e6fa7b 100644
--- a/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
+++ b/app/src/main/java/org/wikipedia/readinglist/AddToReadingListDialog.java
@@ -67,7 +67,7 @@
 private View onboardingButton;
 private InvokeSource invokeSource;
 private CreateButtonClickListener createClickListener = new 
CreateButtonClickListener();
-private List readingLists = new ArrayList<>();
+private ReadingLists readingLists = new ReadingLists();
 @Nullable private DialogInterface.OnDismissListener dismissListener;
 
 public static AddToReadingListDialog newInstance(@NonNull PageTitle title, 
InvokeSource source) {
@@ -161,9 +161,8 @@
 ReadingList.DAO.queryMruLists(null, new 
CallbackTask.Callback() {
 @Override
 public void success(List rows) {
-readingLists = rows;
-ReadingList.sortReadingLists(readingLists,
-
Prefs.getReadingListSortMode(ReadingList.SORT_BY_NAME_ASC));
+readingLists.set(rows);
+
readingLists.sort(Prefs.getReadingListSortMode(ReadingLists.SORT_BY_NAME_ASC));
 adapter.notifyDataSetChanged();
 }
 });
@@ -188,7 +187,7 @@
 .description(null)
 .pages(new ArrayList())
 .build();
-AlertDialog dialog = ReadingListDialogs.createEditDialog(getContext(), 
list, false,
+AlertDialog dialog = ReadingListDialogs.createEditDialog(getContext(), 
list, false, readingLists.getTitles(),
 new ReadingListDialogs.EditDialogListener() {
 @Override
 public void onModify(String newTitle, String 
newDescription, boolean saveOffline) {
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
index 9bbffd4..ac9a1e6 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingList.java
@@ -9,16 +9,9 @@
 import org.wikipedia.readinglist.page.ReadingListPage;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 public final class ReadingList extends ReadingListRow {
-public static final int SORT_BY_NAME_ASC = 0;
-public static final int SORT_BY_NAME_DESC = 1;
-public static final int SORT_BY_RECENT_ASC = 2;
-public static final int SORT_BY_RECENT_DESC = 3;
-
 @NonNull private final List pages;
 private boolean emptyListSavePagesState = true;
 
@@ -124,45 +117,6 @@
 @Override protected void validate() {
 super.validate();
 Validate.notNull(pages);
-}
-}
-
-public static void sortReadingLists(List readingLists, int 
sortMode) {
-switch (sortMode) {
-case SORT_BY_NAME_ASC:
-Collections.sort(readingLists, new Comparator() {
-@Override
-public int compare(ReadingList lhs, ReadingList rhs) {
-return lhs.getTitle().compareTo(rhs.getTitle());
-}
-});
-break;
-case SORT_BY_NAME_DESC:
-Collections.sort(readingLists, new Comparator() {
-@Override
-public int 

[MediaWiki-commits] [Gerrit] mediawiki...PageViewInfo[master]: Add PageViewService to make the extension non-Wikimedia-spec...

[jenkins-bot (Code Review)]

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

Change subject: Add PageViewService to make the extension non-Wikimedia-specific
..


Add PageViewService to make the extension non-Wikimedia-specific

Change-Id: I0ef75e0b94994270992ef07a1698c99820ff7ff3
Depends-On: I3835b054ceac0fa0bcd58b41efa6bf78a0fafae7
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Hooks.php
A includes/PageViewService.php
A includes/ServiceWiring.php
A includes/WikimediaPageViewService.php
A tests/phpunit/ServiceWiringTest.php
A tests/phpunit/WikimediaPageViewServiceTest.php
A tests/smoke/WikimediaPageViewServiceSmokeTest.php
10 files changed, 1,083 insertions(+), 60 deletions(-)

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



diff --git a/extension.json b/extension.json
index 2e8961a..8a24ff3 100644
--- a/extension.json
+++ b/extension.json
@@ -12,7 +12,9 @@
]
},
"AutoloadClasses": {
-   "MediaWiki\\Extensions\\PageViewInfo\\Hooks": 
"includes/Hooks.php"
+   "MediaWiki\\Extensions\\PageViewInfo\\Hooks": 
"includes/Hooks.php",
+   "MediaWiki\\Extensions\\PageViewInfo\\PageViewService": 
"includes/PageViewService.php",
+   
"MediaWiki\\Extensions\\PageViewInfo\\WikimediaPageViewService": 
"includes/WikimediaPageViewService.php"
},
"MessagesDirs": {
"PageViewInfo": [
@@ -38,9 +40,16 @@
"localBasePath": "resources",
"remoteExtPath": "PageViewInfo/resources"
},
+   "ConfigRegistry": {
+   "PageViewInfo": "GlobalVarConfig::newInstance"
+   },
+   "ServiceWiringFiles": [
+   "includes/ServiceWiring.php"
+   ],
"config": {
-   "PageViewInfoEndpoint": 
"https://wikimedia.org/api/rest_v1/metrics/pageviews;,
-   "PageViewInfoDomain": false
+   "PageViewInfoWikimediaEndpoint": 
"https://wikimedia.org/api/rest_v1;,
+   "PageViewInfoWikimediaDomain": false,
+   "PageViewInfoWikimediaRequestLimit": 5
},
"manifest_version": 1
 }
diff --git a/i18n/en.json b/i18n/en.json
index 7a2174f..339d0b0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,5 +7,6 @@
"pvi-desc": "Adds page view information to the info action",
"pvi-month-count": "Page views in the past 30 days",
"pvi-close": "Close",
-   "pvi-range": "$1 - $2"
+   "pvi-range": "$1 - $2",
+   "pvi-invalidresponse": "Invalid response"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 85b449e..ba260de 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,5 +8,6 @@
"pvi-desc": 
"{{desc|name=PageViewInfo|url=https://www.mediawiki.org/wiki/Extension:PageViewInfo}};,
"pvi-month-count": "Label for table cell containing page views in past 
30 days",
"pvi-close": "Text on button to close a dialog\n{{Identical|Close}}",
-   "pvi-range": "Title of dialog, which is the date range the graph is 
for. $1 is the starting date, $2 is the ending date."
+   "pvi-range": "Title of dialog, which is the date range the graph is 
for. $1 is the starting date, $2 is the ending date.",
+   "pvi-invalidresponse": "Error message when the REST API response data 
does not have the expected structure."
 }
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 5302afd..e94ac8c 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -5,8 +5,8 @@
 use IContextSource;
 use FormatJson;
 use Html;
-use MWHttpRequest;
-use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
+use ObjectCache;
 use Title;
 
 class Hooks {
@@ -17,15 +17,18 @@
 */
public static function onInfoAction( IContextSource $ctx, array 
&$pageInfo ) {
$views = self::getMonthViews( $ctx->getTitle() );
-   if ( $views === false ) {
+   if ( !$views ) {
return;
}
-   $count = 0;
-   foreach ( $views['items'] as $item ) {
-   $count += $item['views'];
-   }
+
+   $total = array_sum( $views );
+   reset( $views );
+   $start = self::toYmdHis( key( $views ) );
+   end( $views );
+   $end = self::toYmdHis( key( $views ) );
+
$lang = $ctx->getLanguage();
-   $formatted = $lang->formatNum( $count );
+   $formatted = $lang->formatNum( $total );
$pageInfo['header-basic'][] = [
$ctx->msg( 'pvi-month-count' ),
Html::element( 'div', [ 'class' => 'mw-pvi-month' ], 
$formatted )
@@ -35,73 +38,64 @@
file_get_contents( __DIR__ . '/../graphs/month.json' ),
true
);
-   

[MediaWiki-commits] [Gerrit] integration/config[master]: [cumin] non voting debian-glue job

[Hashar (Code Review)]

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

Change subject: [cumin] non voting debian-glue job
..

[cumin] non voting debian-glue job

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/90/338390/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index cb7d69f..fb4562c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2419,6 +2419,8 @@
   - name: tox-jessie
 
   - name: operations/software/cumin
+test:
+  - debian-glue-non-voting
 template:
   - name: tox-jessie
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f50210148abe9f54f01d5380636d630d8a29876
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] operations...cumin[master]: Moved config.yaml to a doc/examples/ directory

[jenkins-bot (Code Review)]

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

Change subject: Moved config.yaml to a doc/examples/ directory
..


Moved config.yaml to a doc/examples/ directory

* It also allow to easier ship the example file when packaging

Bug: T154588
Change-Id: I657391da85d4ce38329222ffb42795fdfc782fa6
---
M cumin/tests/unit/test_cli.py
R doc/examples/config.yaml
2 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/cumin/tests/unit/test_cli.py b/cumin/tests/unit/test_cli.py
index f878f57..f768f4f 100644
--- a/cumin/tests/unit/test_cli.py
+++ b/cumin/tests/unit/test_cli.py
@@ -9,7 +9,7 @@
 # Environment variables
 _ENV = {'USER': 'root', 'SUDO_USER': 'user'}
 # Command line arguments
-_ARGV = ['-c', 'cumin/config.yaml', '-d', '-m', 'sync', 'host', 'command1', 
'command2']
+_ARGV = ['-c', 'doc/examples/config.yaml', '-d', '-m', 'sync', 'host', 
'command1', 'command2']
 
 
 class TestCLI(unittest.TestCase):
@@ -18,7 +18,7 @@
 def _validate_parsed_args(self, args):
 """Validate that the parsed args have the proper values"""
 self.assertTrue(args.debug)
-self.assertEqual(args.config, 'cumin/config.yaml')
+self.assertEqual(args.config, 'doc/examples/config.yaml')
 self.assertEqual(args.hosts, 'host')
 self.assertEqual(args.commands, ['command1', 'command2'])
 
@@ -61,7 +61,7 @@
 
 def test_parse_config(self):
 """The configuration file is properly parsed and accessible"""
-config = cli.parse_config('cumin/config.yaml')
+config = cli.parse_config('doc/examples/config.yaml')
 self.assertTrue('log_file' in config)
 
 @mock.patch('cumin.cli.stderr')
diff --git a/cumin/config.yaml b/doc/examples/config.yaml
similarity index 75%
rename from cumin/config.yaml
rename to doc/examples/config.yaml
index 7feb37e..13f33f3 100644
--- a/cumin/config.yaml
+++ b/doc/examples/config.yaml
@@ -9,7 +9,7 @@
 
 # Transport-specific configuration
 clustershell:
-environment:
+environment: # Environment variables that will be defined [optional]
 ENV_VARIABLE: env_value
-ssh_options:
+ssh_options:  # SSH options passed to ClusterShell [optional]
 - 'some_option'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I657391da85d4ce38329222ffb42795fdfc782fa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/cumin
Gerrit-Branch: master
Gerrit-Owner: Volans 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Make edit-protection messages a bit more friendly.

[Dbrant (Code Review)]

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

Change subject: Make edit-protection messages a bit more friendly.
..

Make edit-protection messages a bit more friendly.

Change-Id: I760ec065aaa2e3537d91eecffb890a750f56b8f5
---
M app/src/main/java/org/wikipedia/edit/EditHandler.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
3 files changed, 8 insertions(+), 3 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/edit/EditHandler.java 
b/app/src/main/java/org/wikipedia/edit/EditHandler.java
index 2be67e2..721809f 100644
--- a/app/src/main/java/org/wikipedia/edit/EditHandler.java
+++ b/app/src/main/java/org/wikipedia/edit/EditHandler.java
@@ -12,6 +12,7 @@
 import org.wikipedia.analytics.ProtectedEditAttemptFunnel;
 import org.wikipedia.bridge.CommunicationBridge;
 import org.wikipedia.history.HistoryEntry;
+import org.wikipedia.login.User;
 import org.wikipedia.page.Page;
 import org.wikipedia.page.PageFragment;
 import org.wikipedia.page.Section;
@@ -53,7 +54,9 @@
 new AlertDialog.Builder(fragment.getActivity())
 .setCancelable(false)
 .setTitle(R.string.page_protected_can_not_edit_title)
-.setMessage(R.string.page_protected_can_not_edit)
+.setMessage(User.isLoggedIn()
+? R.string.page_protected_can_not_edit
+: R.string.page_protected_can_not_edit_anon)
 .setPositiveButton(android.R.string.ok, null)
 .show();
 funnel.log(currentPage.getPageProperties().getEditProtectionStatus());
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index 7f80088..e34bcbf 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -192,7 +192,8 @@
   Message shown to users when 
editing a semi-protected page
   Message shown to users when editing a 
fully protected page
   Message shown to users when editing a 
page that is protected with a custom level of protection. %s refers to the name 
of the protection level. Examples include \'templateeditor\' on enwiki.
-  Message in dialog box telling the 
user that they can not edit this page because it is protected.
+  Message in dialog box telling the 
user that their account does not currently have the sufficient rights to edit 
this page.
+  Message in dialog box 
telling the user that this page is currently protected against anonymous 
editing.
   Title of dialog box telling 
the user that they can not edit this page because it is protected.
   Menu item in the nav menu to go to 
the Settings screen.
 {{Identical|Settings}}
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 4178c5c..2367966 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -136,7 +136,8 @@
 This page has been 
semi-protected.
 This page has been fully 
protected.
 This page has been protected to the 
following levels: %s
-You do not have the rights to 
edit this page
+Sorry, your account does not 
have sufficient privileges to edit this page at this time.
+Sorry, this page cannot be 
edited anonymously at this time.
 This page is 
protected
 Settings
 Settings

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

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

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Localize blockpageschecker.py to Czech

[Code Review]

Matěj Suchánek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338375 )

Change subject: Localize blockpageschecker.py to Czech
..

Localize blockpageschecker.py to Czech

Change-Id: I3d42ed69fd3250f3b1bd3f47b719e430735bccbd
---
M scripts/blockpageschecker.py
1 file changed, 15 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/75/338375/2

diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index 0e9bd35..69c4cb8 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -79,22 +79,24 @@
 # PREFERENCES
 
 templateSemiProtection = {
+'cs': [r'\{\{(?:[Tt]emplate:|[Šš]ablona:|)([Dd]louhodobě[ _]p|[Pp])'
+   r'olozamčeno(|[^\}]*)\}\}(?:\r\n|)*'],
+'fr': [r'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- 
]?protection(|[^\}]*)\}\}'],
 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ 
_]scad\|.*?|\|.*?)\}\}',
r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'],
-'fr': [r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' +
-   r'|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'],
 'ja': [r'(?)\{\{(?:[Tt]emplate:|)' +
u'半保護' + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'],
 }
 # Regex to get the total-protection template
 templateTotalProtection = {
+'cs': [r'\{\{(?:[Tt]emplate:|[Šš]ablona:|)([Dd]louhodobě[ _]z|[Zz])'
+   r'amčeno(|[^\}]*)\}\}(?:\r\n|)*'],
+'fr': [r'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Pp]rotection(|[^\}]*)\}\}',
+   r'\{\{(?:[Tt]emplate:|[Mm]odèle:|)(?:[Pp]age|[Aa]rchive|'
+   r'[Mm]odèle) protégée?(|[^\}]*)\}\}'],
 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ 
_]scad\|(?:.*?)|minaccia|cancellata)\}\}',
r'\{\{(?:[Tt]emplate:|)(?:[Cc][Tt]|[Cc]anc fatte|[Cc][Ee])\}\}',
r'(?:\s|\n)*?[Qq]uesta pagina'],
-'fr': [r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' +
-   r'|)[Pp]rotection(|[^\}]*)\}\}',
-   r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' + 
r'|)(?:[Pp]age|[Aa]rchive|' +
-   u'[Mm]odèle) protégée' + r'?(|[^\}]*)\}\}'],
 'ja': [r'(?)\{\{(?:[Tt]emplate:|)' + u'保護(?:性急|)' +
r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'],
 }
@@ -123,9 +125,10 @@
 # Array: 0 => Semi-block, 1 => Total Block, 2 => Semi-Move, 3 => Total-Move,
 #4 => template-unique
 templateNoRegex = {
+'cs': ['{{Polozamčeno}}', '{{Zamčeno}}', None, None, None],
+'fr': ['{{Semi-protection}}', '{{Protection}}', None, None, None],
 'it': ['{{Avvisobloccoparziale}}', '{{Avvisoblocco}}', None, None,
'{{Protetta}}'],
-'fr': ['{{Semi-protection}}', '{{Protection}}', None, None, None],
 'ja': [u'{{半保護}}', u'{{保護}}', u'{{移動半保護}}', u'{{移動保護}}', None],
 }
 
@@ -133,6 +136,10 @@
 categoryToCheck = {
 'en': [u'Category:Wikipedia protected pages'],
 'ar': [u'تصنيف:محتويات محمية'],
+'cs': ['Kategorie:Wikipedie:Zamčené stránky',
+   'Kategorie:Wikipedie:Polozamčené stránky',
+   'Kategorie:Wikipedie:Dlouhodobě zamčené stránky',
+   'Kategorie:Wikipedie:Dlouhodobě polozamčené stránky'],
 'fr': [u'Category:Page semi-protégée', u'Category:Page protégée',
u'Catégorie:Article protégé'],
 'he': [u'קטגוריה:ויקיפדיה: דפים מוגנים',
@@ -148,7 +155,7 @@
 }
 
 # Check list to block the users that haven't set their preferences
-project_inserted = ['fr', 'it', 'ja', 'pt', 'zh']
+project_inserted = ['cs', 'fr', 'it', 'ja', 'pt', 'zh']
 
 # END PREFERENCES
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d42ed69fd3250f3b1bd3f47b719e430735bccbd
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Improve symmetry of setting/nulling callbacks on feed views.

[Dbrant (Code Review)]

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

Change subject: Improve symmetry of setting/nulling callbacks on feed views.
..

Improve symmetry of setting/nulling callbacks on feed views.

So, here's the thing:
When feed views get destroyed, we need to explicitly null out the
"callback" field that they contain. Otherwise, it's known to cause memory
leak(s) on certain APIs.

So far, we've been using the onViewAttachedToWindow() method to give the
callback to the view, and similarly using onViewDetachedFromWindow() to
set the callback to null, which seems to work well in preventing memory
leaks.

I've noticed, however, that in certain feed views, we have *nested*
RecyclerViews, and in the adapters of those nested RecyclerViews, we don't
actually use the attached/detached-from-window logic for setting and
nulling the callback (instead we just set the callback in onBindViewHolder).

My guess is that the latest version of appcompat has exposed this
inconsistency, in the form of race condition between the parent and nested
RecyclerAdapters in setting the callback.

This patch updates our "child" RecyclerAdapters to follow the same pattern
of setting and nulling the callback based on the attached/detached calls.

Bug: T158347
Change-Id: Ieb5461dbee0627df5252c51c54817627eedcf4a5
---
M 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
M app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
M app/src/main/java/org/wikipedia/feed/view/ListCardRecyclerAdapter.java
5 files changed, 42 insertions(+), 3 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
index 724cd41..1701aaa 100644
--- 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.view.View;
 
@@ -75,11 +76,14 @@
 super(items);
 }
 
+@Nullable @Override protected ListCardItemView.Callback callback() {
+return getCallback();
+}
+
 @Override
 public void onBindViewHolder(DefaultViewHolder 
holder, int i) {
 BecauseYouReadItemCard card = item(i);
 holder.getView().setHistoryEntry(new 
HistoryEntry(card.pageTitle(), HistoryEntry.SOURCE_FEED_BECAUSE_YOU_READ));
-holder.getView().setCallback(getCallback());
 }
 }
 }
diff --git 
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
index 40008bf..d4c7be0 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import org.wikipedia.R;
 import org.wikipedia.feed.view.CardHeaderView;
@@ -42,11 +43,14 @@
 super(items);
 }
 
+@Nullable @Override protected ListCardItemView.Callback callback() {
+return getCallback();
+}
+
 @Override
 public void onBindViewHolder(DefaultViewHolder 
holder, int position) {
 MostReadItemCard card = item(position);
 holder.getView().setHistoryEntry(new 
HistoryEntry(card.pageTitle(), HistoryEntry.SOURCE_FEED_MOST_READ));
-holder.getView().setCallback(getCallback());
 }
 }
 }
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java 
b/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
index b113044..c800659 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
@@ -2,10 +2,12 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.view.View;
 
 import org.wikipedia.R;
 import org.wikipedia.feed.view.CardHeaderView;
+import org.wikipedia.feed.view.FeedAdapter;
 import org.wikipedia.feed.view.HorizontalScrollingListCardItemView;
 import org.wikipedia.feed.view.HorizontalScrollingListCardView;
 import org.wikipedia.util.DateUtil;
@@ -46,12 +48,15 @@
 super(items);
 }
 
+

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Update jquery.ime to 7edcc7b from upstream

[jenkins-bot (Code Review)]

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

Change subject: Update jquery.ime to 7edcc7b from upstream
..


Update jquery.ime to 7edcc7b from upstream

Changes:
* Added IMEs for Eritrean languages: Tigrinya (ti), Tigre (tig),
  Blin (byn).
* Documentation updates.

Change-Id: Iec9e45711308d0b7a4670c64d3c2c9ae6debd0d9
---
M lib/jquery.ime/jquery.ime.js
M lib/jquery.ime/rules/README.md
A lib/jquery.ime/rules/byn/byn-geezim.js
A lib/jquery.ime/rules/ti/ti-geezim.js
A lib/jquery.ime/rules/tig/tig-geezim.js
5 files changed, 1,320 insertions(+), 18 deletions(-)

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



diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index e00d848..c88a356 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20170130
+/*! jquery.ime - v0.1.0+20170217
 * https://github.com/wikimedia/jquery.ime
 * Copyright (c) 2017 Santhosh Thottingal; Licensed GPL, MIT */
 ( function ( $ ) {
@@ -1786,6 +1786,10 @@
name: 'इनस्क्रिप्ट २',
source: 'rules/brx/brx-inscript2.js'
},
+   'byn-geezim': {
+   name: 'ብሊን',
+   source: 'rules/byn/byn-geezim.js'
+   },
'ckb-transliteration-arkbd': {
name: 'باشووری',
source: 'rules/ckb/ckb-transliteration-arkbd.js'
@@ -2275,6 +2279,14 @@
name: 'විජේසේකර',
source: 'rules/si/si-wijesekara.js'
},
+   'ti-geezim': {
+   name: 'ትግርኛ',
+   source: 'rules/ti/ti-geezim.js'
+   },
+   'tig-geezim': {
+   name: 'ትግረ',
+   source: 'rules/tig/tig-geezim.js'
+   },
'ur-phonetic': {
name: 'صوتی',
source: 'rules/ur/ur-phonetic.js'
@@ -2385,6 +2397,10 @@
brx: {
autonym: 'बोड़ो',
inputmethods: [ 'brx-inscript', 'brx-inscript2' ]
+   },
+   byn: {
+   autonym: 'ብሊን',
+   inputmethods: [ 'byn-geezim' ]
},
ckb: {
autonym: 'کوردیی ناوەندی',
@@ -2654,6 +2670,14 @@
autonym: 'ไทย',
inputmethods: [ 'th-kedmanee', 'th-pattachote' ]
},
+   ti: {
+   autonym: 'ትግርኛ',
+   inputmethods: [ 'ti-geezim' ]
+   },
+   tig: {
+   autonym: 'ትግረ',
+   inputmethods: [ 'tig-geezim' ]
+   },
tkr: {
autonym: 'цӀаӀхна миз',
inputmethods: [ 'cyrl-palochka' ]
diff --git a/lib/jquery.ime/rules/README.md b/lib/jquery.ime/rules/README.md
index b178934..0d106c4 100644
--- a/lib/jquery.ime/rules/README.md
+++ b/lib/jquery.ime/rules/README.md
@@ -1,33 +1,42 @@
+
 jQuery.ime Input method specification
 =
 
 Input methods are defined in javascript files. An input method is a javascript
-object and it is passed to $.ime.register() method to register with jquery.ime
+object and it is passed to `$.ime.register()` method to register with 
`jquery.ime`
 
-eg: $.ime.register( hebrewStandardKeyboard );
+eg: `$.ime.register( hebrewStandardKeyboard );`
+
+Input methods can be built by reusing parts of other methods, this is 
especially
+interesting for complex patterns. If rules are reused then the methods must be
+loaded first. This is done through configurations in 
`jquery.ime.inputmethods.js`.
+
+For examples on reuse, see the rules "nb-normforms" or "hi-inscript".
 
 Metadata fields
 ---
 
 id: A mandatory unique identifier that represents the input method.
-eg: "hindi-inscript"
+eg: `"hindi-inscript"`
 
-name: A mandatory short name for the input method. eg: Hindi InScript
+name: A mandatory short name for the input method. eg: `"Hindi InScript"`
+
+Note that the names used in the menu comes from 
[jquery.ime.inputmethods.js](../src/jquery.ime.inputmethods.js)
 
 description: An optional short description about the input method.
-eg: "keyboard layout as per inscript standard"
+eg: `"keyboard layout as per inscript standard"`
 
 date: An optional string to represent when this input method was written.
 Format should be: -mm-dd
 
 author: An optional string containing the authors name. Can contain email
-address as well. eg: "Santhosh Thottingal, <santhosh.thottin...@gmail.com>"

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add some docs on new account attributes

[Muehlenhoff (Code Review)]

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

Change subject: Add some docs on new account attributes
..


Add some docs on new account attributes

Also present on wikitech now, but wikitech points to this file as well,
so add it here as well.

Change-Id: Ib62ebf08f17a0c1c024ed256075916854443641e
---
M modules/admin/README
1 file changed, 18 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/README b/modules/admin/README
index ae5e39b..e05515b 100644
--- a/modules/admin/README
+++ b/modules/admin/README
@@ -77,6 +77,24 @@
 # IRC (definitely if not registered/identified with nickserv)
 # RT-only (because it can be emailed)
 
+Add the ''realname'' of the user (most labs accounts don't have a real name 
set)
+
+Add the ''email'' address of the users:
+- If the user is WMF staff use the email address of his/her Google account
+  (usually the first letter of the first name and the surname, you can
+  double-check the account name in the Gmail interface). Some users have
+  aliases for their nickname e.g., don't use these, use the official Google
+  account (this allows cross-checking data against OIT corp LDAP)
+- If the user is a volunteer, a researcher or contractor without access to a
+  wikimedia.org account, ask for a contact email address (to have a reliable
+  contact e.g. in case of an account compromise)
+
+If the user to be added is someone with a time-limited access (e.g. interns,
+researchers (who have time-limited MOUs) or short term contractor), add the
+estimated account end date as ''expiry_date'' (format is -MM-DD) and add
+a staff contact as ''expiry_contact''
+
+
 Adding user 'foo' to adm:
 
 groups:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib62ebf08f17a0c1c024ed256075916854443641e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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...WikibaseLexeme[master]: [Proposal] Don't use readable strings in type IDs

[Aleksey Bekh-Ivanov (WMDE) (Code Review)]

Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338356 )

Change subject: [Proposal] Don't use readable strings in type IDs
..

[Proposal] Don't use readable strings in type IDs

It's impossible to change values of entity type ID for Item and Property
but possible for Lexeme, as soon as it is not in production.

Main benefit is that if one will use this just as string value it will
immediately pop up on review, as soon as it will be very noticeable.
It will force all developers use single constant when refering to the ID,
and will reveal relations, like you can see here in LexemeViewTest: why
internal ID exposed to UI?

Also, you can see how many classes currently tied to this ID and can
easily question need for this.

Change-Id: Iac069f87ca8c85582d861e137b2ef7ac8cffa79f
---
M WikibaseLexeme.entitytypes.php
M src/DataModel/Lexeme.php
M src/DataModel/LexemeId.php
M src/DataModel/Serialization/LexemeDeserializer.php
M src/WikibaseLexeme.hooks.php
M tests/phpunit/composer/DataModel/LexemeIdTest.php
M tests/phpunit/composer/DataModel/LexemeTest.php
M tests/phpunit/composer/DataModel/Serialization/LexemeDeserializerTest.php
M tests/phpunit/composer/DataModel/Serialization/LexemeSerializerTest.php
M tests/phpunit/composer/DataModel/Services/Diff/LexemePatcherTest.php
M tests/phpunit/mediawiki/View/LexemeViewTest.php
11 files changed, 29 insertions(+), 26 deletions(-)


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

diff --git a/WikibaseLexeme.entitytypes.php b/WikibaseLexeme.entitytypes.php
index 494fe77..82cb8dd 100644
--- a/WikibaseLexeme.entitytypes.php
+++ b/WikibaseLexeme.entitytypes.php
@@ -35,7 +35,7 @@
 use Wikibase\View\Template\TemplateFactory;
 
 return [
-   'lexeme' => [
+   Lexeme::ENTITY_TYPE => [
'serializer-factory-callback' => function( SerializerFactory 
$serializerFactory ) {
return new LexemeSerializer(
$serializerFactory->newTermListSerializer(),
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 2f266df..a5d0e1a 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -24,7 +24,8 @@
LabelsProvider, DescriptionsProvider, LemmasProvider, 
LexicalCategoryProvider,
LanguageProvider {
 
-   const ENTITY_TYPE = 'lexeme';
+   /** Should be NEVER changed */
+   const ENTITY_TYPE = 'xpipo15we3';
 
/**
 * @var LexemeId|null
diff --git a/src/DataModel/LexemeId.php b/src/DataModel/LexemeId.php
index 3f3261c..a325b9f 100644
--- a/src/DataModel/LexemeId.php
+++ b/src/DataModel/LexemeId.php
@@ -70,7 +70,7 @@
 * @return string
 */
public function getEntityType() {
-   return 'lexeme';
+   return Lexeme::ENTITY_TYPE;
}
 
/**
diff --git a/src/DataModel/Serialization/LexemeDeserializer.php 
b/src/DataModel/Serialization/LexemeDeserializer.php
index 0d064f3..49fa227 100644
--- a/src/DataModel/Serialization/LexemeDeserializer.php
+++ b/src/DataModel/Serialization/LexemeDeserializer.php
@@ -43,7 +43,7 @@
TermListDeserializer $termListDeserializer,
StatementListDeserializer $statementListDeserializer
) {
-   parent::__construct( 'lexeme', 'type' );
+   parent::__construct( Lexeme::ENTITY_TYPE, 'type' );
$this->termListDeserializer = $termListDeserializer;
$this->statementListDeserializer = $statementListDeserializer;
$this->entityIdDeserializer = $entityIdDeserializer;
diff --git a/src/WikibaseLexeme.hooks.php b/src/WikibaseLexeme.hooks.php
index 2c9a040..c7331eb 100644
--- a/src/WikibaseLexeme.hooks.php
+++ b/src/WikibaseLexeme.hooks.php
@@ -3,6 +3,7 @@
 namespace Wikibase\Lexeme;
 
 use MediaWiki\MediaWikiServices;
+use Wikibase\Lexeme\DataModel\Lexeme;
 
 /**
  * MediaWiki hook handlers for the Wikibase Lexeme extension.
@@ -22,7 +23,7 @@
$config = MediaWikiServices::getInstance()->getMainConfig();
 
// Setting the namespace to false disabled automatic 
registration.
-   $entityNamespacesSetting['lexeme'] = $config->get( 
'LexemeNamespace' );
+   $entityNamespacesSetting[Lexeme::ENTITY_TYPE] = $config->get( 
'LexemeNamespace' );
}
 
/**
diff --git a/tests/phpunit/composer/DataModel/LexemeIdTest.php 
b/tests/phpunit/composer/DataModel/LexemeIdTest.php
index 1a6baf4..09ff241 100644
--- a/tests/phpunit/composer/DataModel/LexemeIdTest.php
+++ b/tests/phpunit/composer/DataModel/LexemeIdTest.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Lexeme\Tests\DataModel;
 
+use Wikibase\Lexeme\DataModel\Lexeme;
 use Wikibase\Lexeme\DataModel\LexemeId;
 use InvalidArgumentException;
 use RuntimeException;
@@ -77,7 +78,7 @@
}
 
 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: [Facepalm] Load CSS as Unicode, not ASCII.

[Dbrant (Code Review)]

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

Change subject: [Facepalm] Load CSS as Unicode, not ASCII.
..

[Facepalm] Load CSS as Unicode, not ASCII.

Our CSS contains several "#content" directives that inject additional
content into the HTML, some of which contain Unicode characters. We've
been noticing that these characters don't seem to be rendering correctly
in our WebView.

It turns out that the WebView has been loading the CSS content as ASCII,
and we need to explicitly declare our content to be UTF-8 in a "meta" tag
in the HTML. It's surprising that UTF-8 is not the default, but there
you go.

Bug: T158067
Change-Id: Ia0cd07d99ba1fb09112a883901c1d5d40a29eba7
---
M app/src/main/assets/index.html
M app/src/main/assets/preview.html
M www/index.html
M www/preview.html
4 files changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html
index fcf2f2a..922d140 100644
--- a/app/src/main/assets/index.html
+++ b/app/src/main/assets/index.html
@@ -3,6 +3,8 @@
 
  
 
+
+
 
 
 
diff --git a/app/src/main/assets/preview.html b/app/src/main/assets/preview.html
index 185cf1d..c74c8b8 100644
--- a/app/src/main/assets/preview.html
+++ b/app/src/main/assets/preview.html
@@ -3,6 +3,8 @@
 
 https://wikipedia.org; /> 
 
+
+
 
 
 
diff --git a/www/index.html b/www/index.html
index fcf2f2a..922d140 100644
--- a/www/index.html
+++ b/www/index.html
@@ -3,6 +3,8 @@
 
  
 
+
+
 
 
 
diff --git a/www/preview.html b/www/preview.html
index 185cf1d..c74c8b8 100644
--- a/www/preview.html
+++ b/www/preview.html
@@ -3,6 +3,8 @@
 
 https://wikipedia.org; /> 
 
+
+
 
 
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: .bashrc: Add extra space to PS1

[Marostegui (Code Review)]

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

Change subject: .bashrc: Add extra space to PS1
..


.bashrc: Add extra space to PS1

Adding extra space to my PS1 variable

Change-Id: I6a04ab0b50fe0fd779aa1357b233257952fbdf1b
---
M modules/admin/files/home/marostegui/.bashrc
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/admin/files/home/marostegui/.bashrc 
b/modules/admin/files/home/marostegui/.bashrc
index 49fcae5..be48f06 100644
--- a/modules/admin/files/home/marostegui/.bashrc
+++ b/modules/admin/files/home/marostegui/.bashrc
@@ -3,5 +3,5 @@
 alias mv='mv -i'
 alias ln='ln -i'
 
-export PS1="[\t] \u@\h:\w\\$\[$(tput sgr0)\]"
+export PS1="[\t] \u@\h:\w\\$\[$(tput sgr0)\] "
 alias mysqlbinlog='/opt/wmf-mariadb10/bin/mysqlbinlog 
--defaults-file=/root/.my.cnf'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a04ab0b50fe0fd779aa1357b233257952fbdf1b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
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] mediawiki...BlueSpiceExtendedFilelist[REL1_23]: Initial commit

[Robert Vogel (Code Review)]

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/336966 )

Change subject: Initial commit
..


Initial commit

Change-Id: Ie7763a930efa188b9647ea7fab64410cde3c0216
---
M .gitreview
A BlueSpiceExtendedFilelist.alias.php
A BlueSpiceExtendedFilelist.php
A REL1_27Shim.php
A i18n/de.json
A i18n/en.json
A i18n/filerepo/de.json
A i18n/filerepo/en.json
A i18n/filerepo/qqq.json
A i18n/qqq.json
A i18n/upload/de.json
A i18n/upload/en.json
A i18n/upload/qqq.json
A includes/BlueSpiceExtendedFilelistHooks.php
A includes/api/BSApiFileBackendStore.php
A includes/specials/SpecialBlueSpiceExtendedFilelist.php
A resources/BS.BlueSpiceExtendedFilelist/grid/FileRepo.js
A resources/BS/dialog/Upload.js
A resources/BS/grid/FileRepo.js
A resources/BS/model/File.js
A resources/BS/panel/Upload.js
A resources/bluespice.extendedFilelist.REL1_27Shim.css
A resources/bluespice.extendedFilelist.REL1_27Shim.js
A resources/bluespice.extendedFilelist.css
A resources/bluespice.extendedFilelist.js
A resources/bluespice.extjs.filerepogrid.css
26 files changed, 1,604 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/.gitreview b/.gitreview
index c1ec42b..9851532 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/BlueSpiceExtendedFilelist.git
-defaultbranch=master
+defaultbranch=REL1_23
 defaultrebase=0
diff --git a/BlueSpiceExtendedFilelist.alias.php 
b/BlueSpiceExtendedFilelist.alias.php
new file mode 100644
index 000..21392f4
--- /dev/null
+++ b/BlueSpiceExtendedFilelist.alias.php
@@ -0,0 +1,12 @@
+ array( 'ExtendedFilelist', 
'BlueSpiceExtendedFilelist' )
+);
+
+/** German (Deutsch) */
+$specialPageAliases['de'] = array(
+   'BlueSpiceExtendedFilelist' => array( 'Erweiterte Dateiliste' )
+);
\ No newline at end of file
diff --git a/BlueSpiceExtendedFilelist.php b/BlueSpiceExtendedFilelist.php
new file mode 100644
index 000..5bc9728
--- /dev/null
+++ b/BlueSpiceExtendedFilelist.php
@@ -0,0 +1,36 @@
+ 'BlueSpiceExtendedFilelist',
+   'author' => array( 'Dejan Savuljesku' ),
+   'descriptionmsg' => 'bs-extendedfilelist-desc',
+   'version' => '1.23'
+);
+
+$wgMessagesDirs['BlueSpiceExtendedFilelist'] = __DIR__ .'/i18n';
+$wgExtensionMessagesFiles['BlueSpiceExtendedFilelistAlias'] = __DIR__ 
.'/BlueSpiceExtendedFilelist.alias.php';
+$wgAutoloadClasses['SpecialBlueSpiceExtendedFilelist'] =  
__DIR__.'/includes/specials/SpecialBlueSpiceExtendedFilelist.php';
+$wgAutoloadClasses['BlueSpiceExtendedFilelistHooks'] =  
__DIR__.'/includes/BlueSpiceExtendedFilelistHooks.php';
+$wgSpecialPages['BlueSpiceExtendedFilelist'] = 
'SpecialBlueSpiceExtendedFilelist';
+$wgHooks['BSUserSidebarGlobalActionsWidgetGlobalActions'][] = 
'BlueSpiceExtendedFilelistHooks::onBSUserSidebarGlobalActionsWidgetGlobalActions';
+$wgHooks['SpecialPage_initList'][] = 
'BlueSpiceExtendedFilelistHooks::onSpecialPage_initList';
+
+$wgResourceModules['ext.bluespice.extendedFilelist'] = array(
+   'scripts' => array(
+   'bluespice.extendedFilelist.js'
+   ),
+   'styles' => array(
+   'bluespice.extendedFilelist.css'
+   ),
+   'dependencies' => array(
+   'ext.bluespice.extjs',
+   'ext.bluespice.upload.REL1_27', //Kollision mit MultiUpload 
Erweiterung
+   'ext.bluespice.extjs.filerepo'
+   ),
+   'localBasePath' => 
$IP.'/extensions/BlueSpiceExtendedFilelist/resources',
+   'remoteExtPath' => 'BlueSpiceExtendedFilelist/resources'
+);
+
+$bsgEFLOverrideStandardFilelist = false;
+
+require_once __DIR__ . '/REL1_27Shim.php';
diff --git a/REL1_27Shim.php b/REL1_27Shim.php
new file mode 100644
index 000..92d83eb
--- /dev/null
+++ b/REL1_27Shim.php
@@ -0,0 +1,69 @@
+ __DIR__,
+   'remoteExtPath' => 'BlueSpiceExtendedFilelist/resources',
+   'targets' => array( 'mobile', 'desktop' )
+);
+
+$wgResourceModules['ext.bluespice.upload.REL1_27'] = array(
+   'messages' => array(
+   'bs-upload-uploaddialogtitle',
+   'bs-upload-uploadbuttontext',
+   'bs-upload-uploadfilefieldlabel',
+   'bs-upload-uploadfileemptytext',
+   'bs-upload-uploaddestfilelabel',
+   'bs-upload-allowedfiletypesare',
+   'bs-upload-license',
+   'bs-upload-uploadwatchthislabel',
+   'bs-upload-uploadignorewarningslabel',
+   'bs-upload-categories',
+   'bs-upload-upload-waitmessage',
+   'bs-upload-error',
+   'bs-upload-descfilelabel',
+   'bs-upload-error-long',
+   'bs-upload-filetypenotsupported',
+   'bs-upload-details'
+   )
+) + $aResourceModuleTemplate;
+
+$wgResourceModules['ext.bluespice.extjs.filerepo'] = array(
+   'messages' => array(
+   

[MediaWiki-commits] [Gerrit] translatewiki[master]: Added new 'BlueSpiceExtendedFilelist'

[Robert Vogel (Code Review)]

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

Change subject: Added new 'BlueSpiceExtendedFilelist'
..

Added new 'BlueSpiceExtendedFilelist'

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/53/338353/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index fe8b7f0..a6df882 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -515,6 +515,10 @@
 
 # Blue Spice Sub Page Tree // no i18n
 
+Blue Spice Extended Filelist
+descmsg = bs-extendedfilelist-desc
+aliasfile = BlueSpiceExtendedFilelist.alias.php
+
 # Boiler Plate excluded per T156569
 
 Book Manager

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f6f919f35988bfc4becc45312892d94ec3d0b47
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: Rename PageTitleListCardItemView and related Recycl...

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: Rename PageTitleListCardItemView and related 
RecyclerAdapter
..


Hygiene: Rename PageTitleListCardItemView and related RecyclerAdapter

PageTitleListCardItemView is a wordy, unwieldy class name, and the class
does not actually even involve PageTitles.  Rename it to ListCardItemView
which is less of a mouthful and at least as descriptive.

Rename the related RecyclerAdapter as well.

Change-Id: I43c28750460bfc109daaec578afa559354ba5861
---
M 
app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
M 
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
M app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
R app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
A app/src/main/java/org/wikipedia/feed/view/ListCardRecyclerAdapter.java
D app/src/main/java/org/wikipedia/feed/view/PageTitleRecyclerAdapter.java
8 files changed, 43 insertions(+), 43 deletions(-)

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



diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
 
b/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
index 01b8db9..21fc7bc 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
@@ -24,10 +24,10 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.Mockito.mock;
-import static org.wikipedia.feed.view.PageTitleListCardItemView.Callback;
+import static org.wikipedia.feed.view.ListCardItemView.Callback;
 
 @SmallTest public class PageTitleListCardItemViewTest extends ViewTest {
-private PageTitleListCardItemView subject;
+private ListCardItemView subject;
 
 @Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M}) 
int widthDp,
   @NonNull FontScale fontScale, @NonNull 
PrimaryTestImg image,
@@ -104,7 +104,7 @@
@NonNull TestStr title, @NonNull TestStr subtitle) {
 setUp(widthDp, layoutDirection, fontScale, theme);
 
-subject = new PageTitleListCardItemView(ctx());
+subject = new ListCardItemView(ctx());
 if (!image.isNull()) {
 subject.setImage(frescoUri(image.id()).toString());
 }
diff --git 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
index 22b8c54..724cd41 100644
--- 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++ 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -8,9 +8,9 @@
 import org.wikipedia.R;
 import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.CardLargeHeaderView;
+import org.wikipedia.feed.view.ListCardItemView;
+import org.wikipedia.feed.view.ListCardRecyclerAdapter;
 import org.wikipedia.feed.view.ListCardView;
-import org.wikipedia.feed.view.PageTitleListCardItemView;
-import org.wikipedia.feed.view.PageTitleRecyclerAdapter;
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.views.DefaultViewHolder;
 import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
@@ -70,13 +70,13 @@
 }
 }
 
-private class RecyclerAdapter extends 
PageTitleRecyclerAdapter {
+private class RecyclerAdapter extends 
ListCardRecyclerAdapter {
 RecyclerAdapter(@NonNull List items) {
 super(items);
 }
 
 @Override
-public void 
onBindViewHolder(DefaultViewHolder holder, int i) {
+public void onBindViewHolder(DefaultViewHolder 
holder, int i) {
 BecauseYouReadItemCard card = item(i);
 holder.getView().setHistoryEntry(new 
HistoryEntry(card.pageTitle(), HistoryEntry.SOURCE_FEED_BECAUSE_YOU_READ));
 holder.getView().setCallback(getCallback());
diff --git 
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
index b30e350..40008bf 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -5,9 +5,9 @@
 
 import org.wikipedia.R;
 import org.wikipedia.feed.view.CardHeaderView;
+import org.wikipedia.feed.view.ListCardItemView;
+import org.wikipedia.feed.view.ListCardRecyclerAdapter;
 import org.wikipedia.feed.view.ListCardView;
-import 

[MediaWiki-commits] [Gerrit] mediawiki/debian[trusty]: Merge tag 'debian/1%1.27.1-3_bpo8+1' into trusty

[Legoktm (Code Review)]

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

Change subject: Merge tag 'debian/1%1.27.1-3_bpo8+1' into trusty
..

Merge tag 'debian/1%1.27.1-3_bpo8+1' into trusty

mediawiki Debian release 1:1.27.1-3~bpo8+1

Change-Id: I17773044e89714dbaf2e3594d3f8384b5fe436b4
---
M debian/changelog
1 file changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/48/338348/1

diff --git a/debian/changelog b/debian/changelog
index 63ccf5b..af604e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-<<< HEAD   (56726e Rebuild for trusty)
-mediawiki (1:1.27.1-2ppa2~trusty1) trusty; urgency=medium
+mediawiki (1:1.27.1-3ppa1~trusty1) trusty; urgency=medium
 
   * Rebuild for trusty
 
- -- Kunal Mehta   Sun, 18 Sep 2016 00:08:55 -0700
-===
+ -- Kunal Mehta   Fri, 17 Feb 2017 04:50:19 -0800
+
 mediawiki (1:1.27.1-3~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
@@ -26,7 +25,12 @@
   * Add Provides for extensions now included in this one (Closes: #845281)
 
  -- Kunal Mehta   Tue, 13 Sep 2016 04:17:42 -0700
->>> BRANCH (176c62 Merge tag 'debian/1%1.27.1-3' into jessie)
+
+mediawiki (1:1.27.1-2ppa2~trusty1) trusty; urgency=medium
+
+  * Rebuild for trusty
+
+ -- Kunal Mehta   Sun, 18 Sep 2016 00:08:55 -0700
 
 mediawiki (1:1.27.1-2~bpo8+1) jessie-backports; urgency=medium
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17773044e89714dbaf2e3594d3f8384b5fe436b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: trusty
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Inject SetClaimValue dependencies

[jenkins-bot (Code Review)]

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

Change subject: Inject SetClaimValue dependencies
..


Inject SetClaimValue dependencies

Bug: T158293
Change-Id: Iba5894140fd5f24e379672d78f6781be3ff27dad
---
M repo/Wikibase.php
M repo/includes/Api/SetClaimValue.php
2 files changed, 53 insertions(+), 22 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 50671c3..af1190a 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -337,7 +337,36 @@
);
}
];
-   $wgAPIModules['wbsetclaimvalue'] = 
Wikibase\Repo\Api\SetClaimValue::class;
+   $wgAPIModules['wbsetclaimvalue'] = [
+   'class' => Wikibase\Repo\Api\SetClaimValue::class,
+   'factory' => function( ApiMain $mainModule, $moduleName ) {
+   $wikibaseRepo = 
Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+   $apiHelperFactory = $wikibaseRepo->getApiHelperFactory( 
$mainModule->getContext() );
+   $changeOpFactoryProvider = 
$wikibaseRepo->getChangeOpFactoryProvider();
+
+   $modificationHelper = new 
Wikibase\Repo\Api\StatementModificationHelper(
+   $wikibaseRepo->getSnakFactory(),
+   $wikibaseRepo->getEntityIdParser(),
+   $wikibaseRepo->getStatementGuidValidator(),
+   $apiHelperFactory->getErrorReporter( 
$mainModule )
+   );
+
+   return new Wikibase\Repo\Api\SetClaimValue(
+   $mainModule,
+   $moduleName,
+   $apiHelperFactory->getErrorReporter( 
$mainModule ),
+   
$changeOpFactoryProvider->getStatementChangeOpFactory(),
+   $modificationHelper,
+   $wikibaseRepo->getStatementGuidParser(),
+   function ( $module ) use ( $apiHelperFactory ) {
+   return 
$apiHelperFactory->getResultBuilder( $module );
+   },
+   function ( $module ) use ( $apiHelperFactory ) {
+   return 
$apiHelperFactory->getEntitySavingHelper( $module );
+   }
+   );
+   }
+   ];
$wgAPIModules['wbsetreference'] = Wikibase\Repo\Api\SetReference::class;
$wgAPIModules['wbremovereferences'] = 
Wikibase\Repo\Api\RemoveReferences::class;
$wgAPIModules['wbsetclaim'] = Wikibase\Repo\Api\SetClaim::class;
diff --git a/repo/includes/Api/SetClaimValue.php 
b/repo/includes/Api/SetClaimValue.php
index cf0a7d3..3a84264 100644
--- a/repo/includes/Api/SetClaimValue.php
+++ b/repo/includes/Api/SetClaimValue.php
@@ -50,28 +50,30 @@
/**
 * @param ApiMain $mainModule
 * @param string $moduleName
-* @param string $modulePrefix
+* @param string $errorReporter
+* @param StatementChangeOpFactory $statementChangeOpFactory
+* @param StatementModificationHelper $modificationHelper
+* @param StatementGuidParser $guidParser
+* @param callable $resultBuilderInstantiator
+* @param callable $entitySavingHelperInstantiator
 */
-   public function __construct( ApiMain $mainModule, $moduleName, 
$modulePrefix = '' ) {
-   parent::__construct( $mainModule, $moduleName, $modulePrefix );
-
-   $wikibaseRepo = WikibaseRepo::getDefaultInstance();
-   $apiHelperFactory = $wikibaseRepo->getApiHelperFactory( 
$this->getContext() );
-   $changeOpFactoryProvider = 
$wikibaseRepo->getChangeOpFactoryProvider();
-
-   $this->errorReporter = $apiHelperFactory->getErrorReporter( 
$this );
-   $this->statementChangeOpFactory = 
$changeOpFactoryProvider->getStatementChangeOpFactory();
-
-   $this->modificationHelper = new StatementModificationHelper(
-   $wikibaseRepo->getSnakFactory(),
-   $wikibaseRepo->getEntityIdParser(),
-   $wikibaseRepo->getStatementGuidValidator(),
-   $apiHelperFactory->getErrorReporter( $this )
-   );
-
-   $this->guidParser = $wikibaseRepo->getStatementGuidParser();
-   $this->resultBuilder = $apiHelperFactory->getResultBuilder( 
$this );
-   $this->entitySavingHelper = 
$apiHelperFactory->getEntitySavingHelper( $this );
+   public function __construct(
+   ApiMain $mainModule,
+   $moduleName,
+   $errorReporter,
+ 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add some docs on new account attributes

[Muehlenhoff (Code Review)]

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

Change subject: Add some docs on new account attributes
..

Add some docs on new account attributes

Also present on wikitech now, but wikitech points to this file as well,
so add it here as well.

Change-Id: Ib62ebf08f17a0c1c024ed256075916854443641e
---
M modules/admin/README
1 file changed, 18 insertions(+), 0 deletions(-)


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

diff --git a/modules/admin/README b/modules/admin/README
index ae5e39b..e05515b 100644
--- a/modules/admin/README
+++ b/modules/admin/README
@@ -77,6 +77,24 @@
 # IRC (definitely if not registered/identified with nickserv)
 # RT-only (because it can be emailed)
 
+Add the ''realname'' of the user (most labs accounts don't have a real name 
set)
+
+Add the ''email'' address of the users:
+- If the user is WMF staff use the email address of his/her Google account
+  (usually the first letter of the first name and the surname, you can
+  double-check the account name in the Gmail interface). Some users have
+  aliases for their nickname e.g., don't use these, use the official Google
+  account (this allows cross-checking data against OIT corp LDAP)
+- If the user is a volunteer, a researcher or contractor without access to a
+  wikimedia.org account, ask for a contact email address (to have a reliable
+  contact e.g. in case of an account compromise)
+
+If the user to be added is someone with a time-limited access (e.g. interns,
+researchers (who have time-limited MOUs) or short term contractor), add the
+estimated account end date as ''expiry_date'' (format is -MM-DD) and add
+a staff contact as ''expiry_contact''
+
+
 Adding user 'foo' to adm:
 
 groups:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/debian[xenial]: Merge tag 'debian/1%1.27.1-3' into xenial

[Legoktm (Code Review)]

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

Change subject: Merge tag 'debian/1%1.27.1-3' into xenial
..

Merge tag 'debian/1%1.27.1-3' into xenial

mediawiki Debian release 1:1.27.1-3

Change-Id: I18b8f9b82a145a0ab6d7841564eb33bf67f1d9fb
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/43/338343/1

diff --git a/debian/changelog b/debian/changelog
index 7caa499..e56501b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-<<< HEAD   (9c53dd Update for xenial)
-mediawiki (1:1.27.1-2ppa2~xenial1) xenial; urgency=medium
+mediawiki (1:1.27.1-3ppa1~xenial1) xenial; urgency=medium
 
   * Rebuild for xenial
+  * Drop default-mysql-server recommendation
 
- -- Kunal Mehta   Sat, 17 Sep 2016 16:47:47 -0700
-===
+ -- Kunal Mehta   Fri, 17 Feb 2017 04:25:10 -0800
+
 mediawiki (1:1.27.1-3) unstable; urgency=medium
 
   * Ensure mediawiki depends upon the same version of mediawiki-classes
@@ -19,7 +19,12 @@
   * Add Provides for extensions now included in this one (Closes: #845281)
 
  -- Kunal Mehta   Tue, 13 Sep 2016 04:17:42 -0700
->>> BRANCH (e356c5 Mark changelog as released)
+
+mediawiki (1:1.27.1-2ppa2~xenial1) xenial; urgency=medium
+
+  * Rebuild for xenial
+
+ -- Kunal Mehta   Sat, 17 Sep 2016 16:47:47 -0700
 
 mediawiki (1:1.27.1-2) unstable; urgency=high
 
diff --git a/debian/control b/debian/control
index 63a74d7..69ff21f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@
 Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php, php-mysql | php-pgsql | php-sqlite3 | 
php-mysqlnd, php-common (>= 5.5.0+dfsg-10~), php-mbstring, php-xml, 
mime-support, mediawiki-classes (= ${binary:Version}), ${misc:Depends}
-Recommends: default-mysql-server | virtual-mysql-server | postgresql-contrib, 
php-cli, php-intl, php-curl, php-wikidiff2, python
+Recommends: virtual-mysql-server | postgresql-contrib, php-cli, php-intl, 
php-curl, php-wikidiff2, python
 Suggests: imagemagick | php-gd, memcached, clamav, php-apcu, hhvm
 Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1+1~),
  mediawiki-extensions-ldapauth (<< 2.8~),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18b8f9b82a145a0ab6d7841564eb33bf67f1d9fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: xenial
Gerrit-Owner: Legoktm 

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

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

[jenkins-bot (Code Review)]

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

Change subject: db-codfw.php: Depool db2070
..


db-codfw.php: Depool db2070

db2070 needs a reboot

Bug: T156478
Change-Id: I26e7d5f6f121bff352062db7f321cd796dcb9d94
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index d1f19ed..dcf8e07 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -100,7 +100,7 @@
'db2055' => 50,  # D6 3.3TB 160GB, dump (inactive), vslow
'db2062' => 100, # B5 3.3TB 160GB, api
'db2069' => 100, # D6 3.3TB 160GB, api
-   'db2070' => 400, # C5 3.3TB 160GB
+#  'db2070' => 400, # C5 3.3TB 160GB #T156478
],
's2' => [
'db2017' => 0,   # B6 2.9TB  96GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26e7d5f6f121bff352062db7f321cd796dcb9d94
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
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/mediawiki-config[master]: 'shellmanagers' to 'shellmanager' on wikitech.wikimedia.org

[MarcoAurelio (Code Review)]

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

Change subject: 'shellmanagers' to 'shellmanager' on wikitech.wikimedia.org
..

'shellmanagers' to 'shellmanager' on wikitech.wikimedia.org

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 545c315..debee50 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8492,7 +8492,7 @@
'oathauth' => [ 'oathauth-api-all' => true ], // T153487
'oauthadmin' => [ 'autopatrol' => true ],
'shell' => [ 'loginviashell' => true ],
-   'shellmanagers' => [
+   'shellmanager' => [
'autopatrol' => true,
'userrights' => false,
],
@@ -9989,7 +9989,7 @@
],
'+wikitech' => [
'contentadmin' => [ 'autopatrolled' ],
-   'shellmanagers' => [ 'shell' ],
+   'shellmanager' => [ 'shell' ],
'sysop' => [ 'autopatrolled' ],
],
'+wuuwiki' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I035b10e26e96cf8f00f30f8624686c331b88e324
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] mediawiki...UniversalLanguageSelector[master]: Update jquery.ime to 7edcc7b from upstream

[KartikMistry (Code Review)]

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

Change subject: Update jquery.ime to 7edcc7b from upstream
..

Update jquery.ime to 7edcc7b from upstream

Changes:
* Added IMEs for Eritrean languages: Tigrinya (ti), Tigre (tig),
  Blin (byn).
* Documentation updates.

Change-Id: Iec9e45711308d0b7a4670c64d3c2c9ae6debd0d9
---
M lib/jquery.ime/jquery.ime.js
M lib/jquery.ime/rules/README.md
A lib/jquery.ime/rules/byn/byn-geezim.js
A lib/jquery.ime/rules/ti/ti-geezim.js
A lib/jquery.ime/rules/tig/tig-geezim.js
5 files changed, 1,320 insertions(+), 18 deletions(-)


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

diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index e00d848..c88a356 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20170130
+/*! jquery.ime - v0.1.0+20170217
 * https://github.com/wikimedia/jquery.ime
 * Copyright (c) 2017 Santhosh Thottingal; Licensed GPL, MIT */
 ( function ( $ ) {
@@ -1786,6 +1786,10 @@
name: 'इनस्क्रिप्ट २',
source: 'rules/brx/brx-inscript2.js'
},
+   'byn-geezim': {
+   name: 'ብሊን',
+   source: 'rules/byn/byn-geezim.js'
+   },
'ckb-transliteration-arkbd': {
name: 'باشووری',
source: 'rules/ckb/ckb-transliteration-arkbd.js'
@@ -2275,6 +2279,14 @@
name: 'විජේසේකර',
source: 'rules/si/si-wijesekara.js'
},
+   'ti-geezim': {
+   name: 'ትግርኛ',
+   source: 'rules/ti/ti-geezim.js'
+   },
+   'tig-geezim': {
+   name: 'ትግረ',
+   source: 'rules/tig/tig-geezim.js'
+   },
'ur-phonetic': {
name: 'صوتی',
source: 'rules/ur/ur-phonetic.js'
@@ -2385,6 +2397,10 @@
brx: {
autonym: 'बोड़ो',
inputmethods: [ 'brx-inscript', 'brx-inscript2' ]
+   },
+   byn: {
+   autonym: 'ብሊን',
+   inputmethods: [ 'byn-geezim' ]
},
ckb: {
autonym: 'کوردیی ناوەندی',
@@ -2654,6 +2670,14 @@
autonym: 'ไทย',
inputmethods: [ 'th-kedmanee', 'th-pattachote' ]
},
+   ti: {
+   autonym: 'ትግርኛ',
+   inputmethods: [ 'ti-geezim' ]
+   },
+   tig: {
+   autonym: 'ትግረ',
+   inputmethods: [ 'tig-geezim' ]
+   },
tkr: {
autonym: 'цӀаӀхна миз',
inputmethods: [ 'cyrl-palochka' ]
diff --git a/lib/jquery.ime/rules/README.md b/lib/jquery.ime/rules/README.md
index b178934..0d106c4 100644
--- a/lib/jquery.ime/rules/README.md
+++ b/lib/jquery.ime/rules/README.md
@@ -1,33 +1,42 @@
+
 jQuery.ime Input method specification
 =
 
 Input methods are defined in javascript files. An input method is a javascript
-object and it is passed to $.ime.register() method to register with jquery.ime
+object and it is passed to `$.ime.register()` method to register with 
`jquery.ime`
 
-eg: $.ime.register( hebrewStandardKeyboard );
+eg: `$.ime.register( hebrewStandardKeyboard );`
+
+Input methods can be built by reusing parts of other methods, this is 
especially
+interesting for complex patterns. If rules are reused then the methods must be
+loaded first. This is done through configurations in 
`jquery.ime.inputmethods.js`.
+
+For examples on reuse, see the rules "nb-normforms" or "hi-inscript".
 
 Metadata fields
 ---
 
 id: A mandatory unique identifier that represents the input method.
-eg: "hindi-inscript"
+eg: `"hindi-inscript"`
 
-name: A mandatory short name for the input method. eg: Hindi InScript
+name: A mandatory short name for the input method. eg: `"Hindi InScript"`
+
+Note that the names used in the menu comes from 
[jquery.ime.inputmethods.js](../src/jquery.ime.inputmethods.js)
 
 description: An optional short description about the input method.
-eg: "keyboard layout as per inscript standard"
+eg: `"keyboard layout as per inscript standard"`
 
 date: An optional string to represent when this input method was written.
 Format should be: -mm-dd
 
 author: An optional string containing the authors name. Can contain email
-address as well. eg: "Santhosh Thottingal, &

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Remove old comments

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Remove old comments
..


db-eqiad.php: Remove old comments

db1028 had an alter table and was repooled but a reference to the ticket
was left. Clean that up

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 601f579..9f7a669 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -162,7 +162,7 @@
's7' => [
'db1041' => 0,   # B2 1.4TB  64GB, master
 #  'db1033' => 0,   # B2 1.4TB  64GB, old master
-   'db1028' => 0,   # B1 1.4TB  64GB, vslow, dump #T153300
+   'db1028' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
 #  'db1039' => 0,   # B2 1.4TB  64GB
'db1062' => 1,   # D1 2.8TB 128GB, watchlist, recentchanges, 
contributions, logpager

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf01693bf7eed58db3a5409b0e05568e52b2ad8c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
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/mediawiki-config[master]: db-eqiad.php: Remove old comments

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Remove old comments
..

db-eqiad.php: Remove old comments

db1028 had an alter table and was repooled but a reference to the ticket
was left. Clean that up

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 601f579..9f7a669 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -162,7 +162,7 @@
's7' => [
'db1041' => 0,   # B2 1.4TB  64GB, master
 #  'db1033' => 0,   # B2 1.4TB  64GB, old master
-   'db1028' => 0,   # B1 1.4TB  64GB, vslow, dump #T153300
+   'db1028' => 0,   # B1 1.4TB  64GB, vslow, dump
'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
 #  'db1039' => 0,   # B2 1.4TB  64GB
'db1062' => 1,   # D1 2.8TB 128GB, watchlist, recentchanges, 
contributions, logpager

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf01693bf7eed58db3a5409b0e05568e52b2ad8c
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...UniversalLanguageSelector[wmf/1.29.0-wmf.12]: Fix broken site picks feature for compact language links

[KartikMistry (Code Review)]

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

Change subject: Fix broken site picks feature for compact language links
..

Fix broken site picks feature for compact language links

Ref T153900#3011037 and T155995

Change-Id: I429cdf330b6bf70d1710cd5a041c782e6617cb39
(cherry picked from commit 7baa3c4a3b56bed93827c98e7323dcc9f7fb1526)
---
M UniversalLanguageSelector.hooks.php
1 file changed, 2 insertions(+), 4 deletions(-)


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

diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index f474384..de632cc 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -331,10 +331,8 @@

'/UniversalLanguageSelector/data/fontrepo/fonts/';
}
 
-   // Cannot check where whether CLL is enabled for a particular 
user. The overhead
-   // of including this data is small.
-   if ( isset( $wgWBClientSettings['sortPrepend'] ) ) {
-   $vars['wgULSCompactLinksPrepend'] = 
$wgWBClientSettings['sortPrepend'];
+   if ( isset( $wgInterwikiSortingSortPrepend ) && 
$wgInterwikiSortingSortPrepend !== [] ) {
+   $vars['wgULSCompactLinksPrepend'] = 
$wgInterwikiSortingSortPrepend;
}
 
return true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I429cdf330b6bf70d1710cd5a041c782e6617cb39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: wmf/1.29.0-wmf.12
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: .profile: Add .profile file

[Marostegui (Code Review)]

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

Change subject: .profile: Add .profile file
..


.profile: Add .profile file

Just adding .profile so my .bashrc is read

Change-Id: Ie69edcfe252539c67718d537b53a049ff32d4901
---
A modules/admin/files/home/marostegui/.profile
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/files/home/marostegui/.profile 
b/modules/admin/files/home/marostegui/.profile
new file mode 100644
index 000..35e8d01
--- /dev/null
+++ b/modules/admin/files/home/marostegui/.profile
@@ -0,0 +1,6 @@
+if [ -n "$BASH_VERSION" ]; then
+# include .bashrc if it exists
+if [ -f "$HOME/.bashrc" ]; then
+. "$HOME/.bashrc"
+fi
+fi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69edcfe252539c67718d537b53a049ff32d4901
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Alex Monk 
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/software[master]: generate_dsns_table.sh: Add new script for dsns.

[Jcrespo (Code Review)]

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

Change subject: generate_dsns_table.sh: Add new script for dsns.
..


generate_dsns_table.sh: Add new script for dsns.

The dsns tables are used by pt-table-checksum as another method to
discover slaves instead of "show processlist".

We are using this method in order to tell pt-table-checksum which slaves
it should look for, so we can discard dbstores and sanitarium hosts
which might be delayed and then would stop the check forever.

This quick and small shell script just parses the output from *.hosts
files to identify the slaves, remove the dbstore or sanitarium ones, as
well as the primary master and builds the syntax to run on mysql to
populate the dsns tables.

The dsns tables live under the dsns database on Tendril hosts.
There is one table per shard at the moment.

Bug: T154485
Change-Id: Iffb53744ca71c6a3f6c743f22e7ef80b121223a7
---
A dbtools/generate_dsns_table.sh
1 file changed, 35 insertions(+), 0 deletions(-)

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



diff --git a/dbtools/generate_dsns_table.sh b/dbtools/generate_dsns_table.sh
new file mode 100755
index 000..c425d7b
--- /dev/null
+++ b/dbtools/generate_dsns_table.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# The dsns tables are used by pt-table-checksum as another method to
+# discover slaves instead of "show processlist".
+
+# We are using this method in order to tell pt-table-checksum which slaves
+# it should look for, so we can discard dbstores and sanitarium hosts
+# which might be delayed and then would stop the check forever.
+
+# This quick and small shell script just parses the output from *.hosts
+# files to identify the slaves, remove the dbstore or sanitarium ones, as
+# well as the primary master and builds the syntax to run on mysql to
+# populate the dsns tables.
+
+# The dsns tables live under the dsns database on Tendril hosts.
+# There is one table per shard at the moment.
+
+set -e
+
+if [ $# -eq 0 ]
+then
+echo "Usage: generate_dsns_table.sh shard_number"
+echo "Example: generate_dsns_table.sh s1"
+echo "Valid shards: m3,s1,s2,s3,s4,s5,s6,s7,s8"
+exit 1
+fi
+SHARD="$1"
+HOST_FILE_PATH="/home/marostegui/git/software/dbtools/"
+FILE="$SHARD.hosts"
+for i in $(cat "$HOST_FILE_PATH/$FILE"  | grep "^db" | egrep -v 
"dbstore*|db1095|db1069" | cut -d " " -f1 | head -n-1)
+# The master is delete from the list of hosts as it is not a slave that needs 
to be checked
+do
+echo "insert into dsns.dsns_$SHARD (dsn) values (\"h=$i,u=root\");";
+done
+echo "-- The master is not included on this list as this is only for slaves to 
be checked"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iffb53744ca71c6a3f6c743f22e7ef80b121223a7
Gerrit-PatchSet: 7
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Volans 
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/software[master]: Test commit to debug issue in CI

[Volans (Code Review)]

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

Change subject: Test commit to debug issue in CI
..

Test commit to debug issue in CI

Change-Id: I548173e1f4bec5c887c832f065b8871a357a6466
---
M tox.ini
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/35/338335/1

diff --git a/tox.ini b/tox.ini
index da0bcdc..be6fae1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,3 +46,4 @@
 swiftcleaner/*,
 swiftrepl/*,
 udpprofile/*,
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I548173e1f4bec5c887c832f065b8871a357a6466
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Volans 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move the Diamond NTP collector to ntp::daemon

[Muehlenhoff (Code Review)]

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

Change subject: Move the Diamond NTP collector to ntp::daemon
..

Move the Diamond NTP collector to ntp::daemon

ntp::daemon is used by both the NTP servers and the remaining
clients not (yet) using timesyncd, so move the Diamond collector
into it (it was previously used on the NTP servers as well)

Change-Id: Iea68010a141cb2998221e74e98e43d5949359382
---
M modules/ntp/manifests/daemon.pp
M modules/standard/manifests/ntp/client.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/338333/1

diff --git a/modules/ntp/manifests/daemon.pp b/modules/ntp/manifests/daemon.pp
index 0ad671e..eadea10 100644
--- a/modules/ntp/manifests/daemon.pp
+++ b/modules/ntp/manifests/daemon.pp
@@ -10,6 +10,8 @@
 content => template('ntp/ntp-conf.erb'),
 }
 
+diamond::collector { 'Ntpd': }
+
 service { 'ntp':
 ensure=> ensure_service($ensure),
 require   => [ File['ntp.conf'], Package['ntp'] ],
diff --git a/modules/standard/manifests/ntp/client.pp 
b/modules/standard/manifests/ntp/client.pp
index 91f7bf5..41755f9 100644
--- a/modules/standard/manifests/ntp/client.pp
+++ b/modules/standard/manifests/ntp/client.pp
@@ -13,8 +13,6 @@
 ulsfo => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
 }
 
-diamond::collector { 'Ntpd': }
-
 ntp::daemon { 'client':
 servers   => $client_upstreams[$::site],
 query_acl => $::standard::ntp::monitoring_acl,

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

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

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

[MediaWiki-commits] [Gerrit] operations/software[master]: Last test

[Jcrespo (Code Review)]

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

Change subject: Last test
..

Last test

Change-Id: I9acd9c8e13f63612ba11de7f438380d488452559
---
A dbtools/generate_dsns_table.sh
1 file changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/34/338334/1

diff --git a/dbtools/generate_dsns_table.sh b/dbtools/generate_dsns_table.sh
new file mode 100755
index 000..59d86b0
--- /dev/null
+++ b/dbtools/generate_dsns_table.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# The dsns tables are used by pt-table-checksum as another method to
+# discover slaves instead of "show processlist".
+# 
+# We are using this method in order to tell pt-table-checksum which slaves
+# it should look for, so we can discard dbstores and sanitarium hosts
+# which might be delayed and then would stop the check forever.
+# 
+# This quick and small shell script just parses the output from *.hosts
+# files to identify the slaves, remove the dbstore or sanitarium ones, as
+# well as the primary master and builds the syntax to run on mysql to
+# populate the dsns tables.
+# 
+# The dsns tables live under the dsns database on Tendril hosts.
+# There is one table per shard at the moment.
+
+set -e
+
+if [ $# -eq 0 ]
+then
+   echo "Usage: generate_dsns_table.sh shard_number"
+   echo "Example: generate_dsns_table.sh s1"
+   echo "Valid shards: m3,s1,s2,s3,s4,s5,s6,s7,s8"
+   exit 1
+fi
+SHARD="$1"
+HOST_FILE_PATH="/home/marostegui/git/software/dbtools/"
+FILE="$SHARD.hosts"
+for i in $(cat "$HOST_FILE_PATH/$FILE"  | grep "^db" | egrep -v 
"dbstore*|db1095|db1069" | cut -d " " -f1 | head -n-1)
+# The master is delete from the list of hosts as it is not a slave that needs 
to be checked
+do
+   echo "insert into dsns.dsns_$SHARD (dsn) values (\"h=$i,u=root\");";
+done
+echo "-- The master is not included on this list as this is only for slaves to 
be checked"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9acd9c8e13f63612ba11de7f438380d488452559
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Entity types are not in global scope anymore

[Aleksey Bekh-Ivanov (WMDE) (Code Review)]

Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338332 )

Change subject: Entity types are not in global scope anymore
..

Entity types are not in global scope anymore

Change-Id: Id27f542a014c8aa145738fbfe51033b822050e0a
---
M client/WikibaseClient.php
M client/includes/WikibaseClient.php
M repo/Wikibase.php
M repo/includes/WikibaseRepo.php
4 files changed, 27 insertions(+), 23 deletions(-)


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

diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 07df902..e518ea4 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -95,9 +95,6 @@
$wgWBClientDataTypes[$type] = array_merge( $baseDef, $clientDef 
);
}
 
-   // Registry and definition of entity types
-   $wgWBClientEntityTypes = require __DIR__ . 
'/../lib/WikibaseLib.entitytypes.php';
-
// i18n
$wgMessagesDirs['wikibaseclient'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['Wikibaseclientalias'] = __DIR__ . 
'/WikibaseClient.i18n.alias.php';
diff --git a/client/includes/WikibaseClient.php 
b/client/includes/WikibaseClient.php
index 94df27a..5f14a06 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -467,6 +467,13 @@
}
 
/**
+* @return array
+*/
+   private static function getDefaultEntityTypes() {
+   return require __DIR__ . 
'/../../lib/WikibaseLib.entitytypes.php';
+   }
+
+   /**
 * @return TermBuffer
 */
public function getTermBuffer() {
@@ -695,17 +702,17 @@
 * @return WikibaseClient
 */
private static function newInstance() {
-   global $wgWBClientSettings, $wgWBClientDataTypes, 
$wgWBClientEntityTypes;
+   global $wgWBClientSettings, $wgWBClientDataTypes;
 
-   if ( !is_array( $wgWBClientDataTypes ) || !is_array( 
$wgWBClientEntityTypes ) ) {
-   throw new MWException( '$wgWBClientDataTypes and 
$wgWBClientEntityTypes must be arrays. '
+   if ( !is_array( $wgWBClientDataTypes ) ) {
+   throw new MWException( '$wgWBClientDataTypes must be 
array. '
. 'Maybe you forgot to require 
WikibaseClient.php in your LocalSettings.php?' );
}
 
$dataTypeDefinitions = $wgWBClientDataTypes;
Hooks::run( 'WikibaseClientDataTypes', array( 
&$dataTypeDefinitions ) );
 
-   $entityTypeDefinitions = $wgWBClientEntityTypes;
+   $entityTypeDefinitions = self::getDefaultEntityTypes();
Hooks::run( 'WikibaseClientEntityTypes', array( 
&$entityTypeDefinitions ) );
 
$settings = new SettingsArray( $wgWBClientSettings );
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 345958e..1fc72d5 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -76,7 +76,7 @@
global $wgExtensionMessagesFiles, $wgMessagesDirs;
global $wgAPIModules, $wgAPIListModules, $wgSpecialPages, $wgHooks;
global $wgWBRepoSettings, $wgResourceModules, $wgValueParsers, 
$wgJobClasses;
-   global $wgWBRepoDataTypes, $wgWBRepoEntityTypes;
+   global $wgWBRepoDataTypes;
 
$wgExtensionCredits['wikibase'][] = array(
'path' => __DIR__,
@@ -104,17 +104,6 @@
// constants
define( 'CONTENT_MODEL_WIKIBASE_ITEM', "wikibase-item" );
define( 'CONTENT_MODEL_WIKIBASE_PROPERTY', "wikibase-property" );
-
-   // Registry and definition of entity types
-   $wgWBRepoEntityTypes = require __DIR__ . 
'/../lib/WikibaseLib.entitytypes.php';
-
-   $repoEntityTypes = require __DIR__ . '/WikibaseRepo.entitytypes.php';
-
-   // merge WikibaseRepo.entitytypes.php into $wgWBRepoEntityTypes
-   foreach ( $repoEntityTypes as $type => $repoDef ) {
-   $baseDef = isset( $wgWBRepoEntityTypes[$type] ) ? 
$wgWBRepoEntityTypes[$type] : array();
-   $wgWBRepoEntityTypes[$type] = array_merge( $baseDef, $repoDef );
-   }
 
// rights
// names should be according to other naming scheme
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index ee8ce12..a00c6be 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -291,17 +291,17 @@
 * @return self
 */
private static function newInstance() {
-   global $wgWBRepoDataTypes, $wgWBRepoEntityTypes, 
$wgWBRepoSettings;
+   global $wgWBRepoDataTypes, $wgWBRepoSettings;
 
-   if ( !is_array( $wgWBRepoDataTypes ) || !is_array( 
$wgWBRepoEntityTypes ) ) {
-   throw new MWException( '$wgWBRepoDataTypes and 
$wgWBRepoEntityTypes must be arrays. '
+   if 

[MediaWiki-commits] [Gerrit] operations/software[master]: test commit

[Marostegui (Code Review)]

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

Change subject: test commit
..

test commit

Change-Id: I919bcb6a9834af2aa022c14495757afa68364e54
---
M dbtools/s7.hosts
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/31/338331/1

diff --git a/dbtools/s7.hosts b/dbtools/s7.hosts
index 94f8720..10af7d5 100644
--- a/dbtools/s7.hosts
+++ b/dbtools/s7.hosts
@@ -24,3 +24,4 @@
 db1086.eqiad.wmnet  3306
 db1094.eqiad.wmnet  3306
 db1041.eqiad.wmnet  3306
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I919bcb6a9834af2aa022c14495757afa68364e54
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/software[master]: testing again

[Jcrespo (Code Review)]

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

Change subject: testing again
..

testing again

Change-Id: I5afc950627bb0dd4e8d20be1ea94e11b42890240
---
A test
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/30/338330/1

diff --git a/test b/test
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/test

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5afc950627bb0dd4e8d20be1ea94e11b42890240
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] operations/software[master]: Testing new commit

[Jcrespo (Code Review)]

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

Change subject: Testing new commit
..

Testing new commit

Change-Id: Ib5217a15793461da8137223c853bf82a996eb6dc
---
A dbtools/generate_dsns_table.sh
1 file changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/29/338329/1

diff --git a/dbtools/generate_dsns_table.sh b/dbtools/generate_dsns_table.sh
new file mode 100755
index 000..59d86b0
--- /dev/null
+++ b/dbtools/generate_dsns_table.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# The dsns tables are used by pt-table-checksum as another method to
+# discover slaves instead of "show processlist".
+# 
+# We are using this method in order to tell pt-table-checksum which slaves
+# it should look for, so we can discard dbstores and sanitarium hosts
+# which might be delayed and then would stop the check forever.
+# 
+# This quick and small shell script just parses the output from *.hosts
+# files to identify the slaves, remove the dbstore or sanitarium ones, as
+# well as the primary master and builds the syntax to run on mysql to
+# populate the dsns tables.
+# 
+# The dsns tables live under the dsns database on Tendril hosts.
+# There is one table per shard at the moment.
+
+set -e
+
+if [ $# -eq 0 ]
+then
+   echo "Usage: generate_dsns_table.sh shard_number"
+   echo "Example: generate_dsns_table.sh s1"
+   echo "Valid shards: m3,s1,s2,s3,s4,s5,s6,s7,s8"
+   exit 1
+fi
+SHARD="$1"
+HOST_FILE_PATH="/home/marostegui/git/software/dbtools/"
+FILE="$SHARD.hosts"
+for i in $(cat "$HOST_FILE_PATH/$FILE"  | grep "^db" | egrep -v 
"dbstore*|db1095|db1069" | cut -d " " -f1 | head -n-1)
+# The master is delete from the list of hosts as it is not a slave that needs 
to be checked
+do
+   echo "insert into dsns.dsns_$SHARD (dsn) values (\"h=$i,u=root\");";
+done
+echo "-- The master is not included on this list as this is only for slaves to 
be checked"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5217a15793461da8137223c853bf82a996eb6dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

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

[WikidataBuilder (Code Review)]

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

Change subject: New Wikidata Build - 2017-02-17T10:00:01+
..

New Wikidata Build - 2017-02-17T10:00:01+

Change-Id: I2ec823a5f0f3ff96bc2eaf1613fe10315281eaa9
---
M composer.lock
M extensions/ArticlePlaceholder/includes/SearchHookHandler.php
M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/specials/SpecialAboutTopicTest.php
M extensions/Constraints/.travis.yml
M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
M 
extensions/Constraints/tests/phpunit/Checker/RangeChecker/RangeCheckerHelperTest.php
M extensions/MediaInfo/src/Content/MediaInfoContent.php
M 
extensions/MediaInfo/tests/phpunit/mediawiki/Content/MissingMediaInfoHandlerTest.php
M extensions/Quality/i18n/oc.json
M extensions/Wikibase/.rubocop_todo.yml
M extensions/Wikibase/.scrutinizer.yml
M extensions/Wikibase/README.md
M extensions/Wikibase/client/config/WikibaseClient.default.php
M extensions/Wikibase/client/i18n/bg.json
M extensions/Wikibase/client/i18n/bn.json
M extensions/Wikibase/client/i18n/es.json
M extensions/Wikibase/client/i18n/sty.json
M extensions/Wikibase/client/includes/DataAccess/PropertyIdResolver.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php
M 
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/VariantsAwareRenderer.php
M extensions/Wikibase/client/includes/DataAccess/Scribunto/EntityAccessor.php
M 
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M extensions/Wikibase/client/includes/DispatchingServiceFactory.php
M extensions/Wikibase/client/includes/DispatchingServiceWiring.php
M extensions/Wikibase/client/includes/EntityDataRetrievalServiceFactory.php
M extensions/Wikibase/client/includes/Hooks/ParserFunctionRegistrant.php
M extensions/Wikibase/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
M extensions/Wikibase/client/includes/Hooks/SidebarHookHandlers.php
M extensions/Wikibase/client/includes/Specials/SpecialPagesWithBadges.php
M extensions/Wikibase/client/includes/Store/RepositoryServiceWiring.php
M extensions/Wikibase/client/includes/Store/Sql/DirectSqlStore.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceFactoryTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/DispatchingServiceWiringTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserFunctionRegistrantTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/ChangeLineFormatterTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceContainerTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Store/RepositoryServiceWiringTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackerContractTester.php
M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
M extensions/Wikibase/composer.json
M extensions/Wikibase/docs/hooks.txt
M extensions/Wikibase/docs/rdf-binding.txt
M extensions/Wikibase/lib/i18n/oc.json
M extensions/Wikibase/lib/includes/Formatters/AutoCommentFormatter.php
A 
extensions/Wikibase/lib/includes/Interactors/DispatchingTermSearchInteractorFactory.php
A 
extensions/Wikibase/lib/includes/Interactors/TermIndexSearchInteractorFactory.php
A extensions/Wikibase/lib/includes/Interactors/TermSearchInteractorFactory.php
M extensions/Wikibase/lib/includes/Modules/SitesModuleWorker.php
A extensions/Wikibase/lib/includes/RepositoryDefinitions.php
M extensions/Wikibase/lib/includes/Store/Sql/TermSqlIndex.php
A 
extensions/Wikibase/lib/tests/phpunit/Interactors/DispatchingTermSearchInteractorFactoryTest.php
A 
extensions/Wikibase/lib/tests/phpunit/Interactors/TermIndexSearchInteractorFactoryTest.php
M extensions/Wikibase/lib/tests/phpunit/LanguageNameLookupTest.php
A extensions/Wikibase/lib/tests/phpunit/RepositoryDefinitionsTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/DispatchingTermBufferTest.php
M extensions/Wikibase/lib/tests/phpunit/Store/EntityContentDataCodecTest.php
M extensions/Wikibase/repo/Wikibase.hooks.php
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/i18n/bg.json
M extensions/Wikibase/repo/i18n/bn.json
M extensions/Wikibase/repo/i18n/bs.json
M extensions/Wikibase/repo/i18n/es.json
M extensions/Wikibase/repo/i18n/eu.json
M extensions/Wikibase/repo/i18n/fi.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/oc.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/sty.json
M extensions/Wikibase/repo/i18n/sv.json
M extensions/Wikibase/repo/i18n/yi.json
M 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch - reimage elastic10(17|18|19|20) to jessie and...

[Gehel (Code Review)]

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

Change subject: elasticsearch - reimage elastic10(17|18|19|20) to jessie and 
move data to /srv
..


elasticsearch - reimage elastic10(17|18|19|20) to jessie and move data to /srv

Bug: T151326
Bug: T151328
Change-Id: I2049dd6bb6b8afc341aae17fa53072007082db36
---
M hieradata/hosts/elastic1017.yaml
D hieradata/hosts/elastic1018.yaml
D hieradata/hosts/elastic1019.yaml
D hieradata/hosts/elastic1020.yaml
4 files changed, 0 insertions(+), 13 deletions(-)

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



diff --git a/hieradata/hosts/elastic1017.yaml b/hieradata/hosts/elastic1017.yaml
index 7d55886..6cf24e8 100644
--- a/hieradata/hosts/elastic1017.yaml
+++ b/hieradata/hosts/elastic1017.yaml
@@ -1,7 +1,3 @@
 debdeploy::grains:
   debdeploy-elastic:
 value: canary
-
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1018.yaml b/hieradata/hosts/elastic1018.yaml
deleted file mode 100644
index a764fc7..000
--- a/hieradata/hosts/elastic1018.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1019.yaml b/hieradata/hosts/elastic1019.yaml
deleted file mode 100644
index a764fc7..000
--- a/hieradata/hosts/elastic1019.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1020.yaml b/hieradata/hosts/elastic1020.yaml
deleted file mode 100644
index a764fc7..000
--- a/hieradata/hosts/elastic1020.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2049dd6bb6b8afc341aae17fa53072007082db36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Gehel 
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]: elasticsearch - reimage elastic10(17|18|19|20) to jessie and...

[Gehel (Code Review)]

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

Change subject: elasticsearch - reimage elastic10(17|18|19|20) to jessie and 
move data to /srv
..

elasticsearch - reimage elastic10(17|18|19|20) to jessie and move data to /srv

Bug: T151326
Bug: T151328
Change-Id: I2049dd6bb6b8afc341aae17fa53072007082db36
---
M hieradata/hosts/elastic1017.yaml
D hieradata/hosts/elastic1018.yaml
D hieradata/hosts/elastic1019.yaml
D hieradata/hosts/elastic1020.yaml
4 files changed, 0 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/338327/1

diff --git a/hieradata/hosts/elastic1017.yaml b/hieradata/hosts/elastic1017.yaml
index 7d55886..6cf24e8 100644
--- a/hieradata/hosts/elastic1017.yaml
+++ b/hieradata/hosts/elastic1017.yaml
@@ -1,7 +1,3 @@
 debdeploy::grains:
   debdeploy-elastic:
 value: canary
-
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1018.yaml b/hieradata/hosts/elastic1018.yaml
deleted file mode 100644
index a764fc7..000
--- a/hieradata/hosts/elastic1018.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1019.yaml b/hieradata/hosts/elastic1019.yaml
deleted file mode 100644
index a764fc7..000
--- a/hieradata/hosts/elastic1019.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/hosts/elastic1020.yaml b/hieradata/hosts/elastic1020.yaml
deleted file mode 100644
index a764fc7..000
--- a/hieradata/hosts/elastic1020.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# temporarily override the default data directory, this will be removed when
-# server is reimaged with new data directory on /srv
-elasticsearch::data_dir: '/var/lib/elasticsearch'

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

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

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

[MediaWiki-commits] [Gerrit] operations/software[master]: generate_dsns_table.sh: Add new script for dsns.

[Marostegui (Code Review)]

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

Change subject: generate_dsns_table.sh: Add new script for dsns.
..

generate_dsns_table.sh: Add new script for dsns.

The dsns tables are used by pt-table-checksum as another method to
discover slaves instead of "show processlist".

We are using this method in order to tell pt-table-checksum which slaves
it should look for, so we can discard dbstores and sanitarium hosts
which might be delayed and then would stop the check forever.

This quick and small shell script just parses the output from *.hosts
files to identify the slaves, remove the dbstore or sanitarium ones, as
well as the primary master and builds the syntax to run on mysql to
populate the dsns tables.

The dsns tables live under the dsns database on Tendril hosts.
There is one table per shard at the moment.

Bug: T154485
Change-Id: Iffb53744ca71c6a3f6c743f22e7ef80b121223a7
---
A dbtools/generate_dsns_table.sh
1 file changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/26/338326/1

diff --git a/dbtools/generate_dsns_table.sh b/dbtools/generate_dsns_table.sh
new file mode 100755
index 000..9b26157
--- /dev/null
+++ b/dbtools/generate_dsns_table.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+if [ $# -eq 0 ]
+then
+   echo "Usage: generate_dsns_table.sh shard_number"
+   echo "Example: generate_dsns_table.sh s1"
+   echo "Valid shards: m3,s1,s2,s3,s4,s5,s6,s7,s8"
+   exit 1
+fi
+SHARD="$1"
+HOST_FILE_PATH="/home/marostegui/git/software/dbtools/"
+FILE="$SHARD.hosts"
+for i in $(cat "$HOST_FILE_PATH/$FILE"  | grep "^db" | egrep -v 
"dbstore*|db1095|db1069" | cut -d " " -f1 | head -n-1)
+# The master is delete from the list of hosts as it is not a slave that needs 
to be checked
+do
+   echo "insert into dsns.dsns_$SHARD (dsn) values (\"h=$i,u=root\");";
+done
+echo "-- The master is not included on this list as this is only for slaves to 
be checked"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffb53744ca71c6a3f6c743f22e7ef80b121223a7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
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...ReplaceText[master]: Use MovePage if available

[Nikerabbit (Code Review)]

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

Change subject: Use MovePage if available
..

Use MovePage if available

Change-Id: I8049d3670282935b4bd5658315c571d4bca5a7ae
---
M ReplaceTextJob.php
1 file changed, 26 insertions(+), 1 deletion(-)


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

diff --git a/ReplaceTextJob.php b/ReplaceTextJob.php
index 8122116..9a8b56b 100644
--- a/ReplaceTextJob.php
+++ b/ReplaceTextJob.php
@@ -42,7 +42,32 @@
$new_title = Title::newFromText( $new_page_name, 
$this->title->getNamespace() );
$reason = $this->params['edit_summary'];
$create_redirect = $this->params['create_redirect'];
-   $this->title->moveTo( $new_title, true, $reason, 
$create_redirect );
+   if ( class_exists( 'MovePage' ) ) {
+   $mp = new MovePage( $this->title, $new_title );
+   $valid = $mp->isValidMove();
+   if ( !$valid->isOK() ) {
+   $this->error = $valid->getErrorsArray();
+   return false;
+   }
+
+   $permStatus = $mp->checkPermissions( $wgUser, 
$reason );
+   if ( !$permStatus->isOK() ) {
+   $this->error = 
$permStatus->getErrorsArray();
+   return false;
+   }
+
+   $status = $mp->move( $wgUser, $reason, 
$create_redirect );
+   if ( !$status->isOK() ) {
+   $this->error = 
$status->getErrorsArray();
+   return false;
+   }
+   } else {
+   $errors = $this->title->moveTo( $new_title, 
true, $reason, $create_redirect );
+   if ( $errors !== true ) {
+   $this->error = $errors;
+   return false;
+   }
+   }
if ( $this->params['watch_page'] ) {
if ( class_exists( 'WatchAction' ) ) {
// Class was added in MW 1.19

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8049d3670282935b4bd5658315c571d4bca5a7ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReplaceText
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

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

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338324 )

Change subject: [ChangeAuthor] Register extension
..


[ChangeAuthor] Register extension

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index ad106e2..fe8b7f0 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -586,7 +586,9 @@
 # No message documentation - 2014-10-05
 # Challenge
 
-# Change Author // 2016-09-02 imported from SVN, still old i18n
+Change Author
+aliasfile = ChangeAuthor/ChangeAuthor.alias.php
+optional = changeauthor-rev
 
 Char Insert
 #magicfile = CharInsert/CharInsert.i18n.magic.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7705d70e40a58f75f1e82c756a50dca5aa202987
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]: [ChangeAuthor] Register extension

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338324 )

Change subject: [ChangeAuthor] Register extension
..

[ChangeAuthor] Register extension

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/24/338324/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index ad106e2..fe8b7f0 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -586,7 +586,9 @@
 # No message documentation - 2014-10-05
 # Challenge
 
-# Change Author // 2016-09-02 imported from SVN, still old i18n
+Change Author
+aliasfile = ChangeAuthor/ChangeAuthor.alias.php
+optional = changeauthor-rev
 
 Char Insert
 #magicfile = CharInsert/CharInsert.i18n.magic.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7705d70e40a58f75f1e82c756a50dca5aa202987
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] translatewiki[master]: [SearchStats] Register extension

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338323 )

Change subject: [SearchStats] Register extension
..


[SearchStats] Register extension

Change-Id: Icf4aeed91edb37228e51f3ed386d6b67eaceb60d
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 2 insertions(+), 2 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 14e1bc1..ad106e2 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2174,8 +2174,8 @@
 
 Search Extra NS
 
-# Search Stats // old i18n file
-# aliasfile = SearchStats/SearchStats.alias.php
+Search Stats
+aliasfile = SearchStats/SearchStats.alias.php
 
 Section Disqus
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf4aeed91edb37228e51f3ed386d6b67eaceb60d
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]: [SearchStats] Register extension

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338323 )

Change subject: [SearchStats] Register extension
..

[SearchStats] Register extension

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/23/338323/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 14e1bc1..ad106e2 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2174,8 +2174,8 @@
 
 Search Extra NS
 
-# Search Stats // old i18n file
-# aliasfile = SearchStats/SearchStats.alias.php
+Search Stats
+aliasfile = SearchStats/SearchStats.alias.php
 
 Section Disqus
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf4aeed91edb37228e51f3ed386d6b67eaceb60d
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] translatewiki[master]: [Dashiki] Register extension, already deployed on WMF cluster

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338322 )

Change subject: [Dashiki] Register extension, already deployed on WMF cluster
..


[Dashiki] Register extension, already deployed on WMF cluster

Change-Id: Ibe288825e433f272f86acf28e3add8c56e013e9b
---
M groups/MediaWiki/WikimediaAgg.yaml
M groups/MediaWiki/mediawiki-extensions.txt
2 files changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index ebc0ebf..4e46161 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -28,6 +28,7 @@
   - ext-contributionreporting # wikimediafoundation.org
   - ext-contributiontracking # wikimediafoundation.org
   - ext-creditssource # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
+  - ext-dashiki
   - ext-datavalues # Needed for Wikibase
   - ext-datavalues-datatypes # Needed for Wikibase
   - ext-datavalues-valueformatters # Needed for Wikibase
diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index d45a5fe..14e1bc1 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -808,6 +808,8 @@
 
 D3 Loader
 
+Dashiki
+
 Data Transfer
 aliasfile = DataTransfer/languages/DT_Aliases.php
 optional = dt_filetype_xml, dt_filetype_csv
@@ -2487,6 +2489,8 @@
 
 Tooltip
 
+# Top Lists // Incomplete qqq
+
 Top Ten Pages
 aliasfile = TopTenPages/TopTenPages.alias.php
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe288825e433f272f86acf28e3add8c56e013e9b
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]: [Dashiki] Register extension, already deployed on WMF cluster

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338322 )

Change subject: [Dashiki] Register extension, already deployed on WMF cluster
..

[Dashiki] Register extension, already deployed on WMF cluster

Change-Id: Ibe288825e433f272f86acf28e3add8c56e013e9b
---
M groups/MediaWiki/WikimediaAgg.yaml
M groups/MediaWiki/mediawiki-extensions.txt
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/22/338322/1

diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index ebc0ebf..4e46161 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -28,6 +28,7 @@
   - ext-contributionreporting # wikimediafoundation.org
   - ext-contributiontracking # wikimediafoundation.org
   - ext-creditssource # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
+  - ext-dashiki
   - ext-datavalues # Needed for Wikibase
   - ext-datavalues-datatypes # Needed for Wikibase
   - ext-datavalues-valueformatters # Needed for Wikibase
diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index d45a5fe..14e1bc1 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -808,6 +808,8 @@
 
 D3 Loader
 
+Dashiki
+
 Data Transfer
 aliasfile = DataTransfer/languages/DT_Aliases.php
 optional = dt_filetype_xml, dt_filetype_csv
@@ -2487,6 +2489,8 @@
 
 Tooltip
 
+# Top Lists // Incomplete qqq
+
 Top Ten Pages
 aliasfile = TopTenPages/TopTenPages.alias.php
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe288825e433f272f86acf28e3add8c56e013e9b
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]: Add fr (French) language fallback for br, nrm, oc

[jenkins-bot (Code Review)]

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

Change subject: Add fr (French) language fallback for br, nrm, oc
..


Add fr (French) language fallback for br, nrm, oc

A few languages of France which had not been provided with a
language fallback yet. Data clearly shows that French is known
by nearly all of their speakers and by a large majority of the
users of Wikimedia projects in those languages, while English
is known by a minority. For br and oc, no gender namespaces,
date formats etc. will be inherited.

https://translatewiki.net/wiki/Thread:Portal_talk:Br/Use_French_when_no_translation
https://translatewiki.net/wiki/Thread:Portal_talk:Nrm/Use_French_when_no_translation
https://translatewiki.net/wiki/Thread:Portal_talk:Oc/Use_French_when_no_translation

All translators have been warned and can comment above.

Additionally, there were various discussions on local wikis:
https://oc.wikipedia.org/w/index.php?diff=2040712
https://br.wikipedia.org/w/index.php?curid=130192
https://nrm.wikipedia.org/w/index.php?diff=206241

Incidentally, a majority of editors supports the fallback,
although 1 user for each of br and oc is against, citing
bad feelings/reactions towards France the state.

Change-Id: I02fc9af984f593c9e249b0007aec0ec0b4f95457
---
M languages/messages/MessagesBr.php
A languages/messages/MessagesNrm.php
M languages/messages/MessagesOc.php
3 files changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/languages/messages/MessagesBr.php 
b/languages/messages/MessagesBr.php
index a2a7e7d..d7614cc 100644
--- a/languages/messages/MessagesBr.php
+++ b/languages/messages/MessagesBr.php
@@ -8,6 +8,8 @@
  *
  */
 
+$fallback = 'fr';
+
 $namespaceNames = [
NS_MEDIA=> 'Media',
NS_SPECIAL  => 'Dibar',
@@ -32,6 +34,8 @@
'Kaozeadenn_Skeudenn' => NS_FILE_TALK,
 ];
 
+$namespaceGenderAliases = [];
+
 $specialPageAliases = [
'Activeusers'   => [ 'ImplijerienOberiant' ],
'Allmessages'   => [ 'HollGemennadennoù' ],
diff --git a/languages/messages/MessagesNrm.php 
b/languages/messages/MessagesNrm.php
new file mode 100644
index 000..6cb8c47
--- /dev/null
+++ b/languages/messages/MessagesNrm.php
@@ -0,0 +1,11 @@
+https://translatewiki.net
+ *
+ * @ingroup Language
+ * @file
+ *
+ */
+
+$fallback = 'fr';
diff --git a/languages/messages/MessagesOc.php 
b/languages/messages/MessagesOc.php
index 1d9e0e5..eb8ed88 100644
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -19,7 +19,7 @@
  * @author לערי ריינהארט
  */
 
-$fallback = 'ca';
+$fallback = 'ca, fr';
 
 $bookstoreList = [
'Amazon.fr' => 'https://www.amazon.fr/exec/obidos/ISBN=$1'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02fc9af984f593c9e249b0007aec0ec0b4f95457
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: IAlex 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: Phe 
Gerrit-Reviewer: Platonides 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Seb35 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Thibaut120094 
Gerrit-Reviewer: Tpt 
Gerrit-Reviewer: VIGNERON 
Gerrit-Reviewer: jenkins-bot <>

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