date:20171113

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove madan fonts for ne

2017-11-13 Thread KartikMistry (Code Review)

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

Change subject: Remove madan fonts for ne
..

Remove madan fonts for ne

* Nepali is well supported among modern OSs.
* Font license is not clear.
* No upstream.

Bug: T180422
Change-Id: Id41176dea933886affe20710ff5b1ff5ec337bb9
---
M data/fontrepo/TODO
D data/fontrepo/fonts/madan/font.ini
D data/fontrepo/fonts/madan/madan.ttf
D data/fontrepo/fonts/madan/madan.woff
D data/fontrepo/fonts/madan/madan.woff2
D data/fontrepo/fonts/madan/madan_license.txt
M resources/js/ext.uls.webfonts.repository.js
7 files changed, 0 insertions(+), 32 deletions(-)


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

diff --git a/data/fontrepo/TODO b/data/fontrepo/TODO
index 17db685..0167eb9 100644
--- a/data/fontrepo/TODO
+++ b/data/fontrepo/TODO
@@ -1,6 +1,5 @@
 * New version of Amiri font is available
 * Siyam Rupali TTF claims GPL2+, website GPL3
-* Madan only says "GPL", no proper upstream link
 * Miriam CLM has new upstream version (maybe also Taamey Frank?)
 * KhmerOS font version number does not match upstream (v5)
 * New version of CharisSIL is available
diff --git a/data/fontrepo/fonts/madan/font.ini 
b/data/fontrepo/fonts/madan/font.ini
deleted file mode 100644
index c3f6b23..000
--- a/data/fontrepo/fonts/madan/font.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Madan]
-languages=ne
-version=2
-license=GPL-2.0
-licensefile=gpl-2.0.txt
-url=http://www.mpp.org.np
diff --git a/data/fontrepo/fonts/madan/madan.ttf 
b/data/fontrepo/fonts/madan/madan.ttf
deleted file mode 100644
index f9060bd..000
--- a/data/fontrepo/fonts/madan/madan.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/madan/madan.woff 
b/data/fontrepo/fonts/madan/madan.woff
deleted file mode 100644
index aa43ef0..000
--- a/data/fontrepo/fonts/madan/madan.woff
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/madan/madan.woff2 
b/data/fontrepo/fonts/madan/madan.woff2
deleted file mode 100644
index ffeaed7..000
--- a/data/fontrepo/fonts/madan/madan.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/madan/madan_license.txt 
b/data/fontrepo/fonts/madan/madan_license.txt
deleted file mode 100644
index f02dccb..000
--- a/data/fontrepo/fonts/madan/madan_license.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Open Type rules and Nepali glyphsets developed at Madan Puraskar Pustakalaya 
and released under GPL.
-
-Contacts:
-Madan Puraskar Pustakalaya
-Yalamaya Kendra, Patan, NEPAL
-GPO Box. 42
-www.mpp.org.np
-i...@mpp.org.np
-
-Font Developers:
-Gaurav Shrestha | gau...@mpp.org.np
-Anjan Ale | an...@mpp.org.np
-
-
-Copyright (c) 2007 by Madan Puraskar Pustakalaya. All rights reserved.
-
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 898b042..5a065da 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -282,10 +282,6 @@
"system",
"OpenDyslexic"
],
-   "ne": [
-   "system",
-   "Madan"
-   ],
"nl": [
"system",
"ComicNeue",
@@ -647,11 +643,6 @@
"ttf": "LinuxLibertine/LinLibertine_RIah.ttf?70eb1",
"woff": "LinuxLibertine/LinLibertine_RIah.woff?1c058",
"woff2": "LinuxLibertine/LinLibertine_RIah.woff2?4e887"
-   },
-   "Madan": {
-   "ttf": "madan/madan.ttf?a9297",
-   "woff": "madan/madan.woff?cee7d",
-   "woff2": "madan/madan.woff2?81dd1"
},
"Miriam CLM": {
"ttf": "MiriamCLM/MiriamCLM-Book.ttf?a070f",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id41176dea933886affe20710ff5b1ff5ec337bb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
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] operations/mediawiki-config[master]: Disable EducationProgram on cs.wikipedia

2017-11-13 Thread Urbanecm (Code Review)

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

Change subject: Disable EducationProgram on cs.wikipedia
..

Disable EducationProgram on cs.wikipedia

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index afff02c..cf0ed5a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17270,7 +17270,6 @@
'default' => false,
'arwiki' => true, // T59729
'cawiki' => true, // T73381
-   'cswiki' => true, // T56223
'dewikiversity' => true,
'elwiki' => true, // T58771
'enwiki' => true,

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: [WIP] Split profile.php from StartProfiler and add PhpAutoPr...

2017-11-13 Thread Krinkle (Code Review)

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

Change subject: [WIP] Split profile.php from StartProfiler and add 
PhpAutoPrepend
..

[WIP] Split profile.php from StartProfiler and add PhpAutoPrepend

Bug: T180183
Change-Id: I60cce0eb51101d9e3fed7a65890c101ddd39e7d0
---
A wmf-config/PhpAutoPrepend.php
M wmf-config/StartProfiler.php
A wmf-config/profiler.php
3 files changed, 282 insertions(+), 246 deletions(-)


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

diff --git a/wmf-config/PhpAutoPrepend.php b/wmf-config/PhpAutoPrepend.php
new file mode 100644
index 000..d29a893
--- /dev/null
+++ b/wmf-config/PhpAutoPrepend.php
@@ -0,0 +1,20 @@
+https://secure.php.net/manual/en/ini.core.php#ini.auto-prepend-file
+ */
+
+require_once __DIR__ . '/profiler.php';
diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index a11cecf..93fbe0c 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -12,250 +12,7 @@
 # DefaultSettings.php, and wmf-config CommonSettings or InitialiseSettings.
 # ##
 
-/**
- * File overview:
- *
- * 1. Parse X-Wikimedia-Header
- * 2. One-off profile to stdout (via MediaWiki)
- * 3. One-off profile to /tmp (from localhost)
- * 4. Sampling profiler for production traffic
- * 5. One-off profile to XHGui.
- */
+// profiler.php defines $wmfProfiler
+require_once __DIR__ . '/profiler.php';
 
-/**
- * 1) Parse X-Wikimedia-Header
- *
- * If the X-Wikimedia-Header is present, parse it into an associative array.
- *
- * See https://wikitech.wikimedia.org/wiki/X-Wikimedia-Debug
- */
-$XWD = false;
-if ( isset( $_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) ) {
-   parse_str( preg_replace( '/; ?/', '&', 
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ), $XWD );
-}
-
-if ( ini_get( 'hhvm.stats.enable_hot_profiler' ) ) {
-   /**
-* 2) One-off profile to stdout
-*
-* MediaWiki's Profiler class can output raw profile data directly to 
the output
-* of a web response (web), or in stdout (CLI).
-*
-* For web: Set X-Wikimedia-Debug (to bypass cache) and query param 
'forceprofile=1'.
-* For CLI: Set CLI option '--profiler=text'.
-*
-* See https://www.mediawiki.org/wiki/Manual:Profiling
-*/
-   if (
-   ( isset( $_GET['forceprofile'] ) && isset( 
$_SERVER['HTTP_X_WIKIMEDIA_DEBUG'] ) )
-   || PHP_SAPI === 'cli'
-   ) {
-   $wgProfiler = [
-   'class'  => 'ProfilerXhprof',
-   'flags'  => XHPROF_FLAGS_NO_BUILTINS,
-   'output' => 'text',
-   ];
-
-   /**
-* 3) One-off profile to /tmp
-*
-* When making requests to the local server using shell access,
-* setting the 'Force-Local-XHProf: 1' header will write raw profile 
data
-* directly to a local file in /tmp/xhprof/.
-*
-* Note: This is only allowed for requests within the same server.
-*/
-   } elseif (
-   isset( $_SERVER['HTTP_FORCE_LOCAL_XHPROF'] )
-   && isset( $_SERVER['REMOTE_ADDR'] )
-   && $_SERVER['REMOTE_ADDR'] == '127.0.0.1'
-   && is_writable( '/tmp/xhprof' )
-   ) {
-   xhprof_enable();
-   register_shutdown_function( function () {
-   $prof = xhprof_disable();
-   $titleFormat = "%-75s %6s %13s %13s %13s\n";
-   $format = "%-75s %6d %13.3f %13.3f %13.3f%%\n";
-   $out = sprintf( $titleFormat, 'Name', 'Calls', 'Total', 
'Each', '%' );
-   if ( empty( $prof['main()']['wt'] ) ) {
-   return;
-   }
-   $total = $prof['main()']['wt'];
-   uksort( $prof, function ( $a, $b ) use ( $prof ) {
-   if ( $prof[$a]['wt'] < $prof[$b]['wt'] ) {
-   return 1;
-   } elseif ( $prof[$a]['wt'] > $prof[$b]['wt'] ) {
-   return -1;
-   } else {
-   return 0;
-   }
-   } );
-
-   foreach ( $prof as $name => $info ) {
-   $out .= sprintf( $format, $name, $info['ct'], 
$info['wt'] / 1000,
-   $info['wt'] / $info['ct'] / 1000,
-   $info['wt'] / $total * 100 );
-   }
-   file_put_contents( '/tmp/xhprof/' . date( 
'Y-m-d\TH:i:s' ) . '.prof', $out );
-   } );
-   }
-}
-
-/**
- * 4)

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

2017-11-13 Thread Marostegui (Code Review)

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

Change subject: db-eqiad,db-codfw.php: Pool db1105 as rc for s1,s2
..

db-eqiad,db-codfw.php: Pool db1105 as rc for s1,s2

db1105 is a multi-instance slave that will serve recentchanges service
on s1 and s2.

Start only with watchlist service for s1 and s2 first to see how it goes
and minimize risks.
Starting with really low % of traffic for db1103 to minimize risks in
case of failure.

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


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index af0fa6f..5f67049 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -605,7 +605,8 @@
'db1103:3312' => '10.64.0.164:3312', # do not remove or comment out
'db1103:3314' => '10.64.0.164:3314', # do not remove or comment out
'db1104' => '10.64.16.85', # do not remove or comment out
-   'db1105' => '10.64.32.222', # do not remove or comment out
+   'db1105:3311' => '10.64.32.222:3311', # do not remove or comment out
+   'db1105:3312' => '10.64.32.222:3312', # do not remove or comment out
'db1106' => '10.64.48.13', # do not remove or comment out
'db2001' => '10.192.0.4', # do not remove or comment out
'db2002' => '10.192.0.5', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 6c2eaa3..de0a059 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -111,6 +111,7 @@
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
'db1089' => 500, # C3 3.6TB 512GB
+   'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
's2' => [
'db1054' => 0,   # A3 2.8TB  96GB, master
@@ -121,6 +122,7 @@
'db1090' => 500, # C3 3.6TB 512GB
'db1101' => 1,   # C2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager, old master 2
'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
+   'db1105:3312' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
/* s3 */ 'DEFAULT' => [
'db1075' => 0,   # A2 3.6TB 512GB, master
@@ -151,7 +153,6 @@
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1100' => 1,   # C2 3.6TB 512GB, old master
# 'db1104' => 100,  # B3 3.6TB 512GB
-   # 'db1105' => 1,   # C3 3.6TB 512GB, #DO NOT POOL - going to be 
multi-instance host #T178359
'db1106' => 300,  # D3 3.6TB 512GB
],
's6' => [
@@ -246,24 +247,29 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   'db1051' => 1,
-   'db1055' => 1,
+   'db1051' => 2,
+   'db1055' => 2,
+   'db1105:3311' => 1,
],
'recentchanges' => [
'db1051' => 1,
'db1055' => 1,
+   # 'db1105:3311' => 1,
],
'recentchangeslinked' => [
'db1051' => 1,
'db1055' => 1,
+   # 'db1105:3311' => 1,
],
'contributions' => [
'db1051' => 1,
'db1055' => 1,
+   # 'db1105:3311' => 1,
],
'logpager' => [
'db1051' => 1,
'db1055' => 1,
+   # 'db1105:3311' => 1,
],
'dump' => [
'db1065' => 1,
@@ -289,24 +295,29 @@
'db1074' => 1,
],
'watchlist' => [
-   'db1101' => 1,
-   'db1103:3312' => 1,
+   'db1101' => 2,
+   'db1103:3312' => 2,
+   'db1105:3312' => 1,
],
'recentchanges' => [
'db1101' => 1,
'db1103:3312' => 1,
+   # 'db1105:3312' => 1,
],
'recentchangeslinked' => [
'db1101' => 1,
'db1103:3312' => 1,
+   # 'db1105:3312' => 1,
],
'contributions' => [
'db1101' => 1,
'db1103:3312' => 1,
+   # 'db1105:3312' => 1,
],

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: Tweak dump-corpora.php

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Tweak dump-corpora.php
..


Tweak dump-corpora.php

Instead of doing FormatJson::encode for whole big array, do it
for individual sections instead and stitch it together for one
big file. In other words, home-made streaming json encoder.

This should reduce the memory usage somewhat. If that is not enough
there are further possibilities to improve this script:

1) write to the sink directly, instead of buffering into a string.
2) start streaming to the formatter, so that we do not load all
  sections into the memory before we start formatting them.

Regressions were checked for by comparing the output of this script
before and after this change (default parameters). Only difference
is that this one adds a trailing new line, which is a good thing
in my opinion.

Bug: T180264
Change-Id: Iddbbe85d2db3d444e2ad645bee32fae9bc0ac975
---
M scripts/dump-corpora.php
1 file changed, 16 insertions(+), 12 deletions(-)

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



diff --git a/scripts/dump-corpora.php b/scripts/dump-corpora.php
index 13c0e98..5e3a961 100644
--- a/scripts/dump-corpora.php
+++ b/scripts/dump-corpora.php
@@ -78,9 +78,6 @@
'plaintext',
'(optional) Strip away html.'
);
-
-   $this->resets = [];
-   $this->tags = [];
}
 
private function getPath( $source, $target ) {
@@ -248,13 +245,15 @@
 * @return string|null
 */
public function formatJSON( array $targets ) {
-   $output = [];
+   $output = '';
+   $indent = '';
+
foreach ( $targets as $translation ) {
foreach ( $translation['corpora'] as $id => $unit ) {
unset( $unit['source']['timestamp'], 
$unit['user']['timestamp'], $unit['mt']['timestamp'] );
 
$globalId = 
"{$translation['translationId']}/$id";
-   $output[] = [
+   $section = [
'id' => $globalId,
'sourceLanguage' => 
$translation['sourceLanguage'],
'targetLanguage' => 
$translation['targetLanguage'],
@@ -262,22 +261,27 @@
'mt' => $unit['mt'],
'target' => $unit['user'],
];
+
+   $json = FormatJson::encode( $section, $indent, 
FormatJson::ALL_OK );
+   $output .= self::indent( $indent, $json ) . 
",\n";
}
}
 
if ( $output ) {
-   // MediaWiki has a workaround that cleans up formatting 
with a regexp
-   // with certain PHP versions. As $output can be huge, 
it will run out
-   // of memory trying to do that. In this case, it is 
better to skip
-   // pretty formatting than to have nothing at all.
-   $prettyFormat = json_encode( [], JSON_PRETTY_PRINT ) 
=== '[]';
-
-   return FormatJson::encode( $output, $prettyFormat, 
FormatJson::ALL_OK );
+   // Remove the trailing comma and newline after it
+   $output = trim( $output, "\n," );
+   return "[\n$output\n]\n";
} else {
return null;
}
}
 
+   public static function indent( $indent, $text ) {
+   // Assuming literal newlines do not occur within strings
+   $text = $indent . str_replace( "\n", "\n$indent", $text );
+   return $text;
+   }
+
/**
 * @param array $targets
 * @param string $sourceLanguage Language code.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddbbe85d2db3d444e2ad645bee32fae9bc0ac975
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

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

2017-11-13 Thread Marostegui (Code Review)

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

Change subject: db1105.yaml: Enable notifications
..


db1105.yaml: Enable notifications

Going to start pooling db1105 in core, so let's have notifications
enabled for the host

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

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



diff --git a/hieradata/hosts/db1105.yaml b/hieradata/hosts/db1105.yaml
index a10bb72..f888dc5 100644
--- a/hieradata/hosts/db1105.yaml
+++ b/hieradata/hosts/db1105.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s1: '185G'
 profile::mariadb::core_multiinstance::s2: '185G'
-profile::base::notifications_enabled: '0'

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

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

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

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

2017-11-13 Thread Marostegui (Code Review)

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

Change subject: db1105.yaml: Enable notifications
..

db1105.yaml: Enable notifications

Going to start pooling db1105 in core, so let's have notifications
enabled for the host

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


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

diff --git a/hieradata/hosts/db1105.yaml b/hieradata/hosts/db1105.yaml
index a10bb72..f888dc5 100644
--- a/hieradata/hosts/db1105.yaml
+++ b/hieradata/hosts/db1105.yaml
@@ -2,4 +2,3 @@
 profile::mariadb::core_multiinstance::num_instances: 2
 profile::mariadb::core_multiinstance::s1: '185G'
 profile::mariadb::core_multiinstance::s2: '185G'
-profile::base::notifications_enabled: '0'

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight for db1103

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad.php: Increase weight for db1103
..


db-eqiad.php: Increase weight for db1103

Give db1103 normal rc services weight for s2 and s4

Bug: T178359
Change-Id: I0835f6785a6567407cac283ba9efb00ce4cbb19a
---
M wmf-config/db-eqiad.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 125258d..6c2eaa3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -302,11 +302,11 @@
],
'contributions' => [
'db1101' => 1,
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
],
'logpager' => [
'db1101' => 1,
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
],
],
/* s3 */ 'DEFAULT' => [
@@ -361,12 +361,12 @@
'contributions' => [
'db1053' => 1,
'db1056' => 1,
-   # 'db1103:3314' => 1,
+   'db1103:3314' => 1,
],
'logpager' => [
'db1053' => 1,
'db1056' => 1,
-   # 'db1103:3314' => 1,
+   'db1103:3314' => 1,
],
],
's5' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight for db1103

2017-11-13 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Increase weight for db1103
..

db-eqiad.php: Increase weight for db1103

Give db1103 normal rc services weight for s2 and s4

Bug: T178359
Change-Id: I0835f6785a6567407cac283ba9efb00ce4cbb19a
---
M wmf-config/db-eqiad.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 125258d..6c2eaa3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -302,11 +302,11 @@
],
'contributions' => [
'db1101' => 1,
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
],
'logpager' => [
'db1101' => 1,
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
],
],
/* s3 */ 'DEFAULT' => [
@@ -361,12 +361,12 @@
'contributions' => [
'db1053' => 1,
'db1056' => 1,
-   # 'db1103:3314' => 1,
+   'db1103:3314' => 1,
],
'logpager' => [
'db1053' => 1,
'db1056' => 1,
-   # 'db1103:3314' => 1,
+   'db1103:3314' => 1,
],
],
's5' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0835f6785a6567407cac283ba9efb00ce4cbb19a
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...Vector[master]: VectorTemplate: Restore 'id' for siteNotice wrapper

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: VectorTemplate: Restore 'id' for siteNotice wrapper
..


VectorTemplate: Restore 'id' for siteNotice wrapper

Follows-up bc47b4f.

Change-Id: I4220077679ac6d33650ed82a59696f22f1715485
---
M VectorTemplate.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/VectorTemplate.php b/VectorTemplate.php
index 110d902..5c15503 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -62,7 +62,10 @@
data['sitenotice'] ) {
echo Html::rawElement( 'div',
-   [ 'class' => 'mw-body-content' ],
+   [
+   'id' => 'siteNotice',
+   'class' => 'mw-body-content',
+   ],
// Raw HTML
$this->get( 'sitenotice' )
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4220077679ac6d33650ed82a59696f22f1715485
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: VectorTemplate: Restore 'id' for siteNotice wrapper

2017-11-13 Thread Krinkle (Code Review)

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

Change subject: VectorTemplate: Restore 'id' for siteNotice wrapper
..

VectorTemplate: Restore 'id' for siteNotice wrapper

Follows-up bc47b4f.

Change-Id: I4220077679ac6d33650ed82a59696f22f1715485
---
M VectorTemplate.php
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/VectorTemplate.php b/VectorTemplate.php
index 110d902..5c15503 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -62,7 +62,10 @@
data['sitenotice'] ) {
echo Html::rawElement( 'div',
-   [ 'class' => 'mw-body-content' ],
+   [
+   'id' => 'siteNotice',
+   'class' => 'mw-body-content',
+   ],
// Raw HTML
$this->get( 'sitenotice' )
);

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: featured-image: better diagnostics in error case

2017-11-13 Thread BearND (Code Review)

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

Change subject: featured-image: better diagnostics in error case
..

featured-image: better diagnostics in error case

We don't want to have the promise return undefined if an error occurs.
Instead re-throw the error so it doesn't go into the then block.
Hopefully this will provide better diagnostics in the future if the same
thing happens again.

Bug: T180420
Change-Id: I607cf4be08a040de36e45ea531a4f0cb310a95c6
---
M lib/feed/featured-image.js
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/lib/feed/featured-image.js b/lib/feed/featured-image.js
index 3d3b612..ba812dc 100644
--- a/lib/feed/featured-image.js
+++ b/lib/feed/featured-image.js
@@ -204,6 +204,8 @@
 title: 'No picture of the day for this date',
 detail: 'There is no picture of the day for this date.'
 });
+} else {
+throw err;
 }
 });
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Convert RandomImageGenerator to use the new execution framework

2017-11-13 Thread MaxSem (Code Review)

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

Change subject: Convert RandomImageGenerator to use the new execution framework
..

Convert RandomImageGenerator to use the new execution framework

Introduces a stringifier for Command, useful for debugging.

Change-Id: Ifcfccaef5a609e0cf30186e39a6bd0fa971c2dbd
---
M includes/shell/Command.php
M tests/phpunit/includes/api/RandomImageGenerator.php
2 files changed, 33 insertions(+), 17 deletions(-)


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

diff --git a/includes/shell/Command.php b/includes/shell/Command.php
index 9f080d5..9090c97 100644
--- a/includes/shell/Command.php
+++ b/includes/shell/Command.php
@@ -450,4 +450,15 @@
 
return new Result( $retval, $outBuffer, $errBuffer );
}
+
+   /**
+* Returns the final command line before environment/limiting, etc are 
applied.
+* Use string conversion only for debugging, don't try to pass this to
+* some other execution medium.
+*
+* @return string
+*/
+   public function __toString() {
+   return $this->command;
+   }
 }
diff --git a/tests/phpunit/includes/api/RandomImageGenerator.php 
b/tests/phpunit/includes/api/RandomImageGenerator.php
index 50a59f9..dd68647 100644
--- a/tests/phpunit/includes/api/RandomImageGenerator.php
+++ b/tests/phpunit/includes/api/RandomImageGenerator.php
@@ -23,6 +23,8 @@
  * @author Neil Kandalgaonkar 
  */
 
+use MediaWiki\Shell\Shell;
+
 /**
  * RandomImageGenerator: does what it says on the tin.
  * Can fetch a random image, or also write a number of them to disk with 
random filenames.
@@ -310,16 +312,16 @@
// for now (only works if you have exiv2 installed, a program 
to read
// and manipulate exif).
if ( $wgExiv2Command ) {
-   $cmd = wfEscapeShellArg( $wgExiv2Command )
-   . " -M "
-   . wfEscapeShellArg( "set Exif.Image.Orientation 
" . $orientation['exifCode'] )
-   . " "
-   . wfEscapeShellArg( $filename );
+   $command = Shell::command( $wgExiv2Command,
+   '-M',
+   "set Exif.Image.Orientation 
{$orientation['exifCode']}",
+   $filename
+   )->includeStderr();
 
-   $retval = 0;
-   $err = wfShellExec( $cmd, $retval );
+   $result = $command->execute();
+   $retval = $result->getExitCode();
if ( $retval !== 0 ) {
-   print "Error with $cmd: $retval, $err\n";
+   print "Error with $command: $retval, 
{$result->getStdout()}\n";
}
}
}
@@ -396,22 +398,25 @@
 */
public function writeImageWithCommandLine( $spec, $format, $filename ) {
global $wgImageMagickConvertCommand;
-   $args = [];
-   $args[] = "-size " . wfEscapeShellArg( $spec['width'] . 'x' . 
$spec['height'] );
-   $args[] = wfEscapeShellArg( "xc:" . $spec['fill'] );
+
+   $args = [
+   $wgImageMagickConvertCommand,
+   '-size',
+   $spec['width'] . 'x' . $spec['height'],
+   "xc:{$spec['fill']}",
+   ];
foreach ( $spec['draws'] as $draw ) {
$fill = $draw['fill'];
$polygon = self::shapePointsToString( $draw['shape'] );
$drawCommand = "fill $fill  polygon $polygon";
-   $args[] = '-draw ' . wfEscapeShellArg( $drawCommand );
+   $args[] = '-draw';
+   $args[] = $drawCommand;
}
-   $args[] = wfEscapeShellArg( $filename );
+   $args[] = $filename;
 
-   $command = wfEscapeShellArg( $wgImageMagickConvertCommand ) . " 
" . implode( " ", $args );
-   $retval = null;
-   wfShellExec( $command, $retval );
+   $result = Shell::command( $args )->execute();
 
-   return ( $retval === 0 );
+   return ( $result->getExitCode() === 0 );
}
 
