date:20171204

[MediaWiki-commits] [Gerrit] translatewiki[master]: Use more of ?? operator in RepoNG

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Use more of ?? operator in RepoNG
..


Use more of ?? operator in RepoNG

Change-Id: Icff84e8d1647d32d56bebaf18fbaa784c14842b3
---
M repong/repong.php
1 file changed, 3 insertions(+), 6 deletions(-)

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



diff --git a/repong/repong.php b/repong/repong.php
index 5780232..8e37947 100644
--- a/repong/repong.php
+++ b/repong/repong.php
@@ -244,7 +244,7 @@
// could be ahead of the state that has been processed in the 
wiki.
// With state synchronization we ensure we do not overwrite any
// changes that have been made in the between.
-   $stateDir = isset( $meta[ 'state-directory' ] ) ? $meta[ 
'state-directory' ] : false;
+   $stateDir = $meta[ 'state-directory' ] ?? false;
 
$processes = new SplObjectStorage();
 
@@ -272,10 +272,7 @@
}
 
if ( $type === 'git' ) {
-   $userName = get_current_user();
-   if ( isset( 
$this->usernameConversion[$userName] ) ) {
-   $userName = 
$this->usernameConversion[$userName];
-   }
+   $userName = $this->usernameConversion[ 
$userName ] ?? get_current_user();
 
$repoUrl = $repo['url'];
$repoUrl = str_replace( 'USERNAME', $userName, 
$repoUrl );
@@ -431,7 +428,7 @@
$process->setWorkingDirectory( $base );
$processes->attach( $process );
 
-   $autoMerge = isset( $repo['auto-merge'] ) ? 
$repo['auto-merge'] : true;
+   $autoMerge = $repo['auto-merge'] ?? true;
 
// Merge patch sets submitted to Wikimedia's Gerrit.
if ( $repo['type'] === 'wmgerrit' && $autoMerge ) {

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Add Wikimedia Phabricator for translation

2017-12-04 Thread Nikerabbit (Code Review)

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

Change subject: Add Wikimedia Phabricator for translation
..

Add Wikimedia Phabricator for translation

Change-Id: I4acd6f422586ac3d71eb0c4afe4f58bc6d1be88f
---
M TranslateSettings.php
A groups/Phabricator/Phabricator.yaml
A groups/Phabricator/PhabricatorAgg.yaml
A groups/Phabricator/generate-yaml.php
M repoconfig.yaml
5 files changed, 792 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/96/395196/1

diff --git a/TranslateSettings.php b/TranslateSettings.php
index ad5dfb4..4a13726 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -440,3 +440,9 @@
'url' => 'https://github.com/dissemin/dissemin/issues/new',
'params' => $githubParams,
 ];
+
+wfAddNamespace( 1274, 'Phabricator' );
+$wgCapitalLinkOverrides[NS_PHABRICATOR] = false;
+$wgCapitalLinkOverrides[NS_PHABRICATOR_TALK] = false;
+$wgTranslateGroupFiles[] = "$GROUPS/Phabricator/PhabricatorAgg.yaml";
+$wgTranslateGroupFiles[] = "$GROUPS/Phabricator/Phabricator.yaml";
diff --git a/groups/Phabricator/Phabricator.yaml 
b/groups/Phabricator/Phabricator.yaml
new file mode 100644
index 000..2b386cc
--- /dev/null
+++ b/groups/Phabricator/Phabricator.yaml
@@ -0,0 +1,742 @@
+TEMPLATE:
+  BASIC:
+icon: wiki://Phacility_phabricator_logo.svg
+class: FileBasedMessageGroup
+namespace: NS_PHABRICATOR
+
+  FILES:
+class: JsonFFS
+
+  CHECKER:
+class: MediaWikiMessageChecker
+checks:
+  - wikiParameterCheck
+  - braceBalanceCheck
+
+  MANGLER:
+class: StringMatcher
+patterns:
+   - "*"
+
+  INSERTABLES:
+class: MediaWikiInsertablesSuggester
+
+---
+BASIC:
+  id: phabricator-arcanist-core
+  label: Phabricator (arcanist > core)
+FILES:
+  sourcePattern: '%GROUPROOT%/phabricator/projects/arcanist/core/%CODE%.json'
+MANGLER:
+  prefix: arcanist-core-
+
+---
+BASIC:
+  id: phabricator-libphutil-core
+  label: Phabricator (libphutil > core)
+FILES:
+  sourcePattern: '%GROUPROOT%/phabricator/projects/libphutil/core/%CODE%.json'
+MANGLER:
+  prefix: libphutil-core-
+
+---
+BASIC:
+  id: phabricator-phabricator-almanac
+  label: Phabricator (phabricator > almanac)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/almanac/%CODE%.json'
+MANGLER:
+  prefix: phabricator-almanac-
+
+---
+BASIC:
+  id: phabricator-phabricator-aphlict
+  label: Phabricator (phabricator > aphlict)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/aphlict/%CODE%.json'
+MANGLER:
+  prefix: phabricator-aphlict-
+
+---
+BASIC:
+  id: phabricator-phabricator-audit
+  label: Phabricator (phabricator > audit)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/audit/%CODE%.json'
+MANGLER:
+  prefix: phabricator-audit-
+
+---
+BASIC:
+  id: phabricator-phabricator-auth
+  label: Phabricator (phabricator > auth)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/auth/%CODE%.json'
+MANGLER:
+  prefix: phabricator-auth-
+
+---
+BASIC:
+  id: phabricator-phabricator-badges
+  label: Phabricator (phabricator > badges)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/badges/%CODE%.json'
+MANGLER:
+  prefix: phabricator-badges-
+
+---
+BASIC:
+  id: phabricator-phabricator-base
+  label: Phabricator (phabricator > base)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/base/%CODE%.json'
+MANGLER:
+  prefix: phabricator-base-
+
+---
+BASIC:
+  id: phabricator-phabricator-cache
+  label: Phabricator (phabricator > cache)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/cache/%CODE%.json'
+MANGLER:
+  prefix: phabricator-cache-
+
+---
+BASIC:
+  id: phabricator-phabricator-calendar
+  label: Phabricator (phabricator > calendar)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/calendar/%CODE%.json'
+MANGLER:
+  prefix: phabricator-calendar-
+
+---
+BASIC:
+  id: phabricator-phabricator-celerity
+  label: Phabricator (phabricator > celerity)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/celerity/%CODE%.json'
+MANGLER:
+  prefix: phabricator-celerity-
+
+---
+BASIC:
+  id: phabricator-phabricator-chatlog
+  label: Phabricator (phabricator > chatlog)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/chatlog/%CODE%.json'
+MANGLER:
+  prefix: phabricator-chatlog-
+
+---
+BASIC:
+  id: phabricator-phabricator-conduit
+  label: Phabricator (phabricator > conduit)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/conduit/%CODE%.json'
+MANGLER:
+  prefix: phabricator-conduit-
+
+---
+BASIC:
+  id: phabricator-phabricator-config
+  label: Phabricator (phabricator > config)
+FILES:
+  sourcePattern: 
'%GROUPROOT%/phabricator/projects/phabricator/config/%CODE%.json'
+MANGLER:
+  prefix:

[MediaWiki-commits] [Gerrit] translatewiki[master]: Use more of ?? operator in RepoNG

2017-12-04 Thread Nikerabbit (Code Review)

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

Change subject: Use more of ?? operator in RepoNG
..

Use more of ?? operator in RepoNG

Change-Id: Icff84e8d1647d32d56bebaf18fbaa784c14842b3
---
M repong/repong.php
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/95/395195/1

diff --git a/repong/repong.php b/repong/repong.php
index 5780232..8e37947 100644
--- a/repong/repong.php
+++ b/repong/repong.php
@@ -244,7 +244,7 @@
// could be ahead of the state that has been processed in the 
wiki.
// With state synchronization we ensure we do not overwrite any
// changes that have been made in the between.
-   $stateDir = isset( $meta[ 'state-directory' ] ) ? $meta[ 
'state-directory' ] : false;
+   $stateDir = $meta[ 'state-directory' ] ?? false;
 
$processes = new SplObjectStorage();
 
@@ -272,10 +272,7 @@
}
 
if ( $type === 'git' ) {
-   $userName = get_current_user();
-   if ( isset( 
$this->usernameConversion[$userName] ) ) {
-   $userName = 
$this->usernameConversion[$userName];
-   }
+   $userName = $this->usernameConversion[ 
$userName ] ?? get_current_user();
 
$repoUrl = $repo['url'];
$repoUrl = str_replace( 'USERNAME', $userName, 
$repoUrl );
@@ -431,7 +428,7 @@
$process->setWorkingDirectory( $base );
$processes->attach( $process );
 
-   $autoMerge = isset( $repo['auto-merge'] ) ? 
$repo['auto-merge'] : true;
+   $autoMerge = $repo['auto-merge'] ?? true;
 
// Merge patch sets submitted to Wikimedia's Gerrit.
if ( $repo['type'] === 'wmgerrit' && $autoMerge ) {

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetdb: add command-processing threads setting to puppetdb...

2017-12-04 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395080 )

Change subject: puppetdb: add command-processing threads setting to 
puppetdb::app
..


puppetdb: add command-processing threads setting to puppetdb::app

Add command_processing_threads paramater to puppetdb::app with a
default value of to 16.

Bug: T179722
Change-Id: I8cf2236becd6c1639d013f8e4eaa01aee5773a72
---
M modules/puppetdb/manifests/app.pp
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/puppetdb/manifests/app.pp 
b/modules/puppetdb/manifests/app.pp
index 8ef5a79..a012ee1 100644
--- a/modules/puppetdb/manifests/app.pp
+++ b/modules/puppetdb/manifests/app.pp
@@ -14,6 +14,7 @@
 $heap_size='4G',
 $bind_ip=undef,
 $ssldir=puppet_ssldir(),
+$command_processing_threads=16,
 ) {
 requires_os('debian >= jessie')
 
@@ -126,4 +127,11 @@
 content => template('puppetdb/puppetdb.service.erb'),
 restart => true,
 }
+
+puppetdb::config { 'command-processing':
+settings => {
+'threads' => $command_processing_threads,
+},
+}
+
 }

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix autosyncs

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Fix autosyncs
..


Fix autosyncs

Change-Id: Id2330ea78f277ff116af6ae077fe5bad5f76553c
---
M bin/autosync-mediawiki.sh
M bin/autosync.sh
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/bin/autosync-mediawiki.sh b/bin/autosync-mediawiki.sh
index e54df2d..e793485 100755
--- a/bin/autosync-mediawiki.sh
+++ b/bin/autosync-mediawiki.sh
@@ -4,6 +4,7 @@
 DIRSCRIPT="`( cd \"$DIRSCRIPT\" && pwd )`"
 NAME=mediawiki
 
+cd /resources/projects
 php "$DIRSCRIPT/../repong/repong.php" list | grep ^mediawiki | xargs -n1 -P4 
"$DIRSCRIPT/repo" update
 
 php 
/srv/mediawiki/targets/production/extensions/Translate/scripts/processMessageChanges.php
 \
diff --git a/bin/autosync.sh b/bin/autosync.sh
index f4c70f0..59992e1 100755
--- a/bin/autosync.sh
+++ b/bin/autosync.sh
@@ -6,6 +6,7 @@
 DIRSCRIPT="`( cd \"$DIRSCRIPT\" && pwd )`"
 NAME="non-mediawiki"
 
+cd /resources/projects
 php "$DIRSCRIPT/../repong/repong.php" list | grep -v ^mediawiki | xargs -n1 
-P4 "$DIRSCRIPT/repo" update
 
 php 
/srv/mediawiki/targets/production/extensions/Translate/scripts/processMessageChanges.php
 \

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: Fix autosyncs

2017-12-04 Thread Nikerabbit (Code Review)

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

Change subject: Fix autosyncs
..

Fix autosyncs

Change-Id: Id2330ea78f277ff116af6ae077fe5bad5f76553c
---
M bin/autosync-mediawiki.sh
M bin/autosync.sh
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/86/395186/1

diff --git a/bin/autosync-mediawiki.sh b/bin/autosync-mediawiki.sh
index e54df2d..e793485 100755
--- a/bin/autosync-mediawiki.sh
+++ b/bin/autosync-mediawiki.sh
@@ -4,6 +4,7 @@
 DIRSCRIPT="`( cd \"$DIRSCRIPT\" && pwd )`"
 NAME=mediawiki
 
+cd /resources/projects
 php "$DIRSCRIPT/../repong/repong.php" list | grep ^mediawiki | xargs -n1 -P4 
"$DIRSCRIPT/repo" update
 
 php 
/srv/mediawiki/targets/production/extensions/Translate/scripts/processMessageChanges.php
 \
diff --git a/bin/autosync.sh b/bin/autosync.sh
index f4c70f0..59992e1 100755
--- a/bin/autosync.sh
+++ b/bin/autosync.sh
@@ -6,6 +6,7 @@
 DIRSCRIPT="`( cd \"$DIRSCRIPT\" && pwd )`"
 NAME="non-mediawiki"
 
+cd /resources/projects
 php "$DIRSCRIPT/../repong/repong.php" list | grep -v ^mediawiki | xargs -n1 
-P4 "$DIRSCRIPT/repo" update
 
 php 
/srv/mediawiki/targets/production/extensions/Translate/scripts/processMessageChanges.php
 \

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Add Korean translation for Special pages

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Add Korean translation for Special pages
..


Add Korean translation for Special pages

Change-Id: If34f9ce121ed897784a4842d8acbf8e7d74e351c
Signed-off-by: Yongmin Hong 
---
M Linter.alias.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Linter.alias.php b/Linter.alias.php
index d20f437..779cde1 100644
--- a/Linter.alias.php
+++ b/Linter.alias.php
@@ -30,6 +30,11 @@
'LintErrors' => [ 'Errores_de_sintaxis' ],
 ];
 
+/** 한국어 (Korean) */
+$specialPageAliases['ko'] = [
+   'LintErrors' => [ '린트오류' ],
+];
+
 /** Urdu (اردو) */
 $specialPageAliases['ur'] = [
'LintErrors' => [ 'نحوی_نقائص' ],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If34f9ce121ed897784a4842d8acbf8e7d74e351c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Revi 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Add Korean translation for Special pages

2017-12-04 Thread Revi (Code Review)

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

Change subject: Add Korean translation for Special pages
..

Add Korean translation for Special pages

Change-Id: If34f9ce121ed897784a4842d8acbf8e7d74e351c
Signed-off-by: Yongmin Hong 
---
M Linter.alias.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/Linter.alias.php b/Linter.alias.php
index d20f437..80cd4aa 100644
--- a/Linter.alias.php
+++ b/Linter.alias.php
@@ -30,6 +30,11 @@
'LintErrors' => [ 'Errores_de_sintaxis' ],
 ];
 