/**

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

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

___

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Unify SVG markup

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Unify SVG markup
..


Unify SVG markup

Align SVG markup across Foundation products by
- unifying XML declaration,
- removing unnecessary group and put attribute on path,
- sorting attributes and
- unifying whitespace.

Bug: T178867
Change-Id: Idd3df30af5126e6f1fbc0f437a9afdc566377dc2
---
M images/betafeature-flow-ltr.svg
M images/betafeature-flow-rtl.svg
M modules/editor/editors/visualeditor/ui/images/icons/flow-mention.svg
M modules/notification/icon/flow-new-topic.svg
M modules/notification/icon/flow-post-edited.svg
M modules/notification/icon/flow-topic-renamed.svg
M modules/notification/icon/flow-topic-reopened.svg
M modules/notification/icon/flow-topic-resolved.svg
M modules/notification/icon/flowusertalk-new-topic.svg
M modules/styles/flow/images/anon-user.svg
M modules/styles/flow/images/lock-ltr.svg
M modules/styles/flow/images/lock-rtl.svg
M modules/styles/flow/images/newest-topics.svg
M modules/styles/flow/images/topic-collapse-ltr.svg
M modules/styles/flow/images/topic-collapse-rtl.svg
M modules/tours/flow-icon.svg
16 files changed, 77 insertions(+), 82 deletions(-)

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



diff --git a/images/betafeature-flow-ltr.svg b/images/betafeature-flow-ltr.svg
index eb0ccaf..49870c7 100644
--- a/images/betafeature-flow-ltr.svg
+++ b/images/betafeature-flow-ltr.svg
@@ -1,22 +1,19 @@
-
+
 http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  
+
+  
+
+  
+  
+
+
+
+  
+  
 
+
+
+
+  
 
diff --git a/images/betafeature-flow-rtl.svg b/images/betafeature-flow-rtl.svg
index ff2ad21..9b3c00f 100644
--- a/images/betafeature-flow-rtl.svg
+++ b/images/betafeature-flow-rtl.svg
@@ -1,22 +1,20 @@
-
+
 http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
 
diff --git 
a/modules/editor/editors/visualeditor/ui/images/icons/flow-mention.svg 
b/modules/editor/editors/visualeditor/ui/images/icons/flow-mention.svg
index 61ff7e9..7443e82 100644
--- a/modules/editor/editors/visualeditor/ui/images/icons/flow-mention.svg
+++ b/modules/editor/editors/visualeditor/ui/images/icons/flow-mention.svg
@@ -1,4 +1,4 @@
-
-http://www.w3.org/2000/svg; width="24" height="24">
-
+
+http://www.w3.org/2000/svg; width="24" height="24" viewBox="0 0 24 
24">
+   
 
diff --git a/modules/notification/icon/flow-new-topic.svg 
b/modules/notification/icon/flow-new-topic.svg
index fa2e5f9..9216e2e 100644
--- a/modules/notification/icon/flow-new-topic.svg
+++ b/modules/notification/icon/flow-new-topic.svg
@@ -1,4 +1,4 @@
-
-http://www.w3.org/2000/svg;>
-
+
+http://www.w3.org/2000/svg; width="30" height="30" viewBox="0 0 30 
30">
+   
 
diff --git a/modules/notification/icon/flow-post-edited.svg 
b/modules/notification/icon/flow-post-edited.svg
index a4f563c..e2425e3 100644
--- a/modules/notification/icon/flow-post-edited.svg
+++ b/modules/notification/icon/flow-post-edited.svg
@@ -1,4 +1,4 @@
-
-http://www.w3.org/2000/svg;>
-
+
+http://www.w3.org/2000/svg; width="30" height="30" viewBox="0 0 30 
30">
+   
 
diff --git a/modules/notification/icon/flow-topic-renamed.svg 
b/modules/notification/icon/flow-topic-renamed.svg
index 6d92462..95d0703 100644
--- a/modules/notification/icon/flow-topic-renamed.svg
+++ b/modules/notification/icon/flow-topic-renamed.svg
@@ -1,4 +1,4 @@
-
-http://www.w3.org/2000/svg;>
-
+
+http://www.w3.org/2000/svg; width="30" height="30" viewBox="0 0 30 
30">
+   
 
diff --git a/modules/notification/icon/flow-topic-reopened.svg 
b/modules/notification/icon/flow-topic-reopened.svg
index f668548..88ae3f7 100644
--- a/modules/notification/icon/flow-topic-reopened.svg
+++ b/modules/notification/icon/flow-topic-reopened.svg
@@ -1,4 +1,4 @@
 
-http://www.w3.org/2000/svg;>
-
+http://www.w3.org/2000/svg; width="30" height="30" viewBox="0 0 30 
30">
+   
 
diff --git a/modules/notification/icon/flow-topic-resolved.svg 
b/modules/notification/icon/flow-topic-resolved.svg
index ec48431..3aea32a 100644
--- a/modules/notification/icon/flow-topic-resolved.svg
+++ b/modules/notification/icon/flow-topic-resolved.svg
@@

[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Do not allow updating the default list

2017-11-13 Thread Code Review

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

Change subject: Do not allow updating the default list
..

Do not allow updating the default list

Bug: T180399
Change-Id: I1c52fff05bf6de54684a08cc2c508e5f3f44f769
---
M i18n/en.json
M i18n/qqq.json
M src/ReadingListRepository.php
M tests/src/ReadingListRepositoryTest.php
4 files changed, 14 insertions(+), 1 deletion(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index beb0d4a..30b52cb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,6 +8,7 @@
"readinglists-db-error-not-set-up": "Reading lists have not been set up 
for this user.",
"readinglists-db-error-already-set-up": "Reading lists have already 
been set up for this user.",
"readinglists-db-error-cannot-delete-default-list": "The default list 
cannot be deleted.",
+   "readinglists-db-error-cannot-update-default-list": "The default list 
cannot be updated.",
"readinglists-db-error-no-such-list": "List $1 does not exist.",
"readinglists-db-error-no-such-list-entry": "List entry $1 does not 
exist.",
"readinglists-db-error-not-own-list": "List $1 belongs to another 
user.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 8414fa4..40671e4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,6 +9,7 @@
"readinglists-db-error-not-set-up": "Error message used when trying to 
perform an operation for a user without calling setup first.",
"readinglists-db-error-already-set-up": "Error message used when trying 
to call setup for a user when it has already been performed.",
"readinglists-db-error-cannot-delete-default-list": "Error message used 
when trying to delete the default list.",
+   "readinglists-db-error-cannot-update-default-list": "Error message used 
when trying to update the default list.",
"readinglists-db-error-no-such-list": "Error message used when trying 
to do something with a non-existent list.",
"readinglists-db-error-no-such-list-entry": "Error message used when 
trying to do something with a non-existent list entry.",
"readinglists-db-error-not-own-list": "Error message used when trying 
to do something with a list that belongs to another user.",
diff --git a/src/ReadingListRepository.php b/src/ReadingListRepository.php
index ef32dbf..5ccbc80 100644
--- a/src/ReadingListRepository.php
+++ b/src/ReadingListRepository.php
@@ -299,7 +299,10 @@
$this->assertFieldLength( 'rl_color', $color );
$this->assertFieldLength( 'rl_image', $image );
$this->assertFieldLength( 'rl_icon', $icon );
-   $this->selectValidList( $id, self::READ_LOCKING );
+   $row = $this->selectValidList( $id, self::READ_LOCKING );
+   if ( $row->rl_is_default ) {
+   throw new ReadingListRepositoryException( 
'readinglists-db-error-cannot-update-default-list' );
+   }
 
$data = array_filter( [
'rl_name' => $name,
diff --git a/tests/src/ReadingListRepositoryTest.php 
b/tests/src/ReadingListRepositoryTest.php
index 45bdde3..35ccdd5 100644
--- a/tests/src/ReadingListRepositoryTest.php
+++ b/tests/src/ReadingListRepositoryTest.php
@@ -361,6 +361,14 @@
$repository->updateList( $deletedListId, 'bar' 
);
}
);
+   $this->assertFailsWith( 
'readinglists-db-error-cannot-update-default-list',
+   function () use ( $repository ) {
+   $defaultId = $this->db->selectField( 
'reading_list', 'rl_id',
+   [ 'rl_user_id' => 1, 'rl_is_default' => 
1 ] );
+   $this->assertNotSame( false, $defaultId );
+   $repository->updateList( $defaultId, 'not 
default' );
+   }
+   );
}
 
public function testDeleteList() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c52fff05bf6de54684a08cc2c508e5f3f44f769
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReadingLists
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Modified select2.js to allow for tab to be used as value cho...

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Modified select2.js to allow for tab to be used as value chooser
..


Modified select2.js to allow for tab to be used as value chooser

Change-Id: Iba546b12180ff33b68783464fbc92c1f2c5a320d
---
M libs/select2.js
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/libs/select2.js b/libs/select2.js
index b85661e..70008bf 100644
--- a/libs/select2.js
+++ b/libs/select2.js
@@ -1381,6 +1381,15 @@
 close: function () {
 if (!this.opened()) return;
 
+// Modification, for Page Forms - prevent the "tab" key from 
moving on to the next form input,
+// for either tokens or combobox inputs, so that it can be used as 
a true value selector -
+// which is especially useful for tokens.
+// This modification may possibly become unnecessary if/when 
select2 is upgraded to a more
+// recent version, due to the "closeOnSelect" option that select2 
now has.
+if ( event.key  == 'Tab' ) {
+event.preventDefault();
+}
+
 var cid = this.containerId,
 scroll = "scroll." + cid,
 resize = "resize."+cid,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Modified select2.js to allow for tab to be used as value cho...

2017-11-13 Thread Yaron Koren (Code Review)

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

Change subject: Modified select2.js to allow for tab to be used as value chooser
..

Modified select2.js to allow for tab to be used as value chooser

Change-Id: Iba546b12180ff33b68783464fbc92c1f2c5a320d
---
M libs/select2.js
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/libs/select2.js b/libs/select2.js
index b85661e..70008bf 100644
--- a/libs/select2.js
+++ b/libs/select2.js
@@ -1381,6 +1381,15 @@
 close: function () {
 if (!this.opened()) return;
 
+// Modification, for Page Forms - prevent the "tab" key from 
moving on to the next form input,
+// for either tokens or combobox inputs, so that it can be used as 
a true value selector -
+// which is especially useful for tokens.
+// This modification may possibly become unnecessary if/when 
select2 is upgraded to a more
+// recent version, due to the "closeOnSelect" option that select2 
now has.
+if ( event.key  == 'Tab' ) {
+event.preventDefault();
+}
+
 var cid = this.containerId,
 scroll = "scroll." + cid,
 resize = "resize."+cid,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba546b12180ff33b68783464fbc92c1f2c5a320d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: PageTriageHooks: Use modifyExtensionTable() now that it exists

2017-11-13 Thread Catrope (Code Review)

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

Change subject: PageTriageHooks: Use modifyExtensionTable() now that it exists
..

PageTriageHooks: Use modifyExtensionTable() now that it exists

Depends-On: I20368bf3c007a01718513a435de24907dc0aaf81
Change-Id: I65e647669cb11c18e092645c27e36655d51dc699
---
M PageTriage.hooks.php
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage 
refs/changes/53/391153/1

diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 2f395a5..debd516 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -839,12 +839,10 @@
'ptrl_comment',
$base . '/PageTriageLogPatch_Drop_ptrl_comment.sql'
);
-   $updater->addExtensionUpdate( [
-   'modifyTable',
+   $updater->modifyExtensionTable(
'pagetriage_tags',
-   $base . '/PageTriageTagsPatch.sql',
-   true
-   ] );
+   $base . '/PageTriageTagsPatch.sql'
+   );
 
return true;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: DatabaseUpdater: Add modifyExtensionTable()

2017-11-13 Thread Catrope (Code Review)

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

Change subject: DatabaseUpdater: Add modifyExtensionTable()
..

DatabaseUpdater: Add modifyExtensionTable()

We already had modifyExtensionField(), but to do a table modification
you still had to do
$updater->addExtensionUpdate( [ 'modifyTable', ... ] );

Change-Id: I20368bf3c007a01718513a435de24907dc0aaf81
---
M includes/installer/DatabaseUpdater.php
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/391152/1

diff --git a/includes/installer/DatabaseUpdater.php 
b/includes/installer/DatabaseUpdater.php
index a317822..54ff712 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -340,13 +340,23 @@
 *
 * @param string $tableName The table name
 * @param string $fieldName The field to be modified
-* @param string $sqlPath The path to the SQL change path
+* @param string $sqlPath The path to the SQL patch
 */
public function modifyExtensionField( $tableName, $fieldName, $sqlPath 
) {
$this->extensionUpdates[] = [ 'modifyField', $tableName, 
$fieldName, $sqlPath, true ];
}
 
/**
+* @since 1.31
+*
+* @param string $tableName The table name
+* @param string $sqlPath The path to the SQL patch
+*/
+   public function modifyExtensionTable( $tableName, $sqlPath ) {
+   $this->extensionUpdates[] = [ 'modifyTable', $tableName, 
$sqlPath, true ];
+   }
+
+   /**
 *
 * @since 1.20
 *

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Add a filter for learners (newly autoconfirmed users)

2017-11-13 Thread Catrope (Code Review)

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

Change subject: Add a filter for learners (newly autoconfirmed users)
..

Add a filter for learners (newly autoconfirmed users)

Put the user's experience level in the DB as a string rather than
as a learner/not-learner boolean, so it's easier to add filters
for e.g. experienced users in the future.

Bonus: actually run PageTriageTagsPatch.sql from update.php

Bug: T175225
Change-Id: I27fd98fb8003525e6b512aaa5780b6375e0e6850
---
M PageTriage.hooks.php
M SpecialNewPagesFeed.php
M api/ApiPageTriageList.php
M api/ApiPageTriageStats.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/ArticleMetadata.php
M modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
M sql/PageTriageTags.sql
M sql/PageTriageTagsPatch.sql
M tests/phpunit/ArticleMetadataTest.php
12 files changed, 41 insertions(+), 4 deletions(-)


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

diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 733df56..2f395a5 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -839,6 +839,12 @@
'ptrl_comment',
$base . '/PageTriageLogPatch_Drop_ptrl_comment.sql'
);
+   $updater->addExtensionUpdate( [
+   'modifyTable',
+   'pagetriage_tags',
+   $base . '/PageTriageTagsPatch.sql',
+   true
+   ] );
 
return true;
}
diff --git a/SpecialNewPagesFeed.php b/SpecialNewPagesFeed.php
index f82775e..00181ab 100644
--- a/SpecialNewPagesFeed.php
+++ b/SpecialNewPagesFeed.php
@@ -245,6 +245,11 @@

<%= mw.msg( 'pagetriage-filter-non-autoconfirmed' ) %>

 

+   
+   
<%= mw.msg( 'pagetriage-filter-learners' ) %>
+   

+   


<%= mw.msg( 'pagetriage-filter-blocked' ) %>
diff --git a/api/ApiPageTriageList.php b/api/ApiPageTriageList.php
index c8766c7..036f8a4 100644
--- a/api/ApiPageTriageList.php
+++ b/api/ApiPageTriageList.php
@@ -238,6 +238,8 @@
'no_inbound_links' => [ 'name' => 'linkcount', 'op' => 
'=', 'val' => '0' ],
// non auto confirmed users
'non_autoconfirmed_users' => [ 'name' => 
'user_autoconfirmed', 'op' => '=', 'val' => '0' ],
+   // learning users (newly autoconfirmed)
+   'learners' => [ 'name' => 'user_experience', 'op' => 
'=', 'val' => 'learner' ],
// blocked users
'blocked_users' => [ 'name' => 'user_block_status', 
'op' => '=', 'val' => '1' ],
// bots
@@ -316,6 +318,9 @@
'non_autoconfirmed_users' => [
ApiBase::PARAM_TYPE => 'boolean',
],
+   'learners' => [
+   ApiBase::PARAM_TYPE => 'boolean',
+   ],
'blocked_users' => [
ApiBase::PARAM_TYPE => 'boolean',
],
diff --git a/api/ApiPageTriageStats.php b/api/ApiPageTriageStats.php
index 228b46d..1e64621 100644
--- a/api/ApiPageTriageStats.php
+++ b/api/ApiPageTriageStats.php
@@ -56,6 +56,9 @@
'non_autoconfirmed_users' => [
ApiBase::PARAM_TYPE => 'boolean',
],
+   'learners' => [
+   ApiBase::PARAM_TYPE => 'boolean',
+   ],
'blocked_users' => [
ApiBase::PARAM_TYPE => 'boolean',
],
diff --git a/extension.json b/extension.json
index 04f0e9c..ecfc0f5 100644
--- a/extension.json
+++ b/extension.json
@@ -262,6 +262,7 @@
"pagetriage-filter-no-categories",
"pagetriage-filter-orphan",
"pagetriage-filter-non-autoconfirmed",
+   "pagetriage-filter-learners",
"pagetriage-filter-blocked",

[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: PageTriageTags.sql: clean up trailing whitespace

2017-11-13 Thread Catrope (Code Review)

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

Change subject: PageTriageTags.sql: clean up trailing whitespace
..

PageTriageTags.sql: clean up trailing whitespace

Change-Id: I96a7663695cdd1d80efadebffaaa71b1f2ee370b
---
M sql/PageTriageTags.sql
1 file changed, 16 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage 
refs/changes/50/391150/1

diff --git a/sql/PageTriageTags.sql b/sql/PageTriageTags.sql
index 229ea4a..5e70873 100644
--- a/sql/PageTriageTags.sql
+++ b/sql/PageTriageTags.sql
@@ -7,37 +7,37 @@
 
 CREATE UNIQUE INDEX /*i*/ptrt_tag_id ON /*_*/pagetriage_tags (ptrt_tag_name);
 
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('linkcount', 'Number of inbound links');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('category_count', 'Category mapping count');
 INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('csd_status', 'CSD status');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('prod_status', 'PROD status');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('blp_prod_status', 'BLP PROD status');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('afd_status', 'AFD status');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('rev_count', 'Number of edits to the article');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('page_len', 'Number of bytes of article');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('snippet', 'Beginning of article snippet');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('user_name', 'User name');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('user_editcount', 'User total edit');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('user_creation_date', 'User registration date');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('user_autoconfirmed', 'Check if user is autoconfirmed' );
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('user_bot', 'Check if user is in bot group');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('user_block_status', 'User block status');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('user_id', 'User id');
-INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc) 
+INSERT INTO /*_*/pagetriage_tags (ptrt_tag_name, ptrt_tag_desc)
 VALUES ('reference', 'Check if page has references');

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] Have every rdns advertise a private anycast VIP

2017-11-13 Thread Ayounsi (Code Review)

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

Change subject: [WIP] Have every rdns advertise a private anycast VIP
..

[WIP] Have every rdns advertise a private anycast VIP

Change-Id: I56b16355ee33cd68a6246f08fc16c20f10da3df2
---
A hieradata/hosts/acamar.yaml
M hieradata/role/common/dnsrecursor.yaml
A modules/bird/manifests/init.pp
A modules/bird/templates/bird.service.erb
A modules/bird/templates/bird_anycast.conf.erb
A modules/profile/manifests/bird/anycast.pp
M modules/role/manifests/dnsrecursor.pp
7 files changed, 167 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/391149/1

diff --git a/hieradata/hosts/acamar.yaml b/hieradata/hosts/acamar.yaml
new file mode 100644
index 000..219afcd
--- /dev/null
+++ b/hieradata/hosts/acamar.yaml
@@ -0,0 +1,3 @@
+profile::bird::neighbors_list:
+  - 208.80.153.2 # cr1-codfw ae1:2001
+  - 208.80.153.3 # cr2-codfw ae1:2001
diff --git a/hieradata/role/common/dnsrecursor.yaml 
b/hieradata/role/common/dnsrecursor.yaml
index 49549d1..b2c2243 100644
--- a/hieradata/role/common/dnsrecursor.yaml
+++ b/hieradata/role/common/dnsrecursor.yaml
@@ -1 +1,6 @@
 standard::has_ganglia: false
+
+profile::bird::advertise_vips:
+  rec-dns-anycast-vip: 10.3.0.1/32
+
+profile::bird::bind_service: 'pdns-recursor.service'
diff --git a/modules/bird/manifests/init.pp b/modules/bird/manifests/init.pp
new file mode 100644
index 000..a114dba
--- /dev/null
+++ b/modules/bird/manifests/init.pp
@@ -0,0 +1,52 @@
+# == Class: bird::base
+#
+# Installs Bird
+# Let the option to "bindTo" the Bird service to another service 
(watchdog-like)
+#
+#
+class bird(
+  $neighbors,
+  $bfd = true,
+  $bind_service = '',
+  $routerid= $::ipaddress,
+  ){
+
+  require_package('bird')
+
+  if $bind_service != '' {
+file { '/lib/systemd/system/bird.service':
+ensure  => present,
+owner   => 'root',
+group   => 'root',
+mode=> '0644',
+content => template('bird/bird.service.erb'),
+require => Package['bird'],
+}
+exec { 'bird-systemd-reload':
+command => 'systemctl daemon-reload',
+path=> [ '/usr/bin', '/bin', '/usr/sbin' ],
+refreshonly => true,
+}
+  }
+
+  service { 'bird':
+  ensure  => running,
+  enable  => true,
+  require => Package['bird'],
+  }
+
+  service { 'bird6':
+  ensure  => stopped,
+  enable  => false,
+  require => Package['bird'],
+  }
+
+  file { '/etc/bird/bird.conf':
+  ensure  => present,
+  owner   => 'bird',
+  group   => 'bird',
+  mode=> '0640',
+  content => template('bird/bird_anycast.conf.erb'),
+  }
+
+}
diff --git a/modules/bird/templates/bird.service.erb 
b/modules/bird/templates/bird.service.erb
new file mode 100644
index 000..319ac98
--- /dev/null
+++ b/modules/bird/templates/bird.service.erb
@@ -0,0 +1,17 @@
+[Unit]
+Description=BIRD Internet Routing Daemon (IPv4)
+
+After=<%= @bind_service %>
+BindsTo=<%= @bind_service %>
+
+[Service]
+EnvironmentFile=/etc/bird/envvars
+ExecStartPre=/usr/lib/bird/prepare-environment
+ExecStartPre=/usr/sbin/bird -p
+ExecReload=/usr/sbin/birdc configure
+ExecStart=/usr/sbin/bird -f -u $BIRD_RUN_USER -g $BIRD_RUN_GROUP $BIRD_ARGS
+Restart=on-abort
+
+[Install]
+## https://github.com/systemd/systemd/issues/720
+WantedBy=<%= @bind_service %>
diff --git a/modules/bird/templates/bird_anycast.conf.erb 
b/modules/bird/templates/bird_anycast.conf.erb
new file mode 100644
index 000..f108d07
--- /dev/null
+++ b/modules/bird/templates/bird_anycast.conf.erb
@@ -0,0 +1,47 @@
+
+router id <%= @routerid %>;
+
+protocol device {
+}
+
+protocol kernel {
+   metric 64;
+   import none;
+}
+
+protocol direct {
+   interface "*";
+}
+
+filter vips_filter{
+if ( net.len = 32 && net ~ 10.3.0.0/24 ) then {
+accept;
+}
+else {
+reject;
+}
+}
+
+<%- if @bfd -%>
+protocol bfd {
+interface "*" {
+interval 300 ms;
+multiplier 3;
+};
+}
+<%- end -%>
+
+
+protocol bgp {
+   import none;
+   export filter vips_filter;
+   local as 64605;
+  check link yes;
+  <% @neighbors.each do |neighbor| %>
+  neighbor <%= @neighbor %> as 14907;
+  <% end %>
+  <%- if @bfd -%>
+   bfd yes;
+  <%- end -%>
+
+}
diff --git a/modules/profile/manifests/bird/anycast.pp 
b/modules/profile/manifests/bird/anycast.pp
new file mode 100644
index 000..b048a39
--- /dev/null
+++ b/modules/profile/manifests/bird/anycast.pp
@@ -0,0 +1,42 @@
+# == Class: bird::base
+#
+# Installs and configure Bird
+# Configure Ferm
+#
+#
+class profile::bird::anycast(
+  $bfd = hiera('profile::bird::bfd', true),
+  $neighbors_list = hiera('profile::bird::neighbors_list', []),
+  $bind_service = hiera('profile::bird::bind_service', ''),
+  $advertise_vips =

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: UserGroupsChanged documentation updated

2017-11-13 Thread Huji (Code Review)

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

Change subject: UserGroupsChanged documentation updated
..

UserGroupsChanged documentation updated

The order of variables in the docs now matches the two use cases
in /tests/phpunit/includes/auth/AuthPluginPrimaryAuthenticationProviderTest.php
and in Echo's Hooks.php

Bug: T180292
Change-Id: If00f07431a91b6e1439567834c16415a0fab0876
---
M docs/hooks.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/391148/1

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 6c1597f..ba0a12d 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1080,10 +1080,10 @@
 $user: User who is adding the tags.
 
 'ChangeUserGroups': Called before user groups are changed.
-$performer: The User who will perform the change
 $user: The User whose groups will be changed
 &$add: The groups that will be added
 &$remove: The groups that will be removed
+$performer: The User who will perform the change
 
 'Collation::factory': Called if $wgCategoryCollation is an unknown collation.
 $collationName: Name of the collation in question

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Remove remnants of smw

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Remove remnants of smw
..


Remove remnants of smw

Change-Id: I19ce8f31f04f16e9b0d82073cb2024920adb35d5
Follows-up: I2e2c9939d6718c6cca006703ac2a6f7a6ebf2f21
---
M make-release/make-release.py
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/make-release/make-release.py b/make-release/make-release.py
index 1504b1e..89ce180 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -64,10 +64,6 @@
 help='disable the diff with previous version'
 )
 parser.add_argument(
-'--smw', dest='smw', action='store_true',
-help='include the SemanticMediaWiki bundle'
-)
-parser.add_argument(
 '--build', dest='buildroot',
 default=os.getcwd(),
 help='where the build should happen (defaults to pwd)'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19ce8f31f04f16e9b0d82073cb2024920adb35d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Remove remnants of smw

2017-11-13 Thread Reedy (Code Review)

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

Change subject: Remove remnants of smw
..

Remove remnants of smw

Change-Id: I19ce8f31f04f16e9b0d82073cb2024920adb35d5
Follows-up: I2e2c9939d6718c6cca006703ac2a6f7a6ebf2f21
---
M make-release/make-release.py
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/47/391147/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index 1504b1e..89ce180 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -64,10 +64,6 @@
 help='disable the diff with previous version'
 )
 parser.add_argument(
-'--smw', dest='smw', action='store_true',
-help='include the SemanticMediaWiki bundle'
-)
-parser.add_argument(
 '--build', dest='buildroot',
 default=os.getcwd(),
 help='where the build should happen (defaults to pwd)'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19ce8f31f04f16e9b0d82073cb2024920adb35d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add noop hint for Descriptions too

2017-11-13 Thread Smalyshev (Code Review)

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

Change subject: Add noop hint for Descriptions too
..

Add noop hint for Descriptions too

Bug: T180382
Change-Id: I6f348c0ae7e64c2cffa844ac85b5cc63a9ea6738
---
M repo/includes/Search/Elastic/Fields/DescriptionsField.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/repo/includes/Search/Elastic/Fields/DescriptionsField.php 
b/repo/includes/Search/Elastic/Fields/DescriptionsField.php
index afd0980..c7410a2 100644
--- a/repo/includes/Search/Elastic/Fields/DescriptionsField.php
+++ b/repo/includes/Search/Elastic/Fields/DescriptionsField.php
@@ -53,4 +53,12 @@
return $data;
}
 
+   public function getEngineHints( SearchEngine $engine ) {
+   if ( !( $engine instanceof CirrusSearch ) ) {
+   // For now only Cirrus/Elastic is supported
+   return [];
+   }
+   return [ \CirrusSearch\Search\CirrusIndexField::NOOP_HINT => 
"equals" ];
+   }
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: On this day card

2017-11-13 Thread Sharvaniharan (Code Review)

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

Change subject: On this day card
..

On this day card

- Feed card has been changed per design

Todo: Design changes for detail screen.

BUG: T175995
Change-Id: Ibcc2d23eb180b2f4ec3ffa0cea846efe75f2885d
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/java/org/wikipedia/util/DateUtil.java
A app/src/main/res/drawable/button_shape_gray_corner_rounded.xml
A app/src/main/res/drawable/button_shape_light_gray_corner_rounded.xml
A app/src/main/res/drawable/ic_arrow_forward_base30.xml
M app/src/main/res/layout/view_card_on_this_day.xml
M app/src/main/res/layout/view_on_this_day_event.xml
9 files changed, 114 insertions(+), 82 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
index 5b17955..363458f 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
@@ -61,6 +61,10 @@
 return DateUtil.getFeedCardDateString(date().baseCalendar());
 }
 
+@NonNull String dayString() {
+return 
DateUtil.getMonthOnlyDateString(date().baseCalendar().getTime());
+}
+
 @NonNull public String text() {
 return eventShownOnCard.text();
 }
diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
index f2ed657..23f7cfe 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCardView.java
@@ -19,8 +19,10 @@
 import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.DefaultFeedCardView;
 import org.wikipedia.feed.view.FeedAdapter;
+import org.wikipedia.richtext.RichTextUtil;
 import org.wikipedia.util.DateUtil;
 import org.wikipedia.util.GradientUtil;
+import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.views.DontInterceptTouchListener;
 import org.wikipedia.views.MarginItemDecoration;
 
@@ -33,11 +35,11 @@
 public class OnThisDayCardView extends DefaultFeedCardView {
 @BindView(R.id.view_on_this_day_card_header) CardHeaderView headerView;
 @BindView(R.id.text) TextView descTextView;
+@BindView(R.id.next_event_years) TextView nextEventYearsTextView;
+@BindView(R.id.day) TextView dayTextView;
 @BindView(R.id.year) TextView yearTextView;
-@BindView(R.id.next_year) TextView nextYearTextView;
 @BindView(R.id.years_text) TextView yearsInfoTextView;
 @BindView(R.id.year_layout) LinearLayout yearLayout;
-@BindView(R.id.next_year_layout) LinearLayout nextYearLayout;
 @BindView(R.id.more_events_layout) LinearLayout moreEventsLayout;
 @BindView(R.id.pages_recycler) RecyclerView pagesRecycler;
 private int age;
@@ -102,15 +104,16 @@
 headerView.setTitle(card.title())
 .setSubtitle(card.subtitle())
 .setImage(R.drawable.ic_otd_icon)
-.setImageCircleColor(R.color.base30)
+
.setImageCircleColor(ResourceUtil.getThemedAttributeId(getContext(), 
R.attr.colorAccent))
 .setCard(card)
 .setCallback(getCallback());
 descTextView.setText(card.text());
+RichTextUtil.removeUnderlinesFromLinksAndMakeBold(descTextView);
 yearTextView.setText(DateUtil.yearToStringWithEra(card.year()));
 
yearsInfoTextView.setText(DateUtil.getYearDifferenceString(card.year()));
 
yearLayout.setBackground(GradientUtil.getPowerGradient(R.color.base100, 
Gravity.TOP));
-
nextYearLayout.setBackground(GradientUtil.getPowerGradient(R.color.base100, 
Gravity.BOTTOM));
-
nextYearTextView.setText(DateUtil.yearToStringWithEra(card.nextYear()));
+dayTextView.setText(card.dayString());
+
nextEventYearsTextView.setText(DateUtil.getYearDifferenceString(card.nextYear()));
 }
 
 @Override
diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
index 9429776..9891f2f 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
@@ -22,9 +22,7 @@
 import org.wikipedia.views.DontInterceptTouchListener;
 import org.wikipedia.views.MarginItemDecoration;
 
-import java.text.SimpleDateFormat;
 import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
 import

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Rename stx_v data-parsoid flag to stx

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Rename stx_v data-parsoid flag to stx
..


Rename stx_v data-parsoid flag to stx

Accept both stx and stx_v for now till RESTBase storage turns over
or is refreshed. Might be worth getting this out before or during
the upcoming HTML version bump.

Step 1 of mw:Parsoid/Internals/data-parsoid#Proposal:_Maybe_move_to_data-mw.3F

Change-Id: I768041bcb02b748c4b957f3e710211f7f6c27b70
---
M lib/html2wt/DOMHandlers.js
M lib/html2wt/WTSUtils.js
M lib/html2wt/normalizeDOM.js
M lib/wt2html/pegTokenizer.pegjs
M tests/parserTests-blacklist.js
M tests/parserTests.txt
6 files changed, 42 insertions(+), 26 deletions(-)

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