+/** 한국어 (Korean */
+$specialPageAliases['ko'] = [
+   'LintErrors' => [ '린트오류' ],
+];
+
 /** Urdu (اردو) */
 $specialPageAliases['ur'] = [
'LintErrors' => [ 'نحوی_نقائص' ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If34f9ce121ed897784a4842d8acbf8e7d74e351c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Linter
Gerrit-Branch: master
Gerrit-Owner: Revi 

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Don't construct HTML manually

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Don't construct HTML manually
..


Don't construct HTML manually

Also some other minor tweaks.

Change-Id: Ie99feecfd17134d04e25c796d524028a0cc35c83
---
M README.md
M src/Hooks.php
M src/Person.php
3 files changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/README.md b/README.md
index 75ac6c3..6e2de20 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 MediaWiki Genealogy extension
 =
 
-All details: https://mediawiki.org/wiki/Extension:Genealogy
+All details: https://www.mediawiki.org/wiki/Extension:Genealogy
diff --git a/src/Hooks.php b/src/Hooks.php
index 267dff2..1e2c3f3 100644
--- a/src/Hooks.php
+++ b/src/Hooks.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Extensions\Genealogy;
 
 use EditPage;
+use Html;
 use MediaWiki\MediaWikiServices;
 use OutputPage;
 use Parser;
@@ -36,9 +37,9 @@
$peopleList[] = $renderer->makeKnownLink( 
$partner->getTitle() );
}
if ( count( $peopleList ) > 0 ) {
-   $msg = wfMessage( 'genealogy-existing-partners', count( 
$peopleList ) );
-   $successBox = '' . $msg. join( ', 
', $peopleList ) . '';
-   $output->addHTML( $successBox );
+   $msg = $output->msg( 'genealogy-existing-partners', 
count( $peopleList ) );
+   $partnersMsg = $msg . join( ', ', $peopleList );
+   $output->addHTML( Html::rawElement( 'p', [], 
$partnersMsg ) );
}
}
 
@@ -47,7 +48,7 @@
 * The input parameters are wikitext with templates expanded.
 * The output should be wikitext too.
 * @param Parser $parser The parser.
-* @return string The wikitext with which to replace the parser 
function call.
+* @return string|mixed[] The wikitext with which to replace the parser 
function call.
 */
public static function renderParserFunction( Parser $parser ) {
$params = [];
@@ -56,7 +57,7 @@
array_shift( $args );
// Get param 1, the function type.
$type = array_shift( $args );
-   // Everything that's left must be named.
+   // Everything that remains is required to be named (i.e. we 
discard other unnamed args).
foreach ( $args as $arg ) {
$pair = explode( '=', $arg, 2 );
if ( count( $pair ) == 2 ) {
diff --git a/src/Person.php b/src/Person.php
index a62ff13..825f7e2 100644
--- a/src/Person.php
+++ b/src/Person.php
@@ -120,7 +120,7 @@
 * @return string
 */
public function getBirthDate() {
-   return $this->getPropSingle( "birth date" );
+   return $this->getPropSingle( 'birth date' );
}
 
/**
@@ -128,7 +128,7 @@
 * @return string
 */
public function getDeathDate() {
-   return $this->getPropSingle( "death date" );
+   return $this->getPropSingle( 'death date' );
}
 
/**

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Genealogy[master]: Don't construct HTML manually

2017-12-04 Thread Samwilson (Code Review)

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

Change subject: Don't construct HTML manually
..

Don't construct HTML manually

Also some other minor tweaks.

Change-Id: Ie99feecfd17134d04e25c796d524028a0cc35c83
---
M README.md
M src/Hooks.php
M src/Person.php
3 files changed, 9 insertions(+), 8 deletions(-)


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

diff --git a/README.md b/README.md
index 75ac6c3..6e2de20 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 MediaWiki Genealogy extension
 =
 
-All details: https://mediawiki.org/wiki/Extension:Genealogy
+All details: https://www.mediawiki.org/wiki/Extension:Genealogy
diff --git a/src/Hooks.php b/src/Hooks.php
index 267dff2..1e2c3f3 100644
--- a/src/Hooks.php
+++ b/src/Hooks.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Extensions\Genealogy;
 
 use EditPage;
+use Html;
 use MediaWiki\MediaWikiServices;
 use OutputPage;
 use Parser;
@@ -36,9 +37,9 @@
$peopleList[] = $renderer->makeKnownLink( 
$partner->getTitle() );
}
if ( count( $peopleList ) > 0 ) {
-   $msg = wfMessage( 'genealogy-existing-partners', count( 
$peopleList ) );
-   $successBox = '' . $msg. join( ', 
', $peopleList ) . '';
-   $output->addHTML( $successBox );
+   $msg = $output->msg( 'genealogy-existing-partners', 
count( $peopleList ) );
+   $partnersMsg = $msg . join( ', ', $peopleList );
+   $output->addHTML( Html::rawElement( 'p', [], 
$partnersMsg ) );
}
}
 
@@ -47,7 +48,7 @@
 * The input parameters are wikitext with templates expanded.
 * The output should be wikitext too.
 * @param Parser $parser The parser.
-* @return string The wikitext with which to replace the parser 
function call.
+* @return string|mixed[] The wikitext with which to replace the parser 
function call.
 */
public static function renderParserFunction( Parser $parser ) {
$params = [];
@@ -56,7 +57,7 @@
array_shift( $args );
// Get param 1, the function type.
$type = array_shift( $args );
-   // Everything that's left must be named.
+   // Everything that remains is required to be named (i.e. we 
discard other unnamed args).
foreach ( $args as $arg ) {
$pair = explode( '=', $arg, 2 );
if ( count( $pair ) == 2 ) {
diff --git a/src/Person.php b/src/Person.php
index a62ff13..825f7e2 100644
--- a/src/Person.php
+++ b/src/Person.php
@@ -120,7 +120,7 @@
 * @return string
 */
public function getBirthDate() {
-   return $this->getPropSingle( "birth date" );
+   return $this->getPropSingle( 'birth date' );
}
 
/**
@@ -128,7 +128,7 @@
 * @return string
 */
public function getDeathDate() {
-   return $this->getPropSingle( "death date" );
+   return $this->getPropSingle( 'death date' );
}
 
/**

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

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

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

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

2017-12-04 Thread jenkins-bot (Code Review)

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

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


db-eqiad.php: Depool db1034

db1034 is going to be used to clone db1098:3317

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0794ac0..672c2fd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -162,7 +162,7 @@
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
-   'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager #T178359
# 'db1039' => 0,   # B2 1.4TB  64GB
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
@@ -461,23 +461,23 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'contributions' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'logpager' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ca16028342d0e0e56973b3ebcae63ed59127457
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
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/mediawiki-config[master]: db-eqiad.php: Depool db1034

2017-12-04 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1034

db1034 is going to be used to clone db1098:3317

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 0794ac0..672c2fd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -162,7 +162,7 @@
],
's7' => [
'db1062' => 0,   # D4 2.8TB 128GB, master
-   'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
+   # 'db1034' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager #T178359
# 'db1039' => 0,   # B2 1.4TB  64GB
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
@@ -461,23 +461,23 @@
'db1086' => 1,
],
'watchlist' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'recentchanges' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'recentchangeslinked' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'contributions' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
'logpager' => [
-   'db1034' => 1,
+   # 'db1034' => 1,
'db1101:3317' => 1,
],
],

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove non-default Saab font for Punjabi

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Remove non-default Saab font for Punjabi
..


Remove non-default Saab font for Punjabi

* Not updated from upstream; last release is buggy as per upstream.
* Punjabi language has good font support in all modern operating
  systems.

Bug: T180422
Change-Id: I323953b4c6293df89034f05e0c2e13a96b42dc34
---
D data/fontrepo/fonts/Saab/Saab.ttf
D data/fontrepo/fonts/Saab/Saab.woff
D data/fontrepo/fonts/Saab/Saab.woff2
D data/fontrepo/fonts/Saab/font.ini
M resources/js/ext.uls.webfonts.repository.js
5 files changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/data/fontrepo/fonts/Saab/Saab.ttf 
b/data/fontrepo/fonts/Saab/Saab.ttf
deleted file mode 100644
index b0144b2..000
--- a/data/fontrepo/fonts/Saab/Saab.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Saab/Saab.woff 
b/data/fontrepo/fonts/Saab/Saab.woff
deleted file mode 100644
index 6289120..000
--- a/data/fontrepo/fonts/Saab/Saab.woff
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Saab/Saab.woff2 
b/data/fontrepo/fonts/Saab/Saab.woff2
deleted file mode 100644
index 5c3e26d..000
--- a/data/fontrepo/fonts/Saab/Saab.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Saab/font.ini 
b/data/fontrepo/fonts/Saab/font.ini
deleted file mode 100644
index 1e00c54..000
--- a/data/fontrepo/fonts/Saab/font.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Saab]
-languages=pa
-version=0.91
-license=GPL-2.0-with-font-exception
-licensefile=gpl-2.0.txt
-url=http://guca.sourceforge.net/typography/fonts/saab/
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 5cb186b..74fcbaa 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -293,10 +293,6 @@
"otb": [
"Jomolhari"
],
-   "pa": [
-   "system",
-   "Saab"
-   ],
"pal": [
"Shapour"
],
@@ -714,10 +710,6 @@
"RailwaySans": {
"woff": "RailwaySans/RailwaySans.woff?fda9a",
"woff2": "RailwaySans/RailwaySans.woff2?a6c17"
-   },
-   "Saab": {
-   "woff": "Saab/Saab.woff?5c0ec",
-   "woff2": "Saab/Saab.woff2?633bb"
},
"Saweri": {
"woff": "saweri/saweri.woff?fe688",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I323953b4c6293df89034f05e0c2e13a96b42dc34
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update cxserver to 1693bcf

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Update cxserver to 1693bcf
..


Update cxserver to 1693bcf

List of changes:
12df45c Add Dockerfile to .gitignore
1461d0e Add test for Yandex client
1327401 Youdao: Fix the error code reading
dbf2ca8 test: Add test for Matxin MT
41adae9 lineardoc: Use ES6 syntax
1693bcf Segmentation: ES6 syntax clean up

Change-Id: Ie35c4e95f66cb86d97b87cd7457c87c4970df763
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src b/src
index 0c242c0..1693bcf 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 0c242c0e4e317b6be9097d7b53d7e4fcb3b02a44
+Subproject commit 1693bcf645f5081ce7002d908dd5d2e6d3484b50

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie35c4e95f66cb86d97b87cd7457c87c4970df763
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
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/mediawiki-config[master]: db-eqiad.php: Depool db1090

2017-12-04 Thread jenkins-bot (Code Review)

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

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


db-eqiad.php: Depool db1090

Need alter table

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index bfd5e4c..0794ac0 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -121,7 +121,7 @@
'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743
'db1074' => 300, # A2 3.6TB 512GB, api
'db1076' => 500, # B1 3.6TB 512GB
-   'db1090' => 500, # C3 3.6TB 512GB
+   # 'db1090' => 500, # C3 3.6TB 512GB #T174569
'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
'db1105:3312' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6721feb3cb268c5c942ce434a0b3fb6077c832f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
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/mediawiki-config[master]: db-eqiad.php: Depool db1090

2017-12-04 Thread Marostegui (Code Review)

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

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

db-eqiad.php: Depool db1090

Need alter table

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index bfd5e4c..0794ac0 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -121,7 +121,7 @@
'db1060' => 1,   # C2 2.8TB  96GB, api #master for sanitarium 
#T153743
'db1074' => 300, # A2 3.6TB 512GB, api
'db1076' => 500, # B1 3.6TB 512GB
-   'db1090' => 500, # C3 3.6TB 512GB
+   # 'db1090' => 500, # C3 3.6TB 512GB #T174569
'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4
'db1105:3312' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

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

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

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

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Revert "db-eqiad.php: Depool db1103:3312"
..


Revert "db-eqiad.php: Depool db1103:3312"

This reverts commit 093519a227a191db73426186e246f92f74874e2c.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 18bcbd6..bfd5e4c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -122,7 +122,7 @@
'db1074' => 300, # A2 3.6TB 512GB, api
'db1076' => 500, # B1 3.6TB 512GB
'db1090' => 500, # C3 3.6TB 512GB
-   # 'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4 
#T174569
+   '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' => [
@@ -306,23 +306,23 @@
'db1074' => 1,
],
'watchlist' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'recentchanges' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'recentchangeslinked' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'contributions' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'logpager' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ff487df79fa7a13007e06870e54e23c51c03e06
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
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/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1103:3312"

2017-12-04 Thread Marostegui (Code Review)

Hello jenkins-bot, Jcrespo,

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

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1103:3312"
..

Revert "db-eqiad.php: Depool db1103:3312"

This reverts commit 093519a227a191db73426186e246f92f74874e2c.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 18bcbd6..bfd5e4c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -122,7 +122,7 @@
'db1074' => 300, # A2 3.6TB 512GB, api
'db1076' => 500, # B1 3.6TB 512GB
'db1090' => 500, # C3 3.6TB 512GB
-   # 'db1103:3312' => 1,  # A3 3.6TB 512GB # rc, log: s2 and s4 
#T174569
+   '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' => [
@@ -306,23 +306,23 @@
'db1074' => 1,
],
'watchlist' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'recentchanges' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'recentchangeslinked' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'contributions' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
'logpager' => [
-   # 'db1103:3312' => 1,
+   'db1103:3312' => 1,
'db1105:3312' => 1,
],
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ff487df79fa7a13007e06870e54e23c51c03e06
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
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]: [WIP] objectcache: use region prefixes for mcrouter-backed W...

2017-12-04 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395180 )

Change subject: [WIP] objectcache: use region prefixes for mcrouter-backed WAN 
cache
..

[WIP] objectcache: use region prefixes for mcrouter-backed WAN cache

This allows for mcrouter to have proper cross-DC and intra-DC timeouts.

Change-Id: If48f740f435d266a2050839f34611c0c8f36b3a7
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 28 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/80/395180/1

diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index 8f2c72a..55bab9a 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -87,6 +87,12 @@
protected $purgeChannel;
/** @var EventRelayer Bus that handles purge broadcasts */
protected $purgeRelayer;
+   /** @bar bool Whether to use mcrouter key prefixing for routing */
+   protected $mcrouterAware;
+   /** @var string Physical region for mcrouter use */
+   protected $region;
+   /** @var string Cache cluster name for mcrouter use */
+   protected $cluster;
/** @var LoggerInterface */
protected $logger;
/** @var StatsdDataFactoryInterface */
@@ -200,6 +206,16 @@
 *   callback supplied by the getWithSetCallback() caller. The 
result will be saved
 *   as normal. The handler is expected to call the WAN cache 
callback at an opportune
 *   time (e.g. HTTP post-send), though generally within a few 
100ms. [optional]
+*   - region: the current physical region. This is required when using 
mcrouter as the
+*   backing store proxy. [optional]
+*   - cluster: name of the cache cluster used by this WAN cache. The 
name must be the
+*   same on all datacenters; the ("region","cluster") tuple is 
what distinguishes
+*   the counterpart cache clusters that reside in each datacenter. 
The contents of
+*   https://github.com/facebook/mcrouter/wiki/Config-Files give 
background on this.
+*   This is required when using mcrouter as the backing store 
proxy. [optional]
+*   - mcrouterAware: set as true if mcrouter is the backing store 
proxy and mcrouter
+*   is configured to interpret /// key prefixes 
as routes. This
+*   requires that "region" and "cluster" are both set above. 
[optional]
 */
public function __construct( array $params ) {
$this->cache = $params['cache'];
@@ -209,6 +225,10 @@
$this->purgeRelayer = isset( $params['relayers']['purge'] )
? $params['relayers']['purge']
: new EventRelayerNull( [] );
+   $this->region = isset( $params['region'] ) ? $params['region'] 
: 'main';
+   $this->cluster = isset( $params['cluster'] ) ? 
$params['cluster'] : 'wan-main';
+   $this->mcrouterAware = !empty( $params['mcrouterAware'] );
+
$this->setLogger( isset( $params['logger'] ) ? 
$params['logger'] : new NullLogger() );
$this->stats = isset( $params['stats'] ) ? $params['stats'] : 
new NullStatsdDataFactory();
$this->asyncHandler = isset( $params['asyncHandler'] ) ? 
$params['asyncHandler'] : null;
@@ -1764,10 +1784,11 @@
 * @return bool Success
 */
protected function relayDelete( $key ) {
-   if ( $this->purgeRelayer instanceof EventRelayerNull ) {
-   // This handles the mcrouter and the single-DC case
-   $ok = $this->cache->delete( $key );
-   } else {
+   if ( $this->mcrouterAware ) {
+   // See 
https://github.com/facebook/mcrouter/wiki/Multi-cluster-broadcast-setup
+   // Wildcards select all matching routes, e.g. the WAN 
cluster on all DCs
+   $ok = $this->cache->delete( 
"/*/{$this->cluster}/{$key}" );
+   } elseif ( !( $this->purgeRelayer instanceof EventRelayerNull ) 
) {
$event = $this->cache->modifySimpleRelayEvent( [
'cmd' => 'delete',
'key' => $key,
@@ -1777,6 +1798,9 @@
if ( !$ok ) {
$this->lastRelayError = self::ERR_RELAY;
}
+   } else {
+   // Some other proxy handles broadcasting or there is 
only one datacenter
+   $ok = $this->cache->delete( $key );
}
 
return $ok;

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

Gerrit-MessageType:

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Remove non-default Saab font for Punjabi

2017-12-04 Thread KartikMistry (Code Review)

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

Change subject: Remove non-default Saab font for Punjabi
..

Remove non-default Saab font for Punjabi

* Not updated from upstream; last release is buggy as per upstream.
* Punjabi language has good font support in all modern operating
* systems.

Bug: T180422
Change-Id: I323953b4c6293df89034f05e0c2e13a96b42dc34
---
D data/fontrepo/fonts/Saab/Saab.ttf
D data/fontrepo/fonts/Saab/Saab.woff
D data/fontrepo/fonts/Saab/Saab.woff2
D data/fontrepo/fonts/Saab/font.ini
M resources/js/ext.uls.webfonts.repository.js
5 files changed, 0 insertions(+), 14 deletions(-)


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

diff --git a/data/fontrepo/fonts/Saab/Saab.ttf 
b/data/fontrepo/fonts/Saab/Saab.ttf
deleted file mode 100644
index b0144b2..000
--- a/data/fontrepo/fonts/Saab/Saab.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Saab/Saab.woff 
b/data/fontrepo/fonts/Saab/Saab.woff
deleted file mode 100644
index 6289120..000
--- a/data/fontrepo/fonts/Saab/Saab.woff
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Saab/Saab.woff2 
b/data/fontrepo/fonts/Saab/Saab.woff2
deleted file mode 100644
index 5c3e26d..000
--- a/data/fontrepo/fonts/Saab/Saab.woff2
+++ /dev/null
Binary files differ
diff --git a/data/fontrepo/fonts/Saab/font.ini 
b/data/fontrepo/fonts/Saab/font.ini
deleted file mode 100644
index 1e00c54..000
--- a/data/fontrepo/fonts/Saab/font.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[Saab]
-languages=pa
-version=0.91
-license=GPL-2.0-with-font-exception
-licensefile=gpl-2.0.txt
-url=http://guca.sourceforge.net/typography/fonts/saab/
diff --git a/resources/js/ext.uls.webfonts.repository.js 
b/resources/js/ext.uls.webfonts.repository.js
index 5cb186b..74fcbaa 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -293,10 +293,6 @@
"otb": [
"Jomolhari"
],
-   "pa": [
-   "system",
-   "Saab"
-   ],
"pal": [
"Shapour"
],
@@ -714,10 +710,6 @@
"RailwaySans": {
"woff": "RailwaySans/RailwaySans.woff?fda9a",
"woff2": "RailwaySans/RailwaySans.woff2?a6c17"
-   },
-   "Saab": {
-   "woff": "Saab/Saab.woff?5c0ec",
-   "woff2": "Saab/Saab.woff2?633bb"
},
"Saweri": {
"woff": "saweri/saweri.woff?fe688",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I323953b4c6293df89034f05e0c2e13a96b42dc34
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] mediawiki...deploy[master]: Update cxserver to 1693bcf

2017-12-04 Thread KartikMistry (Code Review)

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

Change subject: Update cxserver to 1693bcf
..

Update cxserver to 1693bcf

List of changes:
12df45c Add Dockerfile to .gitignore
1461d0e Add test for Yandex client
1327401 Youdao: Fix the error code reading
dbf2ca8 test: Add test for Matxin MT
41adae9 lineardoc: Use ES6 syntax
1693bcf Segmentation: ES6 syntax clean up

Change-Id: Ie35c4e95f66cb86d97b87cd7457c87c4970df763
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy 
refs/changes/78/395178/1

diff --git a/src b/src
index 0c242c0..1693bcf 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 0c242c0e4e317b6be9097d7b53d7e4fcb3b02a44
+Subproject commit 1693bcf645f5081ce7002d908dd5d2e6d3484b50

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie35c4e95f66cb86d97b87cd7457c87c4970df763
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update cxserver to 1693bcf

2017-12-04 Thread KartikMistry (Code Review)

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

Change subject: Update cxserver to 1693bcf
..

Update cxserver to 1693bcf

List of changes:
12df45c Add Dockerfile to .gitignore
1461d0e Add test for Yandex client
1327401 Youdao: Fix the error code reading
dbf2ca8 test: Add test for Matxin MT
41adae9 lineardoc: Use ES6 syntax
1693bcf Segmentation: ES6 syntax clean up
xxx Update node module dependencies

Change-Id: I0ca43cd2b96106434862e8874d7fac05f1316b9c
---
A node_modules/.bin/node-pre-gyp
A node_modules/.bin/nopt
A node_modules/.bin/rc
A node_modules/abbrev/LICENSE
A node_modules/abbrev/abbrev.js
A node_modules/abbrev/package.json
M node_modules/ajv/dist/ajv.bundle.js
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/dist/nodent.min.js
M node_modules/ajv/dist/regenerator.min.js
M node_modules/ajv/lib/ajv.js
M node_modules/ajv/package.json
A node_modules/aproba/LICENSE
A node_modules/aproba/index.js
A node_modules/aproba/package.json
A node_modules/are-we-there-yet/CHANGES.md~
A node_modules/are-we-there-yet/LICENSE
A node_modules/are-we-there-yet/index.js
A node_modules/are-we-there-yet/package.json
A node_modules/are-we-there-yet/tracker-base.js
A node_modules/are-we-there-yet/tracker-group.js
A node_modules/are-we-there-yet/tracker-stream.js
A node_modules/are-we-there-yet/tracker.js
A node_modules/block-stream/LICENSE
A node_modules/block-stream/block-stream.js
A node_modules/block-stream/package.json
A node_modules/console-control-strings/LICENSE
A node_modules/console-control-strings/README.md~
A node_modules/console-control-strings/index.js
A node_modules/console-control-strings/package.json
A node_modules/deep-extend/LICENSE
A node_modules/deep-extend/index.js
A node_modules/deep-extend/lib/deep-extend.js
A node_modules/deep-extend/package.json
A node_modules/delegates/.npmignore
A node_modules/delegates/License
A node_modules/delegates/Makefile
A node_modules/delegates/index.js
A node_modules/delegates/package.json
A node_modules/delegates/test/index.js
A node_modules/fs.realpath/LICENSE
A node_modules/fs.realpath/index.js
A node_modules/fs.realpath/old.js
A node_modules/fs.realpath/package.json
A node_modules/fstream-ignore/LICENSE
A node_modules/fstream-ignore/ignore.js
A node_modules/fstream-ignore/package.json
A node_modules/fstream/.npmignore
A node_modules/fstream/.travis.yml
A node_modules/fstream/LICENSE
A node_modules/fstream/examples/filter-pipe.js
A node_modules/fstream/examples/pipe.js
A node_modules/fstream/examples/reader.js
A node_modules/fstream/examples/symlink-write.js
A node_modules/fstream/fstream.js
A node_modules/fstream/lib/abstract.js
A node_modules/fstream/lib/collect.js
A node_modules/fstream/lib/dir-reader.js
A node_modules/fstream/lib/dir-writer.js
A node_modules/fstream/lib/file-reader.js
A node_modules/fstream/lib/file-writer.js
A node_modules/fstream/lib/get-type.js
A node_modules/fstream/lib/link-reader.js
A node_modules/fstream/lib/link-writer.js
A node_modules/fstream/lib/proxy-reader.js
A node_modules/fstream/lib/proxy-writer.js
A node_modules/fstream/lib/reader.js
A node_modules/fstream/lib/socket-reader.js
A node_modules/fstream/lib/writer.js
A node_modules/fstream/package.json
A node_modules/gauge/LICENSE
A node_modules/gauge/base-theme.js
A node_modules/gauge/error.js
A node_modules/gauge/has-color.js
A node_modules/gauge/index.js
A node_modules/gauge/package.json
A node_modules/gauge/plumbing.js
A node_modules/gauge/process.js
A node_modules/gauge/progress-bar.js
A node_modules/gauge/render-template.js
A node_modules/gauge/set-immediate.js
A node_modules/gauge/set-interval.js
A node_modules/gauge/spin.js
A node_modules/gauge/template-item.js
A node_modules/gauge/theme-set.js
A node_modules/gauge/themes.js
A node_modules/gauge/wide-truncate.js
A node_modules/gc-stats/.npmignore
A node_modules/gc-stats/.travis.yml
A node_modules/gc-stats/LICENSE
A node_modules/gc-stats/appveyor.yml
A node_modules/gc-stats/binding.gyp
A 
node_modules/gc-stats/build/gcstats/v1.0.2/Release/node-v48-linux-x64/gcstats.node
A node_modules/gc-stats/example.js
A node_modules/gc-stats/index.js
A node_modules/gc-stats/node_modules/.bin/mkdirp
A node_modules/gc-stats/node_modules/.bin/rimraf
A node_modules/gc-stats/node_modules/.bin/uuid
A node_modules/gc-stats/node_modules/ajv/.tonic_example.js
A node_modules/gc-stats/node_modules/ajv/LICENSE
A node_modules/gc-stats/node_modules/ajv/dist/ajv.bundle.js
A node_modules/gc-stats/node_modules/ajv/dist/ajv.min.js
A node_modules/gc-stats/node_modules/ajv/dist/ajv.min.js.map
A node_modules/gc-stats/node_modules/ajv/dist/nodent.min.js
A node_modules/gc-stats/node_modules/ajv/dist/regenerator.min.js
A node_modules/gc-stats/node_modules/ajv/lib/ajv.d.ts
A node_modules/gc-stats/node_modules/ajv/lib/ajv.js
A node_modules/gc-stats/node_modules/ajv/lib/async.js
A

[MediaWiki-commits] [Gerrit] operations...apertium[master]: apertium: Update for new hfst

2017-12-04 Thread KartikMistry (Code Review)

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

Change subject: apertium: Update for new hfst
..

apertium: Update for new hfst

* Add missing triggers file.
* Update dependency on hfst.
* Update watch file from Debian.

Bug: T181464
Change-Id: Ib7c52f017ec99f868c918d1fd708ef348b41ab9d
---
M debian/changelog
M debian/control
A debian/libapertium3-3.4-0.triggers
M debian/watch
4 files changed, 14 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/contenttranslation/apertium 
refs/changes/76/395176/1

diff --git a/debian/changelog b/debian/changelog
index 17c0301..4ba849f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apertium (3.4.2~r68466-3+wmf1) jessie-wikimedia; urgency=low
+
+  * debian/control:
++ Depends on newer hfst.
+  * Updated debian/watch file.
+  * Add missing triggers file.
+
+ -- Kartik Mistry   Tue, 05 Dec 2017 10:13:02 +0530
+
 apertium (3.4.2~r68466-2+wmf2) jessie-wikimedia; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 61c0ece..d9bd650 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@
pkg-config (>= 0.20),
python3,
xsltproc (>= 1.1.16)
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: http://apertium.org/
 Vcs-Git: https://anonscm.debian.org/cgit/debian-science/packages/apertium.git
 Vcs-Browser: 
https://anonscm.debian.org/cgit/debian-science/packages/apertium.git
@@ -84,8 +84,8 @@
 Depends: apertium-dev (>= ${source:Version}),
  apertium-lex-tools (>= 0.1.1~r60994),
  cg3 (>= 0.9.9~r11621),
- hfst (>= 3.10.0~r2798),
- libhfst-dev (>= 3.10.0~r2798),
+ hfst (>= 3.13.0~r3461),
+ libhfst-dev (>= 3.13.0~r3461),
  ${misc:Depends}
 Description: Metapackage for all tools required for Apertium development
  A metapackage to get all tools required for development of Apertium
diff --git a/debian/libapertium3-3.4-0.triggers 
b/debian/libapertium3-3.4-0.triggers
new file mode 100644
index 000..dd86603
--- /dev/null
+++ b/debian/libapertium3-3.4-0.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff --git a/debian/watch b/debian/watch
index baeb438..97aa2b9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=3
-opts=filenamemangle=s/\S*download=//g \
-https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=sf/apertium/apertium \
-.*=apertium(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+http://sf.net/apertium/apertium-(\d\S+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c52f017ec99f868c918d1fd708ef348b41ab9d
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/contenttranslation/apertium
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Remove useless argument

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Remove useless argument
..


Remove useless argument

The `--png` argument in the Lilypond command
implies the use of the PostScript backend.
Specifying the backend is unnecessary and removed
here.

Change-Id: I56f375c49166e5f901e903fd88bb56a0b788e4c1
---
M includes/Score.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/includes/Score.php b/includes/Score.php
index ce43d94..bede431 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -549,7 +549,6 @@
$wgScoreLilyPond,
'-dmidi-extension=midi', // midi needed for Windows to 
generate the file
$mode,
-   '-dbackend=ps',
'--png',
'--header=texidoc',
$factoryLy

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56f375c49166e5f901e903fd88bb56a0b788e4c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Ebe123 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Remove useless argument

2017-12-04 Thread Ebe123 (Code Review)

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

Change subject: Remove useless argument
..

Remove useless argument

The `--png` argument in the Lilypond command
implies the use of the PostScript backend.
Specifying the backend is unnecessary and removed
here.

Change-Id: I56f375c49166e5f901e903fd88bb56a0b788e4c1
---
M includes/Score.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/includes/Score.php b/includes/Score.php
index ce43d94..bede431 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -549,7 +549,6 @@
$wgScoreLilyPond,
'-dmidi-extension=midi', // midi needed for Windows to 
generate the file
$mode,
-   '-dbackend=ps',
'--png',
'--header=texidoc',
$factoryLy

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56f375c49166e5f901e903fd88bb56a0b788e4c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Ebe123 

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

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Correct couple typos

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Correct couple typos
..


Correct couple typos

Fixed following typos in generatePngAndMidi() function:
* @param in the PHP-doc
* The backend argument in rendering images

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

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



diff --git a/includes/Score.php b/includes/Score.php
index 7e73548..ce43d94 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -489,7 +489,7 @@
 * @param string $code Score code.
 * @param array $options Rendering options. They are the same as for
 *  Score::generateHTML().
-* @parma array $metaData array to hold information about images
+* @param array $metaData array to hold information about images
 *
 * @return array of file names placed in the remote dest dir, with the
 *  file names in each key.
@@ -549,7 +549,7 @@
$wgScoreLilyPond,
'-dmidi-extension=midi', // midi needed for Windows to 
generate the file
$mode,
-   '-dbackpend-ps',
+   '-dbackend=ps',
'--png',
'--header=texidoc',
$factoryLy

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: DNS: Add eqsin networking

2017-12-04 Thread Ayounsi (Code Review)

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

Change subject: DNS: Add eqsin networking
..


DNS: Add eqsin networking

Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 27 insertions(+), 0 deletions(-)

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



diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 884149b..65e4e65 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -68,3 +68,5 @@
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   mr1-eqsin.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr1-eqsin.wikimedia.org.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index a6e6e4f..23af591 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2937,6 +2937,11 @@
 
 ; 10.132.128.0/17 - eqsin mgmt
 $ORIGIN 128.132.{{ zonename }}.
+1   1H  IN PTR  mr1-eqsin.mgmt.eqsin.wmnet.
+2   1H  IN PTR  cr1-eqsin.mgmt.eqsin.wmnet.
+4   1H  IN PTR  asw-eqsin.mgmt.eqsin.wmnet.
+5   1H  IN PTR  scs-eqsin.mgmt.eqsin.wmnet.
+
 $ORIGIN 129.132.{{ zonename }}.
 7   1H  IN PTR  bast5001.mgmt.eqsin.wmnet.
 8   1H  IN PTR  dns5001.mgmt.eqsin.wmnet.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index fdba2c0..5b4b585 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -29,6 +29,15 @@
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
+
+; 103.102.166.128/30 (128-131) - Router's loopbacks
+128 1H IN PTR   mr1-eqsin.wikimedia.org.
+129 1H IN PTR   cr1-eqsin.wikimedia.org.
+
+; 103.102.166.132/31 -- cr1-eqsin <--> mr1-eqsin
+132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
+133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 97a0a50..5fab07a 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -462,6 +462,12 @@
 mr1-ulsfo.oob   1H  IN A209.237.234.242
 mr1-ulsfo.oob   1H  IN  2607:f3a0:0:1024::2
 
+cr1-eqsin   1H  IN A103.102.166.129
+1H  IN  2001:df2:e500:::2
+mr1-eqsin   1H  IN A103.102.166.128
+1H  IN  2001:df2:e500:::1
+mr1-eqsin.oob   1H  IN A27.111.227.106
+mr1-eqsin.oob   1H  IN  2403:b100:3001:9::2
 
 vl1001-eth1.lvs1004 1H  IN A208.80.154.58
 vl1001-eth1.lvs1005 1H  IN A208.80.154.59
diff --git a/templates/wmnet b/templates/wmnet
index 57796e1..25b382d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4695,6 +4695,11 @@
 
 $ORIGIN mgmt.eqsin.wmnet.
 
+mr1-eqsin   1H  IN A10.132.128.1
+cr1-eqsin   1H  IN A10.132.128.2
+asw-eqsin   1H  IN A10.132.128.4
+scs-eqsin   1H  IN A10.132.128.5
+
 ; Servers listed sequentially
 bast50011H  IN A10.132.129.7
 dns5001 1H  IN A10.132.129.8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
Gerrit-PatchSet: 5
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: BBlack 
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]: DNS: Add eqsin networking

2017-12-04 Thread Ayounsi (Code Review)

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

Change subject: DNS: Add eqsin networking
..

DNS: Add eqsin networking

Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
---
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/74/395174/1

diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa 
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index 884149b..fedc737 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -68,3 +68,5 @@
 
 ; 2001:df2:e500:::/56 - Loopback IPs
 $ORIGIN f.f.f.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   mr1-eqiad.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR   cr1-eqsin.wikimedia.org.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index a6e6e4f..23af591 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2937,6 +2937,11 @@
 
 ; 10.132.128.0/17 - eqsin mgmt
 $ORIGIN 128.132.{{ zonename }}.
+1   1H  IN PTR  mr1-eqsin.mgmt.eqsin.wmnet.
+2   1H  IN PTR  cr1-eqsin.mgmt.eqsin.wmnet.
+4   1H  IN PTR  asw-eqsin.mgmt.eqsin.wmnet.
+5   1H  IN PTR  scs-eqsin.mgmt.eqsin.wmnet.
+
 $ORIGIN 129.132.{{ zonename }}.
 7   1H  IN PTR  bast5001.mgmt.eqsin.wmnet.
 8   1H  IN PTR  dns5001.mgmt.eqsin.wmnet.
diff --git a/templates/166.102.103.in-addr.arpa 
b/templates/166.102.103.in-addr.arpa
index fdba2c0..e4224fd 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -29,6 +29,15 @@
 ; 103.102.166.32/27 (32-63) - unused
 ; 103.102.166.64/26 (64-127) - unused
 ; 103.102.166.128/27 (128-159) - Infrastructure Space
+
+: 103.102.166.128/30 (138-131) - Router's loopbacks
+128 1H IN PTR   mr1-eqsin.wikimedia.org.
+129 1H IN PTR   cr1-eqsin.wikimedia.org.
+
+; 103.102.166.132/31 -- cr1-eqsin <--> mr1-eqsin
+132 1H IN PTR   ae1-401.cr1-eqsin.wikimedia.org.
+133 1H IN PTR   ge-0-0-4-401.mr1-eqsin.wikimedia.org.
+
 ; 103.102.166.160/27 (160-191) - unused
 ; 103.102.166.192/27 (192-223) - unused
 ; 103.102.166.224/27 (224-255) - LVS Service IPs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 40070fc..e5281fb 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -462,6 +462,12 @@
 mr1-ulsfo.oob   1H  IN A209.237.234.242
 mr1-ulsfo.oob   1H  IN  2607:f3a0:0:1024::2
 
+cr1-eqsin   1H  IN A103.102.166.129
+1H  IN  2001:df2:e500:::2
+mr1-eqsin   1H  IN A103.102.166.128
+1H  IN  2001:df2:e500:::1
+mr1-eqsin.oob   1H  IN A27.111.227.106
+mr1-eqsin.oob   1H  IN  2403:b100:3001:9::2
 
 vl1001-eth1.lvs1004 1H  IN A208.80.154.58
 vl1001-eth1.lvs1005 1H  IN A208.80.154.59
diff --git a/templates/wmnet b/templates/wmnet
index fed46aa..ba248e3 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4695,6 +4695,11 @@
 
 $ORIGIN mgmt.eqsin.wmnet.
 
+mr1-eqsin   1H  IN A10.132.128.1
+cr1-eqsin   1H  IN A10.132.128.2
+asw-eqsin   1H  IN A10.132.128.4
+scs-eqsin   1H  IN A10.132.128.5
+
 ; Servers listed sequentially
 bast50011H  IN A10.132.129.7
 dns5001 1H  IN A10.132.129.8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2175427928bf1cf5d57dad7aacbfaa32b29d4da6
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...MinervaNeue[master]: Add missing styles for "a.mw-selflink" links

2017-12-04 Thread Gerrit Patch Uploader (Code Review)

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

Change subject: Add missing styles for "a.mw-selflink" links
..

Add missing styles for "a.mw-selflink" links

Taken from MediaWiki core: /resources/src/mediawiki.legacy/shared.css

Bug: T181472
Change-Id: I963604bf6bf74a115622f7abb46f762e32b53506
---
M resources/skins.minerva.content.styles/links.less
1 file changed, 16 insertions(+), 0 deletions(-)


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

diff --git a/resources/skins.minerva.content.styles/links.less 
b/resources/skins.minerva.content.styles/links.less
index db3860c..3d8cd65 100644
--- a/resources/skins.minerva.content.styles/links.less
+++ b/resources/skins.minerva.content.styles/links.less
@@ -35,6 +35,22 @@
background-position: center right;
padding-right: 13px;
}
+
+   &.mw-selflink {
+   color: inherit;
+   font-weight: bold;
+   text-decoration: inherit;
+   }
+
+   &.mw-selflink:hover {
+   cursor: inherit;
+   text-decoration: inherit;
+   }
+
+   &.mw-selflink:active,
+   &.mw-selflink:visited {
+   color: inherit;
+   }
 }
 
 // Generic class name needed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I963604bf6bf74a115622f7abb46f762e32b53506
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Vlakoff 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [doc] fix doc description files

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: [doc] fix doc description files
..


[doc] fix doc description files

Change-Id: I0dba1ae1d5d492783182caf5a0c25b9e53cca273
---
M docs/scripts/scripts.maintenance.rst
M docs/scripts/scripts.rst
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/docs/scripts/scripts.maintenance.rst 
b/docs/scripts/scripts.maintenance.rst
index 0efc042..3680c91 100644
--- a/docs/scripts/scripts.maintenance.rst
+++ b/docs/scripts/scripts.maintenance.rst
@@ -46,7 +46,7 @@
 
 
 scripts.maintenance.wikimedia_sites script
--
+--
 
 .. automodule:: scripts.maintenance.wikimedia_sites
 :members:
diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst
index 44ecbc9..b43271c 100644
--- a/docs/scripts/scripts.rst
+++ b/docs/scripts/scripts.rst
@@ -39,10 +39,10 @@
 :show-inheritance:
 
 
-scripts.blockpagechecker script

+scripts.blockpageschecker script
+
 
-.. automodule:: scripts.blockpagechecker
+.. automodule:: scripts.blockpageschecker
 :members:
 :undoc-members:
 :show-inheritance:
@@ -105,7 +105,7 @@
 scripts.clean_sandbox script
 
 
-.. automodule:: scripts.clean_sandboy
+.. automodule:: scripts.clean_sandbox
 :members:
 :undoc-members:
 :show-inheritance:
@@ -129,10 +129,10 @@
 :show-inheritance:
 
 
-scripts.coodinate_import script

+scripts.coordinate_import script
+
 
-.. automodule:: scripts.coodinate_import
+.. automodule:: scripts.coordinate_import
 :members:
 :undoc-members:
 :show-inheritance:

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: verbosity on test

2017-12-04 Thread Eileen (Code Review)

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

Change subject: verbosity on test
..

verbosity on test

Change-Id: I3c711c74a9ac675f84c18292a98c3b05a7963cb9
---
M sites/all/modules/offline2civicrm/offline2civicrm.common.inc
M sites/all/modules/wmf_common/WmfDatabase.php
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/72/395172/1

diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.common.inc 
b/sites/all/modules/offline2civicrm/offline2civicrm.common.inc
index 284dce5..b003e1f 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.common.inc
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.common.inc
@@ -27,7 +27,7 @@
 $used[$upper] = true;
   }
   if ( $duplicates ) {
-throw new WmfException( 'INVALID_FILE_FORMAT', 'Duplicate column headers: 
' . implode( ", ", $duplicates ) );
+throw new WmfException( 'INVALID_FILE_FORMAT', 'Duplicate column headers: 
' . implode( ", ", $duplicates )  . print_r($row, 1));
   }
   watchdog( 'offline2civicrm', 'Import checks: Column headers loaded from 
file', array(), WATCHDOG_INFO );
 
diff --git a/sites/all/modules/wmf_common/WmfDatabase.php 
b/sites/all/modules/wmf_common/WmfDatabase.php
index d52dddf..01bb205 100644
--- a/sites/all/modules/wmf_common/WmfDatabase.php
+++ b/sites/all/modules/wmf_common/WmfDatabase.php
@@ -16,7 +16,7 @@
* @throws \Exception
*/
 static function transactionalCall( $callback, $params ) {
-watchdog( 'wmf_common', "Beginning DB transaction", NULL, 
WATCHDOG_INFO );
+watchdog( 'wmf_common', "Beginning DB transaction", debug_backtrace(), 
WATCHDOG_INFO );
 $drupal_transaction = db_transaction( 'wmf_default', array( 'target' 
=> 'default' ) );
 $crm_transaction = db_transaction( 'wmf_civicrm', array( 'target' => 
'civicrm' ) );
 $native_civi_transaction = new CRM_Core_Transaction();

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

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

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

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: remove AnyRoute

2017-12-04 Thread Niedzielski (Code Review)

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

Change subject: Chore: remove AnyRoute
..

Chore: remove AnyRoute

Route now only has one type parameter which makes `Route` just as
readable as `AnyRoute`. This patch removes AnyRoute and replaces all
usages.

Change-Id: If85b0c33af3e9356cbff6745ef166c622a9653a0
---
M src/common/router/route.ts
M src/common/router/router.ts
M src/common/router/routes.ts
3 files changed, 4 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/marvin refs/changes/71/395171/1

diff --git a/src/common/router/route.ts b/src/common/router/route.ts
index d36909b..9be7cb5 100644
--- a/src/common/router/route.ts
+++ b/src/common/router/route.ts
@@ -76,8 +76,6 @@
   toPath(params?: undefined): string;
 }
 
-export type AnyRoute = Route;
-
 /**
  * Decompose a URL path into a Params map for use by
  * PageModule.getInitialProps(). This method uses a path regular expression to
diff --git a/src/common/router/router.ts b/src/common/router/router.ts
index c4b8f45..828eac7 100644
--- a/src/common/router/router.ts
+++ b/src/common/router/router.ts
@@ -1,10 +1,5 @@
 import { AnyComponent } from "preact";
-import {
-  AnyRoute,
-  PageComponent,
-  PageModule,
-  Route
-} from "../../common/router/route";
+import { PageComponent, PageModule, Route } from "../../common/router/route";
 import HttpResponse from "../http/http-response";
 
 import notFoundPage from "../pages/not-found";
@@ -72,7 +67,7 @@
 }
 
 export const newRouter = (
-  routes: AnyRoute[],
+  routes: Route[],
   getPage: PageResolver = getChunk
 ) => {
   return {
diff --git a/src/common/router/routes.ts b/src/common/router/routes.ts
index fa9c2fc..5ce6401 100644
--- a/src/common/router/routes.ts
+++ b/src/common/router/routes.ts
@@ -1,6 +1,6 @@
 import { Params as WikiParams } from "../pages/wiki";
 import { Params as SummaryParams } from "../pages/summary";
-import { AnyRoute, NoParamsRoute, Route, newRoute } from "./route";
+import { NoParamsRoute, Route, newRoute } from "./route";
 
 export const home: NoParamsRoute = newRoute({
   path: "/",
@@ -44,7 +44,7 @@
   page: "style-guide"
 });
 
-export const routes: AnyRoute[] = [
+export const routes: Route[] = [
   home,
   about,
   wiki,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If85b0c33af3e9356cbff6745ef166c622a9653a0
Gerrit-PatchSet: 1
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: Sniedzielski 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: [DO NOT MERGE] Use MariaDB 10.0 to match WMF production

2017-12-04 Thread Code Review

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

Change subject: [DO NOT MERGE] Use MariaDB 10.0 to match WMF production
..

[DO NOT MERGE] Use MariaDB 10.0 to match WMF production

Change-Id: Iec1907b87b730970a32333e6d80865c5a7b9fe52
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mysql/manifests/init.pp
M puppet/modules/mysql/manifests/large_prefix.pp
M puppet/modules/mysql/manifests/packages.pp
4 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/70/395170/1

diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp 
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index a29bae8..0a5b206 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -269,8 +269,8 @@
 target  => '/usr/bin/mysql',
 # /usr/bin/mysql is provided by the package
 # mysql-client-core-5.5, but that is only installed as an
-# implicit dependency of mysql-server required by
+# implicit dependency of mariadb-server-10.0 required by
 # mysql::packages.
-require => Package['mysql-server'],
+require => Package['mariadb-server-10.0'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/init.pp 
b/puppet/modules/mysql/manifests/init.pp
index f503c34..43692b2 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -33,7 +33,7 @@
 ensure => running,
 enable => true,
 hasrestart => true,
-require=> Package['mysql-server'],
+require=> Package['mariadb-server-10.0'],
 }
 
 exec { 'set_mysql_password':
diff --git a/puppet/modules/mysql/manifests/large_prefix.pp 
b/puppet/modules/mysql/manifests/large_prefix.pp
index 1bce93d..5836a4e 100644
--- a/puppet/modules/mysql/manifests/large_prefix.pp
+++ b/puppet/modules/mysql/manifests/large_prefix.pp
@@ -11,7 +11,7 @@
 group   => 'root',
 mode=> '0444',
 source  => 'puppet:///modules/mysql/innodb_large_prefix.cnf',
-require => Package['mysql-server'],
+require => Package['mariadb-server-10.0'],
 notify  => Service['mysql'],
 }
 }
diff --git a/puppet/modules/mysql/manifests/packages.pp 
b/puppet/modules/mysql/manifests/packages.pp
index 73f0a65..c90d476 100644
--- a/puppet/modules/mysql/manifests/packages.pp
+++ b/puppet/modules/mysql/manifests/packages.pp
@@ -4,7 +4,7 @@
 # class so they can be included from multiple locations.
 #
 class mysql::packages {
-package { 'mysql-server':
+package { 'mariadb-server-10.0':
 ensure => present,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update the URL and the switch color on the final app onboard...

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Update the URL and the switch color on the final app onboarding 
screen
..


Update the URL and the switch color on the final app onboarding screen

 - Add an URL and a text item with #offline
 - Update the `on` switch color to Accent50

Bug: T181149
Change-Id: I251f32b6fff9f35fdbbfdf01f1dfb2dadee0ac42
---
M app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
M app/src/main/java/org/wikipedia/util/FeedbackUtil.java
M app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles.xml
6 files changed, 13 insertions(+), 3 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java 
b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
index 7fc85a8..1dd2bbc 100644
--- a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
+++ b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
@@ -65,7 +65,9 @@
 FeedbackUtil.showPrivacyPolicy(getContext());
 } else if (url.equals("#about")) {
 FeedbackUtil.showAboutWikipedia(getContext());
-} else  {
+} else if (url.equals("#offline")) {
+FeedbackUtil.showOfflineReadingAndData(getContext());
+} else {
 handleExternalLink(getActivity(), Uri.parse(url));
 }
 }
diff --git a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java 
b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
index 3c46544..e4e7fd0 100644
--- a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
+++ b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
@@ -87,6 +87,10 @@
 visitInExternalBrowser(context, 
Uri.parse(context.getString(R.string.privacy_policy_url)));
 }
 
+public static void showOfflineReadingAndData(Context context) {
+visitInExternalBrowser(context, 
Uri.parse(context.getString(R.string.offline_reading_and_data_url)));
+}
+
 public static void showAboutWikipedia(Context context) {
 visitInExternalBrowser(context, 
Uri.parse(context.getString(R.string.about_wikipedia_url)));
 }
diff --git a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml 
b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
index 3cdef26..f9d79ec 100644
--- a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
+++ b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
@@ -8,5 +8,5 @@
 app:centeredImage="@drawable/illustration_onboarding_analytics"
 app:imageSize="160dp"
 app:primaryText="@string/onboarding_analytics_title"
-app:secondaryText="@string/onboarding_analytics_text"
+app:secondaryText="@string/onboarding_analytics_offline_text"
 app:switchText="@string/onboarding_analytics_switch_title" />
\ No newline at end of file
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index fb1bce6..67526af 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -148,6 +148,7 @@
   Summary of the preference item to 
show the terms of use.\n{{Identical|Terms of use}}
   URL leading to the About Wikipedia page. 
If you can find the appropriate language specific URL of the mobile site please 
do so. If not feel free to keep the English one. Example for German (lang code 
\"de\"): https://de.wikipedia.org/wiki/Wikipedia:Über_Wikipedia\nPlease test 
the URL to make sure it works.
   URL leading to the Wikimedia Foundation 
privacy policy. If you can find the appropriate language specific URL of the 
mobile site please do so. If not feel free to keep the English one. Example for 
German (lang code \"de\"): 
https://meta.m.wikimedia.org/w/index.php?title=Privacy_policy/de\nPlease test 
the URL to make sure it works.
+  URL leading to the Offline 
reading and data section of Wikimedia Android app FAQ. If you can find the 
appropriate language specific URL of the mobile site please do so. 
   URL leading to the Wikimedia Foundation 
terms of use. If you can find the appropriate language specific URL of the 
mobile site please do so. If not feel free to keep the English one. Example for 
German (lang code \"de\"): 
https://m.wikimediafoundation.org/wiki/Terms_of_Use/de\nPlease test the URL to 
make sure it works
   URL for details about the Creative Commons CC 
BY-SA 3.0 license. When possible, please use the appropriate language-specific 
URL, and the mobile version of the site.
   URL for details about the Creative Commons CC0 
license. When possible, please use the appropriate

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Tweak font size of special mobile options label

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Tweak font size of special mobile options label
..


Tweak font size of special mobile options label

Per Nirzar
https://phabricator.wikimedia.org/T169369#3811256

Bug: T169369
Change-Id: Ie46abf350622844f3f55f4b856dc83ac45809384
---
M resources/mobile.special.mobileoptions.styles/mobileoptions.less
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/resources/mobile.special.mobileoptions.styles/mobileoptions.less 
b/resources/mobile.special.mobileoptions.styles/mobileoptions.less
index 10b4b3a..a67f027 100644
--- a/resources/mobile.special.mobileoptions.styles/mobileoptions.less
+++ b/resources/mobile.special.mobileoptions.styles/mobileoptions.less
@@ -16,7 +16,6 @@
padding-bottom: 40px;
 
.oo-ui-fieldLayout-header strong {
-   font-size: 1.1em;
font-weight: bold;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie46abf350622844f3f55f4b856dc83ac45809384
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Pmiazga 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Don't attempt sending revision-visibility events if empty

2017-12-04 Thread Ppchelko (Code Review)

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

Change subject: Don't attempt sending revision-visibility events if empty
..

Don't attempt sending revision-visibility events if empty

Change-Id: I63d0fc80c56532328ad59928ea04d482679a5c52
---
M EventBus.hooks.php
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index 34e89ca..b3fdba6 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -393,6 +393,13 @@
}
}
 
+   if ( empty( $events ) ) {
+   // For revision-visibility-set it's possible that
+   // the page was deleted simultaneously and we can not
+   // send a meaningful event.
+   return;
+   }
+
DeferredUpdates::addCallableUpdate(
function () use ( $events ) {
EventBus::getInstance()->send( $events );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63d0fc80c56532328ad59928ea04d482679a5c52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MultilineTextInputWidget: Correct documentation for config.m...

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: MultilineTextInputWidget: Correct documentation for 
config.maxRows
..


MultilineTextInputWidget: Correct documentation for config.maxRows

Change-Id: Ia8f01eda210326b78e2741a837605afd20400345
---
M src/widgets/MultilineTextInputWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/src/widgets/MultilineTextInputWidget.js 
b/src/widgets/MultilineTextInputWidget.js
index 5b6f828..112c3e5 100644
--- a/src/widgets/MultilineTextInputWidget.js
+++ b/src/widgets/MultilineTextInputWidget.js
@@ -9,7 +9,7 @@
  * @cfg {string} [labelPosition='after'] The position of the inline label 
relative to that of
  * @cfg {boolean} [autosize=false] Automatically resize the text input to fit 
its content.
  *  Use the #maxRows config to specify a maximum number of displayed rows.
- * @cfg {boolean} [maxRows] Maximum number of rows to display when #autosize 
is set to true.
+ * @cfg {number} [maxRows] Maximum number of rows to display when #autosize is 
set to true.
  *  Defaults to the maximum of `10` and `2 * rows`, or `10` if `rows` isn't 
provided.
  */
 OO.ui.MultilineTextInputWidget = function OoUiMultilineTextInputWidget( config 
) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8f01eda210326b78e2741a837605afd20400345
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: 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] oojs/ui[master]: Remove 'transparency' icon

2017-12-04 Thread VolkerE (Code Review)

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

Change subject: Remove 'transparency' icon
..

Remove 'transparency' icon

Removing 'transparency' icon from 'textures' pack. It seemingly
has never been used since it's addition in
Ib46ab01dc39d706e5c25fd473dee0edce51b7e44.

Change-Id: I314e930f5137424c54dc3da725b8af3731ef60f9
---
D src/themes/apex/images/textures/transparency.svg
M src/themes/apex/textures.json
D src/themes/wikimediaui/images/textures/transparency.svg
M src/themes/wikimediaui/textures.json
4 files changed, 2 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/68/395168/1

diff --git a/src/themes/apex/images/textures/transparency.svg 
b/src/themes/apex/images/textures/transparency.svg
deleted file mode 100644
index 14762de..000
--- a/src/themes/apex/images/textures/transparency.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-http://www.w3.org/2000/svg; width="16" height="16" viewBox="0 0 16 
16">
-   
-   
-
diff --git a/src/themes/apex/textures.json b/src/themes/apex/textures.json
index e90730a..5828113 100644
--- a/src/themes/apex/textures.json
+++ b/src/themes/apex/textures.json
@@ -2,7 +2,6 @@
"prefix": "oo-ui-texture",
"intro": "@import '../../../../src/styles/common';",
"images": {
-   "pending": { "file": "images/textures/pending.gif" },
-   "transparency": { "file": "images/textures/transparency.svg" }
+   "pending": { "file": "images/textures/pending.gif" }
}
 }
diff --git a/src/themes/wikimediaui/images/textures/transparency.svg 
b/src/themes/wikimediaui/images/textures/transparency.svg
deleted file mode 100644
index 14762de..000
--- a/src/themes/wikimediaui/images/textures/transparency.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-http://www.w3.org/2000/svg; width="16" height="16" viewBox="0 0 16 
16">
-   
-   
-
diff --git a/src/themes/wikimediaui/textures.json 
b/src/themes/wikimediaui/textures.json
index e90730a..5828113 100644
--- a/src/themes/wikimediaui/textures.json
+++ b/src/themes/wikimediaui/textures.json
@@ -2,7 +2,6 @@
"prefix": "oo-ui-texture",
"intro": "@import '../../../../src/styles/common';",
"images": {
-   "pending": { "file": "images/textures/pending.gif" },
-   "transparency": { "file": "images/textures/transparency.svg" }
+   "pending": { "file": "images/textures/pending.gif" }
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: snapshot, prometheus, maintenance, otrs, archive: remove ganglia

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: snapshot,prometheus,maintenance,otrs,archive: remove ganglia
..

snapshot,prometheus,maintenance,otrs,archive: remove ganglia

Bug: T177225
Change-Id: Iaf75959210a13a75c4cf05ed2e53e11a406a6604
---
A hieradata/role/common/archiva.yaml
M hieradata/role/common/dumps/generation/worker/dumper.yaml
M hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
M hieradata/role/common/mediawiki_maintenance.yaml
M hieradata/role/common/otrs.yaml
M hieradata/role/common/prometheus/ops.yaml
6 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/395167/1

diff --git a/hieradata/role/common/archiva.yaml 
b/hieradata/role/common/archiva.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/role/common/archiva.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/generation/worker/dumper.yaml 
b/hieradata/role/common/dumps/generation/worker/dumper.yaml
index d65cd67..acda036 100644
--- a/hieradata/role/common/dumps/generation/worker/dumper.yaml
+++ b/hieradata/role/common/dumps/generation/worker/dumper.yaml
@@ -2,3 +2,4 @@
   - udp2log-users
   - deployment
   - snapshot-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml 
b/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
index d65cd67..acda036 100644
--- a/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
+++ b/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
@@ -2,3 +2,4 @@
   - udp2log-users
   - deployment
   - snapshot-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/mediawiki_maintenance.yaml 
b/hieradata/role/common/mediawiki_maintenance.yaml
index e89dadf..e80536d 100644
--- a/hieradata/role/common/mediawiki_maintenance.yaml
+++ b/hieradata/role/common/mediawiki_maintenance.yaml
@@ -21,3 +21,4 @@
 # whitelist maintenance servers from screen monitoring
 # many users have permanent sessions here (T165348)
 monitor_screens: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/otrs.yaml b/hieradata/role/common/otrs.yaml
index a8ecacd..118fa1e 100644
--- a/hieradata/role/common/otrs.yaml
+++ b/hieradata/role/common/otrs.yaml
@@ -7,3 +7,4 @@
 #profile::otrs::database_pass:
 #profile::otrs::exim_database_pass:
 standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/prometheus/ops.yaml 
b/hieradata/role/common/prometheus/ops.yaml
index a398352..59f2002 100644
--- a/hieradata/role/common/prometheus/ops.yaml
+++ b/hieradata/role/common/prometheus/ops.yaml
@@ -4,3 +4,4 @@
   - codfw.wmnet
   - esams.wmnet
   - ulsfo.wmnet
+standard::has_ganglia: false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Tweak font size of special mobile options label

2017-12-04 Thread Jdlrobson (Code Review)

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

Change subject: Tweak font size of special mobile options label
..

Tweak font size of special mobile options label

Per Nirzar
https://phabricator.wikimedia.org/T169369#3811256

Bug: T169369
Change-Id: Ie46abf350622844f3f55f4b856dc83ac45809384
---
M resources/mobile.special.mobileoptions.styles/mobileoptions.less
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/resources/mobile.special.mobileoptions.styles/mobileoptions.less 
b/resources/mobile.special.mobileoptions.styles/mobileoptions.less
index 10b4b3a..a67f027 100644
--- a/resources/mobile.special.mobileoptions.styles/mobileoptions.less
+++ b/resources/mobile.special.mobileoptions.styles/mobileoptions.less
@@ -16,7 +16,6 @@
padding-bottom: 40px;
 
.oo-ui-fieldLayout-header strong {
-   font-size: 1.1em;
font-weight: bold;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie46abf350622844f3f55f4b856dc83ac45809384
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Update invert URL param when toggled

2017-12-04 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Update invert URL param when toggled
..

RCFilters: Update invert URL param when toggled

Bug: T182045
Change-Id: Ia9a8afb336305969ac8b5c2e7ffab146844ad9ee
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 14 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/65/395165/1

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 0cec3ff..ba56f6f 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -78,16 +78,19 @@
separator: ';',
fullCoverage: true,
filters: items
-   },
-   {
-   name: 'invertGroup',
-   type: 'boolean',
-   hidden: true,
-   filters: [ {
-   name: 'invert',
-   'default': '0'
-   } ]
} ]
+   };
+   views.invert = {
+   groups: [
+   {
+   name: 'invertGroup',
+   type: 'boolean',
+   hidden: true,
+   filters: [ {
+   name: 'invert',
+   'default': '0'
+   } ]
+   } ]
};
}
if ( tagList ) {
@@ -512,7 +515,6 @@
 */
mw.rcfilters.Controller.prototype.toggleInvertedNamespaces = function 
() {
this.filtersModel.toggleInvertedNamespaces();
-
if (
this.filtersModel.getFiltersByView( 'namespaces' 
).filter(
function ( filterItem ) { return 
filterItem.isSelected(); }
@@ -520,6 +522,8 @@
) {
// Only re-fetch results if there are namespace items 
that are actually selected
this.updateChangesList();
+   } else {
+   this.uriProcessor.updateURL();
}
};
 

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

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

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

[MediaWiki-commits] [Gerrit] eventlogging[master]: Make the kafka async deliver callback thread-safe

2017-12-04 Thread Ppchelko (Code Review)

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

Change subject: Make the kafka async deliver callback thread-safe
..

Make the kafka async deliver callback thread-safe

Bug: T180017
Change-Id: Idaec4b33808e276d427f903a2982aee75b89cd94
---
M eventlogging/service.py
1 file changed, 13 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/eventlogging 
refs/changes/64/395164/1

diff --git a/eventlogging/service.py b/eventlogging/service.py
index f7d30ef..7c4105c 100644
--- a/eventlogging/service.py
+++ b/eventlogging/service.py
@@ -24,6 +24,7 @@
 import os
 import socket
 import yaml
+from tornado.ioloop import IOLoop
 
 from . import ValidationError, SchemaError  # these are int __init__.py
 from .compat import json
@@ -549,14 +550,18 @@
 tf should be a tornado Future to set either
 result or exception appropriately.
 """
-if isinstance(v, BaseException):
-tf.set_exception(v)
-# TODO: This seems correct, but causes
-# an exception to be thrown from the Future object.
-# tf.set_exc_info(sys.exc_info())
-else:
-tf.set_result(v)
-logging.debug('Delivered to kafka: %s', v)
+def actual_callback():
+if isinstance(v, BaseException):
+tf.set_exception(v)
+else:
+tf.set_result(v)
+logging.debug('Delivered to kafka: %s', v)
+
+# Kafka driver calls the delivery callback on the thread
+# other then the MainThread, so transfer the control back
+# to the main thread. It is safe to access the value as
+# kafka producer is thread safe.
+IOLoop.current().add_callback(actual_callback)
 
 tornado_future = tornado.concurrent.Future()
 # When kafka's future calls this delivery callback, the

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idaec4b33808e276d427f903a2982aee75b89cd94
Gerrit-PatchSet: 1
Gerrit-Project: eventlogging
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...DynamicPageList[master]: Check to make sure fopen() worked before trying to write to ...

2017-12-04 Thread Legoktm (Code Review)

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

Change subject: Check to make sure fopen() worked before trying to write to the 
file
..

Check to make sure fopen() worked before trying to write to the file

Bug: T174086
Change-Id: Id095dd171cdd1d2c8f32e6254154e5a68ef3f1d5
---
M DPLMain.php
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DynamicPageList 
refs/changes/63/395163/1

diff --git a/DPLMain.php b/DPLMain.php
index a2bcce0..4a3b644 100644
--- a/DPLMain.php
+++ b/DPLMain.php
@@ -3235,10 +3235,13 @@
}
$cacheTimeStamp = self::prettyTimeStamp( date( 'YmdHis' 
) );
$cFile = fopen( $cacheFile, 'w' );
-   fwrite( $cFile, $originalInput );
-   fwrite( $cFile, "+++\n" );
-   fwrite( $cFile, $output );
-   fclose( $cFile );
+   if ( $cFile !== false ) {
+   fwrite( $cFile, $originalInput );
+   fwrite( $cFile, "+++\n" );
+   fwrite( $cFile, $output );
+   fclose( $cFile );
+   }
+   // @todo log something if couldn't write to cache?
$dplElapsedTime = time() -$dplStartTime;
if ( $logger->iDebugLevel >= 2 ) {
$output .= "{{Extension DPL 
cache|mode=update|page={{FULLPAGENAME}}|cache=$DPLCache|date=$cacheTimeStamp|age=0|now="
 .

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id095dd171cdd1d2c8f32e6254154e5a68ef3f1d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DynamicPageList
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...DynamicPageList[master]: Don't try to write crazy filenames for DPL cache files

2017-12-04 Thread Legoktm (Code Review)

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

Change subject: Don't try to write crazy filenames for DPL cache files
..

Don't try to write crazy filenames for DPL cache files

The filename on the bug report is ridiculously long and looks sketchy. Since
all we need is a unique filename, use sha1() to sanitize it.

Bug: T174086
Change-Id: I2c107da2dcf0ff1f8cb12c1102358210e51454e0
---
M DPLMain.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DynamicPageList 
refs/changes/62/395162/1

diff --git a/DPLMain.php b/DPLMain.php
index c570fe1..a2bcce0 100644
--- a/DPLMain.php
+++ b/DPLMain.php
@@ -1376,7 +1376,7 @@
 
case 'dplcache':
if ( $sArg != '' ) {
-   $DPLCache = 
$parser->mTitle->getArticleID() . '_' . str_replace( '/', '_', $sArg ) . 
'.dplc';
+   $DPLCache = sha1( 
$parser->mTitle->getArticleID() . '_' . str_replace( '/', '_', $sArg ) ) . 
'.dplc';
$DPLCachePath = 
$parser->mTitle->getArticleID() % 10;
} else {
$output .= 
$logger->msgWrongParam( 'dplcache', $sArg );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c107da2dcf0ff1f8cb12c1102358210e51454e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DynamicPageList
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Further cleanup of lib/most-read

2017-12-04 Thread Mholloway (Code Review)

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

Change subject: Further cleanup of lib/most-read
..

Further cleanup of lib/most-read

Note: This change removes the pageid field from the response items.
(Hence not marking this with Hygiene.) Is pageid actually used by clients?

Change-Id: I9d95e77330cfd3e65c8d456b1b69f2c60ed1cce8
---
M lib/feed/most-read-filter.js
M lib/feed/most-read.js
M test/diff/diff.js
M test/diff/results/page_most-read-enwiki-2016-01-01.json
4 files changed, 52 insertions(+), 120 deletions(-)


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

diff --git a/lib/feed/most-read-filter.js b/lib/feed/most-read-filter.js
index f99177e..269b346 100644
--- a/lib/feed/most-read-filter.js
+++ b/lib/feed/most-read-filter.js
@@ -21,10 +21,10 @@
 return BLACKLIST.indexOf(title) !== -1;
 }
 
-function filterSpecialPages(pages, mainPageTitle) {
+function filterSpecial(articles, mainPageTitle) {
 const mainPageRegExp = new RegExp(`^${escape(mainPageTitle)}$`, 'i');
-return pages.filter((page) => {
-return page.ns === 0 && !mainPageRegExp.test(page.title);
+return articles.filter((page) => {
+return page.ns === 0 && !mainPageRegExp.test(page.article);
 });
 }
 
@@ -34,7 +34,7 @@
  * relatively even mix of the two, are presumed to be inflated by bot traffic
  * and not of sufficient human interest to include in the feed.
  */
-function filterBotTraffic(allPlatformsMostRead, desktopMostRead) {
+function filterBots(allPlatformsMostRead, desktopMostRead) {
 
 if (BOT_FILTER_THRESHOLD < 0 || BOT_FILTER_THRESHOLD > 1) {
 throw new HTTPError({
@@ -62,6 +62,6 @@
 }
 
 module.exports = {
-filterSpecialPages,
-filterBotTraffic
+filterSpecial,
+filterBots
 };
diff --git a/lib/feed/most-read.js b/lib/feed/most-read.js
index 6ea5333..22e856f 100644
--- a/lib/feed/most-read.js
+++ b/lib/feed/most-read.js
@@ -7,9 +7,11 @@
 const BBPromise = require('bluebird');
 const mUtil = require('../mobile-util');
 const mwapi = require('../mwapi');
-const filter = require('./most-read-filter');
+const filterSpecial = require('./most-read-filter').filterSpecial;
+const filterBots = require('./most-read-filter').filterBots;
 const dateUtil = require('../dateUtil');
 const pageviews = require('../pageviews');
+const Title = require('mediawiki-title').Title;
 
 /**
  * @public {!string} date ISO 8601 timestamp of pageviews recorded
@@ -23,14 +25,8 @@
 }
 
 function getTopPageviews(app, req, domain, date) {
-const apiDomain = 'wikimedia.org';
-const restReq = {
-headers: { accept: 'application/json; charset=utf-8' }
-};
-const client = new pageviews.Client(app, apiDomain, restReq);
-
-// todo: remove manual bot filtering when a user agent parameter is 
available for top as in the
-//   per-article endpoint
+const restReq = { headers: { accept: 'application/json; charset=utf-8' } };
+const client = new pageviews.Client(app, 'wikimedia.org', restReq);
 return BBPromise.props({
 desktop: client.reqTop(domain, pageviews.Platform.DESKTOP_WEB, date),
 combined: client.reqTop(domain, pageviews.Platform.ALL, date)
@@ -43,29 +39,33 @@
 });
 }
 
-function promise(app, req) {
-const aggregated = !!req.query.aggregated;
-let goodTitles;
-let resultsDate;
+function getViewHistory(app, domain, startDate, endDate, entry) {
+const restReq = { headers: { accept: 'application/json; charset=utf-8' } };
+const client = new pageviews.Client(app, 'wikimedia.org', restReq);
+return client.reqPage(mUtil.removeTLD(domain), pageviews.Platform.ALL, 
pageviews.Agent.USER,
+entry.article, pageviews.Granularity.DAILY, startDate, endDate)
+.then(pageviewsPageRspToDatedPageviews);
+}
 
+function promise(app, req) {
 if (req.params.domain === 'fy.wikipedia.org') {
 return BBPromise.resolve({ meta: {} });
 }
 
 if (!dateUtil.validate(dateUtil.hyphenDelimitedDateString(req))) {
-if (aggregated) {
+if (req.query.aggregated) {
 return BBPromise.resolve({ meta: {} });
 }
 dateUtil.throwDateError();
 }
 
-const targetDomain = 
mUtil.removeTLD(mUtil.mobileToCanonical(req.params.domain));
-
 const reqDate = dateUtil.getRequestedDate(req);
-const date = aggregated ? dateUtil.addDays(reqDate, -1) : reqDate;
+const rspDate = req.query.aggregated ? dateUtil.addDays(reqDate, -1) : 
reqDate;
 
-return getTopPageviews(app, req, targetDomain, date)
-.then((response) => {
+return BBPromise.props({
+pageviews: getTopPageviews(app, req, 
mUtil.removeTLD(req.params.domain), rspDate),
+siteinfo: mwapi.getSiteInfo(app, req)
+}).then((response) => {
 // We're working mainly with the overall list of top pageviews, and cut
 //

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[specialpages]: Always render taglines unconditionally and update styles

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Always render taglines unconditionally and update styles
..


Always render taglines unconditionally and update styles

Adjust tagline margin per Nirzar:
https://phabricator.wikimedia.org/T180095#3801719

Note, this will  enable the tagline everywhere.

Change-Id: I3bce2a3472ab2e53261965c953572f35cc740eed
Bug: T180095
---
M includes/skins/SkinMinerva.php
M resources/skins.minerva.base.styles/pageactions.less
M skinStyles/mobile.special.styles/minerva.less
3 files changed, 12 insertions(+), 14 deletions(-)

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



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index d5e3d2e..9382f75 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -814,7 +814,7 @@
 * @return string HTML for tagline
 */
protected function getTaglineHtml() {
-   $tagline = false;
+   $tagline = '';
 
if ( $this->getUserPageHelper()->isUserPage() ) {
$pageUser = $this->getUserPageHelper()->getPageUser();
@@ -835,16 +835,13 @@
} else {
$title = $this->getTitle();
if ( $title ) {
-   if ( !$title->isMainPage() && 
$title->inNamespace( NS_MAIN ) ) {
-   $vars = $this->getSkinConfigVariables();
-   $tagline = $vars['wgMFDescription'];
-   }
+   $vars = $this->getSkinConfigVariables();
+   $tagline = $vars['wgMFDescription'];
}
}
 
$attrs[ 'class' ] = 'tagline';
-   return $tagline ?
-   Html::element( 'div', $attrs, $tagline ) : '';
+   return Html::element( 'div', $attrs, $tagline );
}
/**
 * Returns the HTML representing the heading.
diff --git a/resources/skins.minerva.base.styles/pageactions.less 
b/resources/skins.minerva.base.styles/pageactions.less
index 0742202..050c83f 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -26,7 +26,7 @@
.tagline {
color: @colorGray5;
font-size: 0.85em;
-   margin: 4px 0 0;
+   margin: 2px 0 0;
 
&:first-letter {
text-transform: capitalize;
diff --git a/skinStyles/mobile.special.styles/minerva.less 
b/skinStyles/mobile.special.styles/minerva.less
index 8d78eaf..1e945b3 100644
--- a/skinStyles/mobile.special.styles/minerva.less
+++ b/skinStyles/mobile.special.styles/minerva.less
@@ -2,21 +2,22 @@
 
 .ns-special {
#content {
-   @verticalPadding: 0.5em;
#section_0 {
-   padding: @verticalPadding 0;
-   text-align: center;
-   font-size: 1.25em;
+   padding: 34px 0 0;
+   font-size: 1.5em;
font-weight: bold;
-   border: 0;
}
 
.pre-content {
padding: 0;
-   border-bottom: 0;
}
}
 
+   // Specific to override mobile display
+   .heading-holder .tagline {
+   margin-bottom: 15px;
+   }
+
h1,
h2 {
// Important given we have no idea which rules special pages 
are enforcing

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3bce2a3472ab2e53261965c953572f35cc740eed
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jdlrobson 
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]: Hygiene: remove adjustMemberKeys and fillInMemberKeys from m...

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: remove adjustMemberKeys and fillInMemberKeys from 
mobile-util
..


Hygiene: remove adjustMemberKeys and fillInMemberKeys from mobile-util

Standard Array functions can and should be used to perform these
operations.

Change-Id: Iefabb9e8e56a5be9bb2c80979b605c8398cecc23
---
M lib/feed/most-read.js
M lib/mobile-util.js
M test/lib/mobile-util/mobile-util-test.js
3 files changed, 8 insertions(+), 70 deletions(-)

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



diff --git a/lib/feed/most-read.js b/lib/feed/most-read.js
index 862e1b0..6ea5333 100644
--- a/lib/feed/most-read.js
+++ b/lib/feed/most-read.js
@@ -22,17 +22,6 @@
 }
 }
 
-/**
- * Construct a list of title strings from the array of good article objects.
- */
-function constructQueryListFrom(goodTitles) {
-const result = [];
-for (let i = 0, n = goodTitles.length; i < n; i++) {
-result.push(goodTitles[i].article);
-}
-return result;
-}
-
 function getTopPageviews(app, req, domain, date) {
 const apiDomain = 'wikimedia.org';
 const restReq = {
@@ -94,11 +83,13 @@
 const desktopItems = desktopResults && desktopResults.items;
 const firstDesktopItems = desktopItems && desktopResults.items[0];
 const combinedArticles = firstCombinedItems && 
firstCombinedItems.articles;
-const combinedArticlesSlice = combinedArticles && 
combinedArticles.slice(0, QUERY_TITLES);
+const combinedSlice = combinedArticles && combinedArticles.slice(0, 
QUERY_TITLES);
 const desktopArticles = firstDesktopItems && 
firstDesktopItems.articles;
-const desktopArticlesSlice = desktopArticles && 
desktopArticles.slice(0, DESKTOP_TITLES);
+const desktopSlice = desktopArticles && desktopArticles.slice(0, 
DESKTOP_TITLES);
 
-goodTitles = filter.filterBotTraffic(combinedArticlesSlice, 
desktopArticlesSlice);
+goodTitles = filter.filterBotTraffic(combinedSlice, desktopSlice)
+.map(i => Object.assign({ title: i.article }, i));
+
 if (mUtil.isEmpty(goodTitles)) {
 mUtil.throw404('No results found.');
 }
@@ -107,7 +98,7 @@
 const month = firstCombinedItems.month;
 const day = firstCombinedItems.day;
 resultsDate = `${year}-${month}-${day}Z`;
-return mwapi.getMostReadMetadata(app, req, 
constructQueryListFrom(goodTitles).join('|'));
+return mwapi.getMostReadMetadata(app, req, goodTitles.map(i => 
i.article).join('|'));
 }).then((response) => {
 const query = response.body && response.body.query;
 const normalizations = query && query.normalized;
@@ -119,11 +110,10 @@
 }
 
 if (normalizations) {
-mUtil.adjustMemberKeys(normalizations, ['article', 'from'], 
['title', 'to']);
-mUtil.mergeByProp(goodTitles, normalizations, 'article');
+const adjusted = normalizations.map(norm => ({ article: norm.from, 
title: norm.to }));
+mUtil.mergeByProp(goodTitles, adjusted, 'article');
 }
 
-mUtil.fillInMemberKeys(goodTitles, ['title', 'article']);
 mUtil.mergeByProp(goodTitles, pages, 'title', true);
 
 goodTitles = filter.filterSpecialPages(goodTitles, mainPageTitle);
diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index ee461ad..ee28266 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -166,41 +166,6 @@
 });
 };
 
-/**
- * Takes an array of objects and makes the specified changes to the keys of 
each
- * member object. E.g., adjustMemberKeys(arr, ['to', 'from'], ['to', 'from'], 
...)
- * @param {!Array} arr an array of objects that will receive the change pairs 
passed in as
- * additional params
- */
-mUtil.adjustMemberKeys = function(arr) {
-for (let i = 0, n = arr.length; i < n; i++) {
-for (let j = 1, m = arguments.length; j < m; j++) {
-if (arr[i][arguments[j][1]]) {
-arr[i][arguments[j][0]] = arr[i][arguments[j][1]];
-delete arr[i][arguments[j][1]];
-}
-}
-}
-};
-
-/**
- * Takes an array of objects and, for each object, creates the specified key 
(if
- * not already present) with the same value as the specified source key for 
each
- * change pair passed in as an additional parameter.
- * E.g., fillInMemberKeys(arr, ['to', 'from'], ['to', 'from'], ...)
- * @param {!Array} arr an array of objects that will receive the change pairs 
passed in as
- * additional params
- */
-mUtil.fillInMemberKeys = function(arr) {
-for (let i = 0, n = arr.length; i < n; i++) {
-for (let j = 1, m = arguments.length; j < m; j++) {
-if (!arr[i][arguments[j][0]]) {
-arr[i][arguments[j][0]] = arr[i][arguments[j][1]];
-}
-}
-}
-};
-

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MultilineTextInputWidget: Correct documentation for config.m...

2017-12-04 Thread Catrope (Code Review)

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

Change subject: MultilineTextInputWidget: Correct documentation for 
config.maxRows
..

MultilineTextInputWidget: Correct documentation for config.maxRows

Change-Id: Ia8f01eda210326b78e2741a837605afd20400345
---
M src/widgets/MultilineTextInputWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/60/395160/1

diff --git a/src/widgets/MultilineTextInputWidget.js 
b/src/widgets/MultilineTextInputWidget.js
index 5b6f828..112c3e5 100644
--- a/src/widgets/MultilineTextInputWidget.js
+++ b/src/widgets/MultilineTextInputWidget.js
@@ -9,7 +9,7 @@
  * @cfg {string} [labelPosition='after'] The position of the inline label 
relative to that of
  * @cfg {boolean} [autosize=false] Automatically resize the text input to fit 
its content.
  *  Use the #maxRows config to specify a maximum number of displayed rows.
- * @cfg {boolean} [maxRows] Maximum number of rows to display when #autosize 
is set to true.
+ * @cfg {number} [maxRows] Maximum number of rows to display when #autosize is 
set to true.
  *  Defaults to the maximum of `10` and `2 * rows`, or `10` if `rows` isn't 
provided.
  */
 OO.ui.MultilineTextInputWidget = function OoUiMultilineTextInputWidget( config 
) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] ImagePage: Create metadata table collapse button in PHP

2017-12-04 Thread Krinkle (Code Review)

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

Change subject: [WIP] ImagePage: Create metadata table collapse button in PHP
..

[WIP] ImagePage: Create metadata table collapse button in PHP

Currently broken because makeMetadataTable() is treated as wikitext
and  is not valid in wikitext.

Change-Id: I05c06bdd4428f0d71a3c154c28237ba0bd57cda7
---
M includes/page/ImagePage.php
M resources/src/mediawiki.action/mediawiki.action.view.filepage.css
M resources/src/mediawiki.action/mediawiki.action.view.metadata.css
M resources/src/mediawiki.action/mediawiki.action.view.metadata.js
4 files changed, 51 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/395159/1

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 1dcdc65..46400c4 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -267,6 +267,20 @@
);
}
}
+   // Create button for metadata.js
+   $r .= Html::rawElement( 'tr',
+   [ 'class' => 'mw-metadata-show-hide-extended' ],
+   Html::rawElement( 'td',
+   [ 'colspan' => '2' ],
+   Html::element( 'a',
+   [
+   'role' => 'button',
+   'tabindex' => '0'
+   ],
+   $this->getContext()->msg( 
'metadata-expand' )
+   )
+   )
+   );
$r .= "\n\n";
return $r;
}
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css 
b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
index b643d76..a49db48 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
@@ -113,7 +113,15 @@
 }
 
 .client-js .mw_metadata.collapsed .mw-metadata-collapsible,
+.client-nojs .mw-metadata-show-hide-extended,
 /* Keep tr.collapsible for back-compat with cached HTML */
 .client-js .mw_metadata.collapsed tr.collapsable {
display: none;
 }
+
+
+@media print {
+   .mw-metadata-show-hide-extended {
+   display: none;
+   }
+}
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css 
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
index f21b111..c93ff4b2 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
@@ -13,7 +13,7 @@
 }
 
 @media print {
-   .mw_metadata .mw-metadata-show-hide-extended {
+   .mw-metadata-show-hide-extended {
display: none;
}
 }
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js 
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
index ac927ae..4b0ab40 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
@@ -14,38 +14,39 @@
return;
}
$tables.each( function () {
-   var $link,
+   var $link = $table.find( 
'.mw-metadata-show-hide-extended a' ),
expandText = mw.msg( 'metadata-expand' ),
collapseText = mw.msg( 'metadata-collapse' ),
$table = $( this );
 
-   $link = $( '' )
-   .text( expandText )
-   .attr( {
-   role: 'button',
-   tabindex: 0
-   } )
-   .on( 'click keypress', function ( e ) {
-   if (
-   e.type === 'click' ||
-   e.type === 'keypress' 
&& e.which === 13
-   ) {
-   if ( $table.hasClass( 
'collapsed' ) ) {
-   // From 
collapsed to expanded. Button will now collapse.
-   $( this ).text( 
collapseText );
-   } else {
-   // From 
expanded to collapsed. Button will now expand.
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ImagePage: Clean up metadata.js collapsing

2017-12-04 Thread Krinkle (Code Review)

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

Change subject: ImagePage: Clean up metadata.js collapsing
..

ImagePage: Clean up metadata.js collapsing

In preparation for trying out a CSS-only approach for the initial
collapse that doesn't cause the expanded view to flash first.

Bug: T182047
Change-Id: I42941ccb05d5525599a0209f0f33db9fe836580b
---
M includes/page/ImagePage.php
M resources/src/mediawiki.action/mediawiki.action.view.metadata.css
M resources/src/mediawiki.action/mediawiki.action.view.metadata.js
3 files changed, 41 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/57/395157/1

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 67f9e09..c774eb5 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -257,7 +257,7 @@
$class = str_replace( ' ', '_', $v['id'] );
if ( $type == 'collapsed' ) {
// Handled by 
mediawiki.action.view.metadata module.
-   $class .= ' collapsable';
+   $class .= ' mw-metadata-collapsible';
}
$r .= Html::rawElement( 'tr',
[ 'class' => $class ],
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css 
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
index b07965e..35b0623 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
@@ -1,7 +1,9 @@
 /*!
  * Hide collapsable rows in a collapsed table.
  */
-table.collapsed tr.collapsable {
+
+ .mw_metadata.collapsed .mw-metadata-collapsible,
+ .mw_metadata.collapsed tr.collapsable {
display: none;
 }
 
@@ -9,14 +11,14 @@
  * Exclude user interface elements from selection.
  */
 .mw-metadata-show-hide-extended {
-   -moz-user-select: none;
-webkit-user-select: none;
+   -moz-user-select: none;
-ms-user-select: none;
user-select: none;
 }
 
 @media print {
-   tr.mw-metadata-show-hide-extended {
+   .mw_metadata .mw-metadata-show-hide-extended {
display: none;
}
 }
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js 
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
index 0d000c9..bae248b 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
@@ -8,42 +8,45 @@
  */
 ( function ( mw, $ ) {
$( function () {
-   var $row, $col, $link,
-   showText = mw.msg( 'metadata-expand' ),
-   hideText = mw.msg( 'metadata-collapse' ),
-   $table = $( '#mw_metadata' ),
-   $tbody = $table.find( 'tbody' );
-
-   if ( !$tbody.find( '.collapsable' ).length ) {
+   var $tables = $( '.mw_metadata' );
+   if ( !$tables.find( '.mw-metadata-collapsible, .collapsable' 
).length ) {
+   // No collapsible rows present on this page
return;
}
+   $tables.each( function () {
+   var $row, $col, $link,
+   expandText = mw.msg( 'metadata-expand' ),
+   collapseText = mw.msg( 'metadata-collapse' ),
+   $table = $( this );
 
-   $row = $( '' );
-   $col = $( '' );
+   $link = $( '' )
+   .text( expandText )
+   .attr( {
+   role: 'button',
+   tabindex: 0
+   } )
+   .on( 'click keypress', function ( e ) {
+   if (
+   e.type === 'click' ||
+   e.type === 'keypress' 
&& e.which === 13
+   ) {
+   if ( $table.hasClass( 
'collapsed' ) ) {
+   // From 
collapsed to expanded. Button will now collapse.
+   $( this ).text( 
collapseText );
+   } else {
+   // From 
expanded to collapsed. Button will now expand.
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ImagePage: Make metadata table's initial collapse CSS-only

2017-12-04 Thread Krinkle (Code Review)

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

Change subject: ImagePage: Make metadata table's initial collapse CSS-only
..

ImagePage: Make metadata table's initial collapse CSS-only

Make the initial collapse of the metadata table not depend on
JavaScript. This eliminates the FOUC, and will also reduce JS
footprint once compat can be removed.

* Move the 'display: none;' styles from metadata.css to
  filepage.css so that they are part of the base styles for
  file pages (metadata.css is only for supporting metadata.js,
  which is loaded dynamically).

* Apply "collapsed" class from the PHP side immediately,
  instead of calling "addClass" in JavaScript.

* Restrict hide-styles to only apply under .client-js to make
  sure the rows remain visible in no-js mode.

* Declare dependency between metadata.js and filepage.css.
  This is just for documentation purposes, as they are both
  already separately loaded on all file pages.

Change-Id: If22bf7acb47b59151dc3b0843a62507c100e548b
---
M includes/page/ImagePage.php
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.view.filepage.css
M resources/src/mediawiki.action/mediawiki.action.view.metadata.css
M resources/src/mediawiki.action/mediawiki.action.view.metadata.js
5 files changed, 15 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/58/395158/1

diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index c774eb5..1dcdc65 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -251,12 +251,13 @@
protected function makeMetadataTable( $metadata ) {
$r = "";
$r .= $this->getContext()->msg( 'metadata-help' )->plain();
-   $r .= "\n";
+   // Intial state is collapsed
+   // see filepage.css and mediawiki.action.view.metadata module.
+   $r .= "\n";
foreach ( $metadata as $type => $stuff ) {
foreach ( $stuff as $v ) {
$class = str_replace( ' ', '_', $v['id'] );
if ( $type == 'collapsed' ) {
-   // Handled by 
mediawiki.action.view.metadata module.
$class .= ' mw-metadata-collapsible';
}
$r .= Html::rawElement( 'tr',
diff --git a/resources/Resources.php b/resources/Resources.php
index 0e6939b..7d89f1c 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1498,6 +1498,7 @@
'metadata-expand',
'metadata-collapse',
],
+   'dependencies' => 'mediawiki.action.view.filepage',
],
'mediawiki.action.view.categoryPage.styles' => [
'styles' => 
'resources/src/mediawiki.action/mediawiki.action.view.categoryPage.less',
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css 
b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
index d466216..b643d76 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
@@ -111,3 +111,9 @@
padding-left: 5px;
margin: 0;
 }
+
+.client-js .mw_metadata.collapsed .mw-metadata-collapsible,
+/* Keep tr.collapsible for back-compat with cached HTML */
+.client-js .mw_metadata.collapsed tr.collapsable {
+   display: none;
+}
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css 
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
index 35b0623..f21b111 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
@@ -1,11 +1,6 @@
 /*!
- * Hide collapsable rows in a collapsed table.
+ * Styles for metadata.js.
  */
-
- .mw_metadata.collapsed .mw-metadata-collapsible,
- .mw_metadata.collapsed tr.collapsable {
-   display: none;
-}
 
 /*
  * Exclude user interface elements from selection.
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js 
b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
index bae248b..ac927ae 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.js
@@ -14,7 +14,7 @@
return;
}
$tables.each( function () {
-   var $row, $col, $link,
+   var $link,
expandText = mw.msg( 'metadata-expand' ),
collapseText = mw.msg( 'metadata-collapse' ),
$table = $( this );
@@ -48,7

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ulsfo: lvs, bastion, remove ganglia and aggregator

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: ulsfo: lvs, bastion, remove ganglia and aggregator
..


ulsfo: lvs, bastion, remove ganglia and aggregator

Bug: T177225
Change-Id: I9c6bdfa1e5729804032646ecfd4c52c4063c74c9
---
A hieradata/hosts/bast4001.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 5 insertions(+), 4 deletions(-)

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



diff --git a/hieradata/hosts/bast4001.yaml b/hieradata/hosts/bast4001.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/hosts/bast4001.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f4cada6..85f2643 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -181,6 +181,10 @@
   __regex: !ruby/regexp /^lvs10(0[7-9]|1[0-2])\.eqiad\.wmnet$/
   profile::pybal::bgp: no
 
+lvs_ulsfo:
+  __regex: !ruby/regexp /^lvs4.*\.ulsfo\.wmnet$/
+  standard::has_ganglia: false
+
 maps_test:
   __regex: !ruby/regexp /^maps-test200[1-4]\.codfw\.wmnet$/
   cassandra::target_version: '2.2'
diff --git a/manifests/site.pp b/manifests/site.pp
index f85e1ad..8ede359 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -109,10 +109,6 @@
 prometheus::ops)
 
 interface::add_ip6_mapped { 'main': }
-
-class { '::ganglia::monitor::aggregator':
-sites =>  'ulsfo',
-}
 }
 
 node 'bast4002.wikimedia.org' {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c6bdfa1e5729804032646ecfd4c52c4063c74c9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ulsfo: lvs, bastion, remove ganglia and aggregator

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: ulsfo: lvs, bastion, remove ganglia and aggregator
..

ulsfo: lvs, bastion, remove ganglia and aggregator

Bug:T177225
Change-Id: I9c6bdfa1e5729804032646ecfd4c52c4063c74c9
---
A hieradata/hosts/bast4001.yaml
M hieradata/regex.yaml
M manifests/site.pp
3 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/395156/1

diff --git a/hieradata/hosts/bast4001.yaml b/hieradata/hosts/bast4001.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/hosts/bast4001.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f4cada6..85f2643 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -181,6 +181,10 @@
   __regex: !ruby/regexp /^lvs10(0[7-9]|1[0-2])\.eqiad\.wmnet$/
   profile::pybal::bgp: no
 
+lvs_ulsfo:
+  __regex: !ruby/regexp /^lvs4.*\.ulsfo\.wmnet$/
+  standard::has_ganglia: false
+
 maps_test:
   __regex: !ruby/regexp /^maps-test200[1-4]\.codfw\.wmnet$/
   cassandra::target_version: '2.2'
diff --git a/manifests/site.pp b/manifests/site.pp
index 256bfa8..92358ab 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -109,10 +109,6 @@
 prometheus::ops)
 
 interface::add_ip6_mapped { 'main': }
-
-class { '::ganglia::monitor::aggregator':
-sites =>  'ulsfo',
-}
 }
 
 node 'bast4002.wikimedia.org' {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Dev: Lint on pre-commit, not when running unit tests

2017-12-04 Thread Mholloway (Code Review)

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

Change subject: Dev: Lint on pre-commit, not when running unit tests
..

Dev: Lint on pre-commit, not when running unit tests

Linting is important but can be a nuisance during a rapid debugging and
testing cycle if run alongside the unit tests.  This patch moves the lint
command to a pre-commit hook to ameliorate this problem.

Change-Id: Ie78d3bed3608adcc2c4bbf38bd0fd981b8c91702
---
M package.json
1 file changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/package.json b/package.json
index 99133cf..9e916e9 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "./app.js",
   "scripts": {
 "start": "service-runner",
-"test": "npm run -s lint && PREQ_CONNECT_TIMEOUT=15 mocha && nsp check",
+"test": "PREQ_CONNECT_TIMEOUT=15 mocha && nsp check",
 "test:unit": "PREQ_CONNECT_TIMEOUT=15 mocha test/lib",
 "lint": "eslint --cache --max-warnings 0 --ext .js --ext .json .",
 "docker-start": "service-runner docker-start",
@@ -13,6 +13,9 @@
 "test-build": "service-runner docker-test && service-runner build 
--deploy-repo --force",
 "coverage": "istanbul cover _mocha -- -R spec"
   },
+  "pre-commit": [
+"lint"
+  ],
   "repository": {
 "type": "git",
 "url": "https://gerrit.wikimedia.org/r/mediawiki/services/mobileapps;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie78d3bed3608adcc2c4bbf38bd0fd981b8c91702
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] pywikibot/core[master]: [bugfix] Don't handle category prefixes as iw shortcuts

2017-12-04 Thread Dvorapa (Code Review)

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

Change subject: [bugfix] Don't handle category prefixes as iw shortcuts
..

[bugfix] Don't handle category prefixes as iw shortcuts

If _makecat in category move gets a var like "mk:B", it tries to save
category named "B" on mkwiki, which is not correct behavior (for this
purpose we have transferbot.py). With this fix inserted category name
like "mk:B" is always considered as bare category name

Bug: T57174
Change-Id: I3f7335351f3b700d10dc23cb91109d19efd04430
---
M scripts/category.py
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/54/395154/1

diff --git a/scripts/category.py b/scripts/category.py
index 9edf5f4..c056f9b 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -750,7 +750,10 @@
 @param var: Either the title as a string or a Category object.
 """
 if not isinstance(var, pywikibot.Category):
-var = pywikibot.Category(self.site, var)
+if re.search(r'(' + r'|'.join(self.site.namespaces[14]) + r'):', 
var, flags=re.I):
+var = pywikibot.Category(self.site, var)
+else:
+var = pywikibot.Category(self.site, self.site.namespace(14) + 
':' + var)
 return var
 
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: API: Account for PHP 7.2 change

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: API: Account for PHP 7.2 change
..


API: Account for PHP 7.2 change

PHP 7.2 broke existing functionality in making count( null ) raise a
warning. So add tests for null all over the place, or change tests where
we know the value is null or an array (but not false, empty-string, or
0) to just cast to boolean.

Bug: T182004
Change-Id: Idfe23a07daa9f60eee72f2daf04304be87057a29
---
M includes/api/ApiDelete.php
M includes/api/ApiEditPage.php
M includes/api/ApiImageRotate.php
M includes/api/ApiOptions.php
M includes/api/ApiQueryAllPages.php
M includes/api/ApiQueryBacklinks.php
M includes/api/ApiQueryBacklinksprop.php
M includes/api/ApiQueryBase.php
M includes/api/ApiQueryCategoryMembers.php
M includes/api/ApiQueryExtLinksUsage.php
M includes/api/ApiQueryLinks.php
M includes/api/ApiRevisionDelete.php
M includes/api/ApiRollback.php
M includes/api/ApiSetPageLanguage.php
M includes/api/ApiTag.php
M includes/api/ApiUserrights.php
16 files changed, 27 insertions(+), 26 deletions(-)

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



diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 7766acd..96c291c 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -59,7 +59,7 @@
 
// If change tagging was requested, check that the user is 
allowed to tag,
// and the tags are valid
-   if ( count( $params['tags'] ) ) {
+   if ( $params['tags'] ) {
$tagStatus = ChangeTags::canAddTagsAccompanyingChange( 
$params['tags'], $user );
if ( !$tagStatus->isOK() ) {
$this->dieStatus( $tagStatus );
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 94d6e97..26d4fd1 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -334,7 +334,7 @@
}
 
// Apply change tags
-   if ( count( $params['tags'] ) ) {
+   if ( $params['tags'] ) {
$tagStatus = ChangeTags::canAddTagsAccompanyingChange( 
$params['tags'], $user );
if ( $tagStatus->isOK() ) {
$requestArray['wpChangeTags'] = implode( ',', 
$params['tags'] );
diff --git a/includes/api/ApiImageRotate.php b/includes/api/ApiImageRotate.php
index 71bda6d..0568403 100644
--- a/includes/api/ApiImageRotate.php
+++ b/includes/api/ApiImageRotate.php
@@ -43,7 +43,7 @@
] );
 
// Check if user can add tags
-   if ( count( $params['tags'] ) ) {
+   if ( $params['tags'] ) {
$ableToTag = ChangeTags::canAddTagsAccompanyingChange( 
$params['tags'], $this->getUser() );
if ( !$ableToTag->isOK() ) {
$this->dieStatus( $ableToTag );
diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index 5b0d86a..14bd089 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -64,7 +64,7 @@
}
 
$changes = [];
-   if ( count( $params['change'] ) ) {
+   if ( $params['change'] ) {
foreach ( $params['change'] as $entry ) {
$array = explode( '=', $entry, 2 );
$changes[$array[0]] = isset( $array[1] ) ? 
$array[1] : null;
diff --git a/includes/api/ApiQueryAllPages.php 
b/includes/api/ApiQueryAllPages.php
index 315def0..a084279 100644
--- a/includes/api/ApiQueryAllPages.php
+++ b/includes/api/ApiQueryAllPages.php
@@ -136,12 +136,12 @@
}
 
// Page protection filtering
-   if ( count( $params['prtype'] ) || $params['prexpiry'] != 'all' 
) {
+   if ( $params['prtype'] || $params['prexpiry'] != 'all' ) {
$this->addTables( 'page_restrictions' );
$this->addWhere( 'page_id=pr_page' );
$this->addWhere( "pr_expiry > {$db->addQuotes( 
$db->timestamp() )} OR pr_expiry IS NULL" );
 
-   if ( count( $params['prtype'] ) ) {
+   if ( $params['prtype'] ) {
$this->addWhereFld( 'pr_type', 
$params['prtype'] );
 
if ( isset( $params['prlevel'] ) ) {
diff --git a/includes/api/ApiQueryBacklinks.php 
b/includes/api/ApiQueryBacklinks.php
index 54be254..830cc48 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -138,7 +138,7 @@
 
if ( count( $this->cont ) >= 2 ) {
$op = $this->params['dir'] == 'descending' ? '<' : '>';
-   if ( count(

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Update the URL and the switch color on the final app onboard...

2017-12-04 Thread Cooltey (Code Review)

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

Change subject: Update the URL and the switch color on the final app onboarding 
screen - Add a URL and a text item with #offline - Update the `on` switch color 
to Accent50
..

Update the URL and the switch color on the final app onboarding screen
- Add a URL and a text item with #offline
- Update the `on` switch color to Accent50

Bug: T181149
Change-Id: I251f32b6fff9f35fdbbfdf01f1dfb2dadee0ac42
---
M app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
M app/src/main/java/org/wikipedia/util/FeedbackUtil.java
M app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles.xml
6 files changed, 13 insertions(+), 3 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java 
b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
index 7fc85a8..1dd2bbc 100644
--- a/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
+++ b/app/src/main/java/org/wikipedia/onboarding/InitialOnboardingFragment.java
@@ -65,7 +65,9 @@
 FeedbackUtil.showPrivacyPolicy(getContext());
 } else if (url.equals("#about")) {
 FeedbackUtil.showAboutWikipedia(getContext());
-} else  {
+} else if (url.equals("#offline")) {
+FeedbackUtil.showOfflineReadingAndData(getContext());
+} else {
 handleExternalLink(getActivity(), Uri.parse(url));
 }
 }
diff --git a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java 
b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
index 3c46544..e4e7fd0 100644
--- a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
+++ b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
@@ -87,6 +87,10 @@
 visitInExternalBrowser(context, 
Uri.parse(context.getString(R.string.privacy_policy_url)));
 }
 
+public static void showOfflineReadingAndData(Context context) {
+visitInExternalBrowser(context, 
Uri.parse(context.getString(R.string.offline_reading_and_data_url)));
+}
+
 public static void showAboutWikipedia(Context context) {
 visitInExternalBrowser(context, 
Uri.parse(context.getString(R.string.about_wikipedia_url)));
 }
diff --git a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml 
b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
index 3cdef26..f9d79ec 100644
--- a/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
+++ b/app/src/main/res/layout/inflate_initial_onboarding_page_three.xml
@@ -8,5 +8,5 @@
 app:centeredImage="@drawable/illustration_onboarding_analytics"
 app:imageSize="160dp"
 app:primaryText="@string/onboarding_analytics_title"
-app:secondaryText="@string/onboarding_analytics_text"
+app:secondaryText="@string/onboarding_analytics_offline_text"
 app:switchText="@string/onboarding_analytics_switch_title" />
\ No newline at end of file
diff --git a/app/src/main/res/values-qq/strings.xml 
b/app/src/main/res/values-qq/strings.xml
index fb1bce6..67526af 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -148,6 +148,7 @@
   Summary of the preference item to 
show the terms of use.\n{{Identical|Terms of use}}
   URL leading to the About Wikipedia page. 
If you can find the appropriate language specific URL of the mobile site please 
do so. If not feel free to keep the English one. Example for German (lang code 
\"de\"): https://de.wikipedia.org/wiki/Wikipedia:Über_Wikipedia\nPlease test 
the URL to make sure it works.
   URL leading to the Wikimedia Foundation 
privacy policy. If you can find the appropriate language specific URL of the 
mobile site please do so. If not feel free to keep the English one. Example for 
German (lang code \"de\"): 
https://meta.m.wikimedia.org/w/index.php?title=Privacy_policy/de\nPlease test 
the URL to make sure it works.
+  URL leading to the Offline 
reading and data section of Wikimedia Android app FAQ. If you can find the 
appropriate language specific URL of the mobile site please do so. 
   URL leading to the Wikimedia Foundation 
terms of use. If you can find the appropriate language specific URL of the 
mobile site please do so. If not feel free to keep the English one. Example for 
German (lang code \"de\"): 
https://m.wikimediafoundation.org/wiki/Terms_of_Use/de\nPlease test the URL to 
make sure it works
   URL for details about the Creative Commons CC 
BY-SA 3.0 license. When possible, please use the appropriate language-specific 
URL, and the mobile version of the site.
   URL for details about the

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Consolidate media selectors

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Hygiene: Consolidate media selectors
..


Hygiene: Consolidate media selectors

Share media selectors between the page transformations and the media
endpoint.  No output changes intended.

Change-Id: Icb881eb3d8663ed2d2723e4c03e68b3e8fd0aa82
---
M lib/media.js
M lib/parseProperty.js
A lib/selectors.js
M lib/transformations/anchorPopUpMediaTransforms.js
M lib/transforms.js
5 files changed, 48 insertions(+), 70 deletions(-)

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



diff --git a/lib/media.js b/lib/media.js
index 0de4391..bf6c6a5 100644
--- a/lib/media.js
+++ b/lib/media.js
@@ -4,22 +4,12 @@
 const api = require('./api-util');
 const mUtil = require('./mobile-util');
 const Title = require('mediawiki-title').Title;
+const MediaSelectors = require('./selectors').MediaSelectors;
+const SpokenWikipediaId = require('./selectors').SpokenWikipediaId;
 
 const MIN_IMAGE_SIZE = 64;
 const MAX_IMAGE_WIDTH = 1280;
 
-const SELECTORS = [
-'figure[typeof^=mw:Image]',
-'figure[typeof^=mw:Video]',
-'figure[typeof^=mw:Audio]',
-'span[typeof^=mw:Image]',
-'span[typeof^=mw:Video]',
-'span[typeof^=mw:Audio]',
-'figure-inline[typeof^=mw:Image]',
-'figure-inline[typeof^=mw:Video]',
-'figure-inline[typeof^=mw:Audio]',
-'span.IPA+small a[rel=mw:MediaLink]'
-];
 
 /**
  * A MediaWiki media type as represented in Parsoid HTML.
@@ -65,7 +55,7 @@
 function getMediaItemInfoFromPage(html) {
 const doc = domino.createDocument(html);
 // todo: handle Mathoid-rendered math images
-const selection = doc.querySelectorAll(SELECTORS.join(','));
+const selection = doc.querySelectorAll(MediaSelectors.join());
 return [].map.call(selection, (elem) => {
 const mediaType = getMediaType(elem);
 const resource = mediaType.selector && 
elem.querySelector(mediaType.selector);
@@ -101,7 +91,7 @@
 } else if (mediaType === Audio) {
 let parent = elem.parentNode;
 while (parent) {
-if (mUtil.isElement(parent) && parent.id === 
"section_SpokenWikipedia") {
+if (mUtil.isElement(parent) && parent.id === 
SpokenWikipediaId) {
 audioType = 'spoken';
 }
 parent = parent.parentNode;
@@ -217,7 +207,6 @@
 getMediaItemInfoFromPage,
 getMetadataFromApi,
 filterResult,
-SELECTORS,
 Image,
 Video,
 Audio
diff --git a/lib/parseProperty.js b/lib/parseProperty.js
index b5c7d6e..caa9550 100644
--- a/lib/parseProperty.js
+++ b/lib/parseProperty.js
@@ -6,6 +6,8 @@
 'use strict';
 
 const mUtil = require('./mobile-util');
+const PronunciationSelector = require('./selectors').PronunciationSelector;
+const SpokenWikipediaId = require('./selectors').SpokenWikipediaId;
 
 function parseInfobox(doc) {
 const ROW_SELECTOR = 'table.infobox > tbody > tr';
@@ -21,8 +23,7 @@
 }
 
 function parsePronunciation(doc, page) {
-const mediaLinkAnchorAfterIPA = 'span.IPA+small a[rel=mw:MediaLink]';
-const pronunciationAnchor = doc.querySelector(mediaLinkAnchorAfterIPA);
+const pronunciationAnchor = doc.querySelector(PronunciationSelector);
 const url = pronunciationAnchor && 
pronunciationAnchor.getAttribute('href');
 page.pronunciation = url && { url };
 }
@@ -32,7 +33,7 @@
  * 
https://en.wikipedia.org/wiki/Wikipedia:WikiProject_Spoken_Wikipedia/Template_guidelines
  */
 function parseSpokenWikipedia(doc, page) {
-const spokenSectionDiv = doc.querySelector('div#section_SpokenWikipedia');
+const spokenSectionDiv = doc.querySelector(`div#${SpokenWikipediaId}`);
 if (spokenSectionDiv) {
 const dataMW = spokenSectionDiv.getAttribute('data-mw');
 const parsedData = dataMW && JSON.parse(dataMW);
diff --git a/lib/selectors.js b/lib/selectors.js
new file mode 100644
index 000..835aac7
--- /dev/null
+++ b/lib/selectors.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const MediaSelectors = [
+'figure[typeof^=mw:Image]',
+'figure[typeof^=mw:Video]',
+'figure[typeof^=mw:Audio]',
+'span[typeof^=mw:Image]',
+'span[typeof^=mw:Video]',
+'span[typeof^=mw:Audio]',
+'figure-inline[typeof^=mw:Image]',
+'figure-inline[typeof^=mw:Video]',
+'figure-inline[typeof^=mw:Audio]',
+'span.IPA+small a[rel=mw:MediaLink]'
+];
+
+const ImageSelectors = MediaSelectors.filter(selector => 
selector.includes('Image'));
+const VideoSelectors = MediaSelectors.filter(selector => 
selector.includes('Video'));
+const PronunciationSelector = MediaSelectors.filter(selector => 
selector.includes('IPA'))[0];
+
+const SpokenWikipediaId = 'section_SpokenWikipedia';
+
+
+module.exports = {
+MediaSelectors,
+ImageSelectors,
+VideoSelectors,
+PronunciationSelector,
+SpokenWikipediaId
+};
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Fix: restore video derivatives

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Fix: restore video derivatives
..


Fix: restore video derivatives

Video derivatives were no longer being included in the media response,
probably because of a rebase error.

Change-Id: Ic948c00bddcd98d7cef5cf5c523bdb23aed79cb6
---
M lib/media.js
M test/diff/results/page_media-enwiki-Hummingbird.json
2 files changed, 104 insertions(+), 3 deletions(-)

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



diff --git a/lib/media.js b/lib/media.js
index bf6c6a5..24a5a18 100644
--- a/lib/media.js
+++ b/lib/media.js
@@ -83,8 +83,8 @@
 type: source.getAttribute('type'),
 title: source.getAttribute('data-title'),
 short_title: source.getAttribute('data-shorttitle'),
-width: source.getAttribute('data-file-width'),
-height: source.getAttribute('data-file-height')
+width: source.getAttribute('data-file-width') || 
undefined,
+height: source.getAttribute('data-file-height') || 
undefined
 };
 });
 }
@@ -144,7 +144,6 @@
 size: info.size
 },
 duration: meta && (meta.length || meta.playtime_seconds) || 
undefined,
-derivatives: info.derivatives,
 artist: ext && ext.Artist && ext.Artist.value,
 credit: ext && ext.Credit && ext.Credit.value,
 license: ext && ext.LicenseShortName && ext.LicenseShortName.value,
diff --git a/test/diff/results/page_media-enwiki-Hummingbird.json 
b/test/diff/results/page_media-enwiki-Hummingbird.json
index 851503a..a022bdd 100644
--- a/test/diff/results/page_media-enwiki-Hummingbird.json
+++ b/test/diff/results/page_media-enwiki-Hummingbird.json
@@ -187,6 +187,40 @@
   "type": "video",
   "caption_html": "Slow motion video of hummingbirds feeding",
   "caption_text": "Slow motion video of hummingbirds feeding",
+  "derivatives": [
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/2/21/Hummingbird_feeding_closeup_2000fps.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Original WebM file, 864 × 480 (955 kbps)",
+  "short_title": "WebM source",
+  "width": "864",
+  "height": "480"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.160p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Low bandwidth WebM (160P)",
+  "short_title": "WebM 160P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.240p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "Small WebM (240P)",
+  "short_title": "WebM 240P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.360p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "WebM (360P)",
+  "short_title": "WebM 360P"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/2/21/Hummingbird_feeding_closeup_2000fps.webm/Hummingbird_feeding_closeup_2000fps.webm.480p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+  "title": "SD WebM (480P)",
+  "short_title": "WebM 480P"
+}
+  ],
   "thumb": {
 "source": 
"https://upload.wikimedia.org/wikipedia/commons/thumb/2/21/Hummingbird_feeding_closeup_2000fps.webm/864px--Hummingbird_feeding_closeup_2000fps.webm.jpg;,
 "width": 864,
@@ -256,6 +290,40 @@
   "type": "video",
   "caption_html": "Hummingbird in Copiapó, Chile: The apparent slow movement of its 
wings is a result of the stroboscopic effect.",
   "caption_text": "Hummingbird in Copiapó, Chile: The apparent slow 
movement of its wings is a result of the stroboscopic effect.",
+  "derivatives": [
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/d/db/Hummingbird.ogv;,
+  "type": "video/ogg; codecs=\"theora, vorbis\"",
+  "title": "Original Ogg file, 854 × 480 (2.55 Mbps)",
+  "short_title": "Ogg source",
+  "width": "854",
+  "height": "480"
+},
+{
+  "src": 
"https://upload.wikimedia.org/wikipedia/commons/transcoded/d/db/Hummingbird.ogv/Hummingbird.ogv.160p.webm;,
+  "type": "video/webm; codecs=\"vp8, vorbis\"",
+

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Use OOUI\HiddenInputWidget

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Use OOUI\HiddenInputWidget
..


Use OOUI\HiddenInputWidget

Bug: T180095
Change-Id: Ifa53ffdfc66f2ff42398d8770376ba164dec5f0a
---
M includes/specials/SpecialMobileOptions.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/includes/specials/SpecialMobileOptions.php 
b/includes/specials/SpecialMobileOptions.php
index 4b8a130..62dc4fe 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -129,11 +129,11 @@
] );
 
if ( $user->isLoggedIn() ) {
-   $fields[] = new OOUI\HtmlSnippet( Html::hidden( 
'token', $user->getEditToken() ) );
+   $fields[] = new OOUI\HiddenInputWidget( [ 'name' => 
'token',
+   'value' => $user->getEditToken() ] );
}
-   $fields[] = new OOUI\HtmlSnippet(
-   Html::hidden( 'returnto', 
$this->returnToTitle->getFullText() )
-   );
+   $fields[] = new OOUI\HiddenInputWidget( [ 'name' => 'returnto',
+   'value' => $this->returnToTitle->getFullText() ] );
 
// @codingStandardsIgnoreEnd
$form->appendContent(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa53ffdfc66f2ff42398d8770376ba164dec5f0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 
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...MobileFrontend[specialpages]: Set tagline on Special:MobileOptions page

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Set tagline on Special:MobileOptions page
..


Set tagline on Special:MobileOptions page

Restrict the existing setting of wikidata descriptions to pages
in the main namespace. This will allow us to make the Minerva skin
dumber about when it should render and when it should not.

Also set a tagline for the special page MobileOptions

Given, we anticipate other special pages to also have taglines,
a configuration variable MFSpecialPageTaglines is added.

Bug: T180095
Change-Id: I3f5886715f0632e67e46e077d362a988a648a123
---
M README.md
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/MobileFrontend.hooks.php
5 files changed, 46 insertions(+), 4 deletions(-)

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



diff --git a/README.md b/README.md
index eab92f1..4522da1 100644
--- a/README.md
+++ b/README.md
@@ -581,6 +581,23 @@
 'tagline' => false,
   ]
 ```
+ $wgMFSpecialPageTaglines
+Set taglines for special pages
+
+```php
+$wgMFSpecialPageTaglines = [
+  "SpecialPageName" => "valid-message-key",
+];
+```
+
+* Type: `Array`
+* Default:
+```php
+  [
+"MobileOptions" => "mobile-frontend-settings-tagline"
+  ]
+```
+
 
  $wgMFStripResponsiveImages
 
diff --git a/extension.json b/extension.json
index 4a57570..8828a4a 100644
--- a/extension.json
+++ b/extension.json
@@ -1265,6 +1265,9 @@
},
"MFNoMobileCategory": false,
"MFNoMobilePages": [],
+   "MFSpecialPageTaglines": {
+   "MobileOptions": "mobile-frontend-settings-tagline"
+   },
"MFNearbyRange": 1,
"MFNearby": false,
"MFNearbyEndpoint": "",
diff --git a/i18n/en.json b/i18n/en.json
index 2798c97..d946136 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -198,6 +198,7 @@
"mobile-frontend-search-content": "Search within pages",
"mobile-frontend-search-content-no-results": 
"'''{{int:mobile-frontend-search-content}}''' to see if this phrase appears 
anywhere.",
"mobile-frontend-search-no-results": "No page with this title.",
+   "mobile-frontend-settings-tagline": "Reading preferences",
"mobile-frontend-settings-beta": "Beta",
"mobile-frontend-settings-site-description": "{{SITENAME}} is available 
in $1 {{PLURAL:$1|language|languages}}. All available versions are listed 
below",
"mobile-frontend-settings-site-header": "{{SITENAME}} Languages",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 68226a2..ab92dfc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -199,6 +199,7 @@
"mobile-frontend-search-content": "Caption for a button performing full 
text search of a given search query.\n\nUsed in 
{{msg-mw|Mobile-frontend-search-content-no-results}}.",
"mobile-frontend-search-content-no-results": "Used when no pages with 
matching titles were found.\n\nRefers to 
{{msg-mw|Mobile-frontend-search-content}}.",
"mobile-frontend-search-no-results": "Message informing user that no 
pages were found for a given query.",
+   "mobile-frontend-settings-tagline": "Tagline for Special:MobileOptions 
- will show under heading",
"mobile-frontend-settings-beta": "Text for beta on settings 
page.\n{{Identical|Beta}}",
"mobile-frontend-settings-site-description": "Shown on 
[[Special:MobileOptions]]. Parameters:\n* $1 - the number of other language 
versions for this wiki",
"mobile-frontend-settings-site-header": "Heading for the 
Special:MobileOptions/Language page - only visible to non JavaScript users",
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index caa2491..ea88c97 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -571,7 +571,9 @@
 * @return bool
 */
public static function onSpecialPageBeforeExecute( SpecialPage 
$special, $subpage ) {
-   $isMobileView = 
MobileContext::singleton()->shouldDisplayMobileView();
+   $context = MobileContext::singleton();
+   $isMobileView = $context->shouldDisplayMobileView();
+   $taglines = $context->getConfig()->get( 
'MFSpecialPageTaglines', [] );
$name = $special->getName();
 
if ( $isMobileView ) {
@@ -580,6 +582,10 @@
);
if ( $name === 'Userlogin' || $name === 'CreateAccount' 
) {
$special->getOutput()->addModules( 
'mobile.special.userlogin.scripts' );
+   }
+   if ( array_key_exists( $name, $taglines ) ) {
+   self::setTagline( $special->getOutput(),
+   wfMessage( $taglines[$name] ) );

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

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Reimplementing MobileOptions in OOUI
..


Reimplementing MobileOptions in OOUI

Special:MobileOptions is completely
written in OOUI.

The submit button is hidden in JavaScript and beta opt in/
value changes will now be managed by JavaScript.

I notice a 157.5kb increase in the introduction of this change.
134.2kb of this is JavaScript and 21.3kb of CSS (the CSS is
documented in T181108)

Other known issues:
* The select dropdown is not native so has various usability
problems (T180730)

Depends-On: I1dda3eb4d0e7ebbec544dc0f5763b079e38f5cc8
Change-Id: I70f68df9d2d305126444319b05675702af75de87
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/MobileFrontend.hooks.php
M includes/specials/SpecialMobileOptions.php
M jsduck.json
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
13 files changed, 253 insertions(+), 275 deletions(-)

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



diff --git a/extension.json b/extension.json
index 85f05ce..4a57570 100644
--- a/extension.json
+++ b/extension.json
@@ -944,35 +944,20 @@
"targets": "mobile",
"position": "top",
"dependencies": [
+   "jquery.cookie",
"mobile.startup"
],
"scripts": [

"resources/mobile.special.mobileoptions.scripts/mobileoptions.js"
],
-   "templates": {
-   "Checkbox.hogan": 
"resources/mobile.special.mobileoptions.scripts/checkbox.mustache"
-   },
"messages": [
+   "mobile-frontend-settings-save",
+   "mobile-frontend-fontchanger-option-small",
+   "mobile-frontend-fontchanger-option-medium",
+   "mobile-frontend-fontchanger-option-large",
+   "mobile-frontend-fontchanger-option-xlarge",
"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/i18n/en.json b/i18n/en.json
index 7b5ee71..2798c97 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -115,10 +115,14 @@
"mobile-frontend-editor-switch-visual-editor": "Switch to visual 
editing",
"mobile-frontend-editor-viewing-source-page": "Viewing source 
of $1",
"mobile-frontend-editor-wait": "Saving edit, please wait.",
-   "mobile-frontend-expand-sections-description": "Always expand all 
sections when navigating to a new page.",
+   "mobile-frontend-expand-sections-description": "Always expand sections 
of all articles by default.",
"mobile-frontend-expand-sections-status": "Expand all sections",
"mobile-frontend-fontchanger-link": "Font size",
-   "mobile-frontend-fontchanger-desc": "Increase or decrease the size of 
the text for readability.",
+   "mobile-frontend-fontchanger-desc": "Adjust article font size for 
better readability.",
+

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Correct couple typos

2017-12-04 Thread Ebe123 (Code Review)

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

Change subject: Correct couple typos
..

Correct couple typos

Fixed following typos in generatePngAndMidi() function:
* @param in the PHP-doc
* The backend argument in rendering images

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


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

diff --git a/includes/Score.php b/includes/Score.php
index 7e73548..ce43d94 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -489,7 +489,7 @@
 * @param string $code Score code.
 * @param array $options Rendering options. They are the same as for
 *  Score::generateHTML().
-* @parma array $metaData array to hold information about images
+* @param array $metaData array to hold information about images
 *
 * @return array of file names placed in the remote dest dir, with the
 *  file names in each key.
@@ -549,7 +549,7 @@
$wgScoreLilyPond,
'-dmidi-extension=midi', // midi needed for Windows to 
generate the file
$mode,
-   '-dbackpend-ps',
+   '-dbackend=ps',
'--png',
'--header=texidoc',
$factoryLy

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99fd7e03cd11f704315eac52cea85aec256b7e62
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Score
Gerrit-Branch: master
Gerrit-Owner: Ebe123 

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[specialpages]: Use OOUI\HiddenInputWidget

2017-12-04 Thread Jdlrobson (Code Review)

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

Change subject: Use OOUI\HiddenInputWidget
..

Use OOUI\HiddenInputWidget

Bug: T180095
Change-Id: Ifa53ffdfc66f2ff42398d8770376ba164dec5f0a
---
M includes/specials/SpecialMobileOptions.php
1 file changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/includes/specials/SpecialMobileOptions.php 
b/includes/specials/SpecialMobileOptions.php
index 4b8a130..62dc4fe 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -129,11 +129,11 @@
] );
 
if ( $user->isLoggedIn() ) {
-   $fields[] = new OOUI\HtmlSnippet( Html::hidden( 
'token', $user->getEditToken() ) );
+   $fields[] = new OOUI\HiddenInputWidget( [ 'name' => 
'token',
+   'value' => $user->getEditToken() ] );
}
-   $fields[] = new OOUI\HtmlSnippet(
-   Html::hidden( 'returnto', 
$this->returnToTitle->getFullText() )
-   );
+   $fields[] = new OOUI\HiddenInputWidget( [ 'name' => 'returnto',
+   'value' => $this->returnToTitle->getFullText() ] );
 
// @codingStandardsIgnoreEnd
$form->appendContent(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa53ffdfc66f2ff42398d8770376ba164dec5f0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: specialpages
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: remove esams ganglia aggregator

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: remove esams ganglia aggregator
..


remove esams ganglia aggregator

Bug: T177225
Change-Id: I5a87d8e64dcdb4700eeacd8b3fa804b786f66c8a
---
A hieradata/hosts/bast3002.yaml
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/bast3002.yaml b/hieradata/hosts/bast3002.yaml
new file mode 100644
index 000..49549d1
--- /dev/null
+++ b/hieradata/hosts/bast3002.yaml
@@ -0,0 +1 @@
+standard::has_ganglia: false
diff --git a/manifests/site.pp b/manifests/site.pp
index f24070f..f85e1ad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -99,7 +99,6 @@
 prometheus::ops)
 
 interface::add_ip6_mapped { 'main': }
-class { '::ganglia::monitor::aggregator': sites =>  'esams', }
 }
 
 # Bastion in California

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Re-apply "Revert "Set wgCommentTableSchemaMigrationStage = M...

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Re-apply "Revert "Set wgCommentTableSchemaMigrationStage = 
MIGRATION_WRITE_BOTH on test wikis""
..


Re-apply "Revert "Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH 
on test wikis""

This reverts commit cf4620dfc8c773d06fd81a411ffa04891b743409.

This re-applies I939b27c759c0ecd50b4ebd5c0358de9fb61f8b.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4309626..83b85cb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19764,9 +19764,6 @@
 
 'wgCommentTableSchemaMigrationStage' => [
'default' => MIGRATION_OLD,
-   'testwiki' => MIGRATION_WRITE_BOTH,
-   'test2wiki' => MIGRATION_WRITE_BOTH,
-   'testwikidatawiki' => MIGRATION_WRITE_BOTH,
 ],
 
 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9d5c6c28b5598d0b12228c863561bd489a5b96b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
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]: Re-apply "Revert "Set wgCommentTableSchemaMigrationStage = M...

2017-12-04 Thread Krinkle (Code Review)

Hello Urbanecm, Legoktm, jenkins-bot, Anomie, Zoranzoki21,

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

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

to review the following change.


Change subject: Re-apply "Revert "Set wgCommentTableSchemaMigrationStage = 
MIGRATION_WRITE_BOTH on test wikis""
..

Re-apply "Revert "Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH 
on test wikis""

This reverts commit cf4620dfc8c773d06fd81a411ffa04891b743409.

This re-applies I939b27c759c0ecd50b4ebd5c0358de9fb61f8b.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4309626..83b85cb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19764,9 +19764,6 @@
 
 'wgCommentTableSchemaMigrationStage' => [
'default' => MIGRATION_OLD,
-   'testwiki' => MIGRATION_WRITE_BOTH,
-   'test2wiki' => MIGRATION_WRITE_BOTH,
-   'testwikidatawiki' => MIGRATION_WRITE_BOTH,
 ],
 
 ];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9d5c6c28b5598d0b12228c863561bd489a5b96b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
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]: Revert "Revert "Set wgCommentTableSchemaMigrationStage = MIG...

2017-12-04 Thread Krinkle (Code Review)

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

Change subject: Revert "Revert "Set wgCommentTableSchemaMigrationStage = 
MIGRATION_WRITE_BOTH on test wikis""
..


Revert "Revert "Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH 
on test wikis""

Wasn't deployed.

This reverts commit fb074eaf56ee2523bb14cdf7090da6e34b053a51.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 83b85cb..4309626 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19764,6 +19764,9 @@
 
 'wgCommentTableSchemaMigrationStage' => [
'default' => MIGRATION_OLD,
+   'testwiki' => MIGRATION_WRITE_BOTH,
+   'test2wiki' => MIGRATION_WRITE_BOTH,
+   'testwikidatawiki' => MIGRATION_WRITE_BOTH,
 ],
 
 ];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71e9b0123b115d1496aeb21fdbf0b16373eecf24
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
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]: Revert "Revert "Set wgCommentTableSchemaMigrationStage = MIG...

2017-12-04 Thread Krinkle (Code Review)

Hello Urbanecm, Legoktm, jenkins-bot, Anomie, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "Revert "Set wgCommentTableSchemaMigrationStage = 
MIGRATION_WRITE_BOTH on test wikis""
..

Revert "Revert "Set wgCommentTableSchemaMigrationStage = MIGRATION_WRITE_BOTH 
on test wikis""

Wasn't deployed.

This reverts commit fb074eaf56ee2523bb14cdf7090da6e34b053a51.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 83b85cb..4309626 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19764,6 +19764,9 @@
 
 'wgCommentTableSchemaMigrationStage' => [
'default' => MIGRATION_OLD,
+   'testwiki' => MIGRATION_WRITE_BOTH,
+   'test2wiki' => MIGRATION_WRITE_BOTH,
+   'testwikidatawiki' => MIGRATION_WRITE_BOTH,
 ],
 
 ];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71e9b0123b115d1496aeb21fdbf0b16373eecf24
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace wfWaitForSlaves() with not deprecated method

2017-12-04 Thread Albert221 (Code Review)

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

Change subject: Replace wfWaitForSlaves() with not deprecated method
..

Replace wfWaitForSlaves() with not deprecated method

Change-Id: I61251876dcd3f2a6de6d893f9c49f045390e21df
---
M maintenance/archives/upgradeLogging.php
M maintenance/cleanupEmptyCategories.php
M maintenance/cleanupInvalidDbKeys.php
M maintenance/cleanupUploadStash.php
M maintenance/cleanupUsersWithNoId.php
M maintenance/convertUserOptions.php
M maintenance/deleteBatch.php
M maintenance/deleteDefaultMessages.php
M maintenance/deleteEqualMessages.php
M maintenance/deleteSelfExternals.php
M maintenance/fixDefaultJsonContentPages.php
M maintenance/fixExtLinksProtocolRelative.php
M maintenance/fixUserRegistration.php
M maintenance/importDump.php
M maintenance/importImages.php
M maintenance/initEditCount.php
M maintenance/makeTestEdits.php
M maintenance/migrateComments.php
M maintenance/migrateUserGroup.php
M maintenance/moveBatch.php
M maintenance/namespaceDupes.php
M maintenance/populateBacklinkNamespace.php
M maintenance/populateCategory.php
M maintenance/populateContentModel.php
M maintenance/populateFilearchiveSha1.php
M maintenance/populateImageSha1.php
M maintenance/populateLogSearch.php
M maintenance/populateLogUsertext.php
M maintenance/populateParentId.php
M maintenance/populateRecentChangesSource.php
M maintenance/populateRevisionLength.php
M maintenance/populateRevisionSha1.php
M maintenance/rebuildrecentchanges.php
M maintenance/recountCategories.php
M maintenance/refreshImageMetadata.php
M maintenance/refreshLinks.php
M maintenance/removeInvalidEmails.php
M maintenance/resetUserTokens.php
M maintenance/runBatchedQuery.php
M maintenance/sql.php
M maintenance/storage/compressOld.php
M maintenance/storage/fixT22757.php
M maintenance/storage/moveToExternal.php
M maintenance/storage/resolveStubs.php
M maintenance/storage/trackBlobs.php
M maintenance/tidyUpBug37714.php
M maintenance/update.php
M maintenance/updateCollation.php
M maintenance/updateRestrictions.php
M maintenance/updateSpecialPages.php
50 files changed, 81 insertions(+), 80 deletions(-)


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

diff --git a/maintenance/archives/upgradeLogging.php 
b/maintenance/archives/upgradeLogging.php
index 13362e0..fcc883a 100644
--- a/maintenance/archives/upgradeLogging.php
+++ b/maintenance/archives/upgradeLogging.php
@@ -175,7 +175,7 @@
$this->dbw->insert( $dstTable, $batch, __METHOD__ );
$numRowsCopied += count( $batch );
 
-   wfWaitForSlaves();
+   
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
echo "Copied $numRowsCopied rows\n";
}
diff --git a/maintenance/cleanupEmptyCategories.php 
b/maintenance/cleanupEmptyCategories.php
index 2d22704..851a550 100644
--- a/maintenance/cleanupEmptyCategories.php
+++ b/maintenance/cleanupEmptyCategories.php
@@ -134,7 +134,7 @@
}
$this->output( "--mode=$mode --begin=$name\n" );
 
-   wfWaitForSlaves();
+   
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
usleep( $throttle * 1000 );
}
 
@@ -188,7 +188,7 @@
 
$this->output( "--mode=remove --begin=$name\n" 
);
 
-   wfWaitForSlaves();
+   
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
usleep( $throttle * 1000 );
}
}
diff --git a/maintenance/cleanupInvalidDbKeys.php 
b/maintenance/cleanupInvalidDbKeys.php
index 569fd2b..44e9844 100644
--- a/maintenance/cleanupInvalidDbKeys.php
+++ b/maintenance/cleanupInvalidDbKeys.php
@@ -235,7 +235,7 @@
__METHOD__ );
$affectedRowCount += 
$dbw->affectedRows();
}
-   wfWaitForSlaves();
+   
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->outputStatus( "Updated $affectedRowCount 
rows on $table.\n" );
 
break;
@@ -248,7 +248,7 @@
// recently, so we can just remove these rows.
$this->outputStatus( "Deleting invalid $table 
rows...\n" );
$dbw->delete( $table, [ $idField => $ids ], 
__METHOD__ );
-

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: multiversion: Update docs for 'wfShellWikiCmd' hook

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: multiversion: Update docs for 'wfShellWikiCmd' hook
..


multiversion: Update docs for 'wfShellWikiCmd' hook

This hook was already renamed from 'wfShellMaintenanceCmd' to
'wfShellWikiCmd' shortly after its creation in 2012.

Follows-up 770c9d8c2eda.

Update the code comments to ease future debugging.

Change-Id: Ia06ccce381a71178ddb8f2f3f1a6cfafa4e98f27
---
M multiversion/MWMultiVersion.php
M wmf-config/CommonSettings.php
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 2b59447..395ef86 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -266,7 +266,8 @@
}
 
/**
-* Handler for the wfShellMaintenanceCmd hook.
+* Handler for the wfShellWikiCmd hook.
+*
 * This converts shell commands like "php $IP/maintenance/foo.php" into
 * commands that use the "MWScript.php" wrapper, for example:
 * "php /srv/mediawiki-staging/multiversion/MWScript.php 
maintenance/foo.php"
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b529ac4..d806b58 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -258,7 +258,7 @@
 
 ini_set( 'memory_limit', $wmgMemoryLimit );
 
-# Rewrite commands given to wfShellWikiCmd() to use Het-Deploy
+# Change calls to wfShellWikiCmd() to use MWScript.php wrapper
 $wgHooks['wfShellWikiCmd'][] = 'MWMultiVersion::onWfShellMaintenanceCmd';
 
 setlocale( LC_ALL, 'en_US.UTF-8' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia06ccce381a71178ddb8f2f3f1a6cfafa4e98f27
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
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/puppet[production]: remove esams ganglia aggregator

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: remove esams ganglia aggregator
..

remove esams ganglia aggregator

Bug: T177225
Change-Id: I5a87d8e64dcdb4700eeacd8b3fa804b786f66c8a
---
M manifests/site.pp
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/395147/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ae7e337..256bfa8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -99,7 +99,6 @@
 prometheus::ops)
 
 interface::add_ip6_mapped { 'main': }
-class { '::ganglia::monitor::aggregator': sites =>  'esams', }
 }
 
 # Bastion in California

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Update comment text color CSS

2017-12-04 Thread Divadsn (Code Review)

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

Change subject: Update comment text color CSS
..

Update comment text color CSS

This patch changes the comment text color to #84A0A0,
as suggested by Kaldari in T170067#3440124.

Bug: T170067
Change-Id: I016b8ce360a06f14b02cee13b629fa578c889347
---
M resources/mode/mediawiki/mediawiki.css
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/resources/mode/mediawiki/mediawiki.css 
b/resources/mode/mediawiki/mediawiki.css
index fea9d70..3b71a2a 100644
--- a/resources/mode/mediawiki/mediawiki.css
+++ b/resources/mode/mediawiki/mediawiki.css
@@ -11,7 +11,7 @@
 .cm-mw-doubleUnderscore, .cm-mw-signature, .cm-mw-hr { color: #08f; 
font-weight: bold; background-color: #eee; }
 .cm-mw-indenting { color: #08f; font-weight: bold; }
 .cm-mw-mnemonic { color: #290; }
-.cm-mw-comment { color: #aaa; font-weight: normal; }
+.cm-mw-comment { color: #84a0a0; font-weight: normal; }
 .cm-mw-apostrophes-bold, .cm-mw-apostrophes-italic { color: #08f; }
 
 pre.cm-mw-section-1 { font-size: 1.8em; line-height: 1.2em; }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I016b8ce360a06f14b02cee13b629fa578c889347
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Divadsn 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweaks of on-this-day header layout.

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Design tweaks of on-this-day header layout.
..


Design tweaks of on-this-day header layout.

Change-Id: I4d2f79b78df6c8736d66a31e7acfb84478e9bf6a
---
M app/src/main/res/layout/fragment_on_this_day.xml
1 file changed, 24 insertions(+), 27 deletions(-)

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



diff --git a/app/src/main/res/layout/fragment_on_this_day.xml 
b/app/src/main/res/layout/fragment_on_this_day.xml
index 428c45e..8a17d9f 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -25,7 +25,7 @@
 
 
@@ -34,6 +34,7 @@
 android:layout_height="match_parent"
 android:layout_gravity="bottom"
 android:layout_marginStart="72dp"
+android:paddingBottom="20dp"
 android:orientation="vertical">
 
 
 
-
+tools:text="Foo\nBar"/>
 
-
-
-
-
 
+
+
 
 
 https://gerrit.wikimedia.org/r/395145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d2f79b78df6c8736d66a31e7acfb84478e9bf6a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Sharvaniharan 
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]: lvs esams: fix regex to remove ganglia

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: lvs esams: fix regex to remove ganglia
..


lvs esams: fix regex to remove ganglia

Change-Id: Ifd34a6baabc596c7c4994424810a3f72daf689e9
---
M hieradata/regex.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 62dc183..f4cada6 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -170,7 +170,7 @@
   profile::pybal::primary: false
 
 lvs_esams:
-  __regex: !ruby/regexp /^lvs3*\.esams\.wmnet$/
+  __regex: !ruby/regexp /^lvs3.*\.esams\.wmnet$/
   standard::has_ganglia: false
 
 lvs_esams_backup:

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Design tweaks of on-this-day header layout.

2017-12-04 Thread Dbrant (Code Review)

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

Change subject: Design tweaks of on-this-day header layout.
..

Design tweaks of on-this-day header layout.

Change-Id: I4d2f79b78df6c8736d66a31e7acfb84478e9bf6a
---
M app/src/main/res/layout/fragment_on_this_day.xml
1 file changed, 24 insertions(+), 27 deletions(-)


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

diff --git a/app/src/main/res/layout/fragment_on_this_day.xml 
b/app/src/main/res/layout/fragment_on_this_day.xml
index 428c45e..8a17d9f 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -25,7 +25,7 @@
 
 
@@ -34,6 +34,7 @@
 android:layout_height="match_parent"
 android:layout_gravity="bottom"
 android:layout_marginStart="72dp"
+android:paddingBottom="20dp"
 android:orientation="vertical">
 
 
 
-
+tools:text="Foo\nBar"/>
 
-
-
-
-
 
+
+
 
 
 https://gerrit.wikimedia.org/r/395145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: lvs esams: fix regex to remove ganglia

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: lvs esams: fix regex to remove ganglia
..

lvs esams: fix regex to remove ganglia

Change-Id: Ifd34a6baabc596c7c4994424810a3f72daf689e9
---
M hieradata/regex.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 62dc183..f4cada6 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -170,7 +170,7 @@
   profile::pybal::primary: false
 
 lvs_esams:
-  __regex: !ruby/regexp /^lvs3*\.esams\.wmnet$/
+  __regex: !ruby/regexp /^lvs3.*\.esams\.wmnet$/
   standard::has_ganglia: false
 
 lvs_esams_backup:

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BreadCrumbs2[master]: Don't use non-namespaced HtmlFormatter

2017-12-04 Thread Legoktm (Code Review)

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

Change subject: Don't use non-namespaced HtmlFormatter
..

Don't use non-namespaced HtmlFormatter

It was deprecated in MediaWiki 1.27.

Change-Id: I659420cc89d5c083947a2ace5ec5c3c7e7af1c48
---
M BreadCrumbs2.hooks.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/BreadCrumbs2.hooks.php b/BreadCrumbs2.hooks.php
index 4f08668..2924583 100644
--- a/BreadCrumbs2.hooks.php
+++ b/BreadCrumbs2.hooks.php
@@ -1,5 +1,7 @@
 https://gerrit.wikimedia.org/r/395143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I659420cc89d5c083947a2ace5ec5c3c7e7af1c48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BreadCrumbs2
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Debug logging for bounce processor

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Debug logging for bounce processor
..


Debug logging for bounce processor

Bug: T181934
Change-Id: Ic332aa534685954b246022567dd878cc910c0f6c
---
M CRM/Utils/Mail/EmailProcessor.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/CRM/Utils/Mail/EmailProcessor.php 
b/CRM/Utils/Mail/EmailProcessor.php
index bb02bae..0e297f2 100644
--- a/CRM/Utils/Mail/EmailProcessor.php
+++ b/CRM/Utils/Mail/EmailProcessor.php
@@ -176,6 +176,7 @@
 // process fifty at a time, CRM-4002
 while ($mails = $store->fetchNext(MAIL_BATCH_SIZE)) {
   foreach ($mails as $key => $mail) {
+watchdog('EmailProcessor', "Processing email: $key", array(), 
WATCHDOG_DEBUG);
 
 // for every addressee: match address elements if it's to CiviMail
 $matches = array();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic332aa534685954b246022567dd878cc910c0f6c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Eileen 
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] apps...wikipedia[master]: Fix style of individual on-this-day items.

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Fix style of individual on-this-day items.
..


Fix style of individual on-this-day items.

Change-Id: Ie7f96ed84753e0df9d1380534627423c437e5716
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
M app/src/main/res/layout/item_on_this_day_pages.xml
2 files changed, 4 insertions(+), 9 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
index 3adaa10..9781542 100644
--- 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
+++ 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
@@ -7,7 +7,6 @@
 import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
@@ -56,12 +55,7 @@
 }
 
 private void setImage(@Nullable String url) {
-if (!TextUtils.isEmpty(url)) {
-pageItemImageView.setVisibility(View.VISIBLE);
-pageItemImageView.loadImage(Uri.parse(url));
-} else {
-pageItemImageView.setVisibility(View.GONE);
-}
+pageItemImageView.loadImage(url == null ? null : Uri.parse(url));
 }
 
 @OnClick(R.id.parent) void onBaseViewClicked() {
diff --git a/app/src/main/res/layout/item_on_this_day_pages.xml 
b/app/src/main/res/layout/item_on_this_day_pages.xml
index 64a273b..b233e5e 100644
--- a/app/src/main/res/layout/item_on_this_day_pages.xml
+++ b/app/src/main/res/layout/item_on_this_day_pages.xml
@@ -12,10 +12,11 @@
 android:orientation="horizontal">
 
 
 
 
 
-https://gerrit.wikimedia.org/r/395119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7f96ed84753e0df9d1380534627423c437e5716
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix collapsed toolbar style in On This Day.

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Fix collapsed toolbar style in On This Day.
..


Fix collapsed toolbar style in On This Day.

Change-Id: Ic0cff9ed526be0c9acf1d3ce3031e7cee28a7061
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/res/layout/fragment_on_this_day.xml
2 files changed, 10 insertions(+), 26 deletions(-)

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



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 a9d8e03..8dd4193 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
@@ -1,9 +1,11 @@
 package org.wikipedia.feed.onthisday;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.app.AppCompatActivity;
@@ -45,7 +47,7 @@
 
 public class OnThisDayFragment extends Fragment {
 @BindView(R.id.day) TextView dayText;
-@BindView(R.id.day_text_view) TextView dayTextView;
+@BindView(R.id.collapsing_toolbar_layout) CollapsingToolbarLayout 
collapsingToolbarLayout;
 @BindView(R.id.day_info_text_view) TextView dayInfoTextView;
 @BindView(R.id.events_recycler) RecyclerView eventsRecycler;
 @BindView(R.id.progress) ProgressBar progressBar;
@@ -116,20 +118,15 @@
 getAppCompatActivity().setSupportActionBar(toolbar);
 
getAppCompatActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 getAppCompatActivity().getSupportActionBar().setTitle("");
-dayTextView.setText(DateUtil.getMonthOnlyDateString(date.getTime()));
+collapsingToolbarLayout.setCollapsedTitleTextColor(Color.WHITE);
 dayText.setText(DateUtil.getMonthOnlyDateString(date.getTime()));
 appBarLayout.addOnOffsetChangedListener(new 
AppBarLayout.OnOffsetChangedListener() {
 @Override
 public void onOffsetChanged(AppBarLayout appBarLayout, int 
verticalOffset) {
-if (Math.abs(verticalOffset) == 
appBarLayout.getTotalScrollRange()) {
-// Collapsed
-dayTextView.setVisibility(View.VISIBLE);
-} else if (verticalOffset == 0) {
-// Expanded
-dayTextView.setVisibility(View.GONE);
-} else {
-// In Transition
-dayTextView.setVisibility(View.GONE);
+if (verticalOffset > -appBarLayout.getTotalScrollRange()) {
+collapsingToolbarLayout.setTitle("");
+} else if (verticalOffset <= 
-appBarLayout.getTotalScrollRange()) {
+
collapsingToolbarLayout.setTitle(DateUtil.getMonthOnlyDateString(date.getTime()));
 }
 }
 });
diff --git a/app/src/main/res/layout/fragment_on_this_day.xml 
b/app/src/main/res/layout/fragment_on_this_day.xml
index 79c3b5f..428c45e 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -14,6 +14,7 @@
 android:fitsSystemWindows="true">
 
 
-
-
-
+app:layout_collapseMode="pin" />
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0cff9ed526be0c9acf1d3ce3031e7cee28a7061
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Sharvaniharan 
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]: Add stripe payment instrument.

2017-12-04 Thread Eileen (Code Review)

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

Change subject: Add stripe payment instrument.
..

Add stripe payment instrument.

Bug: T172423
Change-Id: Ic648ad8bb4e3b13c8cb33c62221c1358bb128a14
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/42/395142/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 3e1509d..f739ff9 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -3429,3 +3429,11 @@
 )),
   ));
 }
+
+/**
+ * Add Stripe payment instrument
+ */
+function wmf_civicrm_update_7590() {
+  civicrm_initialize();
+  wmf_civicrm_create_option_values('payment_instrument', array('Stripe'));
+}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: lvs esams: remove ganglia

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: lvs esams: remove ganglia
..


lvs esams: remove ganglia

Bug: T177225
Change-Id: Ie05c2f0e3f935147ebbb54376251d009bf8501cd
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1b796db..62dc183 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -169,6 +169,10 @@
   __regex: !ruby/regexp /^lvs200[4-6]\.codfw\.wmnet$/
   profile::pybal::primary: false
 
+lvs_esams:
+  __regex: !ruby/regexp /^lvs3*\.esams\.wmnet$/
+  standard::has_ganglia: false
+
 lvs_esams_backup:
   __regex: !ruby/regexp /^lvs300[34]\.esams\.wmnet$/
   profile::pybal::primary: false

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[specialpages]: Center content-header for history/watchlist

2017-12-04 Thread Jdlrobson (Code Review)

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

Change subject: Center content-header for history/watchlist
..

Center content-header for history/watchlist

Bug: T180095
Change-Id: If851ddea593b27167ecc366c10896697e964e3db
---
M resources/skins.minerva.base.styles/ui.less
M resources/skins.minerva.tablet.styles/common.less
M skinStyles/mobile.special.styles/minerva.less
3 files changed, 13 insertions(+), 7 deletions(-)


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

diff --git a/resources/skins.minerva.base.styles/ui.less 
b/resources/skins.minerva.base.styles/ui.less
index 2fbfd81..4b5fb13 100644
--- a/resources/skins.minerva.base.styles/ui.less
+++ b/resources/skins.minerva.base.styles/ui.less
@@ -444,6 +444,7 @@
 .backtotop,
 .image-list,
 .pre-content,
+.content-header,
 // Form only pages e.g Special:MobileOptions
 #mw-content-text > form .oo-ui-fieldLayout-body,
 .content,
diff --git a/resources/skins.minerva.tablet.styles/common.less 
b/resources/skins.minerva.tablet.styles/common.less
index 9fe89d3..506f7b9 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -59,6 +59,7 @@
// Form only pages e.g. Special:MobileOptions
#mw-content-text > form,
.content,
+   .content-header,
.post-content {
max-width: @contentMaxWidthTablet;
margin: 0 @contentPaddingTablet;
diff --git a/skinStyles/mobile.special.styles/minerva.less 
b/skinStyles/mobile.special.styles/minerva.less
index 1e945b3..27de5b3 100644
--- a/skinStyles/mobile.special.styles/minerva.less
+++ b/skinStyles/mobile.special.styles/minerva.less
@@ -18,16 +18,20 @@
margin-bottom: 15px;
}
 
+   .content-header {
+   // Avoid double bottom border on contributions
+   // (exists in MobileFrontend - should probably be removed there)
+   border-bottom: 0;
+   }
+
+   .content-header + *,
+   .page-header-bar + * {
+   border-top: 1px solid @colorGray12;
+   }
+
h1,
h2 {
// Important given we have no idea which rules special pages 
are enforcing
font-family: @fontFamily !important;
-   }
-
-   .content-header {
-   h1,
-   h2 {
-   text-align: center;
-   }
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable RemexHTML on wikis with zero high priority linter errors

2017-12-04 Thread Subramanya Sastry (Code Review)

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

Change subject: Enable RemexHTML on wikis with zero high priority linter errors
..

Enable RemexHTML on wikis with zero high priority linter errors

Bug: T182042

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a6b1634..78d7519 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19227,6 +19227,179 @@
'nowiki' => [ 'driver' => 'RemexHtml' ], // T177989
'dewiki' => [ 'driver' => 'RemexHtml' ], // T181188
'itwiki' => [ 'driver' => 'RemexHtml' ], // T181190
+
+   // T182042: Enable RemexHTML on wikis with zero high-priority linter 
errors
+   'alswikiquote' => [ 'driver' => 'RemexHTML' ],
+   'alswiktionary' => [ 'driver' => 'RemexHTML' ],
+   'angwikisource' => [ 'driver' => 'RemexHTML' ],
+   'astwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'astwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'aswikibooks' => [ 'driver' => 'RemexHTML' ],
+   'aswiktionary' => [ 'driver' => 'RemexHTML' ],
+   'avwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'aywikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bawikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bhwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'biwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'biwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'bmwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bmwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'bmwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'bowikibooks' => [ 'driver' => 'RemexHTML' ],
+   'bowiktionary' => [ 'driver' => 'RemexHTML' ],
+   'chowiki' => [ 'driver' => 'RemexHTML' ],
+   'chrwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'chwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'chwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'cowikibooks' => [ 'driver' => 'RemexHTML' ],
+   'cowikiquote' => [ 'driver' => 'RemexHTML' ],
+   'crwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'crwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'csbwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'cswikibooks' => [ 'driver' => 'RemexHTML' ],
+   'cswikinews' => [ 'driver' => 'RemexHTML' ],
+   'cswikiquote' => [ 'driver' => 'RemexHTML' ],
+   'dinwiki' => [ 'driver' => 'RemexHTML' ],
+   'donatewiki' => [ 'driver' => 'RemexHTML' ],
+   'dzwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'elwikinews' => [ 'driver' => 'RemexHTML' ],
+   'eowikiquote' => [ 'driver' => 'RemexHTML' ],
+   'fjwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'fowiktionary' => [ 'driver' => 'RemexHTML' ],
+   'gawikibooks' => [ 'driver' => 'RemexHTML' ],
+   'gawikiquote' => [ 'driver' => 'RemexHTML' ],
+   'gdwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'gnwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'gnwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'gotwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'guwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'hifwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'hiwikivoyage' => [ 'driver' => 'RemexHTML' ],
+   'howiki' => [ 'driver' => 'RemexHTML' ],
+   'htwikisource' => [ 'driver' => 'RemexHTML' ],
+   'huwikinews' => [ 'driver' => 'RemexHTML' ],
+   'hzwiki' => [ 'driver' => 'RemexHTML' ],
+   'iawiktionary' => [ 'driver' => 'RemexHTML' ],
+   'iewikibooks' => [ 'driver' => 'RemexHTML' ],
+   'iiwiki' => [ 'driver' => 'RemexHTML' ],
+   'ikwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'iswikisource' => [ 'driver' => 'RemexHTML' ],
+   'iuwiki' => [ 'driver' => 'RemexHTML' ],
+   'jamwiki' => [ 'driver' => 'RemexHTML' ],
+   'kbpwiki' => [ 'driver' => 'RemexHTML' ],
+   'kiwiki' => [ 'driver' => 'RemexHTML' ],
+   'kjwiki' => [ 'driver' => 'RemexHTML' ],
+   'kkwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'kkwiktionary' => [ 'driver' => 'RemexHTML' ],
+   'knwikibooks' => [ 'driver' => 'RemexHTML' ],
+   'krwiki' => [ 'driver' => 'RemexHTML' ],
+   'krwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'kswikibooks' => [ 'driver' => 'RemexHTML' ],
+   'kswikiquote' => [ 'driver' => 'RemexHTML' ],
+   'kwwikiquote' => [ 'driver' => 'RemexHTML' ],
+   'ladwiki' => [ 'driver' => 'RemexHTML' ],
+   'lawiki' => [ 'driver' => 'RemexHTML' ],
+   'lawikibooks' => [ 'driver' => 'RemexHTML' ],
+   'lawikiquote' => [ 'driver' => 'RemexHTML' ],
+   'lbwiki' => [ 'driver' => 'RemexHTML' ],
+   'lbwikibooks' => [

[MediaWiki-commits] [Gerrit] mediawiki...MinervaNeue[master]: Use png as fallback for svg on non-supported browsers

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Use png as fallback for svg on non-supported browsers
..


Use png as fallback for svg on non-supported browsers

This will use the srcset attrribute which was introduced with HTML5,
in order to load the svg image on supported browsers.

Should fix the bug after merging change 394820.

Bug: T166684
Change-Id: I2337b750c80e79c816dc817dfe230e063eed0345
---
M README.md
M includes/skins/SkinMinerva.php
2 files changed, 21 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 67b6470..c6c7013 100644
--- a/README.md
+++ b/README.md
@@ -56,10 +56,12 @@
 
 Make the logos configurable.
 
-Currently, `copyright`, `copyright-width`, and `copyright-height` elements are
+Currently, `copyright`, `copyright-fallback`, `copyright-width`, and 
`copyright-height` elements are
 supported.
 
 * `copyright` is the URL of the logo displayed in the header and footer
+* `copyright-fallback` is the URL of the fallback logo displayed on
+  non-supported browsers like IE8 or Opera Mini
 * `copyright-width` (optional) is the width in pixels of the copyright image
   you want to display
 * `copyright-height` (optional) is the height in pixels of the copyright image
@@ -79,6 +81,16 @@
 ]
 ```
 
+Example with fallback URL:
+```php
+[
+  'copyright' => '/images/mysite_copyright_logo.svg',
+  'copyright-fallback' => '/images/mysite_copyright_logo.svg.png',
+  'copyright-width' => 100,
+  'copyright-height' => 15,
+]
+```
+
 * Type: `Array`
 * Default: `[]`
 
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 659ed5e..62cd5be 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -51,6 +51,14 @@
'src' => $customLogos['copyright'],
'alt' => $footerSitename,
];
+   if ( pathinfo( $customLogos['copyright'], 
PATHINFO_EXTENSION ) === 'svg' ) {
+   $attributes['srcset'] = 
$customLogos['copyright'] . ' 1x';
+   if ( isset( $customLogos['copyright-fallback'] 
) ) {
+   $attributes['src'] = 
$customLogos['copyright-fallback'];
+   } else {
+   $attributes['src'] = str_replace( 
'.svg', '.png', $customLogos['copyright'] );
+   }
+   }
if ( isset( $customLogos['copyright-height'] ) ) {
$attributes['height'] = 
$customLogos['copyright-height'];
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2337b750c80e79c816dc817dfe230e063eed0345
Gerrit-PatchSet: 13
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Albert221 
Gerrit-Reviewer: Divadsn 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
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] operations/puppet[production]: lvs esams: remove ganglia

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: lvs esams: remove ganglia
..

lvs esams: remove ganglia

Bug: T177225
Change-Id: Ie05c2f0e3f935147ebbb54376251d009bf8501cd
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/395125/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1b796db..62dc183 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -169,6 +169,10 @@
   __regex: !ruby/regexp /^lvs200[4-6]\.codfw\.wmnet$/
   profile::pybal::primary: false
 
+lvs_esams:
+  __regex: !ruby/regexp /^lvs3*\.esams\.wmnet$/
+  standard::has_ganglia: false
+
 lvs_esams_backup:
   __regex: !ruby/regexp /^lvs300[34]\.esams\.wmnet$/
   profile::pybal::primary: false

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

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

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

[MediaWiki-commits] [Gerrit] labs...guc[master]: Add tests for App::getDB()

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: Add tests for App::getDB()
..


Add tests for App::getDB()

Change-Id: I49bd2762b070d8641d8a7c7faf139a823d2d0421
---
M src/App.php
A tests/AppTest.php
2 files changed, 60 insertions(+), 1 deletion(-)

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



diff --git a/src/App.php b/src/App.php
index 9fa292b..ec1d471 100644
--- a/src/App.php
+++ b/src/App.php
@@ -24,7 +24,7 @@
  * @param string $host
  * @return PDO
  */
-private function openDB($dbname, $host) {
+protected function openDB($dbname, $host) {
 $this->aTP('Create connection to ' . $host);
 
 try {
diff --git a/tests/AppTest.php b/tests/AppTest.php
new file mode 100644
index 000..d725787
--- /dev/null
+++ b/tests/AppTest.php
@@ -0,0 +1,59 @@
+getMockBuilder(App::class)
+->setMethods(['openDB'])
+->getMock();
+
+$pdo = $this->createMock(PDO::class);
+$pdo->expects($this->once())->method('prepare')
+->with('USE `testwiki_p`;')
+->willReturn($this->createMock(PDOStatement::class));
+
+$app->expects($this->once())->method('openDB')
+->with('testwiki_p', 'eg1.web.db.svc.eqiad.wmflabs')
+->willReturn($pdo);
+
+$this->assertInstanceOf(
+PDO::class,
+$app->getDB('testwiki', 'eg1')
+);
+}
+
+public function testGetDBCached() {
+$app = $this->getMockBuilder(App::class)
+->setMethods(['openDB'])
+->getMock();
+$pdo = $this->createMock(PDO::class);
+
$pdo->method('prepare')->willReturn($this->createMock(PDOStatement::class));
+
+$app->expects($this->exactly(2))->method('openDB')
+->withConsecutive(
+['testwiki_p', 'eg1.web.db.svc.eqiad.wmflabs'],
+['otherwiki_p', 'eg2.web.db.svc.eqiad.wmflabs']
+)
+->willReturn($pdo);
+
+$this->assertInstanceOf(
+PDO::class,
+$app->getDB('testwiki', 'eg1'),
+'First on eg1'
+);
+
+$this->assertInstanceOf(
+PDO::class,
+$app->getDB('otherwiki', 'eg1'),
+'Second on eg1'
+);
+
+$this->assertInstanceOf(
+PDO::class,
+$app->getDB('otherwiki', 'eg2'),
+'First on eg2'
+);
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I49bd2762b070d8641d8a7c7faf139a823d2d0421
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/guc
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: multiversion: Update docs for 'wfShellWikiCmd' hook

2017-12-04 Thread Krinkle (Code Review)

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

Change subject: multiversion: Update docs for 'wfShellWikiCmd' hook
..

multiversion: Update docs for 'wfShellWikiCmd' hook

This hook was already renamed from 'wfShellMaintenanceCmd' to
'wfShellWikiCmd' shortly after its creation in 2012.

Follows-up 770c9d8c2eda.

Update the code comments to ease future debugging.

Change-Id: Ia06ccce381a71178ddb8f2f3f1a6cfafa4e98f27
---
M multiversion/MWMultiVersion.php
M wmf-config/CommonSettings.php
2 files changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index 2b59447..395ef86 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -266,7 +266,8 @@
}
 
/**
-* Handler for the wfShellMaintenanceCmd hook.
+* Handler for the wfShellWikiCmd hook.
+*
 * This converts shell commands like "php $IP/maintenance/foo.php" into
 * commands that use the "MWScript.php" wrapper, for example:
 * "php /srv/mediawiki-staging/multiversion/MWScript.php 
maintenance/foo.php"
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b529ac4..d806b58 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -258,7 +258,7 @@
 
 ini_set( 'memory_limit', $wmgMemoryLimit );
 
-# Rewrite commands given to wfShellWikiCmd() to use Het-Deploy
+# Change calls to wfShellWikiCmd() to use MWScript.php wrapper
 $wgHooks['wfShellWikiCmd'][] = 'MWMultiVersion::onWfShellMaintenanceCmd';
 
 setlocale( LC_ALL, 'en_US.UTF-8' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia06ccce381a71178ddb8f2f3f1a6cfafa4e98f27
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] apps...wikipedia[master]: Fix style of individual on-this-day items.

2017-12-04 Thread Dbrant (Code Review)

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

Change subject: Fix style of individual on-this-day items.
..

Fix style of individual on-this-day items.

Change-Id: Ie7f96ed84753e0df9d1380534627423c437e5716
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
M app/src/main/res/layout/item_on_this_day_pages.xml
2 files changed, 4 insertions(+), 9 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
index 3adaa10..9781542 100644
--- 
a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
+++ 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
@@ -7,7 +7,6 @@
 import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
@@ -56,12 +55,7 @@
 }
 
 private void setImage(@Nullable String url) {
-if (!TextUtils.isEmpty(url)) {
-pageItemImageView.setVisibility(View.VISIBLE);
-pageItemImageView.loadImage(Uri.parse(url));
-} else {
-pageItemImageView.setVisibility(View.GONE);
-}
+pageItemImageView.loadImage(url == null ? null : Uri.parse(url));
 }
 
 @OnClick(R.id.parent) void onBaseViewClicked() {
diff --git a/app/src/main/res/layout/item_on_this_day_pages.xml 
b/app/src/main/res/layout/item_on_this_day_pages.xml
index 64a273b..b233e5e 100644
--- a/app/src/main/res/layout/item_on_this_day_pages.xml
+++ b/app/src/main/res/layout/item_on_this_day_pages.xml
@@ -12,10 +12,11 @@
 android:orientation="horizontal">
 
 
 
 
 
-https://gerrit.wikimedia.org/r/395119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "contint: a slave script will require 'jq'"

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: Revert "contint: a slave script will require 'jq'"
..


Revert "contint: a slave script will require 'jq'"

This reverts commit e61675573d76021b31cd0f7287a1413b0dcbe910.

Change-Id: I4c5d9c4eb74ad0c6ec3c62f2d089da6c8e337103
---
M modules/contint/manifests/slave_scripts.pp
1 file changed, 0 insertions(+), 4 deletions(-)

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



diff --git a/modules/contint/manifests/slave_scripts.pp 
b/modules/contint/manifests/slave_scripts.pp
index daf29ee..a2bc8ab 100644
--- a/modules/contint/manifests/slave_scripts.pp
+++ b/modules/contint/manifests/slave_scripts.pp
@@ -12,8 +12,4 @@
 origin => 
'https://gerrit.wikimedia.org/r/p/integration/jenkins.git',
 recurse_submodules => true,
 }
-# bin/mw-fetch-composer-dev.sh requires jq
-package { 'jq':
-ensure => present,
-}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "contint: a slave script will require 'jq'"

2017-12-04 Thread Dzahn (Code Review)

Hello Krinkle, Reedy, Hashar, jenkins-bot,

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

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

to review the following change.


Change subject: Revert "contint: a slave script will require 'jq'"
..

Revert "contint: a slave script will require 'jq'"

This reverts commit e61675573d76021b31cd0f7287a1413b0dcbe910.

Change-Id: I4c5d9c4eb74ad0c6ec3c62f2d089da6c8e337103
---
M modules/contint/manifests/slave_scripts.pp
1 file changed, 0 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/395118/1

diff --git a/modules/contint/manifests/slave_scripts.pp 
b/modules/contint/manifests/slave_scripts.pp
index daf29ee..a2bc8ab 100644
--- a/modules/contint/manifests/slave_scripts.pp
+++ b/modules/contint/manifests/slave_scripts.pp
@@ -12,8 +12,4 @@
 origin => 
'https://gerrit.wikimedia.org/r/p/integration/jenkins.git',
 recurse_submodules => true,
 }
-# bin/mw-fetch-composer-dev.sh requires jq
-package { 'jq':
-ensure => present,
-}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c5d9c4eb74ad0c6ec3c62f2d089da6c8e337103
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
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] apps...wikipedia[master]: Fix collapsed toolbar style in On This Day.

2017-12-04 Thread Dbrant (Code Review)

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

Change subject: Fix collapsed toolbar style in On This Day.
..

Fix collapsed toolbar style in On This Day.

Change-Id: Ic0cff9ed526be0c9acf1d3ce3031e7cee28a7061
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/res/layout/fragment_on_this_day.xml
2 files changed, 10 insertions(+), 26 deletions(-)


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

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 a9d8e03..8dd4193 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
@@ -1,9 +1,11 @@
 package org.wikipedia.feed.onthisday;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.app.AppCompatActivity;
@@ -45,7 +47,7 @@
 
 public class OnThisDayFragment extends Fragment {
 @BindView(R.id.day) TextView dayText;
-@BindView(R.id.day_text_view) TextView dayTextView;
+@BindView(R.id.collapsing_toolbar_layout) CollapsingToolbarLayout 
collapsingToolbarLayout;
 @BindView(R.id.day_info_text_view) TextView dayInfoTextView;
 @BindView(R.id.events_recycler) RecyclerView eventsRecycler;
 @BindView(R.id.progress) ProgressBar progressBar;
@@ -116,20 +118,15 @@
 getAppCompatActivity().setSupportActionBar(toolbar);
 
getAppCompatActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 getAppCompatActivity().getSupportActionBar().setTitle("");
-dayTextView.setText(DateUtil.getMonthOnlyDateString(date.getTime()));
+collapsingToolbarLayout.setCollapsedTitleTextColor(Color.WHITE);
 dayText.setText(DateUtil.getMonthOnlyDateString(date.getTime()));
 appBarLayout.addOnOffsetChangedListener(new 
AppBarLayout.OnOffsetChangedListener() {
 @Override
 public void onOffsetChanged(AppBarLayout appBarLayout, int 
verticalOffset) {
-if (Math.abs(verticalOffset) == 
appBarLayout.getTotalScrollRange()) {
-// Collapsed
-dayTextView.setVisibility(View.VISIBLE);
-} else if (verticalOffset == 0) {
-// Expanded
-dayTextView.setVisibility(View.GONE);
-} else {
-// In Transition
-dayTextView.setVisibility(View.GONE);
+if (verticalOffset > -appBarLayout.getTotalScrollRange()) {
+collapsingToolbarLayout.setTitle("");
+} else if (verticalOffset <= 
-appBarLayout.getTotalScrollRange()) {
+
collapsingToolbarLayout.setTitle(DateUtil.getMonthOnlyDateString(date.getTime()));
 }
 }
 });
diff --git a/app/src/main/res/layout/fragment_on_this_day.xml 
b/app/src/main/res/layout/fragment_on_this_day.xml
index 79c3b5f..428c45e 100644
--- a/app/src/main/res/layout/fragment_on_this_day.xml
+++ b/app/src/main/res/layout/fragment_on_this_day.xml
@@ -14,6 +14,7 @@
 android:fitsSystemWindows="true">
 
 
-
-
-
+app:layout_collapseMode="pin" />
 
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0cff9ed526be0c9acf1d3ce3031e7cee28a7061
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] mediawiki...parsoid[master]: lib/parse.js: Make wt2html and html2wt methods do what they say

2017-12-04 Thread Subramanya Sastry (Code Review)

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

Change subject: lib/parse.js: Make wt2html and html2wt methods do what they say
..

lib/parse.js: Make wt2html and html2wt methods do what they say

Make wt2wt and html2html be external transformations on output
of those methods.

Made out.lint conditional on linting being enabled.

Change-Id: Ifa7150d9badcf5b558b3774185431ef1a1e4f7a0
---
M lib/parse.js
1 file changed, 39 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/16/395116/1

diff --git a/lib/parse.js b/lib/parse.js
index b045dab..61a2fdb 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -8,7 +8,7 @@
 var DU = require('./utils/DOMUtils.js').DOMUtils;
 var Promise = require('./utils/promise.js');
 
-var wt2html, html2wt;
+var _wt2html, _html2wt;
 
 /**
  * Transform wikitext to html
@@ -23,7 +23,7 @@
  *   @return {String} return.contentmodel
  *   @return {Object} [return.pb] If pageBundle was requested
  */
-wt2html = function(obj, env, wt) {
+_wt2html = function(obj, env, wt) {
// `wt` will be `undefined` when we fetched page source and info,
// which we don't want to overwrite.
if (wt !== undefined) {
@@ -37,28 +37,25 @@
}
})
.then(function(doc) {
-   if (['wt2html', 'html2html'].includes(obj.mode)) {
-   var out;
-   if (env.pageBundle) {
-   out = DU.extractDpAndSerialize(obj.bodyOnly ? 
doc.body : doc, {
-   innerXML: obj.bodyOnly,
-   });
-   } else {
-   out = {
-   html: DU.toXML(obj.bodyOnly ? doc.body 
: doc, {
-   innerXML: obj.bodyOnly,
-   }),
-   };
-   }
-   out.lint = env.lintLogger.buffer;
-   if (env.conf.parsoid.linting) {
-   env.log("end/parse");
-   }
-   out.contentmodel = (obj.contentmodel || 
env.page.getContentModel());
-   return out;
+   var out;
+   if (env.pageBundle) {
+   out = DU.extractDpAndSerialize(obj.bodyOnly ? doc.body 
: doc, {
+   innerXML: obj.bodyOnly,
+   });
} else {
-   return html2wt(obj, env, DU.toXML(doc));
+   out = {
+   html: DU.toXML(obj.bodyOnly ? doc.body : doc, {
+   innerXML: obj.bodyOnly,
+   }),
+   };
}
+
+   if (env.conf.parsoid.linting) {
+   out.lint = env.lintLogger.buffer;
+   env.log("end/parse");
+   }
+   out.contentmodel = (obj.contentmodel || 
env.page.getContentModel());
+   return out;
});
 };
 
@@ -73,7 +70,7 @@
  * @return {Promise} Assuming we're ending at wt
  *   @return {String} return.wt
  */
-html2wt = function(obj, env, html, pb) {
+_html2wt = function(obj, env, html, pb) {
var useSelser = (obj.selser !== undefined);
var doc = DU.parseHTML(html);
pb = pb || DU.extractPageBundle(doc);
@@ -89,11 +86,7 @@
var handler = env.getContentHandler(obj.contentmodel);
return handler.fromHTML(env, doc.body, useSelser)
.then(function(out) {
-   if (['html2wt', 'wt2wt', 'selser'].includes(obj.mode)) {
-   return { wt: out };
-   } else {
-   return wt2html(obj, env, out);
-   }
+   return { wt: out };
});
 };
 
@@ -152,6 +145,7 @@
env.page.meta.revision.revid = obj.oldid;
}
 
+   var p;
if (['html2wt', 'html2html', 'selser'].includes(obj.mode)) {
// Selser
var selser = obj.selser;
@@ -171,8 +165,15 @@
throw new Error('this is broken');
}
}
-   return html2wt(obj, env, obj.input, obj.pb);
-   } else {
+   p = _html2wt(obj, env, obj.input, obj.pb);
+   if (obj.mode === 'html2html') {
+   return p.then(function(out) {
+   return _wt2html(obj, env, out.wt);
+   });
+   } else { /* html2wt, selser */
+

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: lib/parse.js: Move env initializations to relevant parsing p...

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: lib/parse.js: Move env initializations to relevant parsing paths
..


lib/parse.js: Move env initializations to relevant parsing paths

Change-Id: Ibb71ac279e8f3e67f487ee738ce9cfe92853e07a
---
M lib/parse.js
1 file changed, 29 insertions(+), 31 deletions(-)

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



diff --git a/lib/parse.js b/lib/parse.js
index 3128834..b045dab 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -145,45 +145,43 @@
return ParserEnv.getParserEnv(parsoidConfig, obj.envOptions)
.then(function(env) {
env.startTime = start;
-
-   // The content version to output
-   if (obj.contentVersion) {
-   env.setContentVersion(obj.contentVersion);
-   }
-
-   if (obj.reuseExpansions) {
-   env.cacheReusableExpansions(obj.reuseExpansions);
-   }
+   var s1 = Date.now();
+   env.bumpTimeUse("Setup Environment", s1 - start);
 
if (obj.oldid) {
env.page.meta.revision.revid = obj.oldid;
}
 
-   // Selser
-   var selser = obj.selser;
-   if (selser !== undefined) {
-   if (selser.oldtext !== null) {
-   env.setPageSrcInfo(selser.oldtext);
-   }
-   if (selser.oldhtml) {
-   env.page.dom = 
DU.parseHTML(selser.oldhtml).body;
-   }
-   if (selser.domdiff) {
-   // FIXME: need to load diff markers from 
attributes
-   env.page.domdiff = {
-   isEmpty: false,
-   dom: DU.ppToDOM(selser.domdiff),
-   };
-   throw new Error('this is broken');
-   }
-   }
-
-   var s1 = Date.now();
-   env.bumpTimeUse("Setup Environment", s1 - start);
-
if (['html2wt', 'html2html', 'selser'].includes(obj.mode)) {
+   // Selser
+   var selser = obj.selser;
+   if (selser !== undefined) {
+   if (selser.oldtext !== null) {
+   env.setPageSrcInfo(selser.oldtext);
+   }
+   if (selser.oldhtml) {
+   env.page.dom = 
DU.parseHTML(selser.oldhtml).body;
+   }
+   if (selser.domdiff) {
+   // FIXME: need to load diff markers 
from attributes
+   env.page.domdiff = {
+   isEmpty: false,
+   dom: DU.ppToDOM(selser.domdiff),
+   };
+   throw new Error('this is broken');
+   }
+   }
return html2wt(obj, env, obj.input, obj.pb);
} else {
+   // The content version to output
+   if (obj.contentVersion) {
+   env.setContentVersion(obj.contentVersion);
+   }
+
+   if (obj.reuseExpansions) {
+   
env.cacheReusableExpansions(obj.reuseExpansions);
+   }
+
var p;
if (obj.input === undefined) {
var target = env.normalizeAndResolvePageTitle();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb71ac279e8f3e67f487ee738ce9cfe92853e07a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 
Gerrit-Reviewer: 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] mediawiki...Wikibase[master]: build: Bump CI development dependencies

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: build: Bump CI development dependencies
..


build: Bump CI development dependencies

 grunt-eslint20.0.0  →  20.1.0
 grunt-stylelint  0.8.0  →   0.9.0
 stylelint7.8.0  →   8.2.0
 stylelint-config-wikimedia   0.4.1  →   0.4.2

Also exempt the extensions directory from linting now it exists.

Change-Id: I78d2958cb3828f436eed7a0d9401b81201f4dc34
---
M .stylelintrc.json
M Gruntfile.js
M package.json
3 files changed, 9 insertions(+), 7 deletions(-)

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



diff --git a/.stylelintrc.json b/.stylelintrc.json
index 880ad7a..9bd3fc5 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,7 +1,7 @@
 {
"extends": "stylelint-config-wikimedia",
"rules": {
-   "selector-no-id": null,
+   "selector-max-id": null,
"no-duplicate-selectors": null,
"no-descending-specificity": null,
"declaration-no-important": null
diff --git a/Gruntfile.js b/Gruntfile.js
index 7897255..8cccae9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,8 @@
all: [
'**/*.json',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
},
stylelint: {
@@ -24,7 +25,8 @@
'!view/resources/jquery/ui/**',
'!view/lib/**',
'!node_modules/**',
-   '!vendor/**'
+   '!vendor/**',
+   '!extensions/**'
]
},
banana: {
diff --git a/package.json b/package.json
index ac9ee18..f31f2fa 100644
--- a/package.json
+++ b/package.json
@@ -14,10 +14,10 @@
 "eslint-config-wikimedia": "0.5.0",
 "grunt": "1.0.1",
 "grunt-banana-checker": "0.6.0",
-"grunt-eslint": "20.0.0",
+"grunt-eslint": "20.1.0",
 "grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.8.0",
-"stylelint": "7.8.0",
-"stylelint-config-wikimedia": "0.4.1"
+"grunt-stylelint": "0.9.0",
+"stylelint": "8.2.0",
+"stylelint-config-wikimedia": "0.4.2"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78d2958cb3828f436eed7a0d9401b81201f4dc34
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jforrester 
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] operations/puppet[production]: labnodepool: move standard/firewall includes to role

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: labnodepool: move standard/firewall includes to role
..


labnodepool: move standard/firewall includes to role

Change-Id: I8ac8c0e768be1512c8a6102a6a5cd14326fece51
---
M manifests/site.pp
M modules/role/manifests/wmcs/openstack/main/nodepool.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 2df12b8..f24070f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1298,8 +1298,6 @@
 node 'labnodepool1001.eqiad.wmnet' {
 $nagios_contact_group = 'admins,contint'
 role(wmcs::openstack::main::nodepool)
-include ::standard
-include ::base::firewall
 }
 
 ## labsdb dbs
diff --git a/modules/role/manifests/wmcs/openstack/main/nodepool.pp 
b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
index 7e77871..d367c7c 100644
--- a/modules/role/manifests/wmcs/openstack/main/nodepool.pp
+++ b/modules/role/manifests/wmcs/openstack/main/nodepool.pp
@@ -1,4 +1,6 @@
 class role::wmcs::openstack::main::nodepool {
 system::role { $name: }
+include ::standard
+include ::profile::base::firewall
 include ::profile::openstack::main::nodepool::service
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8ac8c0e768be1512c8a6102a6a5cd14326fece51
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Better undefined index protection

2017-12-04 Thread Jdlrobson (Code Review)

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

Change subject: Better undefined index protection
..

Better undefined index protection

* CollectionAPIResult::get has better error protection
  then directly accessing $response
* A CollectionAPIResult may error, so check this before trying
  to access information from it.

Bug: T182026
Change-Id: I0bbb8a00d010b8892cd12ec030c8358e42fd2e46
---
M Collection.body.php
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/Collection.body.php b/Collection.body.php
index 6321fc7..452f41c 100644
--- a/Collection.body.php
+++ b/Collection.body.php
@@ -1054,7 +1054,7 @@
$api = CollectionRenderingAPI::instance( $writer );
$response = $api->render( $collection );
 
-   if ( !$this->handleResult( $response ) ) {
+   if ( !$this->handleResult( $response ) || $response->isError() 
) {
return;
}
 
@@ -1078,15 +1078,15 @@
$api = CollectionRenderingAPI::instance( $writer );
$response = $api->forceRender( $collectionID );
 
-   if ( !$response ) {
+   if ( !$response || $response->isError() ) {
return;
}
 
$query = 'bookcmd=rendering'
. '_to=' . urlencode( $request->getVal( 
'return_to', '' ) )
-   . '_id=' . urlencode( 
$response->response['collection_id'] )
-   . '=' . urlencode( $response->response['writer'] 
);
-   if ( isset( $response->response['is_cached'] ) && 
$response->response['is_cached'] ) {
+   . '_id=' . urlencode( $response->get( 
'collection_id' ) )
+   . '=' . urlencode( $response->get( 'writer' ) );
+   if ( $response->get( 'is_cached' ) ) {
$query .= '_cached=1';
}
$this->getOutput()->redirect( SkinTemplate::makeSpecialUrl( 
'Book', $query ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bbb8a00d010b8892cd12ec030c8358e42fd2e46
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

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

2017-12-04 Thread jenkins-bot (Code Review)

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

Change subject: On this day
..


On this day

- Design tweaks
- Changed UtcDate to Date to get default TimeZone.

Bug: T175995
Change-Id: Ib689ba7b1a037142503cb42b6630036560c06cf1
---
M 
app/src/androidTest/java/org/wikipedia/feed/onthisday/OnThisDayCardViewTest.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayActivity.java
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/OnThisDayClient.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayFragment.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayPagesViewHolder.java
M app/src/main/java/org/wikipedia/util/DateUtil.java
M app/src/main/java/org/wikipedia/util/StringUtil.java
D app/src/main/java/org/wikipedia/views/DatePickerFragment.java
D app/src/main/res/drawable/button_shape_gray_corner_rounded.xml
D app/src/main/res/drawable/button_shape_light_gray_corner_rounded.xml
R app/src/main/res/drawable/drawable_12dp_rounded_corner_base30.xml
C app/src/main/res/drawable/drawable_12dp_rounded_corner_base70.xml
D app/src/main/res/drawable/ic_arrow_forward_base30.xml
M app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml
A app/src/main/res/drawable/ic_event_black_24dp.xml
D app/src/main/res/drawable/ic_event_custom_size.xml
M app/src/main/res/drawable/ic_otd_icon.xml
A app/src/main/res/drawable/otd_radio.xml
A app/src/main/res/drawable/otd_year_button_background.xml
M app/src/main/res/layout/fragment_on_this_day.xml
M app/src/main/res/layout/item_on_this_day_pages.xml
M app/src/main/res/layout/view_card_on_this_day.xml
M app/src/main/res/layout/view_events_layout.xml
M app/src/main/res/layout/view_on_this_day_event.xml
M app/src/test/java/org/wikipedia/feed/onthisday/OnThisDayClientTest.java
29 files changed, 337 insertions(+), 320 deletions(-)

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



diff --git 
a/app/src/androidTest/java/org/wikipedia/feed/onthisday/OnThisDayCardViewTest.java
 
b/app/src/androidTest/java/org/wikipedia/feed/onthisday/OnThisDayCardViewTest.java
index b587d6a..6947ead 100644
--- 
a/app/src/androidTest/java/org/wikipedia/feed/onthisday/OnThisDayCardViewTest.java
+++ 
b/app/src/androidTest/java/org/wikipedia/feed/onthisday/OnThisDayCardViewTest.java
@@ -1,6 +1,7 @@
 package org.wikipedia.feed.onthisday;
 
 import android.support.annotation.NonNull;
+import android.text.SpannableStringBuilder;
 
 import org.junit.Before;
 import org.junit.experimental.theories.Theory;
@@ -62,7 +63,7 @@
 OnThisDayCard card = mock(OnThisDayCard.class);
 when(card.title()).thenReturn(str(title));
 when(card.subtitle()).thenReturn(str(subtitle));
-when(card.text()).thenReturn(text);
+when(card.text()).thenReturn(new SpannableStringBuilder(text));
 when(card.year()).thenReturn(year);
 return card;
 }
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java 
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java
index bb7af41..c048db1 100644
--- 
a/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java
+++ 
b/app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageSummary.java
@@ -74,4 +74,10 @@
 return source;
 }
 }
+
+
+public void setDescription(@Nullable String description) {
+this.description = description;
+}
+
 }
diff --git a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java 
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
index d771e95..b9688b6 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
@@ -2,9 +2,12 @@
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.SpannableStringBuilder;
 
+import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.dataclient.restbase.page.RbPageSummary;
 import org.wikipedia.json.annotations.Required;
+import org.wikipedia.util.StringUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,8 +55,13 @@
 @SuppressWarnings("unused") private int year;
 @SuppressWarnings("unused,NullableProblems") @Required @NonNull 
private List pages;
 
-@NonNull public String text() {
-return text;
+@NonNull
+public SpannableStringBuilder text() {
+List pageTitles = new ArrayList<>();
+for (RbPageSummary page : pages) {
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: diadem/dysprosium: introduce skeleton role

2017-12-04 Thread Dzahn (Code Review)

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

Change subject: diadem/dysprosium: introduce skeleton role
..


diadem/dysprosium: introduce skeleton role

Start a (placeholder) role, move includes out of site.pp.

Add some comments what these hosts are for.

wmf-style: total violations delta -2

Bug: T169566
Change-Id: I67cb446ce04a0148ed0ddb9b880bcb0fcab719cb
---
M manifests/site.pp
A modules/role/manifests/dmarc.pp
2 files changed, 15 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index ae7e337..2df12b8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -284,9 +284,9 @@
 role(docker::registry)
 }
 
+# DMARC processing (T169566)
 node /^(diadem|dysprosium)\.wikimedia\.org$/ {
-include ::standard
-include ::base::firewall
+role(dmarc)
 }
 
 node 'dataset1001.wikimedia.org' {
diff --git a/modules/role/manifests/dmarc.pp b/modules/role/manifests/dmarc.pp
new file mode 100644
index 000..6668bf1
--- /dev/null
+++ b/modules/role/manifests/dmarc.pp
@@ -0,0 +1,13 @@
+# == Class: role::dmarc
+#
+# Sets up servers for DMARC processing
+#
+class role::dmarc {
+
+include ::standard
+include ::profile::base::firewall
+
+system::role { 'dmarc':
+description => 'DMARC processing server',
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67cb446ce04a0148ed0ddb9b880bcb0fcab719cb
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Herron 
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 5 >

1 - 100 of 417 matches

Mail list logo