diff --git a/lib/html2wt/DOMHandlers.js b/lib/html2wt/DOMHandlers.js
index 271c16f..93b0dec 100644
--- a/lib/html2wt/DOMHandlers.js
+++ b/lib/html2wt/DOMHandlers.js
@@ -513,8 +513,8 @@
 };
 
 function stxInfoValidForTableCell(state, node) {
-   // If there is no syntax info, nothing to worry about
-   if (!DU.getDataParsoid(node).stx_v) {
+   // If row syntax is not set, nothing to worry about
+   if (DU.getDataParsoid(node).stx !== 'row') {
return true;
}
 
@@ -768,7 +768,7 @@
var attrSepSrc = usableDP ? (dp.attrSepSrc || null) : 
null;
var startTagSrc = usableDP ? dp.startTagSrc : '';
if (!startTagSrc) {
-   startTagSrc = (usableDP && dp.stx_v === 'row') 
? '!!' : '!';
+   startTagSrc = (usableDP && dp.stx === 'row') ? 
'!!' : '!';
}
 
// T149209: Special case to deal with scenarios
@@ -795,7 +795,7 @@
sepnls: {
before: function(node, otherNode, state) {
if (otherNode.nodeName === 'TH' &&
-   DU.getDataParsoid(node).stx_v 
=== 'row') {
+   DU.getDataParsoid(node).stx === 'row') {
// force single line
return { min: 0, max: 
maxNLsInTable(node, otherNode) };
} else {
@@ -819,7 +819,7 @@
var attrSepSrc = usableDP ? (dp.attrSepSrc || null) : 
null;
var startTagSrc = usableDP ? dp.startTagSrc : '';
if (!startTagSrc) {
-   startTagSrc = (usableDP && dp.stx_v === 'row') 
? '||' : '|';
+   startTagSrc = (usableDP && dp.stx === 'row') ? 
'||' : '|';
}
 
// T149209: Special case to deal with scenarios
@@ -845,7 +845,7 @@
sepnls: {
before: function(node, otherNode, state) {
if (otherNode.nodeName === 'TD' &&
-   DU.getDataParsoid(node).stx_v 
=== 'row') {
+   DU.getDataParsoid(node).stx === 'row') {
// force single line
return { min: 0, max: 
maxNLsInTable(node, otherNode) };
} else {
diff --git a/lib/html2wt/WTSUtils.js b/lib/html2wt/WTSUtils.js
index 0b711fa..054079e 100644
--- a/lib/html2wt/WTSUtils.js
+++ b/lib/html2wt/WTSUtils.js
@@ -88,10 +88,10 @@
return true;
}
 
-   // If it didn't have a stx_v marker that indicated that the cell
+   // If it didn't have a stx marker that indicated that the cell
// showed up on the same line via the "||" or "!!" syntax, 
nothing
// to worry about.
-   return DU.getDataParsoid(node).stx_v !== 'row';
+   return DU.getDataParsoid(node).stx !== 'row';
} else if (node.nodeName === 'TR' && 
!DU.getDataParsoid(node).startTagSrc) {
// If this  didn't have a startTagSrc, it would have been
// the first row of a table in original wikitext. So, it is safe
diff --git a/lib/html2wt/normalizeDOM.js b/lib/html2wt/normalizeDOM.js
index 37350ec..b21ccee 100644
--- a/lib/html2wt/normalizeDOM.js
+++ b/lib/html2wt/normalizeDOM.js
@@ -302,6 +302,24 @@
  * 7. Strip bidi chars around categories
  */
 Normalizer.prototype.normalizeNode = function(node) {
+   var dp;
+   if (node.nodeName === 'TH' || node.nodeName === 'TD') {
+   dp = DU.getDataParsoid(node);
+   // Table cells (td/th) previously used the stx_v flag for 
single-row syntax.
+   // Newer code uses stx flag since that is used everywhere else.
+   // While we

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Revise onboarding and user education cards in sideloading Of...

2017-11-13 Thread Cooltey (Code Review)

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

Change subject: Revise onboarding and user education cards in sideloading 
Offline Library  - Remove OnboardingClient() from FeedCoordinator  - Add 
sideloading version text  - Set default value of offline tutorial as false
..

Revise onboarding and user education cards in sideloading Offline Library
 - Remove OnboardingClient() from FeedCoordinator
 - Add sideloading version text
 - Set default value of offline tutorial as false

Bug: T179203
Change-Id: I6b0367c8fc6aa9fc8c2c9ced9ee0a40306fa168e
---
M app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
4 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java 
b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
index 1d4a040..cca8f5f 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedCoordinator.java
@@ -30,7 +30,6 @@
 
 conditionallyAddPendingClient(new SearchClient(), age == 0);
 conditionallyAddPendingClient(new OfflineCompilationClient(), age == 0 
&& !online && OfflineManager.hasCompilation());
-conditionallyAddPendingClient(new OnboardingClient(), age == 0);
 conditionallyAddPendingClient(new AnnouncementClient(), age == 0 && 
online);
 
 List orderedContentTypes = new ArrayList<>();
diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 79fe9ed..786df10 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -558,7 +558,7 @@
 }
 
 public static boolean isOfflineTutorialEnabled() {
-return getBoolean(R.string.preference_key_offline_onboarding_enabled, 
true);
+return getBoolean(R.string.preference_key_offline_onboarding_enabled, 
false);
 }
 
 public static void setOfflineTutorialEnabled(boolean enabled) {
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index aea4c8b..a5f4d44 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -445,6 +445,7 @@
   Message explaining why we 
need permission to access the device storage when reading articles in offline 
mode.
   Error shown when the app could 
not read from the internal or external storage of the device due to permission 
not being granted.
   Message shown in the Feed card that informs 
the user that they are now browsing Wikipedia in offline mode.
+  Message shown in the Feed card 
that informs the user that they are now browsing Wikipedia from article packs 
in offline mode.
   Button label for the user to navigate 
to the offline library screen.
   Title shown on the toolbar of the 
activity for managing article packs.
   Menu item for searching 
article packs by name.
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index d7b5b89..3b82ace 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -498,6 +498,7 @@
 Permission to access 
storage on your device is required for offline browsing.
 Permission not granted to 
read from device storage.
 You are now browsing Wikipedia offline 
with articles in your Offline Library.
+You are now browsing 
Wikipedia offline from article packs in your Offline Library.
 Manage my offline library
 Offline Library
 Search article packs by 
name

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: POC: Reimplementing MobileOptions in OOUI

2017-11-13 Thread Jdlrobson (Code Review)

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

Change subject: POC: Reimplementing MobileOptions in OOUI
..

POC: Reimplementing MobileOptions in OOUI

To tease out the complexity I had a look at what this involves
to get to the point where Special:MobileOptions is completely
written in OOUI and we can use the DropdownWidget

Problems to address:
* Adding widgets to the form
I might be missing something but there's no obvious way to add inputs
to a form rendered in PHP via JS.

* Wiring up click handlers
i might be missing something but it doesn't seem like there is an
easy way to bind an event to the checkbox item. My interpretation of
the minimal docs that exist is that I have to create a class that extends
the InputWidget ... but surely that's not right.

* Creating option descriptions
Creating the div.option-description is messy. I'm not sure if there's an
easier way.

Change-Id: I70f68df9d2d305126444319b05675702af75de87
---
M extension.json
M includes/specials/SpecialMobileOptions.php
D resources/mobile.special.mobileoptions.scripts.fontchanger/FontChanger.hogan
D resources/mobile.special.mobileoptions.scripts.fontchanger/FontChanger.js
D resources/mobile.special.mobileoptions.scripts.fontchanger/FontChanger.less
D resources/mobile.special.mobileoptions.scripts.fontchanger/init.js
D resources/mobile.special.mobileoptions.scripts/checkbox.mustache
M resources/mobile.special.mobileoptions.scripts/mobileoptions.js
M resources/mobile.special.mobileoptions.styles/mobileoptions.less
9 files changed, 108 insertions(+), 248 deletions(-)


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

diff --git a/extension.json b/extension.json
index f2cf7bf..1baa641 100644
--- a/extension.json
+++ b/extension.json
@@ -949,30 +949,9 @@
"scripts": [

"resources/mobile.special.mobileoptions.scripts/mobileoptions.js"
],
-   "templates": {
-   "Checkbox.hogan": 
"resources/mobile.special.mobileoptions.scripts/checkbox.mustache"
-   },
"messages": [
"mobile-frontend-expand-sections-description",
-   "mobile-frontend-expand-sections-status"
-   ]
-   },
-   "mobile.special.mobileoptions.scripts.fontchanger": {
-   "targets": "mobile",
-   "dependencies": [
-   "mobile.startup"
-   ],
-   "templates": {
-   "FontChanger.hogan": 
"resources/mobile.special.mobileoptions.scripts.fontchanger/FontChanger.hogan"
-   },
-   "styles": [
-   
"resources/mobile.special.mobileoptions.scripts.fontchanger/FontChanger.less"
-   ],
-   "scripts": [
-   
"resources/mobile.special.mobileoptions.scripts.fontchanger/FontChanger.js",
-   
"resources/mobile.special.mobileoptions.scripts.fontchanger/init.js"
-   ],
-   "messages": [
+   "mobile-frontend-expand-sections-status",
"mobile-frontend-fontchanger-desc",
"mobile-frontend-fontchanger-link"
]
diff --git a/includes/specials/SpecialMobileOptions.php 
b/includes/specials/SpecialMobileOptions.php
index 662304b..97075ff 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -93,6 +93,7 @@
$user = $this->getUser();
 
$out->setPageTitle( $this->msg( 
'mobile-frontend-main-menu-settings-heading' ) );
+   $out->enableOOUI();
 
if ( $this->getRequest()->getCheck( 'success' ) ) {
$out->wrapWikiMsg(
@@ -101,59 +102,54 @@
);
}
 
-   $betaEnabled = $context->isBetaGroupMember();
+   $fields = [];
+   $form = new OOUI\FormLayout( [
+   'method' => 'POST',
+   'action' => $this->getPageTitle()->getLocalURL(),
+   ] );
+   $form->addClasses( [ 'mw-mf-settings' ] );
 
-   $imagesBeta = $betaEnabled ? 'checked' : '';
-   $betaEnableMsg = $this->msg( 'mobile-frontend-settings-beta' 
)->parse();
-   $betaDescriptionMsg = $this->msg( 
'mobile-frontend-opt-in-explain' )->parse();
-
-   $saveSettings = $this->msg( 'mobile-frontend-save-settings' 
)->escaped();
-   $action =

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Use Html messageBox helpers

2017-11-13 Thread Jdlrobson (Code Review)

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

Change subject: Use Html messageBox helpers
..

Use Html messageBox helpers

These helper methods are now upstreamed into core
(see T166915) and can be removed.

Change-Id: I94329791958251971e0b4817f814acf7a8ee34d6
Depends-On: I2757e1f4ff2599e93a7257fc644cab69063896d2
---
M includes/MobileUI.php
M includes/diff/InlineDifferenceEngine.php
M includes/specials/MobileSpecialPage.php
M includes/specials/SpecialMobileContributions.php
M includes/specials/SpecialMobileHistory.php
M includes/specials/SpecialMobilePreferences.php
6 files changed, 5 insertions(+), 56 deletions(-)


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

diff --git a/includes/MobileUI.php b/includes/MobileUI.php
index fe7f204..fa4b239 100644
--- a/includes/MobileUI.php
+++ b/includes/MobileUI.php
@@ -63,57 +63,6 @@
}
 
/**
-* Return a message box.
-* @param string $html of contents of box
-* @param string $className corresponding to box
-* @param string $heading (optional)
-* @return string of html representing a box.
-*/
-   public static function messageBox( $html, $className, $heading = '' ) {
-   $templateParser = new TemplateParser( __DIR__ . 
'/../resources/mobile.messageBox/' );
-
-   $templateOptions = [
-   'className' => $className,
-   'msg' => $html
-   ];
-   if ( $heading ) {
-   $templateOptions += [
-   'heading' => $heading,
-   'hasHeading' => true,
-   ];
-   }
-   return $templateParser->processTemplate( 'MessageBox', 
$templateOptions );
-   }
-
-   /**
-* Return a warning box.
-* @param string $html of contents of box
-* @return string of html representing a warning box.
-*/
-   public static function warningBox( $html ) {
-   return self::messageBox( $html, 'warningbox' );
-   }
-
-   /**
-* Return an error box.
-* @param string $html of contents of error box
-* @param string $heading (optional)
-* @return string of html representing an error box.
-*/
-   public static function errorBox( $html, $heading = '' ) {
-   return self::messageBox( $html, 'errorbox', $heading );
-   }
-
-   /**
-* Return a success box.
-* @param string $html of contents of box
-* @return string of html representing a success box.
-*/
-   public static function successBox( $html ) {
-   return self::messageBox( $html, 'successbox' );
-   }
-
-   /**
 * Mark some html as being content
 * @param string $html
 * @param string $className additional class names
diff --git a/includes/diff/InlineDifferenceEngine.php 
b/includes/diff/InlineDifferenceEngine.php
index 76e9ff4..10ee84c 100644
--- a/includes/diff/InlineDifferenceEngine.php
+++ b/includes/diff/InlineDifferenceEngine.php
@@ -78,7 +78,7 @@
 
$warnings = $this->getWarningMessageText();
if ( $warnings ) {
-   $warnings = MobileUI::warningBox( $warnings );
+   $warnings = Html::warningBox( $warnings );
}
$output->addHTML(
$warnings .
diff --git a/includes/specials/MobileSpecialPage.php 
b/includes/specials/MobileSpecialPage.php
index 2be1028..73ce4bd 100644
--- a/includes/specials/MobileSpecialPage.php
+++ b/includes/specials/MobileSpecialPage.php
@@ -82,7 +82,7 @@
$out = $this->getOutput();
$out->setPageTitle( $this->msg( 
'mobile-frontend-requires-title' ) );
$out->setProperty( 'unstyledContent', true );
-   $out->addHTML( MobileUI::warningBox( $msg ) );
+   $out->addHTML( Html::warningBox( $msg ) );
}
 
/**
diff --git a/includes/specials/SpecialMobileContributions.php 
b/includes/specials/SpecialMobileContributions.php
index 769f126..ad11304 100644
--- a/includes/specials/SpecialMobileContributions.php
+++ b/includes/specials/SpecialMobileContributions.php
@@ -116,7 +116,7 @@
} else {
// For users who exist but have not made any edits
$out->addHtml(
-   MobileUI::warningBox( $this->msg( 
'mobile-frontend-history-no-results' ) ) );
+   Html::warningBox( $this->msg( 
'mobile-frontend-history-no-results' ) ) );
}
}
 
diff --git a/includes/specials/SpecialMobileHistory.php 
b/includes/specials/SpecialMobileHistory.php
index e72dc06..1f7a806 100644
---

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Provide message/warning/error box abstraction

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Provide message/warning/error box abstraction
..


Provide message/warning/error box abstraction

This will help us consolidate the various uses into one single
method which will help us drive standardisation of these defacto
widgets.

Hopefully, by being a method of the Html class, which has a very
low barrier for use will drive down the inconsistent display of
warning/error boxes across MediaWiki's products

Various usages of warningbox and errorbox have been ported over.
I've retained some more complicated usages which make use of the
parser (wrapWikiMsg) and any where id and class are medled with
- we'll probably want to consider whether we want to encourage
those going forward as they encourage adjusting the styling.

Bug: T166915
Change-Id: I2757e1f4ff2599e93a7257fc644cab69063896d2
---
M RELEASE-NOTES-1.31
M includes/Html.php
M includes/exception/MWException.php
M includes/page/Article.php
M includes/skins/SkinFallbackTemplate.php
M includes/specials/SpecialEditTags.php
M includes/specials/SpecialMovepage.php
M includes/specials/SpecialRecentchangeslinked.php
M includes/specials/SpecialResetTokens.php
M includes/specials/SpecialRevisiondelete.php
M includes/specials/SpecialSearch.php
11 files changed, 73 insertions(+), 30 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 9ded68c..d9da9ac 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -20,6 +20,9 @@
 === New features in 1.31 ===
 * Wikimedia\Rdbms\IDatabase->select() and similar methods now support
   joins with parentheses for grouping.
+* As a first pass in standardizing dialog boxes across the MediaWiki product,
+Html class now provides helper methods for messageBox, successBox, errorBox and
+warningBox generation.
 
 === External library changes in 1.31 ===
 
diff --git a/includes/Html.php b/includes/Html.php
index 0988b05..524fdcd 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -676,6 +676,52 @@
}
 
/**
+* Return the HTML for a message box.
+* @since 1.31
+* @param string $html of contents of box
+* @param string $className corresponding to box
+* @param string $heading (optional)
+* @return string of HTML representing a box.
+*/
+   public static function messageBox( $html, $className, $heading = '' ) {
+   if ( $heading ) {
+   $html = self::element( 'h2', [], $heading ) . $html;
+   }
+   return self::rawElement( 'div', [ 'class' => $className ], 
$html );
+   }
+
+   /**
+* Return a warning box.
+* @since 1.31
+* @param string $html of contents of box
+* @return string of HTML representing a warning box.
+*/
+   public static function warningBox( $html ) {
+   return self::messageBox( $html, 'warningbox' );
+   }
+
+   /**
+* Return an error box.
+* @since 1.31
+* @param string $html of contents of error box
+* @param string $heading (optional)
+* @return string of HTML representing an error box.
+*/
+   public static function errorBox( $html, $heading = '' ) {
+   return self::messageBox( $html, 'errorbox', $heading );
+   }
+
+   /**
+* Return a success box.
+* @since 1.31
+* @param string $html of contents of box
+* @return string of HTML representing a success box.
+*/
+   public static function successBox( $html ) {
+   return self::messageBox( $html, 'successbox' );
+   }
+
+   /**
 * Convenience function to produce a radio button (input element with 
type=radio)
 *
 * @param string $name Name attribute
diff --git a/includes/exception/MWException.php 
b/includes/exception/MWException.php
index 8c1f8dc..c633431 100644
--- a/includes/exception/MWException.php
+++ b/includes/exception/MWException.php
@@ -102,7 +102,7 @@
} else {
$logId = WebRequest::getRequestId();
$type = static::class;
-   return "" .
+   return Html::errorBox(
'[' . $logId . '] ' .
gmdate( 'Y-m-d H:i:s' ) . ": " .
$this->msg( "internalerror-fatal-exception",
@@ -110,7 +110,7 @@
$type,
$logId,
MWExceptionHandler::getURL( $this )
-   ) . "\n" .
+   ) ) .
"";
diff --git a/includes/page/Article.php b/includes/page/Article.php
index df189af..c9dc273 100644
---

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP: make {{anchorencode:}} work with HTML5 section IDs

2017-11-13 Thread MaxSem (Code Review)

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

Change subject: WIP: make {{anchorencode:}} work with HTML5 section IDs
..

WIP: make {{anchorencode:}} work with HTML5 section IDs

Change-Id: If8098e3e839e8ba1cf27b6053017e818c556a733
---
M includes/parser/CoreParserFunctions.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/391141/1

diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index bb0072c..07944d4 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -930,7 +930,8 @@
 */
public static function anchorencode( $parser, $text ) {
$text = $parser->killMarkers( $text );
-   return (string)substr( $parser->guessSectionNameFromWikiText( 
$text ), 1 );
+   $section = (string)substr( 
$parser->guessSectionNameFromWikiText( $text ), 1 );
+   return Sanitizer::safeEncodeAttribute( $section );
}
 
public static function special( $parser, $text ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Tweak groupselector item styling

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Tweak groupselector item styling
..


Tweak groupselector item styling

The statsbar has explanatory text appearing under it when hovered.
There was not enough space and it overlapped with the border that
separates items. Tweaked positioning slightly so that there is now
enough space.

Change-Id: I9900dffda265825f9ee67a4619e6c13f2ea552e6
---
M resources/css/ext.translate.groupselector.css
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Petar.petkovic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/css/ext.translate.groupselector.css 
b/resources/css/ext.translate.groupselector.css
index 790120f..16eda48 100644
--- a/resources/css/ext.translate.groupselector.css
+++ b/resources/css/ext.translate.groupselector.css
@@ -117,10 +117,10 @@
 }
 
 .grid .tux-grouplist__item__label {
-   padding-bottom: 3px; /* grid override */
+   padding-bottom: 0; /* grid override */
padding-left: 15px; /* grid override */
font-weight: normal;
-   line-height: 40px;
+   line-height: 32px;
cursor: pointer;
white-space: nowrap;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9900dffda265825f9ee67a4619e6c13f2ea552e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Petar.petkovic 
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]: Replace Sanitizer::armorLinksCallback() with a closure

2017-11-13 Thread MaxSem (Code Review)

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

Change subject: Replace Sanitizer::armorLinksCallback() with a closure
..

Replace Sanitizer::armorLinksCallback() with a closure

Used only once, small enough. Perfect candidate to not be exposed
even as a private function.

Change-Id: Ic020a596f709cb4f69c48ffe8138f9023a5c4062
---
M includes/Sanitizer.php
1 file changed, 3 insertions(+), 10 deletions(-)


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

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 4c99677..889f3d5 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1161,7 +1161,9 @@
# Stupid hack
$encValue = preg_replace_callback(
'/((?i)' . wfUrlProtocols() . ')/',
-   [ 'Sanitizer', 'armorLinksCallback' ],
+   function ( $matches ) {
+   return str_replace( ':', '', $matches[1] );
+   },
$encValue );
return $encValue;
}
@@ -1404,15 +1406,6 @@
# don't cause the entire string to disappear.
$html = htmlspecialchars( $html, ENT_QUOTES | ENT_SUBSTITUTE );
return $html;
-   }
-
-   /**
-* Regex replace callback for armoring links against further processing.
-* @param array $matches
-* @return string
-*/
-   private static function armorLinksCallback( $matches ) {
-   return str_replace( ':', '', $matches[1] );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] labs...heritage[master]: [WIP] Fix bad idx entries

2017-11-13 Thread Lokal Profil (Code Review)

Lokal Profil has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391139 )

Change subject: [WIP] Fix bad idx entries
..

[WIP] Fix bad idx entries

The idx table is an ugly hack which concatenates four values only to
later explode it. But if the strings are too long for the field
parts are left out and as a result explodingthe value returns
the wrong number of fields.

WIP because:
* Something else is editing these values meaning the last two values
are lost before they reach makeIdx.

Bug: T174503
Change-Id: I42f6b0d97f52e99ac79a3960c21e91c1721b600c
---
M README.md
M api/includes/Statistics.php
2 files changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/README.md b/README.md
index 4a30350..a39f105 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,9 @@
 
 # Update the monuments_all table
 docker-compose run --rm db mysql -h db s51138__heritage_p --user=heritage 
--password=password < erfgoedbot/sql/fill_table_monuments_all.sql
+
+# Update the statistics table
+docker-compose run --rm web php ../maintenance/_buildStats.php
 ```
 
 The web interface will be accessible on http://localhost:8000/
diff --git a/api/includes/Statistics.php b/api/includes/Statistics.php
index 859e5c0..e08f996 100644
--- a/api/includes/Statistics.php
+++ b/api/includes/Statistics.php
@@ -15,6 +15,9 @@
var $axis = [];
static $fieldPrefix = 'st_';
 
+   // must be at least 25 less than max length for idx field
+   static $maxMuniLength = 70;
+
var $lastDay = '';
static $aItems = [
'address', 'address_pct', 'coordinates', 'coordinates_pct', 
'image',
@@ -100,6 +103,9 @@
static function makeIdx( $row ) {
// Need to replace any naturally occuring ':' in row[1]
$muni = str_replace( ':', '', $row[1] );
+   if ( strlen( $muni ) >= Statistics::$maxMuniLength ) {
+   $muni = substr( $muni, 0, Statistics::$maxMuniLength - 
1 ) . '…';
+   }
return $row[0] . ':' . $muni . ':' . $row[2] . ':' . $row[3];
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42f6b0d97f52e99ac79a3960c21e91c1721b600c
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil 

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

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Add Spanish Wikipedia to list of wikis that have mapframe en...

2017-11-13 Thread Bearloga (Code Review)

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

Change subject: Add Spanish Wikipedia to list of wikis that have mapframe 
enabled
..


Add Spanish Wikipedia to list of wikis that have mapframe enabled

Bug: T170022
Bug: T177695
Change-Id: Ia3ba0f9157fa286593d432b2d32cc73e2ddd98c0
---
M modules/metrics/maps/prevalence.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/metrics/maps/prevalence.yaml 
b/modules/metrics/maps/prevalence.yaml
index f66d14e..2dafec0 100644
--- a/modules/metrics/maps/prevalence.yaml
+++ b/modules/metrics/maps/prevalence.yaml
@@ -12,6 +12,7 @@
 - uawiki # as of August 2017 (T171805)
 - euwiki # as of August 2017 (T171805)
 - ptwiki # as of August 2017 (T171805)
+- eswiki # as of October 2017 (T177695)
   miscellaneous: # enabled for the following:
 - mediawikiwiki
 - metawiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3ba0f9157fa286593d432b2d32cc73e2ddd98c0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] wikimedia...golden[master]: Add Spanish Wikipedia to list of wikis that have mapframe en...

2017-11-13 Thread Bearloga (Code Review)

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

Change subject: Add Spanish Wikipedia to list of wikis that have mapframe 
enabled
..

Add Spanish Wikipedia to list of wikis that have mapframe enabled

Bug: T170022
Bug: T177695
Change-Id: Ia3ba0f9157fa286593d432b2d32cc73e2ddd98c0
---
M modules/metrics/maps/prevalence.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/golden 
refs/changes/38/391138/1

diff --git a/modules/metrics/maps/prevalence.yaml 
b/modules/metrics/maps/prevalence.yaml
index f66d14e..2dafec0 100644
--- a/modules/metrics/maps/prevalence.yaml
+++ b/modules/metrics/maps/prevalence.yaml
@@ -12,6 +12,7 @@
 - uawiki # as of August 2017 (T171805)
 - euwiki # as of August 2017 (T171805)
 - ptwiki # as of August 2017 (T171805)
+- eswiki # as of October 2017 (T177695)
   miscellaneous: # enabled for the following:
 - mediawikiwiki
 - metawiki

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3ba0f9157fa286593d432b2d32cc73e2ddd98c0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/golden
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

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

2017-11-13 Thread Jforrester (Code Review)

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

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

Update VE core submodule to master (d9059cd50)

New changes:
b879aeea1 git.wikimedia.org removals
f76f117ed Revert "git.wikimedia.org removals"
8d55f4ac9 Localisation updates from https://translatewiki.net.
c82f7171f Localisation updates from https://translatewiki.net.
d9059cd50 Fix visual diff timeout

Bug: T139089
Bug: T177378
Change-Id: If90a6fee33759be9355d966f9ccd648d2a12003d
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/lib/ve b/lib/ve
index bf37a87..d9059cd 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit bf37a87d2a16a1514a3829e3e5ff3a3d57244528
+Subproject commit d9059cd5092380649f98a08d6d732ea3dbac4e9f

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If90a6fee33759be9355d966f9ccd648d2a12003d
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] mediawiki...parsoid[master]: T178253: Handle pipe ending table attributes in figure captions

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: T178253: Handle pipe ending table attributes in figure captions
..


T178253: Handle pipe ending table attributes in figure captions

 * Fixes 
http://localhost:8000/nl.wikipedia.org/v3/page/html/Klimaatclassificatie_van_K%C3%B6ppen/50339930

 * We do this by providing a nested parsing context in which to parse
   the table.

   In the php parser, `doTableStuff` happens before
   `replaceInternalLinks` so none of the table syntax pipes should ever
   be breaking for a "linkdesc".  The only place this is really an issue
   currently are the two "table_attributes" instances in "table_row_tag"
   and "table_start_tag" where we don't normally break on pipes, since
   they're optional because the php parser considers the rest of the
   line as attributes.  That permits nonsense like,

   {| testing | class="four"
   | ha
   |}

   In the common case, it would be sufficient to just optionally capture
   pipes there at those places with `(spaces* pipe)?` and be done with
   it.

   However, this more permissive solution seems slightly more robust and
   is likelier to match the users intent.  For example,

   [[File:Foobar.jpg|thumb|
   {|
   | hi
 ho | jo
   |}
   ]]

   Here, the php parser would break on the pipe in " ho | jo" since that
   isn't valid table syntax, but we're tokenizing it as raw text in the
   table cell.

   Unfortunately, the support for templates returning options as
   pipe-separated strings in `renderFile` breaks that for us, matching
   the php parser rendering.

Change-Id: I88f54399094d21a1a9db769cd46a1258691459a9
---
M lib/wt2html/pegTokenizer.pegjs
M lib/wt2html/tt/LinkHandler.js
M tests/parserTests.txt
3 files changed, 34 insertions(+), 2 deletions(-)

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



diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index c8fc9d7..8a91a14 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -1725,7 +1725,12 @@
 full_table_in_link_caption
   = (! inline_breaks / & '{{!}}' )
 r:(
-& { return stops.push('table', true); }
+// Note that "linkdesc" is suppressed here to provide a nested parsing
+// context in which to parse the table.  Otherwise, we may break on
+// on pipes in the `table_start_tag` and `table_row_tag` attributes.
+// However, as a result, this can be more permissive than the current
+// php implementation, but likelier to match the users intent.
+& { stops.push('linkdesc', false); return stops.push('table', true); }
 tbl:(
 table_start_tag optionalNewlines
 // Accept multiple end tags since a nested table may have been
@@ -1733,10 +1738,11 @@
 ((sol table_content_line optionalNewlines)*
 sol table_end_tag)+
 ){
+stops.pop('linkdesc');
 stops.pop('table');
 return tbl;
 }
-  / & { return stops.pop('table'); }
+  / & { stops.pop('linkdesc'); return stops.pop('table'); }
 ) { return r; }
 
 table_lines
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index b6d7aa8..77c4858 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1673,6 +1673,12 @@
// image options as a pipe-separated string. We 
aren't
// really providing editing support for this 
yet, or
// ever, maybe.
+   //
+   // TODO(arlolra): Tables in captions suppress 
breaking on
+   // "linkdesc" pipes so `stringifyOptionTokens` 
should account
+   // for pipes in table cell content.  For the 
moment, breaking
+   // here is acceptable since it matches the php 
implementation
+   // bug for bug.
var pieces = oText.split("|").map(function(s) {
return new KV("mw:maybeContent", s);
});
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index ff574d1..4b5f7ab 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -14835,6 +14835,26 @@
 !! end
 
 !! test
+Image with table with attributes in caption
+!! options
+parsoid=wt2html,html2html
+!! wikitext
+[[File:Foobar.jpg|thumb|
+{| class="123" |
+|- class="456" |
+| ha
+|}
+]]
+!! html/parsoid
+
+
+
+ ha
+
+
+!! end
+
+!! test
 Image with nested tables in caption
 !! wikitext
 [[File:Foobar.jpg|thumb|Foo

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

Gerrit-MessageType: merged

[MediaWiki-commits] [Gerrit] integration/config[master]: Added trigger-service-pipeline jobs

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Added trigger-service-pipeline jobs
..


Added trigger-service-pipeline jobs

Defined two new freestyle jobs that trigger the service-pipeline jobs
using the `trigger-jobs` builder, essentially serving as proxies between
the latter and Gearman. Gearman does not currently support triggering
`project-type: pipeline` jobs directly.

Bug: T177954
Change-Id: I12f16d31da03bfd861a627a158b88b0a32a031e8
---
M jjb/service-pipeline.yaml
M zuul/layout.yaml
2 files changed, 38 insertions(+), 16 deletions(-)

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



diff --git a/jjb/service-pipeline.yaml b/jjb/service-pipeline.yaml
index 239833d..3934128 100644
--- a/jjb/service-pipeline.yaml
+++ b/jjb/service-pipeline.yaml
@@ -1,27 +1,49 @@
-- job: 
+- job:
+name: 'trigger-service-pipeline'
+defaults: global
+node: ServicePipelineProduction
+parameters: 
+  - string:
+  name: ZUUL_URL
+  - string:
+  name: ZUUL_PROJECT
+  - string:
+  name: ZUUL_COMMIT
+  - string:
+  name: ZUUL_REF
+builders:
+  - trigger-builds:
+- project: service-pipeline
+  current-parameters: true
+  block: true
+  same-node: true
+
+- job:
+name: 'trigger-service-pipeline-test-only'
+defaults: global
+node: DebianJessieDocker
+parameters: *service-pipeline-parameters
+builders:
+  - trigger-builds:
+- project: service-pipeline-test-only
+  current-parameters: true
+  block: true
+  same-node: true
+
+- job:
 name: 'service-pipeline'
 defaults: global
 project-type: pipeline
-parameters:
-  - string: 
-  name: ZUUL_URL
-  default: https://gerrit.wikimedia.org/r
-  - string:
-  name: ZUUL_PROJECT
-  default: mediawiki/services/mathoid
-  - string:
-  name: ZUUL_COMMIT
-  default: ce18f7a9e18cc60b4162506612d2192ac8c2b8d6
-  - string:
-  name: ZUUL_REF
-  default: refs/changes/19/376319/3
+parameters: *service-pipeline-parameters
 dsl: !include-raw:
   - service-pipeline-production.groovy
   - service-pipeline.groovy
 
 - job:
-<<: *job-service-pipeline
 name: 'service-pipeline-test-only'
+defaults: global
+project-type: pipeline
+parameters: *service-pipeline-parameters
 dsl: !include-raw:
   - service-pipeline-test.groovy
   - service-pipeline.groovy
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5fe6463..f547e5f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1237,7 +1237,7 @@
 gate-and-submit-swat: *npm-service-pipeline-gate-and-submit
 experimental:
   - npm-node-6-docker
-  - service-pipeline-test-only
+  - trigger-service-pipeline-test-only
 
   - name: mwgate-npm
 test:

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Added trigger-service-pipeline jobs

2017-11-13 Thread Dduvall (Code Review)

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

Change subject: Added trigger-service-pipeline jobs
..

Added trigger-service-pipeline jobs

Defined two new freestyle jobs that trigger the service-pipeline jobs
using the `trigger-jobs` builder, essentially serving as proxies between
the latter and Gearman. Gearman does not currently support triggering
`project-type: pipeline` jobs directly.

Bug: T177954
Change-Id: I12f16d31da03bfd861a627a158b88b0a32a031e8
---
M jjb/service-pipeline.yaml
M zuul/layout.yaml
2 files changed, 38 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/36/391136/1

diff --git a/jjb/service-pipeline.yaml b/jjb/service-pipeline.yaml
index 239833d..412f332 100644
--- a/jjb/service-pipeline.yaml
+++ b/jjb/service-pipeline.yaml
@@ -1,27 +1,49 @@
-- job: 
+- job:
+name: 'trigger-service-pipeline'
+defaults: global
+node: ServicePipelineProduction
+parameters: 
+  - string: 
+  name: ZUUL_URL
+  - string:
+  name: ZUUL_PROJECT
+  - string:
+  name: ZUUL_COMMIT
+  - string:
+  name: ZUUL_REF
+builders:
+  - trigger-builds:
+- project: service-pipeline
+  current-parameters: true
+  block: true
+  same-node: true
+
+- job:
+name: 'trigger-service-pipeline-test-only'
+defaults: global
+node: DebianJessieDocker
+parameters: *service-pipeline-parameters
+builders:
+  - trigger-builds:
+- project: service-pipeline-test-only
+  current-parameters: true
+  block: true
+  same-node: true
+
+- job:
 name: 'service-pipeline'
 defaults: global
 project-type: pipeline
-parameters:
-  - string: 
-  name: ZUUL_URL
-  default: https://gerrit.wikimedia.org/r
-  - string:
-  name: ZUUL_PROJECT
-  default: mediawiki/services/mathoid
-  - string:
-  name: ZUUL_COMMIT
-  default: ce18f7a9e18cc60b4162506612d2192ac8c2b8d6
-  - string:
-  name: ZUUL_REF
-  default: refs/changes/19/376319/3
+parameters: *service-pipeline-parameters
 dsl: !include-raw:
   - service-pipeline-production.groovy
   - service-pipeline.groovy
 
 - job:
-<<: *job-service-pipeline
 name: 'service-pipeline-test-only'
+defaults: global
+project-type: pipeline
+parameters: *service-pipeline-parameters
 dsl: !include-raw:
   - service-pipeline-test.groovy
   - service-pipeline.groovy
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5fe6463..f547e5f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1237,7 +1237,7 @@
 gate-and-submit-swat: *npm-service-pipeline-gate-and-submit
 experimental:
   - npm-node-6-docker
-  - service-pipeline-test-only
+  - trigger-service-pipeline-test-only
 
   - name: mwgate-npm
 test:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Sanitizer::safeEncodeAttribute(): also encode ]

2017-11-13 Thread MaxSem (Code Review)

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

Change subject: Sanitizer::safeEncodeAttribute(): also encode ]
..

Sanitizer::safeEncodeAttribute(): also encode ]

...so that it wouldn't break wikilinks, too.

Bug: T29694
Change-Id: I189bdefbc9034cf8d221a89d7158195de1c0fa6c
---
M includes/Sanitizer.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/35/391135/1

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 4c99677..46cf2a5 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1150,6 +1150,7 @@
'{'=> '',
'}'=> '', // prevent unpaired language 
conversion syntax
'['=> '',
+   ']'=> '',
"''"   => '',
'ISBN' => 'SBN',
'RFC'  => 'FC',

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] Add cergen module

2017-11-13 Thread Ottomata (Code Review)

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

Change subject: [WIP] Add cergen module
..

[WIP] Add cergen module

has not been tested, just some ideas atm.

Bug: T166167
Change-Id: I26c3072f4f4d1b8dd73b9e123263b09b5972b045
---
A modules/cergen/manifests/certificate.pp
A modules/cergen/manifests/init.pp
A modules/cergen/manifests/manifest.pp
A modules/cergen/templates/certificate.yaml.erb
4 files changed, 131 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/391134/1

diff --git a/modules/cergen/manifests/certificate.pp 
b/modules/cergen/manifests/certificate.pp
new file mode 100644
index 000..1e11b69
--- /dev/null
+++ b/modules/cergen/manifests/certificate.pp
@@ -0,0 +1,78 @@
+# == Define cergen::certificate
+# == Parameters
+# arguments
+#
+define cergen::certificate (
+$destination,
+$manifest,
+# TODO: use ensure
+$ensure  = 'present',
+$owner   = 'root',
+$group   = 'root',
+$include_private_key = false,
+) {
+include ::passwords::certificates
+$password = $::passwords::certificates::certificates[$title]
+
+$defaults = {
+'authority' =>  'puppet_ca',
+'subject' => {
+'country_name' => 'US',
+'state_or_province_name' => 'CA',
+'locality_name' => 'San Francisco',
+'organization_name' => 'Wikimedia Foundation',
+},
+'expiry' => 'null',
+'key' => {
+'algorithm' => 'ec',
+'password' => $password,
+}
+}
+$certificate_manifest = deep_merge($manifest, $defaults)
+
+@@cergen::manifest { $title:
+ensure  => $ensure,
+content => template('cergen/certificate.yaml.erb'),
+}
+
+# TODO: automatically run cergen --generate using puppet generate() 
function?!
+
+# TODO: Assuming the file is on the puppet master, now render it?
+# Or, should this be a separate define?
+
+# base-path: 
/etc/puppet/private/modules/secret/files/certificates/certs/$name/
+# base-private-path: 
/etc/puppet/private/modules/secret/secrets/certficates/private/$name/
+
+# Default subsequent file resources with these.
+File {
+owner => $owner,
+group => $group,
+mode  => '0400',
+}
+
+file { $destination:
+ensure  => 'directory',
+mode=> '0555',
+# Puppet will fully manage this directory.  Any files in
+# this directory that are not managed by puppet will be deleted.
+recurse => true,
+purge   => true,
+}
+
+file { "${destination}":
+ensure  => 'directory',
+mode=> '0555',
+# Puppet will fully manage this directory.  Any files in
+# this directory that are not managed by puppet will be deleted.
+recurse => true,
+purge   => true,
+source  => "puppet:///secret/certificates/certs/${title}"
+}
+
+if $include_private_key {
+file { "${destination}/{title}.key.private.pem":
+ensure  => 'directory',
+content => 
secret("certificates/private/${title}/${title}.key.private.pem"),
+}
+}
+}
diff --git a/modules/cergen/manifests/init.pp b/modules/cergen/manifests/init.pp
new file mode 100644
index 000..8ee3af6
--- /dev/null
+++ b/modules/cergen/manifests/init.pp
@@ -0,0 +1,16 @@
+# == Class cergen
+# Installs cergen and ensure that /etc/cergen/manifests.d exists.
+#
+class cergen
+{
+require_package('cergen')
+
+$manifests_path = '/etc/cergen/manifests.d'
+
+file { ['/etc/cergen', $manifests_path]:
+ensure => 'directory',
+}
+
+# Collect all exported cergen certificate manifests.
+Cergen_manifest <<||>>
+}
diff --git a/modules/cergen/manifests/manifest.pp 
b/modules/cergen/manifests/manifest.pp
new file mode 100644
index 000..3cf8169
--- /dev/null
+++ b/modules/cergen/manifests/manifest.pp
@@ -0,0 +1,35 @@
+# == Define cergen
+# Installs a cergen certificate manifest file into /etc/cergen/manifests.d
+# This does not handle generation of certificates with cergen CLI.
+# You should manually run cergen CLI and commit the resulting files to puppet 
and private
+# repositories.
+#
+# Parameters:
+# [*ensure*]
+#
+# [*source*]
+#
+# [*content*]
+#
+define cergen::manifest(
+$ensure  = 'present',
+$source  = undef,
+$content = undef,
+) {
+require ::cergen
+
+if $source == undef and $content == undef and $ensure == 'present' {
+fail('you must provide either "source" or "content", or ensure must be 
"absent"')
+}
+
+if $source != undef and $content != undef  {
+fail('"source" and "content" are mutually exclusive')
+}
+
+file { "${::cergen::manifests_path}/${title}.yaml":
+ensure  => $ensure,
+mode=> '0400'
+content =>

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Tweak: Don't report git tag is applied if signing fails

2017-11-13 Thread Mholloway (Code Review)

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

Change subject: Tweak: Don't report git tag is applied if signing fails
..

Tweak: Don't report git tag is applied if signing fails

Change-Id: I0c33ce3dd333511365181d820243d48cf2d1e1d2
---
M scripts/tag-deploy.sh
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/scripts/tag-deploy.sh b/scripts/tag-deploy.sh
index a8926bf..8830005 100755
--- a/scripts/tag-deploy.sh
+++ b/scripts/tag-deploy.sh
@@ -35,5 +35,4 @@
 
 # Tag the latest code repo commit with it & push tags
 cd "$repo_dir"
-git tag -s "$tag" -m "deployed" && git push --tags
-printf "Applied new tag: $tag"
+git tag -s "$tag" -m "deployed" && git push --tag && printf "Applied new tag: 
$tag\n"

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix: Incorrect language counts

2017-11-13 Thread Cooltey (Code Review)

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

Change subject: Fix: Incorrect language counts
..

Fix: Incorrect language counts

 - Update the language counts when the article is in Chinese (should +1 if it's 
in Traditional or Simplified Chinese)

BUG: T180182
Change-Id: I4c40b7edcf9324404ccff9c7c99540e03fc0b114
---
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
M app/src/main/java/org/wikipedia/util/L10nUtil.java
2 files changed, 24 insertions(+), 4 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
index d43dc68..1a8fe01 100644
--- a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
+++ b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
@@ -37,6 +37,7 @@
 import org.wikipedia.search.SearchResults;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.GeoUtil;
+import org.wikipedia.util.L10nUtil;
 import org.wikipedia.util.StringUtil;
 import org.wikipedia.util.log.L;
 import org.wikipedia.views.ConfigurableTextView;
@@ -265,12 +266,18 @@
 
pageLastUpdatedText.setText(parentFragment.getString(R.string.last_updated_text,
 
formatDateRelative(page.getPageProperties().getLastModified(;
 pageLastUpdatedText.setVisibility(View.VISIBLE);
-
 pageTalkContainer.setVisibility(page.getTitle().namespace() == 
Namespace.TALK ? GONE : VISIBLE);
 
-
pageLanguagesContainer.setVisibility(page.getPageProperties().getLanguageCount()
 == 0 ? GONE : VISIBLE);
-
pageLanguagesCount.setText(parentFragment.getString(R.string.language_count_link_text,
-page.getPageProperties().getLanguageCount()));
+/**
+ * TODO: It only updates the count when the article is in Chinese.
+ * If an article is also available in Chinese, the count will be less 
one.
+ * @see LangLinksActivity.java updateLanguageEntriesSupported()
+ */
+int getLanguageCount = 
L10nUtil.getUpdatedLanguageCountIfNeeded(page.getTitle().getWikiSite().languageCode(),
+page.getPageProperties().getLanguageCount());
+
+pageLanguagesContainer.setVisibility(getLanguageCount == 0 ? GONE : 
VISIBLE);
+
pageLanguagesCount.setText(parentFragment.getString(R.string.language_count_link_text,
 getLanguageCount));
 
 pageMapContainer.setVisibility(page.getPageProperties().getGeo() == 
null ? GONE : VISIBLE);
 
diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java 
b/app/src/main/java/org/wikipedia/util/L10nUtil.java
index fcb9cf1..a4b015b 100644
--- a/app/src/main/java/org/wikipedia/util/L10nUtil.java
+++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java
@@ -225,6 +225,19 @@
 }
 }
 
+public static int getUpdatedLanguageCountIfNeeded(String getLanguageCode, 
int originalLanguageCount) {
+
+int updatedLanguageCount = originalLanguageCount;
+
+if (getLanguageCode.equals(CHINESE_LANGUAGE_CODE)) {
+updatedLanguageCount = updatedLanguageCount + 2; // for both 
Traditional and Simplified
+} else if (getLanguageCode.equals(TRADITIONAL_CHINESE_LANGUAGE_CODE) 
|| getLanguageCode.equals(SIMPLIFIED_CHINESE_LANGUAGE_CODE)) {
+updatedLanguageCount = updatedLanguageCount + 1;
+}
+
+return updatedLanguageCount;
+}
+
 private L10nUtil() {
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Re-add FullCalendar < 3 for use by MW < 1.30

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Re-add FullCalendar < 3 for use by MW < 1.30
..


Re-add FullCalendar < 3 for use by MW < 1.30

Change-Id: Ic49cfdc3e29b21700451edc3631cf61706135fa1
---
M Cargo.php
M extension.json
M formats/CargoCalendarFormat.php
A libs/FullCalendar/2.9.1/fullcalendar.css
A libs/FullCalendar/2.9.1/fullcalendar.js
A libs/FullCalendar/2.9.1/lang-all.js
R libs/FullCalendar/3.6.2/fullcalendar.css
R libs/FullCalendar/3.6.2/fullcalendar.js
R libs/FullCalendar/3.6.2/locale-all.js
A libs/FullCalendar/README
M libs/ext.cargo.calendar.js
11 files changed, 14,527 insertions(+), 9 deletions(-)

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




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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Re-add FullCalendar < 3 for use by MW < 1.30

2017-11-13 Thread Yaron Koren (Code Review)

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

Change subject: Re-add FullCalendar < 3 for use by MW < 1.30
..

Re-add FullCalendar < 3 for use by MW < 1.30

Change-Id: Ic49cfdc3e29b21700451edc3631cf61706135fa1
---
M Cargo.php
M extension.json
M formats/CargoCalendarFormat.php
A libs/FullCalendar/2.9.1/fullcalendar.css
A libs/FullCalendar/2.9.1/fullcalendar.js
A libs/FullCalendar/2.9.1/lang-all.js
R libs/FullCalendar/3.6.2/fullcalendar.css
R libs/FullCalendar/3.6.2/fullcalendar.js
R libs/FullCalendar/3.6.2/locale-all.js
A libs/FullCalendar/README
M libs/ext.cargo.calendar.js
11 files changed, 14,527 insertions(+), 9 deletions(-)


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


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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: reserve internal anycast range

2017-11-13 Thread Ayounsi (Code Review)

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

Change subject: reserve internal anycast range
..

reserve internal anycast range

Change-Id: Ie97f0e89fce277d3e09835c3083d30d8c78446d6
---
M templates/10.in-addr.arpa
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/31/391131/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0ed7330..402a984 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -99,6 +99,12 @@
 
 $ORIGIN 5.2.{{ zonename }}.
 
+; 10.3.0.0/24 - Internal anycast services
+
+$ORIGIN 0.3.{{ zonename }}.
+
+
+
 ;
 ; ESAMS
 ;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie97f0e89fce277d3e09835c3083d30d8c78446d6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to c002862

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Update mobileapps to c002862
..


Update mobileapps to c002862

List of changes:
6a3505d Suppress not-yet-deployed REST API URLs
6194927 Use the underlying page HTML tid in page content endpoint etags
82b1b27 Expose tid in the summary 2.0 output
4fe87da Remove mobile-sections URL from summary API URLs
56e9c8e Move namespace_id and namespace_text to top level
76c0d83 Clean up titles object keys
45d2785 Hygiene: Disentangle summary construction from lead object construction
414461f Hygiene: Delete template docs
bfaca54 Update to service-template-node v0.5.3
cc3433f Summary 2.0: Add mobile content URLs
d554068 Update namespace output to { id, title } object
xxx Update node module dependencies

Change-Id: I9fb9b9b98d68530b45d04ad5f516487fd54b43c8
---
M node_modules/bluebird/package.json
M node_modules/body-parser/package.json
M node_modules/bunyan/package.json
M node_modules/compression/package.json
M node_modules/cryptiles/.npmignore
M node_modules/domino/package.json
M node_modules/esprima/dist/esprima.js
M node_modules/express/package.json
M node_modules/hawk/.npmignore
A node_modules/http-shutdown/.npmignore
A node_modules/http-shutdown/.travis.yml
A node_modules/http-shutdown/LICENSE
A node_modules/http-shutdown/index.js
A node_modules/http-shutdown/package.json
A node_modules/http-shutdown/test.js
M node_modules/js-yaml/package.json
M node_modules/json-schema/draft-00/hyper-schema
M node_modules/json-schema/draft-00/json-ref
M node_modules/json-schema/draft-00/links
M node_modules/json-schema/draft-00/schema
M node_modules/json-schema/draft-01/hyper-schema
M node_modules/json-schema/draft-01/json-ref
M node_modules/json-schema/draft-01/links
M node_modules/json-schema/draft-01/schema
M node_modules/json-schema/draft-02/hyper-schema
M node_modules/json-schema/draft-02/json-ref
M node_modules/json-schema/draft-02/links
M node_modules/json-schema/draft-02/schema
M node_modules/json-schema/draft-03/examples/address
M node_modules/json-schema/draft-03/examples/calendar
M node_modules/json-schema/draft-03/examples/card
M node_modules/json-schema/draft-03/examples/geo
M node_modules/json-schema/draft-03/examples/interfaces
M node_modules/json-schema/draft-03/hyper-schema
M node_modules/json-schema/draft-03/json-ref
M node_modules/json-schema/draft-03/links
M node_modules/json-schema/draft-03/schema
M node_modules/json-schema/draft-04/hyper-schema
M node_modules/json-schema/draft-04/links
M node_modules/json-schema/draft-04/schema
M node_modules/json-schema/draft-zyp-json-schema-03.xml
M node_modules/json-schema/draft-zyp-json-schema-04.xml
M node_modules/json-schema/lib/links.js
M node_modules/json-schema/lib/validate.js
M node_modules/json-schema/test/tests.js
M node_modules/kad/package.json
M node_modules/long/.npmignore
M node_modules/long/.travis.yml
M node_modules/long/LICENSE
M node_modules/long/bower.json
M node_modules/long/dist/Long.js
M node_modules/long/externs/Long.js
M node_modules/long/index.js
M node_modules/long/jsdoc.json
M node_modules/long/scripts/build.js
M node_modules/long/src/Long.js
M node_modules/long/src/bower.json
M node_modules/long/src/wrap.js
M node_modules/long/tests/goog.math.long.js
M node_modules/long/tests/suite.js
M node_modules/mediawiki-title/.jscs.json
M node_modules/mediawiki-title/.jshintignore
D node_modules/mediawiki-title/.npmignore
M node_modules/mediawiki-title/.travis.yml
M node_modules/mediawiki-title/lib/index.js
A node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M node_modules/merge/LICENSE
M node_modules/merge/merge.js
M node_modules/merge/merge.min.js
M node_modules/moment/min/moment-with-locales.js
M node_modules/moment/min/moment-with-locales.min.js
M node_modules/moment/min/moment.min.js
M node_modules/moment/moment.js
M node_modules/moment/package.json
M node_modules/moment/src/lib/locale/locales.js
M node_modules/moment/src/lib/moment/get-set.js
M node_modules/moment/src/moment.js
M node_modules/preq/.travis.yml
M node_modules/preq/index.js
M node_modules/preq/package.json
M node_modules/service-runner/lib/logger.js
M node_modules/service-runner/lib/statsd.js
M node_modules/service-runner/package.json
M node_modules/sntp/.npmignore
D node_modules/swagger-router/config.example.yaml
D node_modules/swagger-router/interfaces/mediawiki-content.yaml
M node_modules/swagger-router/lib/node.js
M node_modules/swagger-router/lib/reqTemplate.js
M node_modules/swagger-router/lib/router.js
M node_modules/swagger-router/package.json
M node_modules/swagger-router/test/features/reqTemplate.js
M node_modules/swagger-router/test/features/router.js
A node_modules/swagger-ui/.dockerignore
A node_modules/swagger-ui/.jshintignore
A node_modules/swagger-ui/.jshintrc
A

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mobileapps to c002862

2017-11-13 Thread Mholloway (Code Review)

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

Change subject: Update mobileapps to c002862
..

Update mobileapps to c002862

List of changes:
6a3505d Suppress not-yet-deployed REST API URLs
6194927 Use the underlying page HTML tid in page content endpoint etags
82b1b27 Expose tid in the summary 2.0 output
4fe87da Remove mobile-sections URL from summary API URLs
56e9c8e Move namespace_id and namespace_text to top level
76c0d83 Clean up titles object keys
45d2785 Hygiene: Disentangle summary construction from lead object construction
414461f Hygiene: Delete template docs
bfaca54 Update to service-template-node v0.5.3
cc3433f Summary 2.0: Add mobile content URLs
d554068 Update namespace output to { id, title } object
xxx Update node module dependencies

Change-Id: I9fb9b9b98d68530b45d04ad5f516487fd54b43c8
---
M node_modules/bluebird/package.json
M node_modules/body-parser/package.json
M node_modules/bunyan/package.json
M node_modules/compression/package.json
M node_modules/cryptiles/.npmignore
M node_modules/domino/package.json
M node_modules/esprima/dist/esprima.js
M node_modules/express/package.json
M node_modules/hawk/.npmignore
A node_modules/http-shutdown/.npmignore
A node_modules/http-shutdown/.travis.yml
A node_modules/http-shutdown/LICENSE
A node_modules/http-shutdown/index.js
A node_modules/http-shutdown/package.json
A node_modules/http-shutdown/test.js
M node_modules/js-yaml/package.json
M node_modules/json-schema/draft-00/hyper-schema
M node_modules/json-schema/draft-00/json-ref
M node_modules/json-schema/draft-00/links
M node_modules/json-schema/draft-00/schema
M node_modules/json-schema/draft-01/hyper-schema
M node_modules/json-schema/draft-01/json-ref
M node_modules/json-schema/draft-01/links
M node_modules/json-schema/draft-01/schema
M node_modules/json-schema/draft-02/hyper-schema
M node_modules/json-schema/draft-02/json-ref
M node_modules/json-schema/draft-02/links
M node_modules/json-schema/draft-02/schema
M node_modules/json-schema/draft-03/examples/address
M node_modules/json-schema/draft-03/examples/calendar
M node_modules/json-schema/draft-03/examples/card
M node_modules/json-schema/draft-03/examples/geo
M node_modules/json-schema/draft-03/examples/interfaces
M node_modules/json-schema/draft-03/hyper-schema
M node_modules/json-schema/draft-03/json-ref
M node_modules/json-schema/draft-03/links
M node_modules/json-schema/draft-03/schema
M node_modules/json-schema/draft-04/hyper-schema
M node_modules/json-schema/draft-04/links
M node_modules/json-schema/draft-04/schema
M node_modules/json-schema/draft-zyp-json-schema-03.xml
M node_modules/json-schema/draft-zyp-json-schema-04.xml
M node_modules/json-schema/lib/links.js
M node_modules/json-schema/lib/validate.js
M node_modules/json-schema/test/tests.js
M node_modules/kad/package.json
M node_modules/long/.npmignore
M node_modules/long/.travis.yml
M node_modules/long/LICENSE
M node_modules/long/bower.json
M node_modules/long/dist/Long.js
M node_modules/long/externs/Long.js
M node_modules/long/index.js
M node_modules/long/jsdoc.json
M node_modules/long/scripts/build.js
M node_modules/long/src/Long.js
M node_modules/long/src/bower.json
M node_modules/long/src/wrap.js
M node_modules/long/tests/goog.math.long.js
M node_modules/long/tests/suite.js
M node_modules/mediawiki-title/.jscs.json
M node_modules/mediawiki-title/.jshintignore
D node_modules/mediawiki-title/.npmignore
M node_modules/mediawiki-title/.travis.yml
M node_modules/mediawiki-title/lib/index.js
A node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M node_modules/merge/LICENSE
M node_modules/merge/merge.js
M node_modules/merge/merge.min.js
M node_modules/moment/min/moment-with-locales.js
M node_modules/moment/min/moment-with-locales.min.js
M node_modules/moment/min/moment.min.js
M node_modules/moment/moment.js
M node_modules/moment/package.json
M node_modules/moment/src/lib/locale/locales.js
M node_modules/moment/src/lib/moment/get-set.js
M node_modules/moment/src/moment.js
M node_modules/preq/.travis.yml
M node_modules/preq/index.js
M node_modules/preq/package.json
M node_modules/service-runner/lib/logger.js
M node_modules/service-runner/lib/statsd.js
M node_modules/service-runner/package.json
M node_modules/sntp/.npmignore
D node_modules/swagger-router/config.example.yaml
D node_modules/swagger-router/interfaces/mediawiki-content.yaml
M node_modules/swagger-router/lib/node.js
M node_modules/swagger-router/lib/reqTemplate.js
M node_modules/swagger-router/lib/router.js
M node_modules/swagger-router/package.json
M node_modules/swagger-router/test/features/reqTemplate.js
M node_modules/swagger-router/test/features/router.js
A node_modules/swagger-ui/.dockerignore
A node_modules/swagger-ui/.jshintignore
A node_modules/swagger-ui/.jshintrc
A

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: fix call to changesListModel.update()

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: fix call to changesListModel.update()
..


RCFilters: fix call to changesListModel.update()

Followup to Ie2bc4fe4bd19103b513e4753e59f4adb295fbafa

3rd argument is
  {string} noResultsDetails Type of no result error
... not a boolean (isTimeout) like it used to.

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

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index d519648..5386291 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -262,7 +262,7 @@
this.changesListModel.update(
pieces.changes,
pieces.fieldset,
-   pieces.noResultsDetails === 
'NO_RESULTS_TIMEOUT',
+   pieces.noResultsDetails,
true // We're using existing DOM elements
);
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7766ed082eb2f4e43a89e3b5c0fb2e61bf5f1169
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Remove unnecessary local information from package.json

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Remove unnecessary local information from package.json
..


Remove unnecessary local information from package.json

 * The result of the removeNPMAbsolutePaths utility.

Change-Id: I77ab22494778c0f411527b7f6e626d901d516cbf
---
M node_modules/abbrev/package.json
M node_modules/accepts/node_modules/mime-db/package.json
M node_modules/accepts/node_modules/mime-types/package.json
M node_modules/accepts/package.json
M node_modules/acorn-jsx/node_modules/acorn/package.json
M node_modules/acorn-jsx/package.json
M node_modules/acorn/package.json
M node_modules/ajv-keywords/package.json
M node_modules/ajv/package.json
M node_modules/alea/package.json
M node_modules/amdefine/package.json
M node_modules/ansi-escapes/package.json
M node_modules/ansi-regex/package.json
M node_modules/ansi-styles/package.json
M node_modules/argparse/package.json
M node_modules/array-flatten/package.json
M node_modules/array-union/package.json
M node_modules/array-uniq/package.json
M node_modules/arrify/package.json
M node_modules/asap/package.json
M node_modules/asn1/package.json
M node_modules/assert-plus/package.json
M node_modules/assertion-error/package.json
M node_modules/async/package.json
M node_modules/asynckit/package.json
M node_modules/aws-sign2/package.json
M node_modules/aws4/package.json
M node_modules/babel-code-frame/package.json
M node_modules/babybird/package.json
M node_modules/balanced-match/package.json
M node_modules/bl/node_modules/isarray/package.json
M node_modules/bl/node_modules/readable-stream/package.json
M node_modules/bl/node_modules/string_decoder/package.json
M node_modules/bl/package.json
M node_modules/bluebird/package.json
M node_modules/body-parser/node_modules/content-type/package.json
M node_modules/body-parser/node_modules/debug/package.json
M node_modules/body-parser/node_modules/ms/package.json
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/package.json
M node_modules/boom/package.json
M node_modules/brace-expansion/package.json
M node_modules/buffer-shims/package.json
M node_modules/builtin-modules/package.json
M node_modules/bunyan-syslog-udp/package.json
M node_modules/bunyan/package.json
M node_modules/busboy/package.json
M node_modules/bytes/package.json
M node_modules/caller-path/package.json
M node_modules/callsites/package.json
M node_modules/camelcase/package.json
M node_modules/caseless/package.json
M node_modules/chai/package.json
M node_modules/chalk/package.json
M node_modules/circular-json/package.json
M node_modules/clarinet/package.json
M node_modules/cli-cursor/package.json
M node_modules/cli-width/package.json
M node_modules/cli/node_modules/glob/package.json
M node_modules/cli/package.json
M node_modules/cliui/package.json
M node_modules/co/package.json
M node_modules/code-point-at/package.json
M node_modules/colors/package.json
M node_modules/combined-stream/package.json
M node_modules/commander/package.json
M node_modules/comment-parser/node_modules/isarray/package.json
M node_modules/comment-parser/node_modules/readable-stream/package.json
M node_modules/comment-parser/node_modules/string_decoder/package.json
M node_modules/comment-parser/package.json
M node_modules/component-emitter/package.json
M node_modules/compressible/node_modules/mime-db/package.json
M node_modules/compressible/package.json
M node_modules/compression/node_modules/debug/package.json
M node_modules/compression/node_modules/ms/package.json
M node_modules/compression/package.json
M node_modules/concat-map/package.json
M node_modules/concat-stream/node_modules/isarray/package.json
M node_modules/concat-stream/node_modules/readable-stream/package.json
M node_modules/concat-stream/node_modules/string_decoder/package.json
M node_modules/concat-stream/package.json
M node_modules/connect-busboy/package.json
M node_modules/console-browserify/package.json
M node_modules/content-disposition/package.json
M node_modules/content-type/package.json
M node_modules/cookie-signature/package.json
M node_modules/cookie/package.json
M node_modules/cookiejar/package.json
M node_modules/core-js/package.json
M node_modules/core-util-is/package.json
M node_modules/coveralls/node_modules/caseless/package.json
M node_modules/coveralls/node_modules/esprima/package.json
M node_modules/coveralls/node_modules/har-validator/package.json
M node_modules/coveralls/node_modules/js-yaml/package.json
M node_modules/coveralls/node_modules/minimist/package.json
M node_modules/coveralls/node_modules/qs/package.json
M node_modules/coveralls/node_modules/request/package.json
M node_modules/coveralls/node_modules/tunnel-agent/package.json
M node_modules/coveralls/node_modules/uuid/package.json
M node_modules/coveralls/package.json
M node_modules/cryptiles/package.json
M node_modules/d/package.json
M

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Use getHtmlCode() instead of getCode() for HTML attribute lang

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Use getHtmlCode() instead of getCode() for HTML attribute lang
..


Use getHtmlCode() instead of getCode() for HTML attribute lang

The HTML attribute lang uses a BCP 47 conform language code.

Change-Id: I16c7521bb08062337d5eb1502d9e7d96c1b0cc48
---
M includes/formatters/EchoHtmlDigestEmailFormatter.php
M includes/formatters/EchoHtmlEmailFormatter.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/includes/formatters/EchoHtmlDigestEmailFormatter.php 
b/includes/formatters/EchoHtmlDigestEmailFormatter.php
index f2f96cc..9c67ea2 100644
--- a/includes/formatters/EchoHtmlDigestEmailFormatter.php
+++ b/includes/formatters/EchoHtmlDigestEmailFormatter.php
@@ -54,7 +54,7 @@
 
private function renderBody( Language $language, $intro, $digestList, 
$action, $footer ) {
$alignStart = $language->alignStart();
-   $langCode = $language->getCode();
+   $langCode = $language->getHtmlCode();
$langDir = $language->getDir();
 
return <<< EOF
diff --git a/includes/formatters/EchoHtmlEmailFormatter.php 
b/includes/formatters/EchoHtmlEmailFormatter.php
index 4c28fe6..226decc 100644
--- a/includes/formatters/EchoHtmlEmailFormatter.php
+++ b/includes/formatters/EchoHtmlEmailFormatter.php
@@ -46,7 +46,7 @@
 
private function renderBody( Language $lang, $emailIcon, $summary, 
$action, $intro, $footer ) {
$alignStart = $lang->alignStart();
-   $langCode = $lang->getCode();
+   $langCode = $lang->getHtmlCode();
$langDir = $lang->getDir();
 
$iconImgSrc = Sanitizer::encodeAttribute( $emailIcon );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16c7521bb08062337d5eb1502d9e7d96c1b0cc48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Catrope 
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...mobileapps[master]: Summary 2.0: Add mobile content URLs

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Summary 2.0: Add mobile content URLs
..


Summary 2.0: Add mobile content URLs

We want to avoid making clients redirect to the pages they need.  This
adds content URLs specially formatted for mobile clients in order to
accomplish that.

NOTE: The mobile URL bits are commented out of the spec for now so the
CI tests continue to pass, but should be uncommented once the change
adding the base mobile URL to siteinfo is deployed (this week).

Bug: T170692
Change-Id: I3c4131596f2c22c998fe5802752ae93478b94c03
---
M lib/mobile-util.js
M lib/mwapi.js
M spec.yaml
3 files changed, 35 insertions(+), 15 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 84b4a94..1ebe27f 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -262,7 +262,7 @@
 title: meta.normalizedtitle,
 displaytitle: meta.displaytitle,
 namespace_id: meta.ns,
-namespace_text: meta.ns_text,
+namespace_text: meta.nsText,
 titles: mUtil.buildTitleDictionary(title, meta),
 pageid: meta.id,
 thumbnail: meta.thumbnail,
@@ -283,11 +283,20 @@
 };
 
 mUtil.buildContentUrls = function(domain, title, meta) {
+const mobileBaseUrl = meta.mobileHost;
 return {
-page: `https://${domain}/wiki/${title.getPrefixedDBKey()}`,
-revisions: 
`https://${domain}/wiki/${title.getPrefixedDBKey()}?action=history`,
-edit: `https://${domain}/wiki/${title.getPrefixedDBKey()}?action=edit`,
-talk: meta.talk_ns_text ? 
`https://${domain}/wiki/${meta.talk_ns_text}:${title.getKey()}` : undefined,
+desktop: {
+page: `https://${domain}/wiki/${title.getPrefixedDBKey()}`,
+revisions: 
`https://${domain}/wiki/${title.getPrefixedDBKey()}?action=history`,
+edit: 
`https://${domain}/wiki/${title.getPrefixedDBKey()}?action=edit`,
+talk: meta.talkNsText && 
`https://${domain}/wiki/${meta.talkNsText}:${title.getKey()}`
+},
+mobile: mobileBaseUrl && {
+page: `${mobileBaseUrl}/wiki/${title.getPrefixedDBKey()}`,
+revisions: 
`${mobileBaseUrl}/wiki/Special:History/${title.getPrefixedDBKey()}`,
+edit: 
`${mobileBaseUrl}/wiki/${title.getPrefixedDBKey()}?action=edit`,
+talk: meta.talkNsText && 
`${mobileBaseUrl}/wiki/${meta.talkNsText}:${title.getKey()}`
+}
 };
 };
 
@@ -300,7 +309,7 @@
 // references: 
`https://${domain}/api/rest_v1/page/references/${title.getPrefixedDBKey()}`,
 // media: 
`https://${domain}/api/rest_v1/page/media/${title.getPrefixedDBKey()}`,
 edit_html: 
`https://${domain}/api/rest_v1/page/html/${title.getPrefixedDBKey()}`,
-talk_page_html: meta.talk_ns_text ? 
`https://${domain}/api/rest_v1/page/html/${meta.talk_ns_text}:${title.getKey()}`
 : undefined,
+talk_page_html: meta.talkNsText && 
`https://${domain}/api/rest_v1/page/html/${meta.talkNsText}:${title.getKey()}`
 };
 };
 
diff --git a/lib/mwapi.js b/lib/mwapi.js
index ad987df..7bb49ca 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -220,6 +220,7 @@
 const mainpage = res.siteinfo.general.mainpage === title ? true : 
undefined;
 const talkNsText = page.ns % 2 === 0 ? res.siteinfo.namespaces[page.ns 
+ 1]
 && new Namespace(page.ns + 1, res.siteinfo).getNormalizedText() : 
undefined;
+const mobileHost = res.siteinfo.general.mobileserver;
 
 return {
 geo,
@@ -239,14 +240,15 @@
 thumbnail: page.thumbnail,
 originalimage: page.original,
 ns: page.ns,
-ns_text: res.siteinfo.namespaces[page.ns].name,
-talk_ns: talkNsText ? page.ns + 1 : undefined,
-talk_ns_text: talkNsText,
+nsText: res.siteinfo.namespaces[page.ns].name,
+talkNs: talkNsText ? page.ns + 1 : undefined,
+talkNsText,
 protection,
 editable: !protection.edit,
 mainpage,
 revision: revision && revision.revid,
-description: page.terms && page.terms.description[0]
+description: page.terms && page.terms.description[0],
+mobileHost
 };
 });
 }
diff --git a/spec.yaml b/spec.yaml
index e12008f..a477d0c 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -701,10 +701,16 @@
   timestamp: /.+/
   description: /.+/
   content_urls:
-page: /.+/
-revisions: /.+/
-edit: /.+/
-talk: /.+/
+desktop:
+  page: /.+/
+  revisions: /.+/
+  edit: /.+/
+  talk: /.+/
+#mobile:
+#  page:

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Update namespace output to { id, title } object

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Update namespace output to { id, title } object
..


Update namespace output to { id, title } object

Bug: T177431
Change-Id: I77c72cb2f27eeb8c5cabbdb3769b6395cb6a9586
---
M lib/mobile-util.js
M spec.yaml
2 files changed, 15 insertions(+), 10 deletions(-)

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



diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index 1ebe27f..2c3433b 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -261,8 +261,7 @@
 type: 'standard',
 title: meta.normalizedtitle,
 displaytitle: meta.displaytitle,
-namespace_id: meta.ns,
-namespace_text: meta.nsText,
+namespace: { id: meta.ns, text: meta.nsText },
 titles: mUtil.buildTitleDictionary(title, meta),
 pageid: meta.id,
 thumbnail: meta.thumbnail,
diff --git a/spec.yaml b/spec.yaml
index a477d0c..839822c 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -679,8 +679,9 @@
   type: standard
   title: /.+/
   displaytitle: /.+/
-  namespace_id: /.+/
-  namespace_text: /.*/
+  namespace:
+id: /.+/
+text: /.*/
   titles:
 canonical: /.+/
 normalized: /.+/
@@ -876,12 +877,17 @@
   displaytitle:
 type: string
 description: The page title how it should be shown to the user
-  namespace_id:
-type: integer
-description: the numeric ID for the page's namespace 
(https://www.mediawiki.org/wiki/Manual:Namespace)
-  namespace_text:
-type: string
-description: text name for the MediaWiki namespace
+  namespace:_id:
+type: object
+properties:
+  id:
+type: integer
+description: the numeric ID for the page's namespace 
(https://www.mediawiki.org/wiki/Manual:Namespace)
+  text:
+type: string
+description: text name for the MediaWiki namespace
+required: [ id, text ]
+additionalProperties: false
   titles:
 $ref: '#/definitions/titles_set'
   pageid:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77c72cb2f27eeb8c5cabbdb3769b6395cb6a9586
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Restructure theme-specific styles by OOUI theme

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Restructure theme-specific styles by OOUI theme
..


Restructure theme-specific styles by OOUI theme

Most of the styles are based on OOUI rules. If things
are MW theme specific they can moved later.

Change-Id: If180d32b0f17b717d7ea3e21ee83e7637bc6b216
---
M extension.json
R modules/styles/flow/widgets/editor/mw.flow.ui.editor-apextheme.less
R modules/styles/flow/widgets/editor/mw.flow.ui.editor-wikimediauitheme.less
3 files changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 3e6b768..e238aa4 100644
--- a/extension.json
+++ b/extension.json
@@ -534,11 +534,14 @@

"styles/flow/widgets/mw.flow.ui.TopicTitleWidget.less"
],
"skinStyles": {
-   "vector": [
-   
"styles/flow/widgets/editor/mw.flow.ui.editor-vector.less"
+   "default": [
+   
"styles/flow/widgets/editor/mw.flow.ui.editor-wikimediauitheme.less"
],
"monobook": [
-   
"styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less"
+   
"styles/flow/widgets/editor/mw.flow.ui.editor-apextheme.less"
+   ],
+   "apex": [
+   
"styles/flow/widgets/editor/mw.flow.ui.editor-apextheme.less"
]
},
"messages": [
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-apextheme.less
similarity index 100%
rename from modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
rename to modules/styles/flow/widgets/editor/mw.flow.ui.editor-apextheme.less
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-wikimediauitheme.less
similarity index 100%
rename from modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
rename to 
modules/styles/flow/widgets/editor/mw.flow.ui.editor-wikimediauitheme.less

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If180d32b0f17b717d7ea3e21ee83e7637bc6b216
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Fix visual diff timeout

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Fix visual diff timeout
..


Fix visual diff timeout

Bug: T177378
Change-Id: Ia15ec2fa8ce98969a552430ba52c79c21482f2a7
---
M lib/treeDiffer/treeDiffer-dist.js
M src/dm/ve.dm.VisualDiff.js
2 files changed, 11 insertions(+), 11 deletions(-)

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



diff --git a/lib/treeDiffer/treeDiffer-dist.js 
b/lib/treeDiffer/treeDiffer-dist.js
index 77e2310..e335792 100644
--- a/lib/treeDiffer/treeDiffer-dist.js
+++ b/lib/treeDiffer/treeDiffer-dist.js
@@ -1,6 +1,9 @@
 /*!
  * treeDiffer Namespace for treeDiffer.js
  *
+ * Version 1.0.1
+ * https://github.com/Tchanders/treeDiffer.js
+ *
  * Released under the MIT license
  */
 
@@ -300,6 +303,7 @@
this.findMinimumTransactions( keyRoot1, keyRoot2, 
iNulls, jNulls, transactions );
 
if ( new Date().getTime() > this.endTime ) {
+   this.transactions = null;
return;
}
}
diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index 608ef43..4e0eb97 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -414,7 +414,7 @@
  */
 ve.dm.VisualDiff.prototype.getDocChildDiff = function ( oldDocChild, 
newDocChild, threshold ) {
var i, ilen, j, jlen,
-   treeDiff, linearDiff,
+   transactions, treeDiff, linearDiff,
oldNode, newNode,
replacement,
oldDocChildTree,
@@ -432,20 +432,16 @@
oldDocChildTree = new this.treeDiffer.Tree( oldDocChild, 
ve.DiffTreeNode );
newDocChildTree = new this.treeDiffer.Tree( newDocChild, 
ve.DiffTreeNode );
 
-   treeDiff = new this.treeDiffer.Differ( oldDocChildTree, newDocChildTree 
)
-   .transactions[ oldDocChildTree.orderedNodes.length - 1 ][ 
newDocChildTree.orderedNodes.length - 1 ];
+   transactions = new this.treeDiffer.Differ( oldDocChildTree, 
newDocChildTree ).transactions;
+   if ( transactions === null ) {
+   // Tree diff timed out
+   return false;
+   }
 
+   treeDiff = transactions[ oldDocChildTree.orderedNodes.length - 1 ][ 
newDocChildTree.orderedNodes.length - 1 ];
// Length of old content is length of old node minus the open and close
// tags for each child node
keepLength = oldDocChild.length - 2 * ( 
oldDocChildTree.orderedNodes.length - 1 );
-
-   // Tree diff timed out: record as full remove and insert
-   if ( !treeDiff ) {
-   treeDiff = [];
-   linearDiff = null;
-   diffLength = oldDocChild.length + newDocChild.length;
-   keepLength = 0;
-   }
 
for ( i = 0, ilen = treeDiff.length; i < ilen; i++ ) {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia15ec2fa8ce98969a552430ba52c79c21482f2a7
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tchanders 
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 build tools to 27.0.1.

2017-11-13 Thread Dbrant (Code Review)

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

Change subject: Update build tools to 27.0.1.
..

Update build tools to 27.0.1.

This updates our build tools to the very latest version.
In the previous version of build tools (26.x) there was actually an issue
that was causing certain models of devices to hard-crash, and even enter a
reboot loop.

https://issuetracker.google.com/issues/64434571

Change-Id: I686024860c363dee1e079fd1751a36137cbd04c8
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index f5daefc..999d5c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,7 @@
 android {
 // Keep version in sync with /project.properties
 compileSdkVersion 26
-buildToolsVersion '26.0.2'
+buildToolsVersion '27.0.1'
 
 compileOptions {
 sourceCompatibility = JAVA_VERSION

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I686024860c363dee1e079fd1751a36137cbd04c8
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] analytics...WDCM[master]: Add r-library dir to .gitignore

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Add r-library dir to .gitignore
..


Add r-library dir to .gitignore

Change-Id: I82cb3c531f2d5dfa09e97c505e0204f36028d8ae
---
M .gitignore
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 5b6a065..a386cab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,11 @@
+# Created by install library script
+r-library
+
+# R project stuff
 .Rproj.user
 .Rhistory
 .RData
 .Ruserdata
+
+# IntelliJ idea directory
+.idea
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82cb3c531f2d5dfa09e97c505e0204f36028d8ae
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: Add r-library dir to .gitignore

2017-11-13 Thread Addshore (Code Review)

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

Change subject: Add r-library dir to .gitignore
..

Add r-library dir to .gitignore

Change-Id: I82cb3c531f2d5dfa09e97c505e0204f36028d8ae
---
M .gitignore
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM 
refs/changes/89/391089/1

diff --git a/.gitignore b/.gitignore
index 5b6a065..a386cab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,11 @@
+# Created by install library script
+r-library
+
+# R project stuff
 .Rproj.user
 .Rhistory
 .RData
 .Ruserdata
+
+# IntelliJ idea directory
+.idea
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82cb3c531f2d5dfa09e97c505e0204f36028d8ae
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: [bugfix] Newsletter: notifications as Notices, not ALerts

2017-11-13 Thread Chico Venancio (Code Review)

Chico Venancio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391088 )

Change subject: [bugfix] Newsletter: notifications as Notices, not ALerts
..

[bugfix] Newsletter: notifications as Notices, not ALerts

Change notification types from alerts to notices

Bug: T180392
Change-Id: I976557f90902fa34ff651663b013b71fc9704355
---
M Newsletter.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index e875b1f..de9205c 100644
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -20,7 +20,7 @@
 
$notifications['newsletter-announce'] = [
'category' => 'newsletter',
-   'section' => 'alert',
+   'section' => 'message',
'primary-link' => [
'message' => 
'newsletter-notification-link-text-new-issue',
'destination' => 'new-issue'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I976557f90902fa34ff651663b013b71fc9704355
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Chico Venancio 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Localisation updates from https://translatewiki.net.

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Localisation updates from https://translatewiki.net.
..


Localisation updates from https://translatewiki.net.

Change-Id: I36b1a6a11d0f74c07b474f243dc1d9af074092de
---
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-el/strings.xml
M app/src/main/res/values-fa/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-ja/strings.xml
M app/src/main/res/values-jv/strings.xml
M app/src/main/res/values-kab/strings.xml
M app/src/main/res/values-ko/strings.xml
M app/src/main/res/values-lb/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-pt-rBR/strings.xml
A app/src/main/res/values-sl/strings.xml
M app/src/main/res/values-su/strings.xml
M app/src/main/res/values-sv/strings.xml
17 files changed, 313 insertions(+), 3 deletions(-)

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



diff --git a/app/src/main/res/values-ca/strings.xml 
b/app/src/main/res/values-ca/strings.xml
index 7984994..211ba78 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -398,6 +398,9 @@
   Article destacat
   Desa
   Desat
+  Configura la targetes
+  Configura les targetes 
d\'exploració
+  Reinicialitza als valors per 
defecte
   Descripció de títol
   Publica
   Afegeix una descripció de 
títol
@@ -431,6 +434,7 @@
   La muntanya més alta de 
la Terra
   descripció d\'un 
títol d\'un article sobre l\'Everest
   Més informació
+  Les descripcions 
s\'emmagatzemen i mantenen a Wikidata, el projecte de la Fundació Wikimedia que 
proporciona una base de dades secundària lliure, col·laborativa i multilingüe 
per a donar suport a la Viquipèdia i a altres projectes.
   Gràcies per editar a la 
Viquipèdia!
   Sabem que heu fet el millor 
possible, però un dels revisors tenia una precaució. Els motius possibles de la 
reversió de la modificació poden ser:
   la vostra contribució no 
seguia una de les a href=\"%1$s\"directrius/a.
@@ -470,6 +474,7 @@
   Biblioteca sense connexió
   No hi ha res dins la biblioteca 
sense connexió
   Trieu un paquet d\'articles 
de la Viquipèdia per baixar ara, per tal d\'accedir-hi lliurement més 
endavant.
+  Voleu estalviar dades? Trieu 
«Prefereix contingut fora de línia» a la configuració per a mostrar abans 
aquells articles que estiguin fora de línia fins i tot si teniu connectivitat. 
a href=\"#settings\"Vés als paràmetres/a
   Cerca a la biblioteca fora de 
línia
   Cerqueu resultats a la 
vostra biblioteca fora de línia
   Més informació
@@ -478,13 +483,16 @@
   Construïu la 
vostra biblioteca fora de línia
   Baixeu ara 
paquets d\'articles de la Viquipèdia per a un accés sense de dades més 
endavant.
   Lectura sense 
interrupcions
+  Continueu 
llegint i cercant articles des de la biblioteca fora de línia quan no tingueu 
accés a Internet.
   Emmagatzema 
més coneixement
+  Descarregueu tanta 
Viquipèdia com ho permeti el vostre dispositiu. La biblioteca fora de línia pot 
accedir també als paquets d\'articles d\'un emmagatzemament extern.
   Omet
   Continua
   Primers passos
   Noves formes d\'explorar
   Descobriu els articles destacats, els 
temes rellevants i els suggeriments de lectura al canal Explora.
   Llistes de lectura amb 
sincronització
+  Crea llistes de lectura 
d\'articles que voleu llegir més endavant, fins i tot si esteu fora de línia. 
a href=\"#login\"Inicieu una sessió o creeu in compte/a a la 
Viquipèdia per a conservar una còpia de les vostres llistes de lectura.
   Envia dades anònimes
   Envia les dades 
d\'ús
   Sincronitza les vostres 
llistes de lectura
diff --git a/app/src/main/res/values-da/strings.xml 
b/app/src/main/res/values-da/strings.xml
index fdcbcab..5a7068f 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -399,6 +399,9 @@
   Anbefalet artikel
   Gem
   Gemt
+  Konfigurer kort
+  Konfigurer 
udforskningskort
+  Nulstil til standarderne
   Titelbeskrivelse
   Offentliggør
   Tilføj 
titelbeskrivelse
@@ -486,6 +489,7 @@
   Bliv ved med 
at læse og søge efter artikler i dit lokale bibliotek, når du ikke har 
internetadgang.
   Lagr mere 
viden
   Hent så 
meget Wikipedia som din enhed kan håndtere. Et lokalt bibliotek kan også tilgå 
artikelpakker på eksterne lagerenheder.
+  Denne hovedside giver en 
oversigt over indholdet i denne artikelpakke.br /br /Du kan 
også udforske indholdet i artikelpakker i dit lokale bibliotek ved at søge 
efter tilgængelige artikler, mens du er uden internetforbindelse.
   Udelad
   Fortsæt
   Kom i gang
diff --git a/app/src/main/res/values-de/strings.xml 
b/app/src/main/res/values-de/strings.xml
index 83354e0..0d7f7bd 100644
---

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: Installation script mkdirs r-library

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Installation script mkdirs r-library
..


Installation script mkdirs r-library

Change-Id: I23aec808dc0d1eee4beb9085c7099a218f4035b1
---
M _installProduction_analytics-wmde.R
1 file changed, 24 insertions(+), 2 deletions(-)

Approvals:
  GoranSMilovanovic: Verified; Looks good to me, approved
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/_installProduction_analytics-wmde.R 
b/_installProduction_analytics-wmde.R
index 1f54867..d973370 100644
--- a/_installProduction_analytics-wmde.R
+++ b/_installProduction_analytics-wmde.R
@@ -8,8 +8,30 @@
   http_proxy = "http://webproxy.eqiad.wmnet:8080;,
   https_proxy = "http://webproxy.eqiad.wmnet:8080;)
 
+
+# - fPath: where the scripts is run from?
+fPath <- as.character(commandArgs(trailingOnly = FALSE)[4])
+fPath <- gsub("--file=", "", fPath, fixed = T)
+fPath <- unlist(strsplit(fPath, split = "/", fixed = T))
+fPath <- paste(
+  paste(fPath[1:length(fPath) - 1], collapse = "/"),
+  "/",
+  sep = "")
+
+
+# - find out whether the fPath/r-library directory exists
+# - YES: delete it and mkdir, NO: mkdir only
+if (dir.exists(paths = paste(fPath, "r-library", sep = ""))) {
+  unlink(x = paste(fPath, "r-library", sep = ""), 
+ recursive = T)
+  dir.create(path = paste(fPath, "r-library", sep = ""))
+} else {
+  dir.create(path = paste(fPath, "r-library", sep = ""))
+}
+
 # - install WDCM related packages:
 install.packages(c("dplyr", "httr", "stringr", "XML", "readr", 
"data.table", "tidyr", "maptpx", "Rtsne"),
- lib = "/srv/analytics-wmde/r-library",
- repos = c(CRAN = "https://www.stats.bris.ac.uk/R/;))
\ No newline at end of file
+ lib = paste(fPath, "r-library", sep = ""),
+ repos = c(CRAN = "https://www.stats.bris.ac.uk/R/;))
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23aec808dc0d1eee4beb9085c7099a218f4035b1
Gerrit-PatchSet: 3
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: GoranSMilovanovic 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Remove unnecessary local information from package.json

2017-11-13 Thread Arlolra (Code Review)

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

Change subject: Remove unnecessary local information from package.json
..

Remove unnecessary local information from package.json

 * The result of the removeNPMAbsolutePaths utility.

Change-Id: I77ab22494778c0f411527b7f6e626d901d516cbf
---
M node_modules/abbrev/package.json
M node_modules/accepts/node_modules/mime-db/package.json
M node_modules/accepts/node_modules/mime-types/package.json
M node_modules/accepts/package.json
M node_modules/acorn-jsx/node_modules/acorn/package.json
M node_modules/acorn-jsx/package.json
M node_modules/acorn/package.json
M node_modules/ajv-keywords/package.json
M node_modules/ajv/package.json
M node_modules/alea/package.json
M node_modules/amdefine/package.json
M node_modules/ansi-escapes/package.json
M node_modules/ansi-regex/package.json
M node_modules/ansi-styles/package.json
M node_modules/argparse/package.json
M node_modules/array-flatten/package.json
M node_modules/array-union/package.json
M node_modules/array-uniq/package.json
M node_modules/arrify/package.json
M node_modules/asap/package.json
M node_modules/asn1/package.json
M node_modules/assert-plus/package.json
M node_modules/assertion-error/package.json
M node_modules/async/package.json
M node_modules/asynckit/package.json
M node_modules/aws-sign2/package.json
M node_modules/aws4/package.json
M node_modules/babel-code-frame/package.json
M node_modules/babybird/package.json
M node_modules/balanced-match/package.json
M node_modules/bl/node_modules/isarray/package.json
M node_modules/bl/node_modules/readable-stream/package.json
M node_modules/bl/node_modules/string_decoder/package.json
M node_modules/bl/package.json
M node_modules/bluebird/package.json
M node_modules/body-parser/node_modules/content-type/package.json
M node_modules/body-parser/node_modules/debug/package.json
M node_modules/body-parser/node_modules/ms/package.json
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/package.json
M node_modules/boom/package.json
M node_modules/brace-expansion/package.json
M node_modules/buffer-shims/package.json
M node_modules/builtin-modules/package.json
M node_modules/bunyan-syslog-udp/package.json
M node_modules/bunyan/package.json
M node_modules/busboy/package.json
M node_modules/bytes/package.json
M node_modules/caller-path/package.json
M node_modules/callsites/package.json
M node_modules/camelcase/package.json
M node_modules/caseless/package.json
M node_modules/chai/package.json
M node_modules/chalk/package.json
M node_modules/circular-json/package.json
M node_modules/clarinet/package.json
M node_modules/cli-cursor/package.json
M node_modules/cli-width/package.json
M node_modules/cli/node_modules/glob/package.json
M node_modules/cli/package.json
M node_modules/cliui/package.json
M node_modules/co/package.json
M node_modules/code-point-at/package.json
M node_modules/colors/package.json
M node_modules/combined-stream/package.json
M node_modules/commander/package.json
M node_modules/comment-parser/node_modules/isarray/package.json
M node_modules/comment-parser/node_modules/readable-stream/package.json
M node_modules/comment-parser/node_modules/string_decoder/package.json
M node_modules/comment-parser/package.json
M node_modules/component-emitter/package.json
M node_modules/compressible/node_modules/mime-db/package.json
M node_modules/compressible/package.json
M node_modules/compression/node_modules/debug/package.json
M node_modules/compression/node_modules/ms/package.json
M node_modules/compression/package.json
M node_modules/concat-map/package.json
M node_modules/concat-stream/node_modules/isarray/package.json
M node_modules/concat-stream/node_modules/readable-stream/package.json
M node_modules/concat-stream/node_modules/string_decoder/package.json
M node_modules/concat-stream/package.json
M node_modules/connect-busboy/package.json
M node_modules/console-browserify/package.json
M node_modules/content-disposition/package.json
M node_modules/content-type/package.json
M node_modules/cookie-signature/package.json
M node_modules/cookie/package.json
M node_modules/cookiejar/package.json
M node_modules/core-js/package.json
M node_modules/core-util-is/package.json
M node_modules/coveralls/node_modules/caseless/package.json
M node_modules/coveralls/node_modules/esprima/package.json
M node_modules/coveralls/node_modules/har-validator/package.json
M node_modules/coveralls/node_modules/js-yaml/package.json
M node_modules/coveralls/node_modules/minimist/package.json
M node_modules/coveralls/node_modules/qs/package.json
M node_modules/coveralls/node_modules/request/package.json
M node_modules/coveralls/node_modules/tunnel-agent/package.json
M node_modules/coveralls/node_modules/uuid/package.json
M node_modules/coveralls/package.json
M node_modules/cryptiles/package.json
M node_modules/d/package.json
M

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: Installation script mkdirs r-library

2017-11-13 Thread GoranSMilovanovic (Code Review)

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

Change subject: Installation script mkdirs r-library
..

Installation script mkdirs r-library

Change-Id: I23aec808dc0d1eee4beb9085c7099a218f4035b1
---
M _installProduction_analytics-wmde.R
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM 
refs/changes/86/391086/1

diff --git a/_installProduction_analytics-wmde.R 
b/_installProduction_analytics-wmde.R
index aab4cb0..d973370 100644
--- a/_installProduction_analytics-wmde.R
+++ b/_installProduction_analytics-wmde.R
@@ -8,6 +8,8 @@
   http_proxy = "http://webproxy.eqiad.wmnet:8080;,
   https_proxy = "http://webproxy.eqiad.wmnet:8080;)
 
+
+# - fPath: where the scripts is run from?
 fPath <- as.character(commandArgs(trailingOnly = FALSE)[4])
 fPath <- gsub("--file=", "", fPath, fixed = T)
 fPath <- unlist(strsplit(fPath, split = "/", fixed = T))
@@ -16,6 +18,17 @@
   "/",
   sep = "")
 
+
+# - find out whether the fPath/r-library directory exists
+# - YES: delete it and mkdir, NO: mkdir only
+if (dir.exists(paths = paste(fPath, "r-library", sep = ""))) {
+  unlink(x = paste(fPath, "r-library", sep = ""), 
+ recursive = T)
+  dir.create(path = paste(fPath, "r-library", sep = ""))
+} else {
+  dir.create(path = paste(fPath, "r-library", sep = ""))
+}
+
 # - install WDCM related packages:
 install.packages(c("dplyr", "httr", "stringr", "XML", "readr", 
"data.table", "tidyr", "maptpx", "Rtsne"),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23aec808dc0d1eee4beb9085c7099a218f4035b1
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to ab4dc209 and update mediawiki-title

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Bump src/ to ab4dc209 and update mediawiki-title
..


Bump src/ to ab4dc209 and update mediawiki-title

Change-Id: Id36aa619f8abcec81aa641e4848242a72e4c811c
---
M node_modules/mediawiki-title/.jscs.json
M node_modules/mediawiki-title/.jshintignore
D node_modules/mediawiki-title/.npmignore
M node_modules/mediawiki-title/.travis.yml
M node_modules/mediawiki-title/lib/index.js
A node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M src
9 files changed, 310 insertions(+), 62 deletions(-)

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



diff --git a/node_modules/mediawiki-title/.jscs.json 
b/node_modules/mediawiki-title/.jscs.json
index 189fa2b..7005142 100644
--- a/node_modules/mediawiki-title/.jscs.json
+++ b/node_modules/mediawiki-title/.jscs.json
@@ -26,6 +26,7 @@
 "node_modules/**",
 "test/**",
 "coverage/**",
-"test.db.**"
+"test.db.**",
+"lib/mediawiki.Title.phpCharToUpper.js"
   ]
-}
\ No newline at end of file
+}
diff --git a/node_modules/mediawiki-title/.jshintignore 
b/node_modules/mediawiki-title/.jshintignore
index 1c69eee..7e45fc9 100644
--- a/node_modules/mediawiki-title/.jshintignore
+++ b/node_modules/mediawiki-title/.jshintignore
@@ -1,3 +1,4 @@
 coverage
 node_modules
 test
+lib/mediawiki.Title.phpCharToUpper.js
diff --git a/node_modules/mediawiki-title/.npmignore 
b/node_modules/mediawiki-title/.npmignore
deleted file mode 100644
index 269d298..000
--- a/node_modules/mediawiki-title/.npmignore
+++ /dev/null
@@ -1,9 +0,0 @@
-coverage
-node_modules
-npm-debug.log
-
-# WebStorm IDE files
-.idea/*
-
-# vim temp files
-*swp
diff --git a/node_modules/mediawiki-title/.travis.yml 
b/node_modules/mediawiki-title/.travis.yml
index c678a5b..c651632 100644
--- a/node_modules/mediawiki-title/.travis.yml
+++ b/node_modules/mediawiki-title/.travis.yml
@@ -1,9 +1,9 @@
 language: node_js
 node_js:
-- "0.10"
-- "0.12"
-- "4.2"
-- "5"
+- "4"
+- "6"
+- "8"
+- "node"
 
 sudo: false
 
diff --git a/node_modules/mediawiki-title/lib/index.js 
b/node_modules/mediawiki-title/lib/index.js
index aa380b6..9b7c997 100644
--- a/node_modules/mediawiki-title/lib/index.js
+++ b/node_modules/mediawiki-title/lib/index.js
@@ -1,7 +1,8 @@
 "use strict";
 
-var sanitizeIP = require('./ip');
-var utils  = require('./utils');
+var sanitizeIP = require('./ip');
+var utils  = require('./utils');
+var phpCharToUpper = require('./mediawiki.Title.phpCharToUpper.js');
 
 /**
  * A UTF-8 replacement character that's explicitly prohibited in the title
@@ -211,6 +212,8 @@
 function _capitalizeTitle(result, siteInfo) {
 var nsCase = siteInfo.namespaces[result.namespace._id + ''].case;
 if (nsCase === 'first-letter') {
+// This special casing is from core's `Language::ucfirst`
+// Grep for definitions in core/languages/classes/
 if (result.title[0] === 'i' && (siteInfo.general.lang === 'az'
 || siteInfo.general.lang === 'tr'
 || siteInfo.general.lang === 'kaa'
@@ -218,12 +221,8 @@
 result.title = 'İ' +  result.title.substr(1);
 } else if (!/^[A-Z]/.test(result.title)) {
 var firstCharacter = result.title.charAt(0);
-var upperCasedFirstLetter = firstCharacter.toUpperCase();
-// PHP is only capable of upper-casing letters that end up
-// as a single character, however JS upper-cases German 'ß' to SS
-if (upperCasedFirstLetter.length === firstCharacter.length) {
-result.title = upperCasedFirstLetter + result.title.substr(1);
-}
+var upperCasedFirstLetter = phpCharToUpper(firstCharacter);
+result.title = upperCasedFirstLetter + result.title.substr(1);
 }
 }
 return result;
diff --git a/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js 
b/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
new file mode 100644
index 000..f337911
--- /dev/null
+++ b/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
@@ -0,0 +1,255 @@
+// This file can't be parsed by JSDuck due to 
.
+// (It is excluded in jsduck.json.)
+// ESLint suggests unquoting some object keys, which would render the file 
unparseable by Opera 12.
+/* eslint-disable quote-props */
+( function () {
+   var toUpperMapping = {
+   'ß': 'ß',
+   'ŉ': 'ŉ',
+   'ǅ': 'ǅ',
+   'ǆ': 'ǅ',
+   'ǈ': 'ǈ',
+   'ǉ': 'ǈ',
+   'ǋ': 'ǋ',
+   'ǌ': 'ǋ',
+   'ǰ': 'ǰ',
+   'ǲ': 'ǲ',
+

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: minor

2017-11-13 Thread GoranSMilovanovic (Code Review)

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

Change subject: minor
..

minor

Change-Id: I332e7e4f7213794b1075d412adf1de28c53e4b9b
---
M _installProduction_analytics-wmde.R
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM 
refs/changes/83/391083/1

diff --git a/_installProduction_analytics-wmde.R 
b/_installProduction_analytics-wmde.R
index 8a020db..aab4cb0 100644
--- a/_installProduction_analytics-wmde.R
+++ b/_installProduction_analytics-wmde.R
@@ -3,10 +3,6 @@
 ### --- Hey hey: 
 ### --- run as sudo -u analytics-wmde Rscript 
/srv/analytics-wmde/installRlib/_installProduction_analytics-wmde.R
 
-# - setup
-### --- NOTE: {kimisc} is the only WDCM relevant R package
-### --- that needs to be installed manually
-
 # - set proxy:
 Sys.setenv(
   http_proxy = "http://webproxy.eqiad.wmnet:8080;,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I332e7e4f7213794b1075d412adf1de28c53e4b9b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to ab4dc209 and update mediawiki-title

2017-11-13 Thread Subramanya Sastry (Code Review)

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

Change subject: Bump src/ to ab4dc209 and update mediawiki-title
..

Bump src/ to ab4dc209 and update mediawiki-title

Change-Id: Id36aa619f8abcec81aa641e4848242a72e4c811c
---
M node_modules/mediawiki-title/.jscs.json
M node_modules/mediawiki-title/.jshintignore
D node_modules/mediawiki-title/.npmignore
M node_modules/mediawiki-title/.travis.yml
M node_modules/mediawiki-title/lib/index.js
A node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M src
9 files changed, 310 insertions(+), 62 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/82/391082/1

diff --git a/node_modules/mediawiki-title/.jscs.json 
b/node_modules/mediawiki-title/.jscs.json
index 189fa2b..7005142 100644
--- a/node_modules/mediawiki-title/.jscs.json
+++ b/node_modules/mediawiki-title/.jscs.json
@@ -26,6 +26,7 @@
 "node_modules/**",
 "test/**",
 "coverage/**",
-"test.db.**"
+"test.db.**",
+"lib/mediawiki.Title.phpCharToUpper.js"
   ]
-}
\ No newline at end of file
+}
diff --git a/node_modules/mediawiki-title/.jshintignore 
b/node_modules/mediawiki-title/.jshintignore
index 1c69eee..7e45fc9 100644
--- a/node_modules/mediawiki-title/.jshintignore
+++ b/node_modules/mediawiki-title/.jshintignore
@@ -1,3 +1,4 @@
 coverage
 node_modules
 test
+lib/mediawiki.Title.phpCharToUpper.js
diff --git a/node_modules/mediawiki-title/.npmignore 
b/node_modules/mediawiki-title/.npmignore
deleted file mode 100644
index 269d298..000
--- a/node_modules/mediawiki-title/.npmignore
+++ /dev/null
@@ -1,9 +0,0 @@
-coverage
-node_modules
-npm-debug.log
-
-# WebStorm IDE files
-.idea/*
-
-# vim temp files
-*swp
diff --git a/node_modules/mediawiki-title/.travis.yml 
b/node_modules/mediawiki-title/.travis.yml
index c678a5b..c651632 100644
--- a/node_modules/mediawiki-title/.travis.yml
+++ b/node_modules/mediawiki-title/.travis.yml
@@ -1,9 +1,9 @@
 language: node_js
 node_js:
-- "0.10"
-- "0.12"
-- "4.2"
-- "5"
+- "4"
+- "6"
+- "8"
+- "node"
 
 sudo: false
 
diff --git a/node_modules/mediawiki-title/lib/index.js 
b/node_modules/mediawiki-title/lib/index.js
index aa380b6..9b7c997 100644
--- a/node_modules/mediawiki-title/lib/index.js
+++ b/node_modules/mediawiki-title/lib/index.js
@@ -1,7 +1,8 @@
 "use strict";
 
-var sanitizeIP = require('./ip');
-var utils  = require('./utils');
+var sanitizeIP = require('./ip');
+var utils  = require('./utils');
+var phpCharToUpper = require('./mediawiki.Title.phpCharToUpper.js');
 
 /**
  * A UTF-8 replacement character that's explicitly prohibited in the title
@@ -211,6 +212,8 @@
 function _capitalizeTitle(result, siteInfo) {
 var nsCase = siteInfo.namespaces[result.namespace._id + ''].case;
 if (nsCase === 'first-letter') {
+// This special casing is from core's `Language::ucfirst`
+// Grep for definitions in core/languages/classes/
 if (result.title[0] === 'i' && (siteInfo.general.lang === 'az'
 || siteInfo.general.lang === 'tr'
 || siteInfo.general.lang === 'kaa'
@@ -218,12 +221,8 @@
 result.title = 'İ' +  result.title.substr(1);
 } else if (!/^[A-Z]/.test(result.title)) {
 var firstCharacter = result.title.charAt(0);
-var upperCasedFirstLetter = firstCharacter.toUpperCase();
-// PHP is only capable of upper-casing letters that end up
-// as a single character, however JS upper-cases German 'ß' to SS
-if (upperCasedFirstLetter.length === firstCharacter.length) {
-result.title = upperCasedFirstLetter + result.title.substr(1);
-}
+var upperCasedFirstLetter = phpCharToUpper(firstCharacter);
+result.title = upperCasedFirstLetter + result.title.substr(1);
 }
 }
 return result;
diff --git a/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js 
b/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
new file mode 100644
index 000..f337911
--- /dev/null
+++ b/node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
@@ -0,0 +1,255 @@
+// This file can't be parsed by JSDuck due to 
.
+// (It is excluded in jsduck.json.)
+// ESLint suggests unquoting some object keys, which would render the file 
unparseable by Opera 12.
+/* eslint-disable quote-props */
+( function () {
+   var toUpperMapping = {
+   'ß': 'ß',
+   'ŉ': 'ŉ',
+   'ǅ': 'ǅ',
+   'ǆ': 'ǅ',
+   'ǈ': 'ǈ',
+   'ǉ': 'ǈ',
+   'ǋ': 'ǋ',
+   'ǌ': 'ǋ',
+   'ǰ': 'ǰ',
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Don't throw exception when no content available for certain ...

2017-11-13 Thread Dbrant (Code Review)

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

Change subject: Don't throw exception when no content available for certain 
feed cards.
..

Don't throw exception when no content available for certain feed cards.

When no content is available for the ContinueReading or BecauseYouRead
cards, they throw an exception, which can cause issues with the ordering
and visibility of unrelated cards.

Change-Id: Ibf690f5e2d3256be8fc9d70cb98901e101df8a1a
---
M app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
M 
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingClient.java
2 files changed, 3 insertions(+), 8 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
index 8bf70ee..9bafdc8 100644
--- 
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
+++ 
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadClient.java
@@ -15,7 +15,6 @@
 import org.wikipedia.search.SearchResults;
 import org.wikipedia.util.log.L;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -34,7 +33,7 @@
 readMoreTopicTask = new MainPageReadMoreTopicTask(age) {
 @Override public void onFinish(@Nullable HistoryEntry entry) {
 if (entry == null) {
-cb.error(new IOException("Error retrieving history entry 
for suggestions"));
+cb.success(Collections.emptyList());
 return;
 }
 getCardForHistoryEntry(entry, cb);
diff --git 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingClient.java
 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingClient.java
index 622590d..61a3dbd 100644
--- 
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingClient.java
+++ 
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingClient.java
@@ -10,7 +10,6 @@
 import org.wikipedia.history.HistoryEntry;
 import org.wikipedia.util.log.L;
 
-import java.io.IOException;
 import java.util.Collections;
 
 public class ContinueReadingClient implements FeedClient {
@@ -26,11 +25,8 @@
 lastPageReadTask = new LastPageReadTask(context, age, MIN_DAYS_OLD, 
MAX_DAYS_OLD) {
 @Override
 public void onFinish(@Nullable HistoryEntry entry) {
-if (entry == null) {
-cb.error(new IOException("Error fetching last-read page"));
-return;
-}
-cb.success(Collections.singletonList((Card) new 
ContinueReadingCard(entry)));
+cb.success(entry == null ? Collections.emptyList()
+: Collections.singletonList((Card) new 
ContinueReadingCard(entry)));
 }
 
 @Override

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf690f5e2d3256be8fc9d70cb98901e101df8a1a
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] integration/config[master]: Add TerraCodes to CI whitelist.

2017-11-13 Thread Zoranzoki21 (Code Review)

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

Change subject: Add TerraCodes to CI whitelist.
..

Add TerraCodes to CI whitelist.

See https://gerrit.wikimedia.org/r/#/q/owner:terracodes%2540tools.wmflabs.org 
for his patches.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/79/391079/2

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5fe6463..75e133c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -229,7 +229,7 @@
 | sucheta\.ghoshal@gmail\.com
 | tacsipacsi@jnet\.hu
 | tamaraslosarek@gmail\.com
-| terracodes@outlook\.com
+| terracodes@tools.wmflabs\.org
 | tasneem\.lo\.31@gmail\.com
 | thalia\.e\.chan@googlemail\.com
 | thomasmulhall410@yahoo\.com
@@ -468,7 +468,7 @@
- ^thomasmulhall410@yahoo\.com$ # Paladox T114528
- ^thomaspt@hotmail\.fr$
- ^at\.light@live\.com\.au$ # This, that and the other
-   - ^terracodes@outlook\.com$ # TerraCodes
+   - ^terracodes@tools.wmflabs\.org$ # TerraCodes
- ^tk\.999\.wikia@gmail\.com$
- ^tomasz@twkozlowski\.com$
- ^01tonythomas@gmail\.com$

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e05cdf586cc1032ed9b7df07498ef9bce804e88
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: install script knows where it lives

2017-11-13 Thread GoranSMilovanovic (Code Review)

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

Change subject: install script knows where it lives
..

install script knows where it lives

Change-Id: I79774f46487619763089a163c3d0c0684e743ebd
---
M _installProduction_analytics-wmde.R
1 file changed, 15 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM 
refs/changes/80/391080/1

diff --git a/_installProduction_analytics-wmde.R 
b/_installProduction_analytics-wmde.R
index 1f54867..8a020db 100644
--- a/_installProduction_analytics-wmde.R
+++ b/_installProduction_analytics-wmde.R
@@ -3,13 +3,26 @@
 ### --- Hey hey: 
 ### --- run as sudo -u analytics-wmde Rscript 
/srv/analytics-wmde/installRlib/_installProduction_analytics-wmde.R
 
+# - setup
+### --- NOTE: {kimisc} is the only WDCM relevant R package
+### --- that needs to be installed manually
+
 # - set proxy:
 Sys.setenv(
   http_proxy = "http://webproxy.eqiad.wmnet:8080;,
   https_proxy = "http://webproxy.eqiad.wmnet:8080;)
 
+fPath <- as.character(commandArgs(trailingOnly = FALSE)[4])
+fPath <- gsub("--file=", "", fPath, fixed = T)
+fPath <- unlist(strsplit(fPath, split = "/", fixed = T))
+fPath <- paste(
+  paste(fPath[1:length(fPath) - 1], collapse = "/"),
+  "/",
+  sep = "")
+
 # - install WDCM related packages:
 install.packages(c("dplyr", "httr", "stringr", "XML", "readr", 
"data.table", "tidyr", "maptpx", "Rtsne"),
- lib = "/srv/analytics-wmde/r-library",
- repos = c(CRAN = "https://www.stats.bris.ac.uk/R/;))
\ No newline at end of file
+ lib = paste(fPath, "r-library", sep = ""),
+ repos = c(CRAN = "https://www.stats.bris.ac.uk/R/;))
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79774f46487619763089a163c3d0c0684e743ebd
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: puppetmaster remove puppetmaster-common package ensure

2017-11-13 Thread Herron (Code Review)

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

Change subject: puppet: puppetmaster remove puppetmaster-common package ensure
..


puppet: puppetmaster remove puppetmaster-common package ensure

remove puppetmaster-common package ensure from puppetmaster module. this
package has been removed from newer releases and on older systems will
be installed as a dependency of the puppetmaster-passenger package.

Bug: T177254
Change-Id: I7dfbab18a1ec7c494f6036325ecd383ed5ac3057
---
M modules/puppetmaster/manifests/hiera.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/manifests/passenger.pp
3 files changed, 6 insertions(+), 23 deletions(-)

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



diff --git a/modules/puppetmaster/manifests/hiera.pp 
b/modules/puppetmaster/manifests/hiera.pp
index c9d745e..66613d6 100644
--- a/modules/puppetmaster/manifests/hiera.pp
+++ b/modules/puppetmaster/manifests/hiera.pp
@@ -14,13 +14,10 @@
 ) {
 
 file { '/etc/puppet/hiera.yaml':
-ensure  => $ensure,
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
-source  => $source,
-require => Package['puppetmaster-common'],
+ensure => $ensure,
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+source => $source,
 }
-# We don't need to declare ruby-hiera as a package explicitly as
-# puppetmaster-common depends on ruby-hiera.
 }
diff --git a/modules/puppetmaster/manifests/init.pp 
b/modules/puppetmaster/manifests/init.pp
index 37e1c22..e15b50f 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -84,15 +84,8 @@
 default => 'puppetmaster',
 }
 
-# puppetmaster-common package name changed to puppet-master-common with 
version 4
-$puppetmaster_common_package_name = $puppet_major_version ? {
-4   => 'puppet-master-common',
-default => 'puppetmaster-common',
-}
-
 package { [
 $puppetmaster_package_name,
-$puppetmaster_common_package_name,
 'vim-puppet',
 'puppet-el',
 'rails',
diff --git a/modules/puppetmaster/manifests/passenger.pp 
b/modules/puppetmaster/manifests/passenger.pp
index 7939674..7c11fcb 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -66,12 +66,6 @@
 default => 'puppetmaster-passenger',
 }
 
-# puppetmaster-common package name changed to puppet-master-common with 
version 4
-$puppetmaster_common_package_name = $puppet_major_version ? {
-4   => 'puppet-master-common',
-default => 'puppetmaster-common',
-}
-
 package { $puppetmaster_passenger_package_name:
 ensure => present,
 }
@@ -93,8 +87,7 @@
 mode=> '0444',
 source  => 'puppet:///modules/puppetmaster/default',
 require => [
-Package[ $puppetmaster_passenger_package_name ],
-Package[ $puppetmaster_common_package_name ]
+Package[ $puppetmaster_passenger_package_name ]
 ],
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7dfbab18a1ec7c494f6036325ecd383ed5ac3057
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Herron 
Gerrit-Reviewer: Herron 
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]: Add ::statistics::wmde::wdcm

2017-11-13 Thread Ottomata (Code Review)

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

Change subject: Add ::statistics::wmde::wdcm
..


Add ::statistics::wmde::wdcm

 - fetch wdcm code using the analytics-wmde user
 - make sure packages required by scripts exist

Bug: T171258
Change-Id: I9c8599bb94d94ccff34483a7dff1b0da2b78e55e
---
M modules/statistics/manifests/wmde.pp
A modules/statistics/manifests/wmde/wdcm.pp
2 files changed, 52 insertions(+), 0 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved
  Addshore: Looks good to me, but someone else must approve



diff --git a/modules/statistics/manifests/wmde.pp 
b/modules/statistics/manifests/wmde.pp
index 624b28c..be05d1c 100644
--- a/modules/statistics/manifests/wmde.pp
+++ b/modules/statistics/manifests/wmde.pp
@@ -40,4 +40,12 @@
 wmde_secrets  => $wmde_secrets,
 require   => User[$user],
 }
+
+# Wikidata concepts processing
+class { '::statistics::wmde::wdcm':
+dir => "${homedir}/wdcm",
+user=> $user,
+require => User[$user],
+}
+
 }
diff --git a/modules/statistics/manifests/wmde/wdcm.pp 
b/modules/statistics/manifests/wmde/wdcm.pp
new file mode 100644
index 000..09c1ade
--- /dev/null
+++ b/modules/statistics/manifests/wmde/wdcm.pp
@@ -0,0 +1,44 @@
+# Licence AGPL version 3 or later
+#
+# @author Addshore
+#
+# Related task: https://phabricator.wikimedia.org/T171258
+#
+# == Parameters
+#   dir   - string. Directory to use.
+#   user  - string. User to use.
+class statistics::wmde::wdcm(
+$dir,
+$user  = 'analytics-wmde'
+) {
+
+$src_dir  = "${dir}/src"
+
+file { $dir:
+ensure  => 'directory',
+owner   => $user,
+group   => $user,
+mode=> '0644',
+require => User[$user],
+}
+
+git::clone { 'analytics/wmde/WDCM':
+# TODO do we want a similar latest & production branch here? Or just 
manually pulling? scap?
+# Currently when we update the code in the repo we will have to pull 
the updates ourselves.
+ensure=> 'present',
+branch=> 'master',
+directory => $src_dir,
+owner => $user,
+group => $user,
+require   => File[$dir],
+}
+
+# TODO the scripts in the WDCM repo require R, but apparently we can't 
specify that here without things breaking.
+
+# TODO we also can't yes install any R packages that we require, but we 
work around that by using a maanual script.
+# The WDCM repo has a script _installProduction_analytics-wmde.R which can 
be used to install the libraries needed.
+# https://phabricator.wikimedia.org/T170995
+
+# TODO crons for the R scripts will live here once each script is ready 
for production.
+
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c8599bb94d94ccff34483a7dff1b0da2b78e55e
Gerrit-PatchSet: 15
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Bearloga 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: GoranSMilovanovic 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: reflinks handle FatalServerError & Server504Error [T180308]

2017-11-13 Thread Gerrit Patch Uploader (Code Review)

Gerrit Patch Uploader has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/391077 )

Change subject: reflinks handle FatalServerError & Server504Error [T180308]
..

reflinks handle FatalServerError & Server504Error [T180308]

reflinks.py crashes when FatalServerError & Server504Error occurs. this patch 
add error handling to ignore both of them while checking for reference link 
title

Change-Id: Ief433c2ab46376f430b01a51bc1820186bb61077
---
M scripts/reflinks.py
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/77/391077/1

diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 6553876..e9c0243 100755
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -599,7 +599,9 @@
 except (URLError,
 socket.error,
 IOError,
-httplib.error) as e:
+httplib.error,
+pywikibot.FatalServerError,
+pywikibot.Server504Error) as e:
 pywikibot.output(u'Can\'t retrieve page %s : %s'
  % (ref.url, e))
 continue

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief433c2ab46376f430b01a51bc1820186bb61077
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Remove old deprecated SavedPages database table.

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Remove old deprecated SavedPages database table.
..


Remove old deprecated SavedPages database table.

This is long overdue, and is in preparation for the new implementation of
reading list syncing.

Change-Id: I7f3e97841d0d54a08486b436c1d8413890f11efc
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/database/Database.java
D app/src/main/java/org/wikipedia/database/contract/SavedPageContract.java
M app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
D app/src/main/java/org/wikipedia/savedpages/SavedPage.java
D app/src/main/java/org/wikipedia/savedpages/SavedPageDatabaseTable.java
6 files changed, 1 insertion(+), 235 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 0c1a0c5..974b4a6 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -47,7 +47,6 @@
 import org.wikipedia.readinglist.page.ReadingListPageRow;
 import org.wikipedia.readinglist.page.database.ReadingListPageHttpRow;
 import org.wikipedia.readinglist.page.database.disk.ReadingListPageDiskRow;
-import org.wikipedia.savedpages.SavedPage;
 import org.wikipedia.search.RecentSearch;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.settings.RemoteConfig;
@@ -298,8 +297,6 @@
 client = new DatabaseClient<>(this, PageImage.DATABASE_TABLE);
 } else if (cls.equals(RecentSearch.class)) {
 client = new DatabaseClient<>(this, 
RecentSearch.DATABASE_TABLE);
-} else if (cls.equals(SavedPage.class)) {
-client = new DatabaseClient<>(this, SavedPage.DATABASE_TABLE);
 } else if (cls.equals(EditSummary.class)) {
 client = new DatabaseClient<>(this, 
EditSummary.DATABASE_TABLE);
 } else if (cls.equals(UserOption.class)) {
diff --git a/app/src/main/java/org/wikipedia/database/Database.java 
b/app/src/main/java/org/wikipedia/database/Database.java
index 611fbc9..34e8098 100644
--- a/app/src/main/java/org/wikipedia/database/Database.java
+++ b/app/src/main/java/org/wikipedia/database/Database.java
@@ -10,7 +10,6 @@
 import org.wikipedia.pageimages.PageImage;
 import org.wikipedia.readinglist.database.ReadingListRow;
 import org.wikipedia.readinglist.page.ReadingListPageRow;
-import org.wikipedia.savedpages.SavedPage;
 import org.wikipedia.search.RecentSearch;
 import org.wikipedia.useroption.database.UserOptionRow;
 import org.wikipedia.util.log.L;
@@ -23,7 +22,6 @@
 HistoryEntry.DATABASE_TABLE,
 PageImage.DATABASE_TABLE,
 RecentSearch.DATABASE_TABLE,
-SavedPage.DATABASE_TABLE,
 EditSummary.DATABASE_TABLE,
 
 // Order matters. UserOptionDatabaseTable has a dependency on
diff --git 
a/app/src/main/java/org/wikipedia/database/contract/SavedPageContract.java 
b/app/src/main/java/org/wikipedia/database/contract/SavedPageContract.java
deleted file mode 100644
index da2f307..000
--- a/app/src/main/java/org/wikipedia/database/contract/SavedPageContract.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.wikipedia.database.contract;
-
-import android.net.Uri;
-import android.provider.BaseColumns;
-
-import org.wikipedia.database.DbUtil;
-import org.wikipedia.database.column.DateColumn;
-import org.wikipedia.database.column.LongColumn;
-import org.wikipedia.database.column.StrColumn;
-
-@Deprecated @SuppressWarnings("checkstyle:interfaceistype")
-public final class SavedPageContract {
-public static final String TABLE = "savedpages";
-private static final String PATH = "saved";
-
-public interface Col {
-LongColumn ID = new LongColumn(TABLE, BaseColumns._ID, "integer 
primary key");
-StrColumn SITE = new StrColumn(TABLE, "site", "string");
-StrColumn LANG = new StrColumn(TABLE, "lang", "text");
-StrColumn TITLE = new StrColumn(TABLE, "title", "string");
-StrColumn NAMESPACE = new StrColumn(TABLE, "namespace", "string");
-DateColumn TIMESTAMP = new DateColumn(TABLE, "timestamp", "integer");
-
-String[] SELECTION = DbUtil.qualifiedNames(SITE, LANG, NAMESPACE, 
TITLE);
-}
-
-public interface Page extends Col {
-String PATH = SavedPageContract.PATH + "/page";
-Uri URI = 
Uri.withAppendedPath(AppContentProviderContract.AUTHORITY_BASE, PATH);
-}
-
-private SavedPageContract() { }
-}
diff --git 
a/app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java 
b/app/src/main/java/org/wikipedia/readinglist/database/ReadingListTable.java
index 0dd886b..1bd5a8a 100644
---

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: puppetmaster remove puppetmaster-common package ensure

2017-11-13 Thread Herron (Code Review)

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

Change subject: puppet: puppetmaster remove puppetmaster-common package ensure
..

puppet: puppetmaster remove puppetmaster-common package ensure

remove puppetmaster-common package ensure from puppetmaster module. this
package has been removed from newer releases and on older systems will
be installed as a dependency of the puppetmaster-passenger package.

Bug: T177254
Change-Id: I7dfbab18a1ec7c494f6036325ecd383ed5ac3057
---
M modules/puppetmaster/manifests/hiera.pp
M modules/puppetmaster/manifests/init.pp
M modules/puppetmaster/manifests/passenger.pp
3 files changed, 1 insertion(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/391076/1

diff --git a/modules/puppetmaster/manifests/hiera.pp 
b/modules/puppetmaster/manifests/hiera.pp
index c9d745e..866cd12 100644
--- a/modules/puppetmaster/manifests/hiera.pp
+++ b/modules/puppetmaster/manifests/hiera.pp
@@ -19,8 +19,5 @@
 group   => 'root',
 mode=> '0444',
 source  => $source,
-require => Package['puppetmaster-common'],
 }
-# We don't need to declare ruby-hiera as a package explicitly as
-# puppetmaster-common depends on ruby-hiera.
 }
diff --git a/modules/puppetmaster/manifests/init.pp 
b/modules/puppetmaster/manifests/init.pp
index 37e1c22..e15b50f 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -84,15 +84,8 @@
 default => 'puppetmaster',
 }
 
-# puppetmaster-common package name changed to puppet-master-common with 
version 4
-$puppetmaster_common_package_name = $puppet_major_version ? {
-4   => 'puppet-master-common',
-default => 'puppetmaster-common',
-}
-
 package { [
 $puppetmaster_package_name,
-$puppetmaster_common_package_name,
 'vim-puppet',
 'puppet-el',
 'rails',
diff --git a/modules/puppetmaster/manifests/passenger.pp 
b/modules/puppetmaster/manifests/passenger.pp
index 7939674..7c11fcb 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -66,12 +66,6 @@
 default => 'puppetmaster-passenger',
 }
 
-# puppetmaster-common package name changed to puppet-master-common with 
version 4
-$puppetmaster_common_package_name = $puppet_major_version ? {
-4   => 'puppet-master-common',
-default => 'puppetmaster-common',
-}
-
 package { $puppetmaster_passenger_package_name:
 ensure => present,
 }
@@ -93,8 +87,7 @@
 mode=> '0444',
 source  => 'puppet:///modules/puppetmaster/default',
 require => [
-Package[ $puppetmaster_passenger_package_name ],
-Package[ $puppetmaster_common_package_name ]
+Package[ $puppetmaster_passenger_package_name ]
 ],
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: parallel-lint/phpcs: Don't scan .git

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: parallel-lint/phpcs: Don't scan .git
..


parallel-lint/phpcs: Don't scan .git

I have a few branches locally that are named something.php,
which phpcs scans (and then reports errors).
There's no need for these tools to scan .git, so just leave it.

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

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



diff --git a/composer.json b/composer.json
index db002aa..50f2b35 100644
--- a/composer.json
+++ b/composer.json
@@ -76,8 +76,8 @@
"fix": "phpcbf",
"test": [
"composer validate --no-interaction",
-   "parallel-lint . --exclude vendor --exclude 
node_modules",
-   "phpcs -p -s"
+   "parallel-lint . --exclude vendor --exclude 
node_modules --exclude .git",
+   "phpcs -p -s --ignore=.git"
]
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05f3665b7fa8be5516617ffcb02f24d0471fc596
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix swagger-ui spec parsing

2017-11-13 Thread Mholloway (Code Review)

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

Change subject: Fix swagger-ui spec parsing
..

Fix swagger-ui spec parsing

This was failing due to the types of items in arrays not being
specified.

Bug: T174983
Change-Id: I2a9b4034f46993d070dacd6633c32a56a4951e44
---
M spec.yaml
1 file changed, 14 insertions(+), 2 deletions(-)


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

diff --git a/spec.yaml b/spec.yaml
index e12008f..05dca89 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -833,6 +833,8 @@
   $merge:
 type: array
 description: One-element array containing the link to the RESTBase 
summary for the article
+items:
+  type: string
 required:
   - $merge
 
@@ -960,6 +962,8 @@
   $merge:
 type: array
 description: One-element array containing the link to the RESTBase 
summary for the article
+items:
+  type: string
   views:
 type: integer
 description: Number of views on the requested day
@@ -1122,7 +1126,8 @@
   platforms:
 type: array
 description: An array of platforms to display the announcement. 
Possible values are "iOSApp" or "AndroidApp"
-items: { type: string }
+items:
+  type: string
   text:
 type: string
 description: The text of the announcement
@@ -1143,7 +1148,8 @@
   countries:
 type: array
 description: An array of country codes in which to display the 
announcement. Clients should derive the country from 'GeoIP' portion of the 
Set-Cookie header
-items: { type: string }
+items:
+  type: string
 required:
   - id
   - type
@@ -1176,6 +1182,8 @@
   lang:
 type: array
 description: A list of wiki language codes documenting the language(s) 
of the articles in the compilation
+items:
+  type: string
   summary:
 type: string
 description: A short description of the compilation contents
@@ -1249,6 +1257,8 @@
   derivatives:
 type: array
 description: a list of derivatives of the original file (applies only 
to videos)
+items:
+  type: object
   ext:
 type: object
 description: extended metadata about the object (provided by the 
CommonsMetadata extension)
@@ -1285,6 +1295,8 @@
   data:
 type: array
 description: Buffer contents
+items:
+  type: string
 additionalProperties: false
 
   titles_set:

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update CiviCRM submodule

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Update CiviCRM submodule
..


Update CiviCRM submodule

456c34246b Link to contact
5f822df149 When undelete is true, add new contact as assignee for merged 
contact activity record

Change-Id: I0a6144957b6fbbb3d64b4a5be11a5a17296e1ac0
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index f0ea364..456c342 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit f0ea3643e3d34f77bbd4f3a11a1134fe1602fa2a
+Subproject commit 456c34246ba8c90caa5c13a66196fb2b455f5bca

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

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

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

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

2017-11-13 Thread jenkins-bot (Code Review)

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

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


Merge branch 'master' into deployment

6f3e30088 Fix activity_type_id
aa715dd72 Use standard 'from' in TY test form
28933a2bc Update CiviCRM submodule

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: If82490e5524f058154505328fc8e0a59ead2d163
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: xenon: pass --mindwidth to flamegraph.pl

2017-11-13 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/390645 )

Change subject: xenon: pass --mindwidth to flamegraph.pl
..


xenon: pass --mindwidth to flamegraph.pl

The flame graphs are currently slow to download and slow to render
because the weight threshold for plotting a function is very low.
Increasing the threshold (via --mindwidth=2) causes flamegraph.pl to
omit leaf functions that have a tiny footprint. The resultant flame
graph still contains anything anyone would reasonably care about, but is
more than ten times smaller (600k -> 50k) and renders instantly.

Change-Id: I0a01c694374799718662e16a974decfaf0589ca1
---
M modules/xenon/files/xenon-generate-svgs
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/xenon/files/xenon-generate-svgs 
b/modules/xenon/files/xenon-generate-svgs
index f2ad376..8b40f07 100755
--- a/modules/xenon/files/xenon-generate-svgs
+++ b/modules/xenon/files/xenon-generate-svgs
@@ -11,11 +11,11 @@
 mkdir -m0755 -p "$(dirname $svg)"
 [ ! -f "$svg" -o "$svg" -ot "$log" ] && {
 echo "Generating ${svg}..."
-nice /usr/local/bin/flamegraph.pl --title="$title" "$log" | gzip -9 > 
"$svg"
+nice /usr/local/bin/flamegraph.pl --minwidth=2 --title="$title" "$log" 
| gzip -9 > "$svg"
 }
 [ ! -f "$rsvg" -o "$rsvg" -ot "$log" ] && {
 echo "Generating ${rsvg}..."
-nice /usr/local/bin/flamegraph.pl --reverse --colors=blue 
--title="$title - reversed" "$log" | gzip -9 > "$rsvg"
+nice /usr/local/bin/flamegraph.pl --minwidth=2 --reverse --colors=blue 
--title="$title - reversed" "$log" | gzip -9 > "$rsvg"
 }
 done
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a01c694374799718662e16a974decfaf0589ca1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

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

2017-11-13 Thread Ejegg (Code Review)

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

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

Merge branch 'master' into deployment

6f3e30088 Fix activity_type_id
aa715dd72 Use standard 'from' in TY test form
28933a2bc Update CiviCRM submodule

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/74/391074/1


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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Update CiviCRM submodule

2017-11-13 Thread Ejegg (Code Review)

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

Change subject: Update CiviCRM submodule
..

Update CiviCRM submodule

456c34246b Link to contact
5f822df149 When undelete is true, add new contact as assignee for merged 
contact activity record

Change-Id: I0a6144957b6fbbb3d64b4a5be11a5a17296e1ac0
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/73/391073/1

diff --git a/civicrm b/civicrm
index f0ea364..456c342 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit f0ea3643e3d34f77bbd4f3a11a1134fe1602fa2a
+Subproject commit 456c34246ba8c90caa5c13a66196fb2b455f5bca

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a6144957b6fbbb3d64b4a5be11a5a17296e1ac0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...chromium-render[master]: Lower render queue timeout to 60 seconds

2017-11-13 Thread Bmansurov (Code Review)

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

Change subject: Lower render queue timeout to 60 seconds
..

Lower render queue timeout to 60 seconds

Also fix up the logging messages, and make task IDs more unique.

Bug: T178501
Change-Id: Ie316bf281b0f82dfb74123243d797e3f8931e486
---
M config.dev.yaml
M lib/queue.js
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/chromium-render 
refs/changes/72/391072/1

diff --git a/config.dev.yaml b/config.dev.yaml
index ce24eb4..22792b5 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -97,4 +97,4 @@
   # the maximum number of puppeteer instances that can be launched at a 
time
   render_concurrency: 1
   # don't wait to render a PDF after this many seconds
-  render_queue_timeout: 90
\ No newline at end of file
+  render_queue_timeout: 60
\ No newline at end of file
diff --git a/lib/queue.js b/lib/queue.js
index 63ec493..b9607a9 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -48,11 +48,11 @@
   */
 _onBeforePush(data, callback) {
 const that = this;
-data._id = uuid.TimeUuid.now().toString();
+data._id = uuid.TimeUuid.now().toString() + data.uri;
 data._timeoutID = setTimeout(() => {
 that._queueObject.remove((worker) => {
 if (worker.data._id === data._id) {
-that._logger.log('trace/warning', {
+that._logger.log('warn', {
 msg: `Queue is still busy after waiting ` +
 `for ${that._timeout} secs.`
 });
@@ -106,7 +106,7 @@
 callback(null, pdf);
 })
 .catch((error) => {
-this._logger.log('trace/error', {
+this._logger.log('error', {
 msg: `Cannot convert page ${data.uri} to PDF.`,
 error
 });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie316bf281b0f82dfb74123243d797e3f8931e486
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: fix puppetmaster-passenger package in puppetmaster::...

2017-11-13 Thread Herron (Code Review)

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

Change subject: puppet: fix puppetmaster-passenger package in 
puppetmaster::passenger
..


puppet: fix puppetmaster-passenger package in puppetmaster::passenger

Bug: T177254
Change-Id: I08453f25456e825b7fcff021d8cf676b443d18f4
---
M modules/puppetmaster/manifests/passenger.pp
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/modules/puppetmaster/manifests/passenger.pp 
b/modules/puppetmaster/manifests/passenger.pp
index 5fce63c..7939674 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -22,10 +22,6 @@
 ) {
 include ::apache::mod::passenger
 
-package { 'puppetmaster-passenger':
-ensure => present,
-}
-
 # jessie-specific instructions
 if os_version('debian >= jessie') {
 # Debian jessie needs the DH params file
@@ -76,6 +72,10 @@
 default => 'puppetmaster-common',
 }
 
+package { $puppetmaster_passenger_package_name:
+ensure => present,
+}
+
 # Since we are running puppet via passenger, we need to ensure
 # the puppetmaster service is stopped, since they use the same port
 # and will conflict when both started.

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Use standard 'from' in TY test form

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Use standard 'from' in TY test form
..


Use standard 'from' in TY test form

Bug: T180388
Change-Id: I096f201d3fe85afc2ac045bcbd962d1834e943c1
---
M sites/all/modules/thank_you/thank_you.module
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/sites/all/modules/thank_you/thank_you.module 
b/sites/all/modules/thank_you/thank_you.module
index 1d9d610..4d88386 100644
--- a/sites/all/modules/thank_you/thank_you.module
+++ b/sites/all/modules/thank_you/thank_you.module
@@ -91,7 +91,7 @@
$form['from_address'] = array(
'#type' => 'textfield',
'#title' => t('Sender\'s email address'),
-'#default_value' => 'webmaster@local.localhost',
+'#default_value' => variable_get( 'thank_you_from_address', 
'don...@wikimedia.org' ),
'#required' => TRUE,
);
 

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

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

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

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: _installProduction_analytics-wmde.R puppetization

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: _installProduction_analytics-wmde.R puppetization
..


_installProduction_analytics-wmde.R puppetization

Change-Id: I82747d8fb4d9e3f658cd464692e44820ec2c85e4
---
A _installProduction_analytics-wmde.R
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/_installProduction_analytics-wmde.R 
b/_installProduction_analytics-wmde.R
new file mode 100644
index 000..1f54867
--- /dev/null
+++ b/_installProduction_analytics-wmde.R
@@ -0,0 +1,15 @@
+
+### --- Install WDCM R packages in production (currently: stat1005)
+### --- Hey hey: 
+### --- run as sudo -u analytics-wmde Rscript 
/srv/analytics-wmde/installRlib/_installProduction_analytics-wmde.R
+
+# - set proxy:
+Sys.setenv(
+  http_proxy = "http://webproxy.eqiad.wmnet:8080;,
+  https_proxy = "http://webproxy.eqiad.wmnet:8080;)
+
+# - install WDCM related packages:
+install.packages(c("dplyr", "httr", "stringr", "XML", "readr", 
+   "data.table", "tidyr", "maptpx", "Rtsne"),
+ lib = "/srv/analytics-wmde/r-library",
+ repos = c(CRAN = "https://www.stats.bris.ac.uk/R/;))
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I82747d8fb4d9e3f658cd464692e44820ec2c85e4
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: GoranSMilovanovic 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics...WDCM[master]: _installProduction_analytics-wmde.R puppetization

2017-11-13 Thread GoranSMilovanovic (Code Review)

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

Change subject: _installProduction_analytics-wmde.R puppetization
..

_installProduction_analytics-wmde.R puppetization

Change-Id: I82747d8fb4d9e3f658cd464692e44820ec2c85e4
---
A _installProduction_analytics-wmde.R
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM 
refs/changes/71/391071/1

diff --git a/_installProduction_analytics-wmde.R 
b/_installProduction_analytics-wmde.R
new file mode 100644
index 000..1f54867
--- /dev/null
+++ b/_installProduction_analytics-wmde.R
@@ -0,0 +1,15 @@
+
+### --- Install WDCM R packages in production (currently: stat1005)
+### --- Hey hey: 
+### --- run as sudo -u analytics-wmde Rscript 
/srv/analytics-wmde/installRlib/_installProduction_analytics-wmde.R
+
+# - set proxy:
+Sys.setenv(
+  http_proxy = "http://webproxy.eqiad.wmnet:8080;,
+  https_proxy = "http://webproxy.eqiad.wmnet:8080;)
+
+# - install WDCM related packages:
+install.packages(c("dplyr", "httr", "stringr", "XML", "readr", 
+   "data.table", "tidyr", "maptpx", "Rtsne"),
+ lib = "/srv/analytics-wmde/r-library",
+ repos = c(CRAN = "https://www.stats.bris.ac.uk/R/;))
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82747d8fb4d9e3f658cd464692e44820ec2c85e4
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Copy external link numbering from content.parsoid.less

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Copy external link numbering from content.parsoid.less
..


Copy external link numbering from content.parsoid.less

Change-Id: I308d06ada35e63d81db8d034717f650d54aafc78
---
M resources/skins.minerva.content.styles/links.less
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/resources/skins.minerva.content.styles/links.less 
b/resources/skins.minerva.content.styles/links.less
index 5e2b599..db3860c 100644
--- a/resources/skins.minerva.content.styles/links.less
+++ b/resources/skins.minerva.content.styles/links.less
@@ -51,3 +51,15 @@
background: none !important;
padding: 0 !important;
 }
+
+// Numbered external links, copied from content.parsoid.less
+// TODO: Separate theme-agnostic rules from that module
+// so we can load it here.
+.mw-parser-output {
+   counter-reset: mw-numbered-ext-link;
+
+   a[rel~='mw:ExtLink']:empty:after {
+   content: '[' counter( mw-numbered-ext-link ) ']';
+   counter-increment: mw-numbered-ext-link;
+   }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I308d06ada35e63d81db8d034717f650d54aafc78
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralNotice[master]: Add API to delay call to record impression

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Add API to delay call to record impression
..


Add API to delay call to record impression

Change-Id: Ida5e777d435d157cfcf6ead7728b35b6beb330b2
Bug: T176334
---
M resources/subscribing/ext.centralNotice.display.js
M tests/qunit/subscribing/ext.centralNotice.display.tests.js
2 files changed, 264 insertions(+), 6 deletions(-)

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



diff --git a/resources/subscribing/ext.centralNotice.display.js 
b/resources/subscribing/ext.centralNotice.display.js
index 959b50b..9ced44b 100644
--- a/resources/subscribing/ext.centralNotice.display.js
+++ b/resources/subscribing/ext.centralNotice.display.js
@@ -39,8 +39,11 @@
// For providing a jQuery.Promise to signal when a banner has 
loaded
bannerLoadedDeferredObj,
 
-   // Name of a requested banner; see cn.requestBanner(), below
-   requestedBannerName = null;
+   // Name of a requested banner; see cn.requestBanner(), below.
+   requestedBannerName = null,
+
+   // Maximum time to delay the record impression call, in 
milliseconds
+   MAX_RECORD_IMPRESSION_DELAY = 250;
 
// TODO: make data.result options explicit via constants
 
@@ -199,7 +202,44 @@
.prepend( bannerHtml );
}
 
+   /**
+* Adds reallyRecordImpression() as the last handler for 
cn.recordImpressionDeferredObj,
+* then resolves.
+*/
+   function resolveRecordImpressionDeferred() {
+   cn.recordImpressionDeferredObj.done( reallyRecordImpression );
+   cn.recordImpressionDeferredObj.resolve();
+   }
+
function recordImpression() {
+   var timeout,
+   timeoutHasRun = false;
+
+   if ( cn.recordImpressionDelayPromises.length === 0 ) {
+   reallyRecordImpression();
+   return;
+   }
+
+   // If there are promises in cn.recordImpressionDelayPromises, 
then
+   // cn.recordImpressionDeferredObj (used in 
resolveRecordImpressionDeferred())
+   // should already have been set.
+
+   timeout = setTimeout( function() {
+   timeoutHasRun = true;
+   resolveRecordImpressionDeferred();
+   }, MAX_RECORD_IMPRESSION_DELAY );
+
+   // This function can only run once, so checking that the 
timeout hasn't run yet
+   // should be sufficient to prevent extra record impression 
calls.
+   $.when.apply( $, cn.recordImpressionDelayPromises ).always( 
function () {
+   if ( !timeoutHasRun ) {
+   clearTimeout( timeout );
+   resolveRecordImpressionDeferred();
+   }
+   } );
+   }
+
+   function reallyRecordImpression() {
var state = cn.internal.state,
url;
 
@@ -321,7 +361,7 @@
 
} else {
// Otherwise, use a random number and banner weights to 
choose from among
-   // banners available to the user in this campiagn, in 
this bucket. (Most
+   // banners available to the user in this campaign, in 
this bucket. (Most
// of the time, there's only one.)
banner = chooser.chooseBanner(
campaign,
@@ -343,7 +383,7 @@
return;
}
 
-   // Pass more info about following banner selection
+   // Pass more info following banner selection
state.setBanner( banner );
 
if ( cn.kvStore ) {
@@ -470,6 +510,21 @@
 
processAfterBannerFetch();
},
+
+   /**
+* Promises to delay the record impression call, if possible; 
see
+* cn.requestRecordImpressionDelay(), below. Only exposed for 
use in tests.
+*
+* @private
+*/
+   recordImpressionDelayPromises: [],
+
+   /**
+* For providing a jQuery.Promise to signal when the record 
impression call is
+* about to be sent. (Value will be set to a new deferred 
object only as needed.)
+* @private
+*/
+   recordImpressionDeferredObj: null,
 
/**
 * Attachment point for other objects in this module that are 
not meant
@@ -657,6 +712,24 @@
},
 
/**
+* Request that, if possible, the record impression call be 
delayed until

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: parallel-lint/phpcs: Don't scan .git

2017-11-13 Thread Hoo man (Code Review)

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

Change subject: parallel-lint/phpcs: Don't scan .git
..

parallel-lint/phpcs: Don't scan .git

I have a few branches locally that are named something.php,
which phpcs scans (and then reports errors).
There's no need for these tools to scan .git, so just leave it.

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


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

diff --git a/composer.json b/composer.json
index db002aa..50f2b35 100644
--- a/composer.json
+++ b/composer.json
@@ -76,8 +76,8 @@
"fix": "phpcbf",
"test": [
"composer validate --no-interaction",
-   "parallel-lint . --exclude vendor --exclude 
node_modules",
-   "phpcs -p -s"
+   "parallel-lint . --exclude vendor --exclude 
node_modules --exclude .git",
+   "phpcs -p -s --ignore=.git"
]
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05f3665b7fa8be5516617ffcb02f24d0471fc596
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Adding Ian Marlier to wmf ldap

2017-11-13 Thread RobH (Code Review)

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

Change subject: Adding Ian Marlier to wmf ldap
..


Adding Ian Marlier to wmf ldap

inclusion in admins module for addition to wmf ldap group

Bug: T180381
Change-Id: Ib4d1d46a08a0cbf8470ec8f295f9237d71e317a1
---
M modules/admin/data/data.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 44c1303..d272410 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2869,3 +2869,7 @@
 ensure: present
 realname: Jack Gleeson
 email: jglee...@wikimedia.org
+  imarlier:
+ensure: present
+realname: Ian Marlier
+email: imarl...@wikimedia.org

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4d1d46a08a0cbf8470ec8f295f9237d71e317a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: RobH 
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]: Adding Ian Marlier to wmf ldap

2017-11-13 Thread RobH (Code Review)

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

Change subject: Adding Ian Marlier to wmf ldap
..

Adding Ian Marlier to wmf ldap

inclusion in admins module for addition to wmf ldap group

Bug: T180381
Change-Id: Ib4d1d46a08a0cbf8470ec8f295f9237d71e317a1
---
M modules/admin/data/data.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 44c1303..d272410 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2869,3 +2869,7 @@
 ensure: present
 realname: Jack Gleeson
 email: jglee...@wikimedia.org
+  imarlier:
+ensure: present
+realname: Ian Marlier
+email: imarl...@wikimedia.org

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Dump entities: Add --no-cache to avoid reading from entity c...

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Dump entities: Add --no-cache to avoid reading from entity 
caches
..


Dump entities: Add --no-cache to avoid reading from entity caches

In production we know that the hit rate for on the cache will be
0 if on Zend… thus it's way way faster to not bother looking.

Bug: T180048
Change-Id: I7c8515ad83eee3c66c69a2282cdee974ed149900
---
M repo/maintenance/dumpEntities.php
M repo/maintenance/dumpJson.php
M repo/maintenance/dumpRdf.php
3 files changed, 18 insertions(+), 2 deletions(-)

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



diff --git a/repo/maintenance/dumpEntities.php 
b/repo/maintenance/dumpEntities.php
index defdfa8..5f887f6 100644
--- a/repo/maintenance/dumpEntities.php
+++ b/repo/maintenance/dumpEntities.php
@@ -51,6 +51,7 @@
$this->addOption( 'log', "Log file (default is stderr). Will be 
appended.", false, true );
$this->addOption( 'quiet', "Disable progress reporting", false, 
false );
$this->addOption( 'limit', "Limit how many entities are 
dumped.", false, true );
+   $this->addOption( 'no-cache', "If this is set, don't try to 
read from an EntityRevisionCache.", false, false );
}
 
public function setDumpEntitiesServices( SqlEntityIdPagerFactory 
$sqlEntityIdPagerFactory ) {
@@ -211,6 +212,19 @@
}
 
/**
+* Cache flag for use in Store::getEntityRevisionLookup.
+*
+* @return string One of "retrieve-only" and "uncached"
+*/
+   protected function getEntityRevisionLookupCacheMode() {
+   if ( $this->getOption( 'no-cache', false ) ) {
+   return 'uncached';
+   } else {
+   return 'retrieve-only';
+   }
+   }
+
+   /**
 * @param string|null $entityType
 *
 * @return SqlEntityIdPager
diff --git a/repo/maintenance/dumpJson.php b/repo/maintenance/dumpJson.php
index ef93de1..05d19f0 100644
--- a/repo/maintenance/dumpJson.php
+++ b/repo/maintenance/dumpJson.php
@@ -80,7 +80,9 @@
$wikibaseRepo->getEntityNamespaceLookup(),
$wikibaseRepo->getEntityIdParser()
);
-   $revisionLookup = 
$wikibaseRepo->getEntityRevisionLookup( 'retrieve-only' );
+   $revisionLookup = 
$wikibaseRepo->getEntityRevisionLookup(
+   $this->getEntityRevisionLookupCacheMode()
+   );
 
$this->setServices(
$sqlEntityIdPagerFactory,
diff --git a/repo/maintenance/dumpRdf.php b/repo/maintenance/dumpRdf.php
index f1e6b1b..0ad22a5 100644
--- a/repo/maintenance/dumpRdf.php
+++ b/repo/maintenance/dumpRdf.php
@@ -120,7 +120,7 @@
$wikibaseRepo->getPropertyDataTypeLookup(),
$wikibaseRepo->getValueSnakRdfBuilderFactory(),
$wikibaseRepo->getEntityRdfBuilderFactory(),
-   $wikibaseRepo->getEntityRevisionLookup( 
'retrieve-only' ),
+   $wikibaseRepo->getEntityRevisionLookup( 
$this->getEntityRevisionLookupCacheMode() ),
$wikibaseRepo->getRdfVocabulary(),
$wikibaseRepo->getEntityContentFactory()
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c8515ad83eee3c66c69a2282cdee974ed149900
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Add screenshot tasks for manual and re-use tabs in Citoid

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Add screenshot tasks for manual and re-use tabs in Citoid
..


Add screenshot tasks for manual and re-use tabs in Citoid

Bug: T180363
Change-Id: Icf9a370e7b80611b1f5e897e31e0004b656dabac
---
M build/screenshots.userGuide.js
1 file changed, 32 insertions(+), 0 deletions(-)

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



diff --git a/build/screenshots.userGuide.js b/build/screenshots.userGuide.js
index 6782dd3..d57fa17 100644
--- a/build/screenshots.userGuide.js
+++ b/build/screenshots.userGuide.js
@@ -59,6 +59,38 @@
}, 500 );
}
);
+   runScreenshotTest( 
'VisualEditor_Citoid_Inspector_Manual', lang,
+   // This function is converted to a 
string and executed in the browser
+   function () {
+   var done = arguments[ 
arguments.length - 1 ],
+   surface = 
ve.init.target.surface;
+   
ve.init.target.surface.context.inspectors.currentWindow.setModePanel( 'manual' 
);
+   setTimeout( function () {
+   done(
+   
seleniumUtils.getBoundingRect( [
+   
surface.$element.find( '.ve-ce-mwReferenceNode' )[ 0 ],
+   
surface.context.inspectors.currentWindow.$element[ 0 ]
+   ] )
+   );
+   } );
+   }
+   );
+   runScreenshotTest( 
'VisualEditor_Citoid_Inspector_Reuse', lang,
+   // This function is converted to a 
string and executed in the browser
+   function () {
+   var done = arguments[ 
arguments.length - 1 ],
+   surface = 
ve.init.target.surface;
+   
ve.init.target.surface.context.inspectors.currentWindow.setModePanel( 'reuse' );
+   setTimeout( function () {
+   done(
+   
seleniumUtils.getBoundingRect( [
+   
surface.$element.find( '.ve-ce-mwReferenceNode' )[ 0 ],
+   
surface.context.inspectors.currentWindow.$element[ 0 ]
+   ] )
+   );
+   } );
+   }
+   );
} );
test.it( 'Tool groups (headings/text 
style/indentation/insert/page settings)', function () {
runScreenshotTest( 
'VisualEditor_Toolbar_Headings', lang,

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

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

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

[MediaWiki-commits] [Gerrit] unicodejs[master]: Use versioned URLs for data, instead of latest

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Use versioned URLs for data, instead of latest
..


Use versioned URLs for data, instead of latest

Also fix some ES6 linting issues.

Change-Id: Id26df4be2109c4b2eec157a1b0ab49050be94056
---
M .eslintrc.json
M Gruntfile.js
M build/moduleUtils.js
M tools/unicodejs-properties.js
4 files changed, 14 insertions(+), 15 deletions(-)

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



diff --git a/.eslintrc.json b/.eslintrc.json
index 0a7a6fa..0129817 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,8 +1,5 @@
 {
 "extends": "wikimedia",
-"parserOptions": {
-"ecmaVersion": 5
-},
 "env": {
 "qunit": true
 },
diff --git a/Gruntfile.js b/Gruntfile.js
index ce29a8d..f327712 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,4 @@
-/* eslint-env node */
+/* eslint-env node, es6 */
 module.exports = function ( grunt ) {
var modules = grunt.file.readJSON( 'build/modules.json' ),
moduleUtils = require( './build/moduleUtils' ),
@@ -28,7 +28,7 @@
eslint: {
all: [
'*.js',
-   '{build,src,tests}/**/*.js'
+   '{build,src,tests,tools}/**/*.js'
]
},
karma: {
diff --git a/build/moduleUtils.js b/build/moduleUtils.js
index 2c5504f..09b1b37 100644
--- a/build/moduleUtils.js
+++ b/build/moduleUtils.js
@@ -4,7 +4,7 @@
  * Code shared with the OOjs UI project
  */
 
-/* eslint-env node */
+/* eslint-env node, es6 */
 module.exports = {
/**
 * Expand an array of file paths and variant-objects into
diff --git a/tools/unicodejs-properties.js b/tools/unicodejs-properties.js
index 85c175b..3bba6d9 100755
--- a/tools/unicodejs-properties.js
+++ b/tools/unicodejs-properties.js
@@ -2,9 +2,11 @@
 
 // Generates unicodejs.*(properties|categories).js from Unicode data
 
-/* eslint-env node */
+/* eslint-env node, es6 */
+/* eslint-disable no-console */
 
-var http = require( 'http' ),
+const VERSION = '8.0.0',
+   http = require( 'http' ),
fs = require( 'fs' );
 
 function extractProperties( body, jsname, full, propPatterns, 
excludeSurrogates ) {
@@ -19,7 +21,7 @@
definitionTest = 
/^([0-9A-F]{4,6})(?:\.\.([0-9A-F]{4,6}))?\s*;\s*(\w+)\s*#/;
 
lines.forEach( function ( line ) {
-   var matches, jsname, start, end, propText;
+   var matches, start, end, propText;
 
line = line.trim();
// Ignore comment or blank lines
@@ -114,35 +116,35 @@
 
 [
{
-   url: 
'http://unicode.org/Public/UNIDATA/DerivedCoreProperties.txt',
+   url: 
'http://unicode.org/Public/%V/ucd/DerivedCoreProperties.txt',
jsname: 'derivedcoreproperties',
propPatterns: [ /^(Alphabetic)$/ ]
},
{
-   url: 
'http://www.unicode.org/Public/UNIDATA/extracted/DerivedGeneralCategory.txt',
+   url: 
'http://www.unicode.org/Public/%V/ucd/extracted/DerivedGeneralCategory.txt',
jsname: 'derivedgeneralcategories',
propPatterns: [ /^(Pc)$/, /^(M).*$/ ]
},
{
-   url: 
'http://www.unicode.org/Public/UNIDATA/auxiliary/GraphemeBreakProperty.txt',
+   url: 
'http://www.unicode.org/Public/%V/ucd/auxiliary/GraphemeBreakProperty.txt',
jsname: 'graphemebreakproperties',
full: true,
propPatterns: [ /^(.*)$/ ],
excludeSurrogates: true
},
{
-   url: 
'http://www.unicode.org/Public/UNIDATA/auxiliary/WordBreakProperty.txt',
+   url: 
'http://www.unicode.org/Public/%V/ucd/auxiliary/WordBreakProperty.txt',
jsname: 'wordbreakproperties',
full: true,
propPatterns: [ /^(.*)$/ ]
},
{
-   url: 
'http://www.unicode.org/Public/UCD/latest/ucd/extracted/DerivedBidiClass.txt',
+   url: 
'http://www.unicode.org/Public/%V/ucd/extracted/DerivedBidiClass.txt',
jsname: 'derivedbidiclasses',
propPatterns: [ /^(L|R|AL)$/ ]
}
 ].forEach( function ( options ) {
-   var request = http.request( options.url, function ( res ) {
+   var request = http.request( options.url.replace( '%V', VERSION ), 
function ( res ) {
var body = '';
 
res.on( 'data', function ( data ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id26df4be2109c4b2eec157a1b0ab49050be94056
Gerrit-PatchSet: 1
Gerrit-Project: unicodejs

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Bump to mediawiki-title@0.6.5

2017-11-13 Thread jenkins-bot (Code Review)

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

Change subject: Bump to mediawiki-title@0.6.5
..


Bump to mediawiki-title@0.6.5

 * Bonus, make use of getPrefixedText in one instance.

Change-Id: Ieb21006c281a5be5cea6096f152f281a46e1b768
---
M lib/wt2html/tt/LinkHandler.js
M npm-shrinkwrap.json
M package.json
3 files changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 691026e..b6d7aa8 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -521,8 +521,7 @@
 
// Add title unless it's just a fragment
if (target.href[0] !== '#') {
-   // Normalize title according to how PHP parser does it currently
-   newTk.setAttribute('title', 
target.title.getPrefixedDBKey().replace(/_/g, ' '));
+   newTk.setAttribute('title', target.title.getPrefixedText());
}
 
cb({ tokens: [newTk].concat(content, [new EndTagTk('a')]) });
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index fc4f4e7..963a753 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1686,9 +1686,9 @@
   "resolved": 
"https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz;
 },
 "mediawiki-title": {
-  "version": "0.6.4",
-  "from": "mediawiki-title@0.6.4",
-  "resolved": 
"https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz;
+  "version": "0.6.5",
+  "from": "mediawiki-title@0.6.5",
+  "resolved": 
"https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz;
 },
 "merge": {
   "version": "1.2.0",
diff --git a/package.json b/package.json
index 6ea27ce..244d751 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
 "express-handlebars": "^3.0.0",
 "finalhandler": "^1.0.6",
 "js-yaml": "^3.8.3",
-"mediawiki-title": "^0.6.4",
+"mediawiki-title": "^0.6.5",
 "negotiator": 
"git+https://github.com/arlolra/negotiator#full-parse-access;,
 "pegjs": "git+https://github.com/tstarling/pegjs#fork;,
 "prfun": "^2.1.4",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb21006c281a5be5cea6096f152f281a46e1b768
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Sbailey 
Gerrit-Reviewer: Subramanya Sastry 
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]: puppet: fix puppetmaster-passenger package in puppetmaster::...

2017-11-13 Thread Herron (Code Review)

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

Change subject: puppet: fix puppetmaster-passenger package in 
puppetmaster::passenger
..

puppet: fix puppetmaster-passenger package in puppetmaster::passenger

Bug: T177254
Change-Id: I08453f25456e825b7fcff021d8cf676b443d18f4
---
M modules/puppetmaster/manifests/passenger.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/391067/1

diff --git a/modules/puppetmaster/manifests/passenger.pp 
b/modules/puppetmaster/manifests/passenger.pp
index 5fce63c..7939674 100644
--- a/modules/puppetmaster/manifests/passenger.pp
+++ b/modules/puppetmaster/manifests/passenger.pp
@@ -22,10 +22,6 @@
 ) {
 include ::apache::mod::passenger
 
-package { 'puppetmaster-passenger':
-ensure => present,
-}
-
 # jessie-specific instructions
 if os_version('debian >= jessie') {
 # Debian jessie needs the DH params file
@@ -76,6 +72,10 @@
 default => 'puppetmaster-common',
 }
 
+package { $puppetmaster_passenger_package_name:
+ensure => present,
+}
+
 # Since we are running puppet via passenger, we need to ensure
 # the puppetmaster service is stopped, since they use the same port
 # and will conflict when both started.

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_upload: do not apply 256K hfp to CL-less requests

2017-11-13 Thread BBlack (Code Review)

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

Change subject: cache_upload: do not apply 256K hfp to CL-less requests
..


cache_upload: do not apply 256K hfp to CL-less requests

Change-Id: Ib3e14c94fcf9b078fff388b04f27f23b7d9117ea
---
M modules/varnish/templates/upload-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/varnish/templates/upload-frontend.inc.vcl.erb 
b/modules/varnish/templates/upload-frontend.inc.vcl.erb
index 5c10bc4..a00a667 100644
--- a/modules/varnish/templates/upload-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/upload-frontend.inc.vcl.erb
@@ -115,7 +115,7 @@
}
 
// hit-for-pass objects >= 256K size
-   if (std.integer(beresp.http.Content-Length, 262144) >= 262144 || 
beresp.http.Content-Length ~ "^[0-9]{9}") {
+   if (std.integer(beresp.http.Content-Length, 0) >= 262144 || 
beresp.http.Content-Length ~ "^[0-9]{9}") {
set beresp.http.X-CDIS = "pass";
set beresp.uncacheable = true;
return (deliver);

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

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

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

1 2 3 4 >

1 - 100 of 308 matches

Mail list logo