[MediaWiki-commits] [Gerrit] Hygiene: Add new lines before function keyword - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Add new lines before function keyword
..

Hygiene: Add new lines before function keyword

Change-Id: Ib62efcb7314fe5c5333a3447dc7151bd78e52cd7
---
M javascripts/loggingSchemas/MobileWebClickTracking.js
M javascripts/loggingSchemas/mobileWebUploads.js
M javascripts/specials/nearby.js
3 files changed, 8 insertions(+), 2 deletions(-)


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

diff --git a/javascripts/loggingSchemas/MobileWebClickTracking.js 
b/javascripts/loggingSchemas/MobileWebClickTracking.js
index 1b81870..10b37e3 100644
--- a/javascripts/loggingSchemas/MobileWebClickTracking.js
+++ b/javascripts/loggingSchemas/MobileWebClickTracking.js
@@ -17,6 +17,7 @@
}
return M.log( 'MobileWebClickTracking', data );
}
+
function futureLog( name, href ) {
s.save( 'MobileWebClickTracking-name', name );
s.save( 'MobileWebClickTracking-href', href );
diff --git a/javascripts/loggingSchemas/mobileWebUploads.js 
b/javascripts/loggingSchemas/mobileWebUploads.js
index fe81370..092a8ed 100644
--- a/javascripts/loggingSchemas/mobileWebUploads.js
+++ b/javascripts/loggingSchemas/mobileWebUploads.js
@@ -1,7 +1,9 @@
 ( function ( M, $ ) {
var user = M.require( 'user' );
+
function getLog( funnel ) {
-   return function ( data ) {
+
+   function logger( data ) {
if ( mw.config.get( 'wgArticleId', -1 ) !== -1 ) {
data.pageId = mw.config.get( 'wgArticleId' );
}
@@ -13,7 +15,9 @@
isEditable: mw.config.get( 'wgIsPageEditable' ),
mobileMode: M.getMode()
}, data ) );
-   };
+   }
+
+   return logger;
}
 
M.define( 'loggingSchemas/mobileWebUploads', { getLog: getLog } );
diff --git a/javascripts/specials/nearby.js b/javascripts/specials/nearby.js
index fc2e270..dd73ffa 100644
--- a/javascripts/specials/nearby.js
+++ b/javascripts/specials/nearby.js
@@ -52,6 +52,7 @@
$icon.hide();
refresh( $.extend( {}, options, { pageTitle: pageTitle 
} ) );
} );
+
function refreshCurrentLocation() {
$icon.show();
refresh( $.extend( {}, options, { useCurrentLocation: 
true } ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib62efcb7314fe5c5333a3447dc7151bd78e52cd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hygiene: Require line feed at end of file - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Require line feed at end of file
..

Hygiene: Require line feed at end of file

Change-Id: I02b61de0970cbf46eb15d5d332c97f52e9f40c49
---
M .jscsrc
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/.jscsrc b/.jscsrc
index 9a76887..d7a523e 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -2,6 +2,7 @@
   preset: wikimedia,
   requireMultipleVarDecl: onevar,
   requireBlocksOnNewline: true,
+  requireLineFeedAtFileEnd: true,
   requirePaddingNewlinesBeforeKeywords: [function],
   disallowDanglingUnderscores: null,
   requireSpacesInsideParentheses: all,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02b61de0970cbf46eb15d5d332c97f52e9f40c49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hygiene: Simple whitespace and js documentation fix to nearby - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Simple whitespace and js documentation fix to nearby
..

Hygiene: Simple whitespace and js documentation fix to nearby

Change-Id: I6fab00141cd8c87efc0a1750ba31b49a556780a4
---
M javascripts/specials/nearby.js
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/javascripts/specials/nearby.js b/javascripts/specials/nearby.js
index dd73ffa..e6b914b 100644
--- a/javascripts/specials/nearby.js
+++ b/javascripts/specials/nearby.js
@@ -45,6 +45,7 @@
longitude: lon
} ) );
} );
+
/*
 * #/page/PageTitle
 */
@@ -53,10 +54,14 @@
refresh( $.extend( {}, options, { pageTitle: pageTitle 
} ) );
} );
 
+   /*
+* Refresh the current view using browser geolocation api
+*/
function refreshCurrentLocation() {
$icon.show();
refresh( $.extend( {}, options, { useCurrentLocation: 
true } ) );
}
+
/*
 * Anything else search with current location
 * FIXME: The regex has to negate the rest of the routes 
because every time we

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fab00141cd8c87efc0a1750ba31b49a556780a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Hygiene: Move variable declaration on to single line - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Move variable declaration on to single line
..

Hygiene: Move variable declaration on to single line

No need to span two lines

Change-Id: Iff7121d0a2a0f69d96b0577cfbc30d1b620fc75b
---
M javascripts/specials/watchlist.js
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/javascripts/specials/watchlist.js 
b/javascripts/specials/watchlist.js
index 5dac597..9f92ea1 100644
--- a/javascripts/specials/watchlist.js
+++ b/javascripts/specials/watchlist.js
@@ -3,8 +3,7 @@
WatchList = M.require( 'modules/watchlist/WatchList' ),
schema = M.require( 'loggingSchemas/MobileWebClickTracking' ),
canonicalName = mw.config.get( 'wgCanonicalSpecialPageName' ),
-   pageName = canonicalName === 'EditWatchlist' || canonicalName 
=== 'Watchlist' ?
-   'watchlist' : 'diff',
+   pageName = canonicalName === 'EditWatchlist' || canonicalName 
=== 'Watchlist' ? 'watchlist' : 'diff',
subPageName = M.query.watchlistview || 'a-z';
 
function init() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff7121d0a2a0f69d96b0577cfbc30d1b620fc75b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Make mw.wikibase.entity.formatPropertyValues work for non-items - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Make mw.wikibase.entity.formatPropertyValues work for non-items
..


Make mw.wikibase.entity.formatPropertyValues work for non-items

To get rid of the meaningless error message this is throwing right
now and to make this compatible with having statements on non-items.

Bug: 72124
Change-Id: I8abec32dedb87f9fab78e824b3703f2f240c25b0
---
M client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M client/includes/scribunto/WikibaseLuaEntityBindings.php
M client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua
M client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php
M 
client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
5 files changed, 37 insertions(+), 18 deletions(-)

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



diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php 
b/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
index 5d43ab4..54cc394 100644
--- a/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
+++ b/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
@@ -48,7 +48,8 @@
$wikibaseClient-getStore()-getEntityLookup(),
new ParserOutputUsageAccumulator( 
$this-getParser()-getOutput() ),
$wikibaseClient-getSettings()-getSetting( 
'siteGlobalID' ),
-   $wgContLang
+   $wgContLang,
+   $wikibaseClient-getEntityIdParser()
);
}
 
diff --git a/client/includes/scribunto/WikibaseLuaEntityBindings.php 
b/client/includes/scribunto/WikibaseLuaEntityBindings.php
index cf68e20..21dcf07 100644
--- a/client/includes/scribunto/WikibaseLuaEntityBindings.php
+++ b/client/includes/scribunto/WikibaseLuaEntityBindings.php
@@ -8,12 +8,13 @@
 use Wikibase\DataModel\Entity\Entity;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdValue;
-use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\StatementListProvider;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use Wikibase\DataModel\Snak\Snak;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\DataModel\Entity\EntityIdParser;
 
 /**
  * Actual implementations of the functions to access Wikibase through the 
Scribunto extension
@@ -62,19 +63,22 @@
 * @param UsageAccumulator $usageAccumulator
 * @param string $siteId
 * @param Language $language
+* @param EntityIdParser $entityIdParser
 */
public function __construct(
SnakFormatter $snakFormatter,
EntityLookup $entityLookup,
UsageAccumulator $usageAccumulator,
$siteId,
-   Language $language
+   Language $language,
+   EntityIdParser $entityIdParser
) {
$this-snakFormatter = $snakFormatter;
$this-entityLookup = $entityLookup;
$this-usageAccumulator = $usageAccumulator;
$this-siteId = $siteId;
$this-language = $language;
+   $this-entityIdParser = $entityIdParser;
}
 
/**
@@ -97,15 +101,15 @@
 
/**
 * Returns such Claims from $entity that have a main Snak for the 
property that
-* is specified by $propertyLabel.
+* is specified by $propertyId.
 *
-* @param Entity $entity
+* @param StatementListProvider $statementListProvider
 * @param PropertyId $propertyId
 *
 * @return Claims
 */
-   private function getClaimsForProperty( Entity $entity, PropertyId 
$propertyId ) {
-   $allClaims = new Claims( $entity-getClaims() );
+   private function getClaimsForProperty( StatementListProvider 
$statementListProvider, PropertyId $propertyId ) {
+   $allClaims = new Claims( 
$statementListProvider-getStatements() );
 
return $allClaims-getClaimsForProperty( $propertyId );
}
@@ -170,12 +174,12 @@
 * @return string
 */
public function formatPropertyValues( $entityId, $propertyId, array 
$acceptableRanks = null ) {
-   $entityId = new ItemId( $entityId );
+   $entityId = $this-entityIdParser-parse( $entityId );
$propertyId = new PropertyId( $propertyId );
 
$entity = $this-getEntity( $entityId );
 
-   if ( !$entity ) {
+   if ( !( $entity instanceof StatementListProvider ) ) {
return '';
}
 
diff --git 
a/client/tests/phpunit/includes/scribunto/LuaWikibaseEntityLibraryTests.lua 

[MediaWiki-commits] [Gerrit] Fix undefined error on end of play of native audio - change (mediawiki...TimedMediaHandler)

[TheDJ (Code Review)]

TheDJ has uploaded a new change for review.

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

Change subject: Fix undefined error on end of play of native audio
..

Fix undefined error on end of play of native audio

Untested

Bug: 56353
Change-Id: I0a8fa8da9bd84fc548d5c3049fb266e785829975
---
M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/07/174407/1

diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js 
b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
index 11e20aa..8c514f7 100644
--- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
+++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
@@ -469,6 +469,11 @@
callback = null;
}
}
+   if( !vid ) {
+   callbackHandler();
+   _this.currentSeekTargetTime = seekTime.toFixed( 2 );
+   return;
+   }
// Check if player is ready for seek:
if( vid.readyState  1 ){
// Try to seek for 4 seconds:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a8fa8da9bd84fc548d5c3049fb266e785829975
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] audit ssh key use on production cluster - change (operations/software)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: audit ssh key use on production cluster
..

audit ssh key use on production cluster

this script checks for private keys on cluster, keys
in authorized_keys not managed by puppet, and labs ssh
keys in authorized_keys on production hosts.

Change-Id: I840dc9b6a63663a58b692368f8eb23e5e00590ee
---
A audits/check_ssh_keys.py
1 file changed, 818 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/08/174408/1

diff --git a/audits/check_ssh_keys.py b/audits/check_ssh_keys.py
new file mode 100644
index 000..e591e07
--- /dev/null
+++ b/audits/check_ssh_keys.py
@@ -0,0 +1,818 @@
+import os
+import sys
+import time
+import salt.client
+import getopt
+import yaml
+import re
+
+
+class User(object):
+'''
+manage key related information about a user,
+including home directory path, private key filenames,
+authorized keys, public key filenames
+'''
+def __init__(self, user, user_info, saltcmd):
+self.user = user
+self.user_info = user_info
+self.saltcmd = saltcmd
+self.auth_keys_in_file = None
+self.homedir = None
+self.key_files = None
+self.priv_key_list = None
+self.encr_priv_key_list = None
+self.pub_key_list = None
+self.keys_dir = None
+self.host = None
+self.public_key_info = None
+
+def get_remote_content(self, filename, host=None):
+'''
+get the contents of a file on a remote host via salt
+filename: full path to file to be read
+host: fqdn of host
+'''
+if not host:
+host = self.host
+result = self.saltcmd.client.cmd(host, cmd.run_all, [cat  + 
filename])
+
+
+format for one host:
+{'localhost.localdomain': {'pid': 8029, 'retcode': 0, 'stderr': '',
+'stdout': ' 14:39:40 up 1 day, 13:19,
+5 users,  load average: 0.08, 0.21, 0.30'}}
+
+if result[host]['retcode']:
+return None
+else:
+return result[host]['stdout']
+
+def get_remote_home_dir(self, host=None):
+'''
+get and return the home directory of the specified
+user, on the specified host or on the host specified
+for this instance
+'''
+if not host:
+host = self.host
+if self.user_info:
+if host in self.user_info:
+if self.user in self.user_info[host]:
+return self.user_info[host][self.user]
+return None
+
+def get_remote_files_in_dir(self, path, host=None):
+'''
+get and return list of files in a directory on remote host
+via salt
+'''
+if not host:
+host = self.host
+result = (self.saltcmd.client.cmd(host, cmd.run_all, [find  + path 
+
+  -maxdepth 1 -type 
f]))
+if result[host]['retcode']:
+return None
+else:
+lines = result[host]['stdout'].split('\n')
+return [os.path.basename(l) for l in lines]
+
+def get_remote_timestamp(self, filename, host=None):
+'''
+get and return the timestamp for a file on a remote host
+vi salt
+'''
+if not host:
+host = self.host
+result = self.saltcmd.client.cmd(host, cmd.run_all,
+  [stat -c %Y  +
+   os.path.join(self.keys_dir, filename)])
+if result[host]['retcode']:
+return None
+else:
+return result[host]['stdout']
+
+def setup_per_host(self, host):
+'''
+for the given host, get the user's homedir, list all their
+files with keys, etc. in preparation for checking them
+'''
+self.key_files = None
+self.priv_key_list = None
+self.encr_priv_key_list = None
+self.pub_key_list = None
+self.host = host
+self.public_key_info = None
+self.keys_dir = None
+self.homedir = self.get_remote_home_dir()
+
+# may fail if in the meantime the user or the directory is removed
+try:
+self.keys_dir = os.path.join(self.homedir, .ssh)
+result = (self.saltcmd.client.cmd(host, cmd.run_all,
+   [find  + self.keys_dir +
+ -maxdepth 1 -type f]))
+if result[host]['retcode']:
+return None
+self.key_files = self.get_remote_files_in_dir(self.keys_dir)
+except:
+pass
+
+def get_remote_priv_key_files(self, path, host=None):
+'''
+return two lists, one of the names of the 

[MediaWiki-commits] [Gerrit] Cleanup after I457552b5017948d246becac6677c2e01464edc43 - change (mediawiki...Wikibase)

[Adrian Lang (Code Review)]

Adrian Lang has uploaded a new change for review.

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

Change subject: Cleanup after I457552b5017948d246becac6677c2e01464edc43
..

Cleanup after I457552b5017948d246becac6677c2e01464edc43

Change-Id: Icad8c24ea364dc03ef5b1d980c1e65cafc396063
---
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/View/EntityViewFactory.php
M repo/includes/WikibaseRepo.php
3 files changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/repo/includes/EntityParserOutputGenerator.php 
b/repo/includes/EntityParserOutputGenerator.php
index 53dd76d..d92adf2 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -19,7 +19,6 @@
 use Wikibase\Lib\Store\EntityRetrievingTermLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LanguageLabelLookup;
-use Wikibase\Lib\WikibaseValueFormatterBuilders;
 use Wikibase\Repo\View\EntityViewFactory;
 
 /**
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 8d5057c..89e3759 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -16,7 +16,6 @@
 use Wikibase\Lib\Store\EntityRetrievingTermLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LanguageLabelLookup;
-use Wikibase\Lib\WikibaseValueFormatterBuilders;
 use Wikibase\PropertyView;
 use Wikibase\Repo\View\ClaimsView;
 use Wikibase\Repo\View\FingerprintView;
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index f380ae8..0daed7a 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -47,7 +47,6 @@
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityRetrievingTermLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LanguageLabelLookup;
 use Wikibase\Lib\WikibaseDataTypeBuilders;
@@ -490,8 +489,6 @@
 */
public function getValueFormatterBuilders() {
global $wgContLang;
-
-   $termLookup = new EntityRetrievingTermLookup( 
$this-getEntityLookup() );
 
return new WikibaseValueFormatterBuilders(
$this-getEntityLookup(),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icad8c24ea364dc03ef5b1d980c1e65cafc396063
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de

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

[MediaWiki-commits] [Gerrit] Cleanup after I457552b5017948d246becac6677c2e01464edc43 - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Cleanup after I457552b5017948d246becac6677c2e01464edc43
..


Cleanup after I457552b5017948d246becac6677c2e01464edc43

Change-Id: Icad8c24ea364dc03ef5b1d980c1e65cafc396063
---
M repo/includes/EntityParserOutputGenerator.php
M repo/includes/View/EntityViewFactory.php
M repo/includes/WikibaseRepo.php
3 files changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/repo/includes/EntityParserOutputGenerator.php 
b/repo/includes/EntityParserOutputGenerator.php
index 53dd76d..d92adf2 100644
--- a/repo/includes/EntityParserOutputGenerator.php
+++ b/repo/includes/EntityParserOutputGenerator.php
@@ -19,7 +19,6 @@
 use Wikibase\Lib\Store\EntityRetrievingTermLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LanguageLabelLookup;
-use Wikibase\Lib\WikibaseValueFormatterBuilders;
 use Wikibase\Repo\View\EntityViewFactory;
 
 /**
diff --git a/repo/includes/View/EntityViewFactory.php 
b/repo/includes/View/EntityViewFactory.php
index 8d5057c..89e3759 100644
--- a/repo/includes/View/EntityViewFactory.php
+++ b/repo/includes/View/EntityViewFactory.php
@@ -16,7 +16,6 @@
 use Wikibase\Lib\Store\EntityRetrievingTermLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LanguageLabelLookup;
-use Wikibase\Lib\WikibaseValueFormatterBuilders;
 use Wikibase\PropertyView;
 use Wikibase\Repo\View\ClaimsView;
 use Wikibase\Repo\View\FingerprintView;
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index f380ae8..0daed7a 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -47,7 +47,6 @@
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\Lib\Store\EntityRetrievingTermLookup;
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\LanguageLabelLookup;
 use Wikibase\Lib\WikibaseDataTypeBuilders;
@@ -490,8 +489,6 @@
 */
public function getValueFormatterBuilders() {
global $wgContLang;
-
-   $termLookup = new EntityRetrievingTermLookup( 
$this-getEntityLookup() );
 
return new WikibaseValueFormatterBuilders(
$this-getEntityLookup(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icad8c24ea364dc03ef5b1d980c1e65cafc396063
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Job template to run composer scripts - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Job template to run composer scripts
..

Job template to run composer scripts

The `cdb` projects rely on composer to fetch dependencies and execute
scripts. Introduce job template '{name}-composer-{composer_command}'
which runs composer install  composer composer_command.

`composer install` is passed --prefer-dist in order to download tarballs
which are thus cacheable and save a lot of processing time compared to
cloning each upstream repositories.

The job template accepts the `composer_command_args` variable which is
passed as extra argument:

 composer composer_command -- composer_command_args

Set it to default to '' via a definition in the 'global' default. Recent
version of JJB pass that to the project and thus the job-template,
saving us from having to define an empty 'composer_command_args' on each
project.

composer '--working-dir' is being used since Zuul cloner clones the
source repository under src/$ZUUL_PROJECT. Pass it to both invocation of
composer.

Provide empty directories $WORKSPACE/build and  $WORKSPACE/log
directories. For example to write test results to which can then be
interpreted by Jenkins publishers.

Change-Id: I5211c0ba7377960c8dd266968446ecbf0b4e338d
---
M jjb/defaults.yaml
M jjb/job-templates.yaml
2 files changed, 47 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/10/174410/1

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index ded5f08..3bbeafb 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -5,6 +5,9 @@
 
 project-type: freestyle
 
+# Default variables passed to jobs
+composer_command_args: 
+
 wrappers:
   - timeout:
   timeout: 30
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 968c637..bfe1749 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -53,6 +53,50 @@
 builders:
  - npm
 
+# Runs composer install then composer {composer_command}
+#
+# Parameters:
+#
+# composer_command: the command to pass to composer, ex: 'phpunit'
+# composer_command_args: extra arguments to pass to the command,
+# will be passed after '--'. Default is '', set in the JJB 'global' default.
+#
+# Notes:
+#
+# `composer install` is being passed `--prefer-dist` to download cacheable
+# tarballs when possible.
+#
+# Both composer commands have `--working-dir` since Zuul cloner clones under
+# src/$ZUUL_PROJECT. `composer_command_args` can thus reference paths
+# relatively to the src/$ZUUL_PROJECT directory.
+#
+# Example:
+#
+# project:
+#   name: myproject
+#   jobs:
+#   - '{name}-composer-{composer_command}':
+#  composer_command: test
+#   - '{name}-composer-{composer_command}'
+#  composer_command: phpunit
+#  composer_command_args: '--log-junit log/phpunit-junit.xml'
+#
+- job-template:
+name: '{name}-composer-{composer_command}'
+node: contintLabsSlaves  UbuntuPrecise  # Precise == PHP 5.3.x
+concurrent: true
+triggers:
+- zuul
+builders:
+ - zuul-cloner:
+ projects: $ZUUL_PROJECT
+ - shell: |
+ rm -fR build log
+ mkdir -p build log
+
+ composer install --working-dir $WORKSPACE/src/$ZUUL_PROJECT 
--prefer-dist --profile
+ composer {composer_command} --working-dir 
$WORKSPACE/src/$ZUUL_PROJECT -- {composer_command_args}
+
 - job-template:
 name: '{name}-puppetlint-lenient'
 node: contintLabsSlave  UbuntuPrecise

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5211c0ba7377960c8dd266968446ecbf0b4e338d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Add cdb-composer-phpunit - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Add cdb-composer-phpunit
..

Add cdb-composer-phpunit

Invokes `composer phpunit` on the `cdb` project, log junit result to
log/phpunit-junit.xml.

FIXME: need to apply the publisher 'phpunit-junit' in order to have
Jenkins interprets the tests results.

Change-Id: I986bc438acfb19a0a7b36e1b435dfd4423a66a25
---
M jjb/misc.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/11/174411/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index a6b7980..85a379f 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -108,3 +108,7 @@
  - '{name}-phplint'
  - '{name}-phpunit'
  - php-composer-validate
+ - '{name}-composer-{composer_command}':
+ composer_command: 'phpunit'
+ composer_command_args: '--log-junit log/phpunit-junit.xml'
+ # FIXME: need to pass publisher 'phpunit-junit'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I986bc438acfb19a0a7b36e1b435dfd4423a66a25
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Add customization of publishers for composer jobs - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Add customization of publishers for composer jobs
..

Add customization of publishers for composer jobs

A composer command might generate files which we want Jenkins to
interpreate via a publisher.  The cdb project runs phpunit which creates
a XML report of the tests.  We want to be able to use the xunit
publisher for this command but not for others (since they do not
generate the xunit report).

Add to the job template `{name}-composer-{composer_command}` a parameter
`composer_publishers` which is a sequence of publishers to add to the
job templates.  We are using a !!python/tuple to prevent JJB from
realizing a job per element of othe sequence and pass them as is to the
job template.
http://ci.openstack.org/jenkins-job-builder/definition.html#variable-references

Add a default: composer_publishers: !!python/tuple []

Make the cdb composer phpunit job to use the publishers 'phpunit-junit'
and 'archive-log-dir'.

We probably want to use the same trick for the python tox and ruby
bundle jobs.

Change-Id: I632440782c5b838243f7d0fcf8b424d5a43d8d12
---
M jjb/defaults.yaml
M jjb/job-templates.yaml
M jjb/misc.yaml
3 files changed, 19 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/12/174412/1

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 3bbeafb..1836a25 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -7,6 +7,13 @@
 
 # Default variables passed to jobs
 composer_command_args: 
+# Use a tuple to prevent JJB from expanding each element of a list which
+# would realize a job per element when we want to pass the sequence of
+# elements.
+# 
http://ci.openstack.org/jenkins-job-builder/definition.html#variable-references
+#
+# See job-template '{name}-composer-{composer_command}' for usage.
+composer_publishers: !!python/tuple []
 
 wrappers:
   - timeout:
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index bfe1749..3e2e678 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -58,8 +58,15 @@
 # Parameters:
 #
 # composer_command: the command to pass to composer, ex: 'phpunit'
+#
 # composer_command_args: extra arguments to pass to the command,
 # will be passed after '--'. Default is '', set in the JJB 'global' default.
+#
+# composer_publishers: publishers to use with this job. If you need to pass
+# several, use a tuple object:
+#   !!python/tuple ['phpunit-junit', # 'archive-log-dir']
+# Default is: '!!python/tuple []', no publisher applied, set in the JJB
+# 'global' default.
 #
 # Notes:
 #
@@ -80,6 +87,7 @@
 #   - '{name}-composer-{composer_command}'
 #  composer_command: phpunit
 #  composer_command_args: '--log-junit log/phpunit-junit.xml'
+#  composer_publishers: !!python/tuple ['phpunit-junit', 
'archive-log-dir']
 #
 - job-template:
 name: '{name}-composer-{composer_command}'
@@ -97,6 +105,9 @@
  composer install --working-dir $WORKSPACE/src/$ZUUL_PROJECT 
--prefer-dist --profile
  composer {composer_command} --working-dir 
$WORKSPACE/src/$ZUUL_PROJECT -- {composer_command_args}
 
+# see 
http://ci.openstack.org/jenkins-job-builder/definition.html#variable-references
+publishers: '{obj:composer_publishers}'
+
 - job-template:
 name: '{name}-puppetlint-lenient'
 node: contintLabsSlave  UbuntuPrecise
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 85a379f..bb43fd3 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -111,4 +111,4 @@
  - '{name}-composer-{composer_command}':
  composer_command: 'phpunit'
  composer_command_args: '--log-junit log/phpunit-junit.xml'
- # FIXME: need to pass publisher 'phpunit-junit'
+ composer_publishers: !!python/tuple ['phpunit-junit', 
'archive-log-dir']

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I632440782c5b838243f7d0fcf8b424d5a43d8d12
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Make nil the default for acceptableRanks in formatPropertyVa... - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Make nil the default for acceptableRanks in formatPropertyValues
..


Make nil the default for acceptableRanks in formatPropertyValues

Change-Id: I92d5b8f5d9cf536d159ea9060685f5358f2a3289
---
M client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
M client/includes/scribunto/WikibaseLuaEntityBindings.php
M client/includes/scribunto/mw.wikibase.entity.lua
3 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved



diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php 
b/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
index 5d43ab4..9f8693d 100644
--- a/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
+++ b/client/includes/scribunto/Scribunto_LuaWikibaseEntityLibrary.php
@@ -88,18 +88,18 @@
 *
 * @param string $entityId
 * @param string $propertyId
-* @param int[] $acceptableRanks
+* @param int[]|null $acceptableRanks
 *
 * @throws ScribuntoException
 * @return string[]
 */
-   public function formatPropertyValues( $entityId, $propertyId, array 
$acceptableRanks ) {
+   public function formatPropertyValues( $entityId, $propertyId, array 
$acceptableRanks = null ) {
$this-checkType( 'formatPropertyValues', 0, $entityId, 
'string' );
// Use 1 as index for the property id, as the first parameter 
comes from
// internals of mw.wikibase.entity (an index of 2 might confuse 
users
// as they only gave one parameter themselves)
$this-checkType( 'formatPropertyValues', 1, $propertyId, 
'string' );
-   $this-checkType( 'formatPropertyValues', 2, $acceptableRanks, 
'table' );
+   $this-checkTypeOptional( 'formatPropertyValues', 2, 
$acceptableRanks, 'table', null );
try {
return array( 
$this-getImplementation()-formatPropertyValues( $entityId, $propertyId, 
$acceptableRanks ) );
} catch ( InvalidArgumentException $e ) {
diff --git a/client/includes/scribunto/WikibaseLuaEntityBindings.php 
b/client/includes/scribunto/WikibaseLuaEntityBindings.php
index cf68e20..f2aab75 100644
--- a/client/includes/scribunto/WikibaseLuaEntityBindings.php
+++ b/client/includes/scribunto/WikibaseLuaEntityBindings.php
@@ -165,7 +165,7 @@
 *
 * @param string $entityId
 * @param string $propertyId
-* @param int[] $acceptableRanks
+* @param int[]|null $acceptableRanks
 *
 * @return string
 */
diff --git a/client/includes/scribunto/mw.wikibase.entity.lua 
b/client/includes/scribunto/mw.wikibase.entity.lua
index 01d05c2..68609d5 100644
--- a/client/includes/scribunto/mw.wikibase.entity.lua
+++ b/client/includes/scribunto/mw.wikibase.entity.lua
@@ -119,7 +119,7 @@
 -- @param propertyId
 -- @param acceptableRanks
 methodtable.formatPropertyValues = function( entity, propertyId, 
acceptableRanks )
-   acceptableRanks = acceptableRanks or {}
+   acceptableRanks = acceptableRanks or nil
 
local formatted = php.formatPropertyValues(
entity.id,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92d5b8f5d9cf536d159ea9060685f5358f2a3289
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Lay the ground for the openstack icehouse migration. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Lay the ground for the openstack icehouse migration.
..

Lay the ground for the openstack icehouse migration.

- Add config files for icehouse (currently duplicates of havana)
- Remove some checks for openstack version.  These were there
  to distinguish between folsom and havana, and we aren't running
  folsom anymore.  No doubt some new checks like these will creep
  in shortly.

Change-Id: I6ef9bb1eed271acdeb32d3be1c7b6aa0d1423f5d
---
A modules/openstack/files/icehouse/nova/policy.json
A modules/openstack/files/icehouse/nova/virt-libvirt-driver
A modules/openstack/files/icehouse/nova/wikinotifier.py
A modules/openstack/files/icehouse/virtscripts/cold-migrate
A modules/openstack/files/icehouse/virtscripts/dc-migrate
A modules/openstack/files/icehouse/virtscripts/logstat.py
A modules/openstack/files/icehouse/virtscripts/prod.sh
M modules/openstack/manifests/adminscripts.pp
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/openstack-manager.pp
A modules/openstack/templates/icehouse/glance/glance-api.conf.erb
A modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
A modules/openstack/templates/icehouse/keystone/keystone.conf.erb
A modules/openstack/templates/icehouse/neutron/api-paste.ini.erb
A modules/openstack/templates/icehouse/neutron/neutron.conf.erb
A modules/openstack/templates/icehouse/neutron/ovs_neutron_plugin.ini.erb
A modules/openstack/templates/icehouse/nova/api-paste.ini.erb
A modules/openstack/templates/icehouse/nova/dnsmasq-nova.conf.erb
A modules/openstack/templates/icehouse/nova/nova.conf.erb
19 files changed, 7,229 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/174413/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ef9bb1eed271acdeb32d3be1c7b6aa0d1423f5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Remove usage of deprecated Claims and Entity classes - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove usage of deprecated Claims and Entity classes
..


Remove usage of deprecated Claims and Entity classes

Change-Id: I7e885e9cafc9f3251e82832788d6fe29f7423dd0
---
M client/includes/DataAccess/PropertyParserFunction/SnaksFinder.php
M 
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
2 files changed, 29 insertions(+), 21 deletions(-)

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



diff --git a/client/includes/DataAccess/PropertyParserFunction/SnaksFinder.php 
b/client/includes/DataAccess/PropertyParserFunction/SnaksFinder.php
index 8913c3c..e4451d7 100644
--- a/client/includes/DataAccess/PropertyParserFunction/SnaksFinder.php
+++ b/client/includes/DataAccess/PropertyParserFunction/SnaksFinder.php
@@ -2,11 +2,14 @@
 
 namespace Wikibase\DataAccess\PropertyParserFunction;
 
-use Wikibase\DataModel\Claim\Claims;
-use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\Snak;
+use Wikibase\DataModel\Statement\BestStatementsFinder;
+use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementList;
+use Wikibase\DataModel\StatementListProvider;
 use Wikibase\Lib\Store\EntityLookup;
 
 /**
@@ -52,17 +55,20 @@
 
// We only want the best claims over here, so that we only show 
the most
// relevant information.
-   $claims = $this-getClaimsForProperty( $entity, $propertyId, 
$languageCode );
+   $bestStatements = $this-getBestStatementsForProperty( $entity, 
$propertyId );
 
-   $bestClaims = $claims-getBestClaims();
-
-   if ( $bestClaims-isEmpty() ) {
+   if ( empty( $bestStatements ) ) {
wfDebugLog( __CLASS__, __METHOD__ . ': no claims 
found.' );
wfProfileOut( __METHOD__ );
return array();
}
 
-   $snaks = $bestClaims-getMainSnaks();
+   $snaks = array_map(
+   function( Statement $statement ) {
+   return $statement-getMainSnak();
+   },
+   $bestStatements
+   );
 
wfProfileOut( __METHOD__ );
return $snaks;
@@ -72,16 +78,18 @@
 * Returns such Claims from $entity that have a main Snak for the 
property that
 * is specified by $propertyId.
 *
-* @param Entity $entity The Entity from which to get the clams
-* @param string $propertyId
-* @param string $languageCode
+* @param EntityDocument $entity The Entity from which to get the clams
+* @param PropertyId $propertyId
 *
-* @return Claims The claims for the given property.
+* @return Statement[]
 */
-   private function getClaimsForProperty( Entity $entity, $propertyId, 
$languageCode ) {
-   $allClaims = new Claims( $entity-getClaims() );
+   private function getBestStatementsForProperty( EntityDocument $entity, 
PropertyId $propertyId ) {
+   if ( $entity instanceof StatementListProvider ) {
+   $bestStatementsFinder = new BestStatementsFinder( 
$entity-getStatements() );
+   return 
$bestStatementsFinder-getBestStatementsForProperty( $propertyId );
+   }
 
-   return $allClaims-getClaimsForProperty( $propertyId );
+   return array();
}
 
 }
diff --git 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
index 9bc91f9..65ddf59 100644
--- 
a/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/PropertyParserFunction/SnaksFinderTest.php
@@ -55,17 +55,17 @@
new StringValue( 'three kittens!!!' )
) ) );
$statement3-setGuid( 'Q42$3' );
-   $statement3-setRank( Claim::RANK_DEPRECATED );
+   $statement3-setRank( Statement::RANK_DEPRECATED );
 
$item = Item::newEmpty();
$item-setId( new ItemId( 'Q42' ) );
-   $item-addClaim( $statement1 );
-   $item-addClaim( $statement2 );
-   $item-addClaim( $statement3 );
+   $item-getStatements()-addStatement( $statement1 );
+   $item-getStatements()-addStatement( $statement2 );
+   $item-getStatements()-addStatement( $statement3 );
 
$property = Property::newFromType( 'string' );
$property-setId( 

[MediaWiki-commits] [Gerrit] Removed text-decoration from toolbar links in ExtJs Managers - change (mediawiki...BlueSpiceFoundation)

[Smuggli (Code Review)]

Smuggli has uploaded a new change for review.

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

Change subject: Removed text-decoration from toolbar links in ExtJs Managers
..

Removed text-decoration from toolbar links in ExtJs Managers

Change-Id: I1472cbf1822b94c03e24ab9cb675c1dfdac179b6
---
M resources/bluespice.extjs/bluespice.extjs.fixes.css
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/resources/bluespice.extjs/bluespice.extjs.fixes.css 
b/resources/bluespice.extjs/bluespice.extjs.fixes.css
index c484532..5ecf12b 100644
--- a/resources/bluespice.extjs/bluespice.extjs.fixes.css
+++ b/resources/bluespice.extjs/bluespice.extjs.fixes.css
@@ -83,4 +83,8 @@
 
 .x-window {
line-height: normal;
+}
+
+.x-btn-toolbar {
+   text-decoration: none !important;
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1472cbf1822b94c03e24ab9cb675c1dfdac179b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Fix consistency in messages - change (mediawiki...VisualEditor)

[Lokal Profil (Code Review)]

Lokal Profil has uploaded a new change for review.

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

Change subject: Fix consistency in messages
..

Fix consistency in messages

Fixed consistency in two messages and added article to a third.
Affected messages:
* apihelp-visualeditor-description
* apihelp-visualeditor-param-oldid
* apihelp-visualeditoredit-param-oldid

Reported at:
https://translatewiki.net/wiki/MediaWiki:Apihelp-visualeditor-param-oldid/sv
https://translatewiki.net/wiki/MediaWiki:Apihelp-visualeditoredit-param-oldid/sv

Change-Id: I054cf021482276c3676e91d9cf9f6fcdfc12d583
---
M modules/ve-mw/i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 56adcc7..9d4cddf 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -18,12 +18,12 @@
},
accesskey-ca-editsource: e,
accesskey-ca-ve-edit: v,
-   apihelp-visualeditor-description: Returns HTML5 for a page from the 
parsoid service.,
+   apihelp-visualeditor-description: Returns HTML5 for a page from the 
Parsoid service.,
apihelp-visualeditor-param-basetimestamp: When saving, set this to 
the timestamp of the revision that was edited. Used to detect edit conflicts.,
apihelp-visualeditor-param-cachekey: For serialize or diff, use the 
result of a previous serializeforcache request with this key. Overrides 
$1html.,
apihelp-visualeditor-param-format: ,
apihelp-visualeditor-param-html: HTML to send to Parsoid to convert 
to wikitext.,
-   apihelp-visualeditor-param-oldid: The revision number to use 
(defaults to latest version).,
+   apihelp-visualeditor-param-oldid: The revision number to use 
(defaults to latest revision).,
apihelp-visualeditor-param-paction: Action to perform.,
apihelp-visualeditor-param-page: The page to perform actions on.,
apihelp-visualeditor-param-pst: Pre-save transform wikitext before 
sending it to Parsoid (paction=parsefragment).,
@@ -37,7 +37,7 @@
apihelp-visualeditoredit-param-html: HTML to send to Parsoid in 
exchange for wikitext.,
apihelp-visualeditoredit-param-minor: Flag for minor edit.,
apihelp-visualeditoredit-param-needcheck: When saving, set this 
parameter if the revision might have roundtrip problems. This will result in 
the edit being tagged.,
-   apihelp-visualeditoredit-param-oldid: The revision number to use. 
Defaults to latest revision. Use 0 for new page.,
+   apihelp-visualeditoredit-param-oldid: The revision number to use. 
Defaults to latest revision. Use 0 for a new page.,
apihelp-visualeditoredit-param-page: The page to perform actions 
on.,
apihelp-visualeditoredit-param-starttimestamp: When saving, set this 
to the timestamp of when the page was loaded. Used to detect edit conflicts.,
apihelp-visualeditoredit-param-summary: Edit summary.,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I054cf021482276c3676e91d9cf9f6fcdfc12d583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add job template for doxygen publishing - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Add job template for doxygen publishing
..

Add job template for doxygen publishing

Create job template '{name}-doxygen-publish' which simply runs
`doxygen`.

The 'docdest' parameter passed to the 'push-doc' MUST contains
'/$DOC_SUBPATH/' to ensure the docs are namespaces per branches and
tags.

Change-Id: I27715362bc1560293678adf7c05c61f8884bdbf5
---
M jjb/doc.yaml
1 file changed, 35 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/16/174416/1

diff --git a/jjb/doc.yaml b/jjb/doc.yaml
index 0c457ec..ca971c8 100644
--- a/jjb/doc.yaml
+++ b/jjb/doc.yaml
@@ -98,3 +98,38 @@
 
 logrotate:
 daysToKeep: 15
+
+# Generate doxygen documentation to doc.wikimedia.org
+#
+# Parameters:
+#
+# docsrc: dir where the doc has been generated to, relative to the source root.
+# For HTML documentation, Doxygen uses OUTPUT_DIRECTORY/HTML_OUTPUT
+# which would default to 'html'.  Check the project Doxyfile parameters
+# to get the exact path.
+# docdest: directory under doc.wikimedia.org/. MUST contains the string
+#  '/$DOC_SUBPATH/' to namespace the published documentations by
+#  branches and tags.
+- job-template:
+name: '{name}-doxygen-publish'
+node: contintLabsSlave  UbuntuTrusty
+concurrent: false
+triggers:
+- zuul
+builders:
+- assert-env-doc_subpath
+- shell: |
+if [[ '{docdest}' != *'/$DOC_SUBPATH/'*]]; then
+echo The docdest parameter MUST contains '/\$DOC_SUBPATH/ to 
namespace docs
+echo per branches and tags. Given: '{docdest}'.
+exit 1
+fi
+- zuul-cloner:
+projects: $ZUUL_PROJECT
+- shell: |
+cd src/$ZUUL_PROJECT
+doxygen -v
+doxygen
+- push-doc:
+docsrc: 'src/$ZUUL_PROJECT/{docsrc}'
+docdest: '{docdest}'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I27715362bc1560293678adf7c05c61f8884bdbf5
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Publish doxygen doc for the 'cdb' project - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Publish doxygen doc for the 'cdb' project
..

Publish doxygen doc for the 'cdb' project

First use of the '{name}-doxygen-publish' job template introduced
previously. Should make the Doxygen documentation published under
https://doc.wikimedia.org/cdb/VERSION/.

In Zuul, that is the second repo ever to have a job in the 'publish'
pipeline which reacts on tags. Not sure whether the 'push-doc' job
handles ref-updates properly but we will now be able to test it.

Bug: 73530
Change-Id: I591750a7defa13625ea0f440394ca34ab622913c
---
M jjb/misc.yaml
M zuul/layout.yaml
2 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/17/174417/1

diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index a6b7980..f82bacb 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -108,3 +108,6 @@
  - '{name}-phplint'
  - '{name}-phpunit'
  - php-composer-validate
+ - '{name}-doxygen-publish':
+ docsrc: 'doc/html'
+ docdest: 'cdb/$DOC_SUBPATH/'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8b32ebc..e8e6601 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5938,6 +5938,10 @@
  - cdb-phplint
  - cdb-phpunit
  - php-composer-validate
+postmerge:
+ - cdb-doxygen-publish
+publish:
+ - cdb-doxygen-publish
 
   - name: sartoris
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I591750a7defa13625ea0f440394ca34ab622913c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Lay the ground for the openstack icehouse migration. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Lay the ground for the openstack icehouse migration.
..


Lay the ground for the openstack icehouse migration.

- Add config files for icehouse (currently duplicates of havana)
- Remove some checks for openstack version.  These were there
  to distinguish between folsom and havana, and we aren't running
  folsom anymore.  No doubt some new checks like these will creep
  in shortly.

Change-Id: I6ef9bb1eed271acdeb32d3be1c7b6aa0d1423f5d
---
A modules/openstack/files/icehouse/nova/.pep8
A modules/openstack/files/icehouse/nova/policy.json
A modules/openstack/files/icehouse/nova/virt-libvirt-driver
A modules/openstack/files/icehouse/nova/wikinotifier.py
A modules/openstack/files/icehouse/virtscripts/.pep8
A modules/openstack/files/icehouse/virtscripts/cold-migrate
A modules/openstack/files/icehouse/virtscripts/dc-migrate
A modules/openstack/files/icehouse/virtscripts/logstat.py
A modules/openstack/files/icehouse/virtscripts/prod.sh
M modules/openstack/manifests/adminscripts.pp
M modules/openstack/manifests/common.pp
M modules/openstack/manifests/openstack-manager.pp
A modules/openstack/templates/icehouse/glance/glance-api.conf.erb
A modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
A modules/openstack/templates/icehouse/keystone/keystone.conf.erb
A modules/openstack/templates/icehouse/neutron/api-paste.ini.erb
A modules/openstack/templates/icehouse/neutron/neutron.conf.erb
A modules/openstack/templates/icehouse/neutron/ovs_neutron_plugin.ini.erb
A modules/openstack/templates/icehouse/nova/api-paste.ini.erb
A modules/openstack/templates/icehouse/nova/dnsmasq-nova.conf.erb
A modules/openstack/templates/icehouse/nova/nova.conf.erb
21 files changed, 7,237 insertions(+), 18 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ef9bb1eed271acdeb32d3be1c7b6aa0d1423f5d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix typo in API message - change (mediawiki...UploadWizard)

[Lokal Profil (Code Review)]

Lokal Profil has uploaded a new change for review.

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

Change subject: Fix typo in API message
..

Fix typo in API message

Capital F in Flickr and changed return to returns.
Affected message:
* apihelp-flickrblacklist-description

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/18/174418/1

diff --git a/i18n/en.json b/i18n/en.json
index 8a0ec45..81bc25b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -330,7 +330,7 @@
campaigns: Upload Wizard campaigns,
mwe-upload-campaigns-pagination-next: Next page,
mwe-upload-campaigns-list-title: List of upload campaigns,
-   apihelp-flickrblacklist-description: Validate a flickr URL by using 
the user ID (NSID) for blacklisting.\n\nWhen used with the list option, return 
all blacklisted IDs.,
+   apihelp-flickrblacklist-description: Validate a Flickr URL by using 
the user ID (NSID) for blacklisting.\n\nWhen used with the list option, returns 
all blacklisted IDs.,
apihelp-flickrblacklist-param-url: The Flickr URL to be tested.,
apihelp-flickrblacklist-param-list: When set, the complete blacklist 
is returned. Cannot be used together with $1url.,
apihelp-flickrblacklist-example-1: Check a URL against the 
blacklist,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ed01b398d715fc1126f006dadcc9a6811586425
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com

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

[MediaWiki-commits] [Gerrit] Stop clobbering reason from alterImpressionData - change (mediawiki...CentralNotice)

[Pcoombe (Code Review)]

Pcoombe has submitted this change and it was merged.

Change subject: Stop clobbering reason from alterImpressionData
..


Stop clobbering reason from alterImpressionData

My last change to impression recording overwrote reasons set by
banner-specific alterImpressionData functions.  This should let
those back through.

Change-Id: Ifb4a6c01ce894408b0eb86587bcb5eb130d615bd
---
M modules/ext.centralNotice.bannerController/bannerController.js
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Pcoombe: Looks good to me, approved



diff --git a/modules/ext.centralNotice.bannerController/bannerController.js 
b/modules/ext.centralNotice.bannerController/bannerController.js
index 1069335..79eb55a 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -434,7 +434,11 @@
// ~~ as of 2012-11-27
if ( !bannerShown ) {
hideBanner = true;
-   impressionData.reason = 
'alterImpressionData';
+   // alterImpressionData should set a 
reason, but we'll set a
+   // default if it didn't
+   if ( !impressionData.reason ) {
+   impressionData.reason = 
'alterImpressionData';
+   }
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb4a6c01ce894408b0eb86587bcb5eb130d615bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Awight awi...@wikimedia.org
Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org
Gerrit-Reviewer: Ewulczyn ewulc...@wikimedia.org
Gerrit-Reviewer: Katie Horn kh...@wikimedia.org
Gerrit-Reviewer: Mwalker mwal...@khaosdev.com
Gerrit-Reviewer: Pcoombe pcoo...@wikimedia.org
Gerrit-Reviewer: Ssmith ssm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix typo in API message - change (mediawiki...UploadWizard)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fix typo in API message
..


Fix typo in API message

Capital F in Flickr and changed return to returns.
Affected message:
* apihelp-flickrblacklist-description

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

Approvals:
  MarkTraceur: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 8a0ec45..81bc25b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -330,7 +330,7 @@
campaigns: Upload Wizard campaigns,
mwe-upload-campaigns-pagination-next: Next page,
mwe-upload-campaigns-list-title: List of upload campaigns,
-   apihelp-flickrblacklist-description: Validate a flickr URL by using 
the user ID (NSID) for blacklisting.\n\nWhen used with the list option, return 
all blacklisted IDs.,
+   apihelp-flickrblacklist-description: Validate a Flickr URL by using 
the user ID (NSID) for blacklisting.\n\nWhen used with the list option, returns 
all blacklisted IDs.,
apihelp-flickrblacklist-param-url: The Flickr URL to be tested.,
apihelp-flickrblacklist-param-list: When set, the complete blacklist 
is returned. Cannot be used together with $1url.,
apihelp-flickrblacklist-example-1: Check a URL against the 
blacklist,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ed01b398d715fc1126f006dadcc9a6811586425
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Pass wiki to jump-url, and $suffix and $params into $wgConf-... - change (mediawiki...SecurePoll)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Pass wiki to jump-url, and $suffix and $params into 
$wgConf-get()
..

Pass wiki to jump-url, and $suffix and $params into $wgConf-get()

Since I3a90ae7f, the remote auth requires the source wiki ID. So let's
make sure it gets passed from SecurePoll_VotePage.

But just the wiki isn't enough for $wgConf-get(), as (1) it won't
always pick up if wgServer is defined by suffixes and (2) it may have
$lang and other variables in it that need translation. We can derive
the site and lang from 'wiki' if we don't already have them, and then
derive the suffix from the site.

Bug: 73588
Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
---
M includes/pages/VotePage.php
M includes/user/Auth.php
2 files changed, 24 insertions(+), 1 deletion(-)


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

diff --git a/includes/pages/VotePage.php b/includes/pages/VotePage.php
index f0d9cda..f2935d5 100644
--- a/includes/pages/VotePage.php
+++ b/includes/pages/VotePage.php
@@ -243,6 +243,7 @@
Xml::openElement( 'form', array( 'action' = $url, 
'method' = 'post' ) ) .
Html::hidden( 'token', 
SecurePoll_RemoteMWAuth::encodeToken( $wgUser-getToken() ) ) .
Html::hidden( 'id', $wgUser-getId() ) .
+   Html::hidden( 'wiki', wfWikiID() ) .
Xml::submitButton( wfMsg( 'securepoll-jump' ) ) .
'/form'
);
diff --git a/includes/user/Auth.php b/includes/user/Auth.php
index 1a252ec..2075a27 100644
--- a/includes/user/Auth.php
+++ b/includes/user/Auth.php
@@ -318,7 +318,29 @@
}
 
$wgConf-loadFullData();
-   $server = $wgConf-get( 'wgServer', $params['wiki'] );
+
+   // Get the site and language from $wgConf, if necessary.
+   if ( !isset( $params['site'] ) || !isset( $params['lang'] ) ) {
+   list( $site, $lang ) = $wgConf-siteFromDB( 
$params['wiki'] );
+   if ( !isset( $params['site'] ) ) {
+   $params['site'] = $site;
+   $vars['$site'] = $site;
+   }
+   if ( !isset( $params['lang'] ) ) {
+   $params['lang'] = $lang;
+   $vars['$lang'] = $lang;
+   }
+   }
+
+   // In some cases it doesn't matter what we pass for $suffix. 
When it
+   // does, the correct value is $params['site'] unless there is a 
string
+   // back-mapping for it in $wgConf-suffixes.
+   $suffixes = array_flip( $wgConf-suffixes );
+   $suffix = isset( $suffixes[$params['site']] )  is_string( 
$suffixes[$params['site']] )
+   ? $suffixes[$params['site']]
+   : $params['site'];
+
+   $server = $wgConf-get( 'wgServer', $params['wiki'], $suffix, 
$params );
$params['wgServer'] = $server;
$vars[\$wgServer] = $server;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update glance config for icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Update glance config for icehouse
..

Update glance config for icehouse

Change-Id: I7242c02e9a5cd45cfc883952c3824a7196bd73ad
---
M modules/openstack/templates/icehouse/glance/glance-api.conf.erb
1 file changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/174421/1

diff --git a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb 
b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
index f7a0399..e658e60 100644
--- a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
@@ -43,11 +43,6 @@
 # Not supported on OS X.
 #tcp_keepidle = 600
 
-# SQLAlchemy connection string for the reference implementation
-# registry server. Any valid SQLAlchemy connection string is fine.
-# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-sql_connection =  mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
-
 # Period in seconds after which SQLAlchemy should reestablish its connection
 # to the database.
 #
@@ -141,6 +136,7 @@
 
 # Configuration options if sending notifications via rabbitmq (these are
 # the defaults)
+rpc_backend = rabbit
 rabbit_host = localhost
 rabbit_port = 5672
 rabbit_use_ssl = false
@@ -327,3 +323,10 @@
 # [pipeline:glance-api-keystone], you would configure the flavor below
 # as 'keystone'.
 flavor=keystone
+
+[database]
+# SQLAlchemy connection string for the reference implementation
+# registry server. Any valid SQLAlchemy connection string is fine.
+# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+connection =  mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7242c02e9a5cd45cfc883952c3824a7196bd73ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Removed error_log - change (mediawiki...BlueSpiceFoundation)

[Smuggli (Code Review)]

Smuggli has uploaded a new change for review.

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

Change subject: Removed error_log
..

Removed error_log

Somehow an error_log made its way in.

Change-Id: I945801c0f15086e50db077aa004024a8b9b4c85b
---
M includes/installer/BsWebInstaller.php
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/includes/installer/BsWebInstaller.php 
b/includes/installer/BsWebInstaller.php
index ba8f9cd..9e9f0ac 100644
--- a/includes/installer/BsWebInstaller.php
+++ b/includes/installer/BsWebInstaller.php
@@ -155,9 +155,6 @@
'callback' = array( $installer, 
'createExtensionTables' )
);
 
-
-   #BsConfig::saveSettings();
-   error_log(var_export(BsConfig::getRegisteredVars(),1));
return $this-installSteps;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I945801c0f15086e50db077aa004024a8b9b4c85b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] Removed error_log - change (mediawiki...BlueSpiceFoundation)

[Smuggli (Code Review)]

Smuggli has submitted this change and it was merged.

Change subject: Removed error_log
..


Removed error_log

Somehow an error_log made its way in.

Change-Id: I945801c0f15086e50db077aa004024a8b9b4c85b
---
M includes/installer/BsWebInstaller.php
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/includes/installer/BsWebInstaller.php 
b/includes/installer/BsWebInstaller.php
index ba8f9cd..9e9f0ac 100644
--- a/includes/installer/BsWebInstaller.php
+++ b/includes/installer/BsWebInstaller.php
@@ -155,9 +155,6 @@
'callback' = array( $installer, 
'createExtensionTables' )
);
 
-
-   #BsConfig::saveSettings();
-   error_log(var_export(BsConfig::getRegisteredVars(),1));
return $this-installSteps;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I945801c0f15086e50db077aa004024a8b9b4c85b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Hygiene: Extend load talk module only if needed - change (mediawiki...MobileFrontend)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Hygiene: Extend load talk module only if needed
..

Hygiene: Extend load talk module only if needed

data-title (needed by talk module) is only set, if Title::canTalk is
true. If it is false, no need to load talk module.

Follow up: I134113eaac9b774755b436976d20e20474018352

Change-Id: Idf849b756e230c1739f7cc5812c88b7a367cf34b
---
M includes/skins/SkinMinervaBeta.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index 098beb3..a1c628f 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -34,7 +34,7 @@
public function getDefaultModules() {
$modules = parent::getDefaultModules();
$title = $this-getTitle();
-   if ( $this-isAllowedPageAction( 'talk' )  
!$title-isTalkPage() ) {
+   if ( $this-isAllowedPageAction( 'talk' )  
!$title-isTalkPage()  $title-canTalk() ) {
$modules['talk'] = array( 'mobile.talk' );
}
$modules['beta'] = array( 'mobile.beta' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf849b756e230c1739f7cc5812c88b7a367cf34b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de

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

[MediaWiki-commits] [Gerrit] Update glance config for icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Update glance config for icehouse
..


Update glance config for icehouse

Change-Id: I7242c02e9a5cd45cfc883952c3824a7196bd73ad
---
M modules/openstack/templates/icehouse/glance/glance-api.conf.erb
1 file changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb 
b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
index f7a0399..e658e60 100644
--- a/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-api.conf.erb
@@ -43,11 +43,6 @@
 # Not supported on OS X.
 #tcp_keepidle = 600
 
-# SQLAlchemy connection string for the reference implementation
-# registry server. Any valid SQLAlchemy connection string is fine.
-# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-sql_connection =  mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
-
 # Period in seconds after which SQLAlchemy should reestablish its connection
 # to the database.
 #
@@ -141,6 +136,7 @@
 
 # Configuration options if sending notifications via rabbitmq (these are
 # the defaults)
+rpc_backend = rabbit
 rabbit_host = localhost
 rabbit_port = 5672
 rabbit_use_ssl = false
@@ -327,3 +323,10 @@
 # [pipeline:glance-api-keystone], you would configure the flavor below
 # as 'keystone'.
 flavor=keystone
+
+[database]
+# SQLAlchemy connection string for the reference implementation
+# registry server. Any valid SQLAlchemy connection string is fine.
+# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+connection =  mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7242c02e9a5cd45cfc883952c3824a7196bd73ad
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Hygiene: Add group other to conditionally loaded modules - change (mediawiki...MobileFrontend)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Hygiene: Add group other to conditionally loaded modules
..

Hygiene: Add group other to conditionally loaded modules

Suggested on change: Idf57dec830211d38f1e0d5ea634cd19d605f090f

Change-Id: I4a670f49901ae19462f542046e6a42a2d410de9f
---
M includes/Resources.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/includes/Resources.php b/includes/Resources.php
index df3e6fd..47d911d 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -226,6 +226,7 @@
'scripts' = array(
'javascripts/modules/editor/init.js',
),
+   'group' = 'other',
),
 
'mobile.abusefilter' = $wgMFResourceFileModuleBoilerplate + array(
@@ -434,6 +435,7 @@
// for talk.js
'mobile-frontend-talk-overlay-header',
),
+   'group' = 'other',
),
 
'mobile.preferredLanguages' = $wgMFResourceFileModuleBoilerplate + 
array(
@@ -562,6 +564,7 @@
'mobile-frontend-categories-subheading',
'mobile-frontend-categories-nocat',
),
+   'group' = 'other',
),
 
'mobile.wikigrok.abTest' = $wgMFResourceFileModuleBoilerplate + array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a670f49901ae19462f542046e6a42a2d410de9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de

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

[MediaWiki-commits] [Gerrit] Upgrade labnet1001 to icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Upgrade labnet1001 to icehouse
..

Upgrade labnet1001 to icehouse

Change-Id: I35cd0ba3e3614499878f669361360f1790b5cfe4
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 2c778d2..a853af5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2882,7 +2882,7 @@
 
 node 'labnet1001.eqiad.wmnet' {
 $cluster = 'virt'
-$openstack_version = 'havana'
+$openstack_version = 'icehouse'
 $use_neutron = false
 
 $ganglia_aggregator = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35cd0ba3e3614499878f669361360f1790b5cfe4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Consolidate entries for virt1001-1009. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Consolidate entries for virt1001-1009.
..

Consolidate entries for virt1001-1009.

They were all the same, anyway.

Change-Id: I1722ab88753970077a44913d80f4faff6915d7a9
---
M manifests/site.pp
1 file changed, 1 insertion(+), 27 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 750b450..7cfda5d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2898,33 +2898,7 @@
 }
 }
 
-node /virt100[1-5].eqiad.wmnet/ {
-$cluster = 'virt'
-$openstack_version = 'havana'
-$use_neutron = false
-
-include admin
-include standard
-include role::nova::compute
-if $use_neutron == true {
-include role::neutron::computenode
-}
-}
-
-node 'virt1006.eqiad.wmnet' {
-$cluster = 'virt'
-$openstack_version = 'havana'
-$use_neutron = false
-
-include admin
-include standard
-include role::nova::compute
-if $use_neutron == true {
-include role::neutron::computenode
-}
-}
-
-node /virt100[7-9].eqiad.wmnet/ {
+node /virt100[1-9].eqiad.wmnet/ {
 $cluster = 'virt'
 $openstack_version = 'havana'
 $use_neutron = false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1722ab88753970077a44913d80f4faff6915d7a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update labs compute nodes to icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Update labs compute nodes to icehouse
..

Update labs compute nodes to icehouse

Change-Id: I03893eef9f03a53802b9979c0ee9a1a9055861cb
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/174428/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a853af5..298162a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2900,7 +2900,7 @@
 
 node /virt100[1-9].eqiad.wmnet/ {
 $cluster = 'virt'
-$openstack_version = 'havana'
+$openstack_version = 'icehouse'
 $use_neutron = false
 
 include admin

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03893eef9f03a53802b9979c0ee9a1a9055861cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Consolidate entries for virt1001-1009. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Consolidate entries for virt1001-1009.
..


Consolidate entries for virt1001-1009.

They were all the same, anyway.

Change-Id: I1722ab88753970077a44913d80f4faff6915d7a9
---
M manifests/site.pp
1 file changed, 1 insertion(+), 27 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 750b450..7cfda5d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2898,33 +2898,7 @@
 }
 }
 
-node /virt100[1-5].eqiad.wmnet/ {
-$cluster = 'virt'
-$openstack_version = 'havana'
-$use_neutron = false
-
-include admin
-include standard
-include role::nova::compute
-if $use_neutron == true {
-include role::neutron::computenode
-}
-}
-
-node 'virt1006.eqiad.wmnet' {
-$cluster = 'virt'
-$openstack_version = 'havana'
-$use_neutron = false
-
-include admin
-include standard
-include role::nova::compute
-if $use_neutron == true {
-include role::neutron::computenode
-}
-}
-
-node /virt100[7-9].eqiad.wmnet/ {
+node /virt100[1-9].eqiad.wmnet/ {
 $cluster = 'virt'
 $openstack_version = 'havana'
 $use_neutron = false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1722ab88753970077a44913d80f4faff6915d7a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] varnishkafka: do not reload on every puppet run - change (operations...varnishkafka)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: varnishkafka: do not reload on every puppet run
..

varnishkafka: do not reload on every puppet run

Because of how the notify event propagation works in puppet, the use of
notify = refreshonly = notify chains doesn't work, and results in
executing a ganglia restart on every puppet run

Change-Id: I85380223e698f10d6b48fa636876498b013d6b8b
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/monitor.pp
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/varnishkafka 
refs/changes/29/174429/1

diff --git a/manifests/monitor.pp b/manifests/monitor.pp
index a5a3c04..edba879 100644
--- a/manifests/monitor.pp
+++ b/manifests/monitor.pp
@@ -26,7 +26,7 @@
 require = File['/usr/lib/ganglia/python_modules/varnishkafka.py'],
 command = /usr/bin/python 
/usr/lib/ganglia/python_modules/varnishkafka.py --generate 
--key-prefix='${key_prefix}' --tmax=${log_statistics_interval} 
${log_statistics_file}  /etc/ganglia/conf.d/varnishkafka-${name}.pyconf.new,
 onlyif  = /usr/bin/test -s ${log_statistics_file},
-notify  = Exec[replace-varnishkafka-${name}.pyconf],
+before  = Exec[replace-varnishkafka-${name}.pyconf],
 }
 
 exec { replace-varnishkafka-${name}.pyconf:
@@ -36,6 +36,5 @@
 command = mv varnishkafka-${name}.pyconf.new 
varnishkafka-${name}.pyconf,
 require = Exec[generate-varnishkafka-${name}.pyconf],
 notify  = Service['gmond'],
-refreshonly = true,
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85380223e698f10d6b48fa636876498b013d6b8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/varnishkafka
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] varnishkafka: do not reload on every puppet run - change (operations...varnishkafka)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: varnishkafka: do not reload on every puppet run
..


varnishkafka: do not reload on every puppet run

Because of how the notify event propagation works in puppet, the use of
notify = refreshonly = notify chains doesn't work, and results in
executing a ganglia restart on every puppet run

Change-Id: I85380223e698f10d6b48fa636876498b013d6b8b
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/monitor.pp
1 file changed, 1 insertion(+), 2 deletions(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/manifests/monitor.pp b/manifests/monitor.pp
index a5a3c04..edba879 100644
--- a/manifests/monitor.pp
+++ b/manifests/monitor.pp
@@ -26,7 +26,7 @@
 require = File['/usr/lib/ganglia/python_modules/varnishkafka.py'],
 command = /usr/bin/python 
/usr/lib/ganglia/python_modules/varnishkafka.py --generate 
--key-prefix='${key_prefix}' --tmax=${log_statistics_interval} 
${log_statistics_file}  /etc/ganglia/conf.d/varnishkafka-${name}.pyconf.new,
 onlyif  = /usr/bin/test -s ${log_statistics_file},
-notify  = Exec[replace-varnishkafka-${name}.pyconf],
+before  = Exec[replace-varnishkafka-${name}.pyconf],
 }
 
 exec { replace-varnishkafka-${name}.pyconf:
@@ -36,6 +36,5 @@
 command = mv varnishkafka-${name}.pyconf.new 
varnishkafka-${name}.pyconf,
 require = Exec[generate-varnishkafka-${name}.pyconf],
 notify  = Service['gmond'],
-refreshonly = true,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85380223e698f10d6b48fa636876498b013d6b8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/varnishkafka
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] icinga: Scream in -operations too when betacluster has issues - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: icinga: Scream in -operations too when betacluster has issues
..

icinga: Scream in -operations too when betacluster has issues

Bug: T1334
Change-Id: Ic309babb4f3fcbe2b8a18709a272f8c2fc8ae3ec
---
M modules/icinga/files/contactgroups.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/174430/1

diff --git a/modules/icinga/files/contactgroups.cfg 
b/modules/icinga/files/contactgroups.cfg
index 47eb717..c9d184e 100644
--- a/modules/icinga/files/contactgroups.cfg
+++ b/modules/icinga/files/contactgroups.cfg
@@ -36,7 +36,7 @@
 
 define contactgroup {
 contactgroup_name   betalabs
-members 
gregg,amusso,cmcmahon,yuvipanda,kart,irc-qa,betacluster-alerts-list
+members 
gregg,amusso,cmcmahon,yuvipanda,kart,irc-qa,irc,betacluster-alerts-list
 }
 
 define contactgroup {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic309babb4f3fcbe2b8a18709a272f8c2fc8ae3ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] Update varnishkafka module with ganglia fix - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Update varnishkafka module with ganglia fix
..

Update varnishkafka module with ganglia fix

Change-Id: Ib119ea31a8715b8a47c5e43ddc54d57f43f94d70
---
M modules/varnishkafka
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/174431/1

diff --git a/modules/varnishkafka b/modules/varnishkafka
index be96849..f46966c 16
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
-Subproject commit be96849c8d6d95d83de8a0d14a5b04f4573a89a6
+Subproject commit f46966cd07ffd881877a72ab60c337238e68b071

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib119ea31a8715b8a47c5e43ddc54d57f43f94d70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update varnishkafka module with ganglia fix - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Update varnishkafka module with ganglia fix
..


Update varnishkafka module with ganglia fix

Change-Id: Ib119ea31a8715b8a47c5e43ddc54d57f43f94d70
---
M modules/varnishkafka
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/modules/varnishkafka b/modules/varnishkafka
index be96849..f46966c 16
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
-Subproject commit be96849c8d6d95d83de8a0d14a5b04f4573a89a6
+Subproject commit f46966cd07ffd881877a72ab60c337238e68b071

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib119ea31a8715b8a47c5e43ddc54d57f43f94d70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert Fix tracking for version - change (mediawiki...SyntaxHighlight_GeSHi)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Revert Fix tracking for version
..

Revert Fix tracking for version

This reverts commit d69ae1f3ac97404831da292145ad843574a14579.

Change-Id: Ic724f6fe1b1cbc969ac195762bdf517e129cd9dd
---
M SyntaxHighlight_GeSHi.class.php
M SyntaxHighlight_GeSHi.php
2 files changed, 14 insertions(+), 3 deletions(-)


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

diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index 2216a4d..7ac0611 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -508,6 +508,18 @@
}
 
/**
+* Get the GeSHI's version information while Special:Version is read.
+* @param $extensionTypes
+* @return bool
+*/
+   public static function extensionTypes( $extensionTypes ) {
+   global $wgExtensionCredits;
+   self::initialise();
+   
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] = 
GESHI_VERSION;
+   return true;
+   }
+
+   /**
 * Register a ResourceLoader module providing styles for each supported 
language.
 *
 * @param ResourceLoader $resourceLoader
diff --git a/SyntaxHighlight_GeSHi.php b/SyntaxHighlight_GeSHi.php
index 9a3bc97..de2c76b 100644
--- a/SyntaxHighlight_GeSHi.php
+++ b/SyntaxHighlight_GeSHi.php
@@ -40,15 +40,13 @@
die( This version of SyntaxHighlight GeSHi requires MediaWiki 1.24 );
 }
 
-define('GESHI_VERSION', '1.0.8.12');
 
-$wgExtensionCredits['parserhook'][] = array(
+$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi'] = array(
'path'   = __FILE__,
'name'   = 'SyntaxHighlight',
'author' = array( 'Brion Vibber', 'Tim Starling', 'Rob 
Church', 'Niklas Laxström' ),
'descriptionmsg' = 'syntaxhighlight-desc',
'url'= 
'https://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi',
-   'version'= GESHI_VERSION,
 );
 
 // Change these in LocalSettings.php
@@ -63,6 +61,7 @@
 $wgAutoloadClasses['ResourceLoaderGeSHiModule'] = $dir . 
'ResourceLoaderGeSHiModule.php';
 $wgAutoloadClasses['ResourceLoaderGeSHiLocalModule'] = $dir . 
'ResourceLoaderGeSHiLocalModule.php';
 
+$wgHooks['ExtensionTypes'][] = 'SyntaxHighlight_GeSHi::extensionTypes';
 $wgHooks['ResourceLoaderRegisterModules'][] = 
'SyntaxHighlight_GeSHi::resourceLoaderRegisterModules';
 $wgHooks['ContentGetParserOutput'][] = 'SyntaxHighlight_GeSHi::renderHook';
 $wgHooks['ApiFormatHighlight'][] = 'SyntaxHighlight_GeSHi::apiFormatHighlight';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic724f6fe1b1cbc969ac195762bdf517e129cd9dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Revert Fix tracking for version - change (mediawiki...SyntaxHighlight_GeSHi)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Revert Fix tracking for version
..


Revert Fix tracking for version

This reverts commit d69ae1f3ac97404831da292145ad843574a14579.

Change-Id: Ic724f6fe1b1cbc969ac195762bdf517e129cd9dd
---
M SyntaxHighlight_GeSHi.class.php
M SyntaxHighlight_GeSHi.php
2 files changed, 13 insertions(+), 3 deletions(-)

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



diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index e5c9d3a..21c7d04 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -501,6 +501,18 @@
}
 
/**
+* Get the GeSHI's version information while Special:Version is read.
+* @param $extensionTypes
+* @return bool
+*/
+   public static function extensionTypes( $extensionTypes ) {
+   global $wgExtensionCredits;
+   self::initialise();
+   
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] = 
GESHI_VERSION;
+   return true;
+   }
+
+   /**
 * Register a ResourceLoader module providing styles for each supported 
language.
 *
 * @param ResourceLoader $resourceLoader
diff --git a/SyntaxHighlight_GeSHi.php b/SyntaxHighlight_GeSHi.php
index ac6420a..7b0ef4b 100644
--- a/SyntaxHighlight_GeSHi.php
+++ b/SyntaxHighlight_GeSHi.php
@@ -40,8 +40,6 @@
die( This version of SyntaxHighlight GeSHi requires MediaWiki 1.24 );
 }
 
-define('GESHI_VERSION', '1.0.8.12');
-
 include_once __DIR__ . '/SyntaxHighlight_GeSHi.langs.php';
 
 $wgExtensionCredits['parserhook'][] = array(
@@ -50,7 +48,6 @@
'author' = array( 'Brion Vibber', 'Tim Starling', 'Rob 
Church', 'Niklas Laxström' ),
'descriptionmsg' = 'syntaxhighlight-desc',
'url'= 
'https://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi',
-   'version'= GESHI_VERSION,
 );
 
 // Change these in LocalSettings.php
@@ -65,6 +62,7 @@
 $wgAutoloadClasses['ResourceLoaderGeSHiModule'] = $dir . 
'ResourceLoaderGeSHiModule.php';
 $wgAutoloadClasses['ResourceLoaderGeSHiLocalModule'] = $dir . 
'ResourceLoaderGeSHiLocalModule.php';
 
+$wgHooks['ExtensionTypes'][] = 'SyntaxHighlight_GeSHi::extensionTypes';
 $wgHooks['ResourceLoaderRegisterModules'][] = 
'SyntaxHighlight_GeSHi::resourceLoaderRegisterModules';
 $wgHooks['ContentGetParserOutput'][] = 'SyntaxHighlight_GeSHi::renderHook';
 $wgHooks['ApiFormatHighlight'][] = 'SyntaxHighlight_GeSHi::apiFormatHighlight';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic724f6fe1b1cbc969ac195762bdf517e129cd9dd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update virt1000 (labs controller node) to icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Update virt1000 (labs controller node) to icehouse
..


Update virt1000 (labs controller node) to icehouse

Change-Id: Ib998e9ba355b4ec73e3d5b46c5257f7021d1f40f
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 7cfda5d..2c778d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2822,7 +2822,7 @@
 $ganglia_aggregator= true
 $is_puppet_master  = true
 $is_labs_puppet_master = true
-$openstack_version = 'havana'
+$openstack_version = 'icehouse'
 $use_neutron   = false
 
 include standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib998e9ba355b4ec73e3d5b46c5257f7021d1f40f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Fix GESHI version - change (mediawiki...SyntaxHighlight_GeSHi)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Fix GESHI version
..

Fix GESHI version

* This fixes a problem in https://gerrit.wikimedia.org/r/#/c/172581/ which 
caused an error saying GESHI version constrant is defined twice.

Bug: 73567
Change-Id: I836e0df942a066d80255c1b68472e7ee58124357
---
M SyntaxHighlight_GeSHi.class.php
M SyntaxHighlight_GeSHi.php
M geshi/geshi.php
3 files changed, 15 insertions(+), 4 deletions(-)


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

diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index e5c9d3a..21c7d04 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -501,6 +501,18 @@
}
 
/**
+* Get the GeSHI's version information while Special:Version is read.
+* @param $extensionTypes
+* @return bool
+*/
+   public static function extensionTypes( $extensionTypes ) {
+   global $wgExtensionCredits;
+   self::initialise();
+   
$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] = 
GESHI_VERSION;
+   return true;
+   }
+
+   /**
 * Register a ResourceLoader module providing styles for each supported 
language.
 *
 * @param ResourceLoader $resourceLoader
diff --git a/SyntaxHighlight_GeSHi.php b/SyntaxHighlight_GeSHi.php
index ac6420a..7b0ef4b 100644
--- a/SyntaxHighlight_GeSHi.php
+++ b/SyntaxHighlight_GeSHi.php
@@ -40,8 +40,6 @@
die( This version of SyntaxHighlight GeSHi requires MediaWiki 1.24 );
 }
 
-define('GESHI_VERSION', '1.0.8.12');
-
 include_once __DIR__ . '/SyntaxHighlight_GeSHi.langs.php';
 
 $wgExtensionCredits['parserhook'][] = array(
@@ -50,7 +48,6 @@
'author' = array( 'Brion Vibber', 'Tim Starling', 'Rob 
Church', 'Niklas Laxström' ),
'descriptionmsg' = 'syntaxhighlight-desc',
'url'= 
'https://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi',
-   'version'= GESHI_VERSION,
 );
 
 // Change these in LocalSettings.php
@@ -65,6 +62,7 @@
 $wgAutoloadClasses['ResourceLoaderGeSHiModule'] = $dir . 
'ResourceLoaderGeSHiModule.php';
 $wgAutoloadClasses['ResourceLoaderGeSHiLocalModule'] = $dir . 
'ResourceLoaderGeSHiLocalModule.php';
 
+$wgHooks['ExtensionTypes'][] = 'SyntaxHighlight_GeSHi::extensionTypes';
 $wgHooks['ResourceLoaderRegisterModules'][] = 
'SyntaxHighlight_GeSHi::resourceLoaderRegisterModules';
 $wgHooks['ContentGetParserOutput'][] = 'SyntaxHighlight_GeSHi::renderHook';
 $wgHooks['ApiFormatHighlight'][] = 'SyntaxHighlight_GeSHi::apiFormatHighlight';
diff --git a/geshi/geshi.php b/geshi/geshi.php
index 405ff16..16af2cc 100644
--- a/geshi/geshi.php
+++ b/geshi/geshi.php
@@ -41,7 +41,8 @@
 //
 
 /** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.8.12');
+/** Added this to SyntaxHighlight_GeSHi.php due to it not showing up in api */
+//define('GESHI_VERSION', '1.0.8.12');
 
 // Define the root directory for the GeSHi code tree
 if (!defined('GESHI_ROOT')) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I836e0df942a066d80255c1b68472e7ee58124357
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Pass wiki to jump-url, and $suffix and $params into $wgConf-... - change (mediawiki...SecurePoll)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Pass wiki to jump-url, and $suffix and $params into 
$wgConf-get()
..


Pass wiki to jump-url, and $suffix and $params into $wgConf-get()

Since I3a90ae7f, the remote auth requires the source wiki ID. So let's
make sure it gets passed from SecurePoll_VotePage.

But just the wiki isn't enough for $wgConf-get(), as (1) it won't
always pick up if wgServer is defined by suffixes and (2) it may have
$lang and other variables in it that need translation. We can derive
the site and lang from 'wiki' if we don't already have them, and then
derive the suffix from the site.

Bug: 73588
Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
---
M includes/pages/VotePage.php
M includes/user/Auth.php
2 files changed, 24 insertions(+), 1 deletion(-)

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



diff --git a/includes/pages/VotePage.php b/includes/pages/VotePage.php
index f0d9cda..f2935d5 100644
--- a/includes/pages/VotePage.php
+++ b/includes/pages/VotePage.php
@@ -243,6 +243,7 @@
Xml::openElement( 'form', array( 'action' = $url, 
'method' = 'post' ) ) .
Html::hidden( 'token', 
SecurePoll_RemoteMWAuth::encodeToken( $wgUser-getToken() ) ) .
Html::hidden( 'id', $wgUser-getId() ) .
+   Html::hidden( 'wiki', wfWikiID() ) .
Xml::submitButton( wfMsg( 'securepoll-jump' ) ) .
'/form'
);
diff --git a/includes/user/Auth.php b/includes/user/Auth.php
index 1a252ec..2075a27 100644
--- a/includes/user/Auth.php
+++ b/includes/user/Auth.php
@@ -318,7 +318,29 @@
}
 
$wgConf-loadFullData();
-   $server = $wgConf-get( 'wgServer', $params['wiki'] );
+
+   // Get the site and language from $wgConf, if necessary.
+   if ( !isset( $params['site'] ) || !isset( $params['lang'] ) ) {
+   list( $site, $lang ) = $wgConf-siteFromDB( 
$params['wiki'] );
+   if ( !isset( $params['site'] ) ) {
+   $params['site'] = $site;
+   $vars['$site'] = $site;
+   }
+   if ( !isset( $params['lang'] ) ) {
+   $params['lang'] = $lang;
+   $vars['$lang'] = $lang;
+   }
+   }
+
+   // In some cases it doesn't matter what we pass for $suffix. 
When it
+   // does, the correct value is $params['site'] unless there is a 
string
+   // back-mapping for it in $wgConf-suffixes.
+   $suffixes = array_flip( $wgConf-suffixes );
+   $suffix = isset( $suffixes[$params['site']] )  is_string( 
$suffixes[$params['site']] )
+   ? $suffixes[$params['site']]
+   : $params['site'];
+
+   $server = $wgConf-get( 'wgServer', $params['wiki'], $suffix, 
$params );
$params['wgServer'] = $server;
$vars[\$wgServer] = $server;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] enwiki gets Cirrus as primary - change (operations/mediawiki-config)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: enwiki gets Cirrus as primary
..

enwiki gets Cirrus as primary

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b5d1044..571fa6f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13972,7 +13972,6 @@
 
 'wmgUseCirrus' = array(
'default' = true,
-   'enwiki' = false,
 ),
 
 'wmgUseCirrusAsAlternative' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb856c7e6d04768418d567553a4f60199121b7c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update keystone config file for icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Update keystone config file for icehouse
..

Update keystone config file for icehouse

Change-Id: Ic82bafa3c81e9fef7ee3e7d3e9811e96366d2184
---
M modules/openstack/templates/icehouse/keystone/keystone.conf.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/174435/1

diff --git a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb 
b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
index 3bf5e93..e9364d1 100644
--- a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
+++ b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
@@ -54,6 +54,8 @@
 # onready = keystone.common.systemd
 
 [sql]
+
+[database]
 # The SQLAlchemy connection string used to connect to the database
 connection = mysql://%= keystoneconfig[db_user] %:%= 
keystoneconfig[db_pass] %@%= keystoneconfig[db_host] %/%= 
keystoneconfig[db_name] %
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic82bafa3c81e9fef7ee3e7d3e9811e96366d2184
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Pass wiki to jump-url, and $suffix and $params into $wgConf-... - change (mediawiki...SecurePoll)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Pass wiki to jump-url, and $suffix and $params into 
$wgConf-get()
..

Pass wiki to jump-url, and $suffix and $params into $wgConf-get()

Since I3a90ae7f, the remote auth requires the source wiki ID. So let's
make sure it gets passed from SecurePoll_VotePage.

But just the wiki isn't enough for $wgConf-get(), as (1) it won't
always pick up if wgServer is defined by suffixes and (2) it may have
$lang and other variables in it that need translation. We can derive
the site and lang from 'wiki' if we don't already have them, and then
derive the suffix from the site.

Bug: 73588
Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
(cherry picked from commit 7cb1964fcfa7a6732352e23555ab39723fe3c4ef)
---
M includes/pages/VotePage.php
M includes/user/Auth.php
2 files changed, 24 insertions(+), 1 deletion(-)


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

diff --git a/includes/pages/VotePage.php b/includes/pages/VotePage.php
index f0d9cda..f2935d5 100644
--- a/includes/pages/VotePage.php
+++ b/includes/pages/VotePage.php
@@ -243,6 +243,7 @@
Xml::openElement( 'form', array( 'action' = $url, 
'method' = 'post' ) ) .
Html::hidden( 'token', 
SecurePoll_RemoteMWAuth::encodeToken( $wgUser-getToken() ) ) .
Html::hidden( 'id', $wgUser-getId() ) .
+   Html::hidden( 'wiki', wfWikiID() ) .
Xml::submitButton( wfMsg( 'securepoll-jump' ) ) .
'/form'
);
diff --git a/includes/user/Auth.php b/includes/user/Auth.php
index 1a252ec..2075a27 100644
--- a/includes/user/Auth.php
+++ b/includes/user/Auth.php
@@ -318,7 +318,29 @@
}
 
$wgConf-loadFullData();
-   $server = $wgConf-get( 'wgServer', $params['wiki'] );
+
+   // Get the site and language from $wgConf, if necessary.
+   if ( !isset( $params['site'] ) || !isset( $params['lang'] ) ) {
+   list( $site, $lang ) = $wgConf-siteFromDB( 
$params['wiki'] );
+   if ( !isset( $params['site'] ) ) {
+   $params['site'] = $site;
+   $vars['$site'] = $site;
+   }
+   if ( !isset( $params['lang'] ) ) {
+   $params['lang'] = $lang;
+   $vars['$lang'] = $lang;
+   }
+   }
+
+   // In some cases it doesn't matter what we pass for $suffix. 
When it
+   // does, the correct value is $params['site'] unless there is a 
string
+   // back-mapping for it in $wgConf-suffixes.
+   $suffixes = array_flip( $wgConf-suffixes );
+   $suffix = isset( $suffixes[$params['site']] )  is_string( 
$suffixes[$params['site']] )
+   ? $suffixes[$params['site']]
+   : $params['site'];
+
+   $server = $wgConf-get( 'wgServer', $params['wiki'], $suffix, 
$params );
$params['wgServer'] = $server;
$vars[\$wgServer] = $server;
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Anomie bjor...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Pass wiki to jump-url, and $suffix and $params into $wgConf-... - change (mediawiki...SecurePoll)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Pass wiki to jump-url, and $suffix and $params into 
$wgConf-get()
..


Pass wiki to jump-url, and $suffix and $params into $wgConf-get()

Since I3a90ae7f, the remote auth requires the source wiki ID. So let's
make sure it gets passed from SecurePoll_VotePage.

But just the wiki isn't enough for $wgConf-get(), as (1) it won't
always pick up if wgServer is defined by suffixes and (2) it may have
$lang and other variables in it that need translation. We can derive
the site and lang from 'wiki' if we don't already have them, and then
derive the suffix from the site.

Bug: 73588
Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
(cherry picked from commit 7cb1964fcfa7a6732352e23555ab39723fe3c4ef)
---
M includes/pages/VotePage.php
M includes/user/Auth.php
2 files changed, 24 insertions(+), 1 deletion(-)

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



diff --git a/includes/pages/VotePage.php b/includes/pages/VotePage.php
index f0d9cda..f2935d5 100644
--- a/includes/pages/VotePage.php
+++ b/includes/pages/VotePage.php
@@ -243,6 +243,7 @@
Xml::openElement( 'form', array( 'action' = $url, 
'method' = 'post' ) ) .
Html::hidden( 'token', 
SecurePoll_RemoteMWAuth::encodeToken( $wgUser-getToken() ) ) .
Html::hidden( 'id', $wgUser-getId() ) .
+   Html::hidden( 'wiki', wfWikiID() ) .
Xml::submitButton( wfMsg( 'securepoll-jump' ) ) .
'/form'
);
diff --git a/includes/user/Auth.php b/includes/user/Auth.php
index 1a252ec..2075a27 100644
--- a/includes/user/Auth.php
+++ b/includes/user/Auth.php
@@ -318,7 +318,29 @@
}
 
$wgConf-loadFullData();
-   $server = $wgConf-get( 'wgServer', $params['wiki'] );
+
+   // Get the site and language from $wgConf, if necessary.
+   if ( !isset( $params['site'] ) || !isset( $params['lang'] ) ) {
+   list( $site, $lang ) = $wgConf-siteFromDB( 
$params['wiki'] );
+   if ( !isset( $params['site'] ) ) {
+   $params['site'] = $site;
+   $vars['$site'] = $site;
+   }
+   if ( !isset( $params['lang'] ) ) {
+   $params['lang'] = $lang;
+   $vars['$lang'] = $lang;
+   }
+   }
+
+   // In some cases it doesn't matter what we pass for $suffix. 
When it
+   // does, the correct value is $params['site'] unless there is a 
string
+   // back-mapping for it in $wgConf-suffixes.
+   $suffixes = array_flip( $wgConf-suffixes );
+   $suffix = isset( $suffixes[$params['site']] )  is_string( 
$suffixes[$params['site']] )
+   ? $suffixes[$params['site']]
+   : $params['site'];
+
+   $server = $wgConf-get( 'wgServer', $params['wiki'], $suffix, 
$params );
$params['wgServer'] = $server;
$vars[\$wgServer] = $server;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14cb6b446662f9c3ac31f8a93a60dd13d22d6e34
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update keystone config file for icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Update keystone config file for icehouse
..


Update keystone config file for icehouse

Change-Id: Ic82bafa3c81e9fef7ee3e7d3e9811e96366d2184
---
M modules/openstack/templates/icehouse/keystone/keystone.conf.erb
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb 
b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
index 3bf5e93..f436f11 100644
--- a/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
+++ b/modules/openstack/templates/icehouse/keystone/keystone.conf.erb
@@ -54,12 +54,13 @@
 # onready = keystone.common.systemd
 
 [sql]
-# The SQLAlchemy connection string used to connect to the database
-connection = mysql://%= keystoneconfig[db_user] %:%= 
keystoneconfig[db_pass] %@%= keystoneconfig[db_host] %/%= 
keystoneconfig[db_name] %
-
 # the timeout before idle sql connections are reaped
 # idle_timeout = 200
 
+[database]
+# The SQLAlchemy connection string used to connect to the database
+connection = mysql://%= keystoneconfig[db_user] %:%= 
keystoneconfig[db_pass] %@%= keystoneconfig[db_host] %/%= 
keystoneconfig[db_name] %
+
 [identity]
 driver = keystone.identity.backends.ldap.Identity
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic82bafa3c81e9fef7ee3e7d3e9811e96366d2184
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update SecurePoll with [[gerrit:174436]] - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Update SecurePoll with [[gerrit:174436]]
..

Update SecurePoll with [[gerrit:174436]]

Change-Id: I6d344b1842385b98cb4b151a5a2ea0b1b3f7de0e
---
M extensions/SecurePoll
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/extensions/SecurePoll b/extensions/SecurePoll
index aa9d461..d002bca 16
--- a/extensions/SecurePoll
+++ b/extensions/SecurePoll
-Subproject commit aa9d461762c3615ca7ff925f42f4a8aef2e6d573
+Subproject commit d002bca3efd779b5f54cd3fbd11e5841a71b2c55

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d344b1842385b98cb4b151a5a2ea0b1b3f7de0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Anomie bjor...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update SecurePoll with [[gerrit:174436]] - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has submitted this change and it was merged.

Change subject: Update SecurePoll with [[gerrit:174436]]
..


Update SecurePoll with [[gerrit:174436]]

Change-Id: I6d344b1842385b98cb4b151a5a2ea0b1b3f7de0e
---
M extensions/SecurePoll
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/SecurePoll b/extensions/SecurePoll
index aa9d461..d002bca 16
--- a/extensions/SecurePoll
+++ b/extensions/SecurePoll
-Subproject commit aa9d461762c3615ca7ff925f42f4a8aef2e6d573
+Subproject commit d002bca3efd779b5f54cd3fbd11e5841a71b2c55

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d344b1842385b98cb4b151a5a2ea0b1b3f7de0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use CirrusSearch by default for enwiki - change (operations/mediawiki-config)

[Manybubbles (Code Review)]

Manybubbles has uploaded a new change for review.

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

Change subject: Use CirrusSearch by default for enwiki
..

Use CirrusSearch by default for enwiki

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b5d1044..571fa6f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13972,7 +13972,6 @@
 
 'wmgUseCirrus' = array(
'default' = true,
-   'enwiki' = false,
 ),
 
 'wmgUseCirrusAsAlternative' = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3193476a765ed90d14f975a4596ad954eba19aca
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Manybubbles never...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] enwiki gets Cirrus as primary - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: enwiki gets Cirrus as primary
..


enwiki gets Cirrus as primary

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

Approvals:
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  Manybubbles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b5d1044..571fa6f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13972,7 +13972,6 @@
 
 'wmgUseCirrus' = array(
'default' = true,
-   'enwiki' = false,
 ),
 
 'wmgUseCirrusAsAlternative' = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb856c7e6d04768418d567553a4f60199121b7c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Disable decorators and wrappers when not __debug__ - change (pywikibot/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Disable decorators and wrappers when not __debug__
..


Disable decorators and wrappers when not __debug__

When python is called with -O, it optimises the code and
sets __debug__ to False, which may be used to disable
blocks of code not suitable for an optimised tool.

This patch disables decorators and wrappers, which provide
deprecation facilities or check the server version and user
rights before performing an operation.  In optimise mode
the caller must explicitly login, avoid deprecated arguments,
check the server versions  features.

epydoc can be generated using:

python -O /usr/bin/epydoc pywikibot

Bug: 72424
Change-Id: I67ed6b3e79ac46ef92e2b08ef6c606fd7177bae2
---
M pywikibot/site.py
M pywikibot/tools.py
M tests/aspects.py
M tests/deprecation_tests.py
M tests/dry_site_tests.py
5 files changed, 46 insertions(+), 7 deletions(-)

Approvals:
  John Vandenberg: Looks good to me, but someone else must approve
  XZise: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/site.py b/pywikibot/site.py
index c727248..dd994e2 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -963,6 +963,10 @@
 else:
 raise Exception(Not implemented)
 return fn(self, *args, **kwargs)
+
+if not __debug__:
+return fn
+
 callee.__name__ = fn.__name__
 callee.__doc__ = fn.__doc__
 callee.__module__ = callee.__module__
@@ -990,6 +994,10 @@
 uisn't implemented in MediaWiki version  %s
 % (fn.__name__, version))
 return fn(self, *args, **kwargs)
+
+if not __debug__:
+return fn
+
 callee.__name__ = fn.__name__
 callee.__doc__ = fn.__doc__
 callee.__module__ = fn.__module__
diff --git a/pywikibot/tools.py b/pywikibot/tools.py
index ad890eb..d71ad8a 100644
--- a/pywikibot/tools.py
+++ b/pywikibot/tools.py
@@ -438,6 +438,7 @@
 Python 3 iterator method.
 return self.next()
 
+
 # Decorators
 #
 # Decorator functions without parameters are _invoked_ differently from
@@ -536,6 +537,9 @@
 else:
 return inner_wrapper
 
+if not __debug__:
+return obj
+
 return outer_wrapper
 
 
@@ -571,6 +575,9 @@
 warning(u%s is deprecated. % (name))
 return obj(*args, **kwargs)
 
+if not __debug__:
+return obj
+
 wrapper.__doc__ = obj.__doc__
 wrapper.__name__ = obj.__name__
 wrapper.__module__ = obj.__module__
@@ -586,6 +593,9 @@
 
 # When called as @deprecated, return a replacement function
 if without_parameters:
+if not __debug__:
+return args[0]
+
 return decorator(args[0])
 # Otherwise return a decorator, which returns a replacement function
 else:
@@ -646,6 +656,9 @@
 del __kw[old_arg]
 return obj(*__args, **__kw)
 
+if not __debug__:
+return obj
+
 wrapper.__doc__ = obj.__doc__
 wrapper.__name__ = obj.__name__
 wrapper.__module__ = obj.__module__
@@ -704,6 +717,10 @@
old=old_name or target.__name__,
target=target_module,
source=source_module)
+
+if not __debug__:
+return target
+
 return call
 
 
@@ -726,7 +743,9 @@
 super(ModuleDeprecationWrapper, self).__setattr__('_deprecated', {})
 super(ModuleDeprecationWrapper, self).__setattr__('_module', module)
 super(ModuleDeprecationWrapper, self).__setattr__('__doc__', 
module.__doc__)
-sys.modules[module.__name__] = self
+
+if __debug__:
+sys.modules[module.__name__] = self
 
 def _add_deprecated_attr(self, name, replacement=None,
  replacement_name=None):
diff --git a/tests/aspects.py b/tests/aspects.py
index f134dcc..00ee838 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -915,7 +915,19 @@
 user = True
 
 
-class DeprecationTestCase(TestCase):
+class DebugOnlyTestCase(TestCase):
+
+Test cases that only operate in debug mode.
+
+@classmethod
+def setUpClass(cls):
+if not __debug__:
+raise unittest.SkipTest(
+'%s is disabled when __debug__ is disabled.' % cls.__name__)
+super(DebugOnlyTestCase, cls).setUpClass()
+
+
+class DeprecationTestCase(DebugOnlyTestCase, TestCase):
 
 Test cases for deprecation function in the tools module.
 
diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py
index bbdf02b..98f3ccc 100644
--- a/tests/deprecation_tests.py
+++ b/tests/deprecation_tests.py
@@ -10,7 +10,7 @@
 from pywikibot.tools import (
 deprecated, deprecate_arg, deprecated_args, add_full_name
 )
-from 

[MediaWiki-commits] [Gerrit] Include spark CDH .deb in apt - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Include spark CDH .deb in apt
..

Include spark CDH .deb in apt

Change-Id: Id8da50f2015dacf7af9cf4b799bac59a37c784da
---
M modules/install-server/files/reprepro/updates
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/174440/1

diff --git a/modules/install-server/files/reprepro/updates 
b/modules/install-server/files/reprepro/updates
index e0887a6..232a17f 100644
--- a/modules/install-server/files/reprepro/updates
+++ b/modules/install-server/files/reprepro/updates
@@ -16,7 +16,7 @@
 Suite: precise-cdh5.0.2
 Architectures: amd64 source
 VerifyRelease: 327574EE02A818DD
-ListShellHook: grep-dctrl -e -S 
'^zookeeper$|^hadoop$|^hadoop-0.20-mapreduce$|^bigtop-jsvc$|^bigtop-utils$|^sqoop$|^hbase$|^pig$|^pig-udf-datafu$|^hive$|^oozie$|^hue$|^bigtop-tomcat$|^spark$|^avro-libs$|^parquet$|^parquet-format$'
  || [ $? -eq 1 ]
+ListShellHook: grep-dctrl -e -S 
'^zookeeper$|^hadoop$|^hadoop-0.20-mapreduce$|^bigtop-jsvc$|^bigtop-utils$|^sqoop$|^hbase$|^pig$|^pig-udf-datafu$|^hive$|^oozie$|^hue$|^bigtop-tomcat$|^spark$|^avro-libs$|^parquet$|^parquet-format|spark$'
  || [ $? -eq 1 ]
 
 Name: hwraid
 Method: http://hwraid.le-vert.net/ubuntu

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8da50f2015dacf7af9cf4b799bac59a37c784da
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Correct returnto on Special:UserLogout - change (mediawiki...OAuthAuthentication)

[CSteipp (Code Review)]

CSteipp has uploaded a new change for review.

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

Change subject: Correct returnto on Special:UserLogout
..

Correct returnto on Special:UserLogout

If you clicked the login link while on Special:UserLogout (you want to
immediately login as another usre), you were redirected to
Special:Logout as soon as you logged in via OAuth, so the user was
immediatly logged out.

Change-Id: Id3af65e32a32bb7fcf9cd94635f9d84192b8ea03
---
M utils/Hooks.php
1 file changed, 14 insertions(+), 7 deletions(-)


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

diff --git a/utils/Hooks.php b/utils/Hooks.php
index 6df4a81..23c207d 100644
--- a/utils/Hooks.php
+++ b/utils/Hooks.php
@@ -8,14 +8,21 @@
$wgOAuthAuthenticationAllowLocalUsers, 
$wgOAuthAuthenticationRemoteName;
 
if ( $wgUser-getID() == 0 ) {
+
$query = array();
-   $query['returnto'] = $title-getPrefixedText();
-   $returntoquery = $wgRequest-getValues();
-   unset( $returntoquery['title'] );
-   unset( $returntoquery['returnto'] );
-   unset( $returntoquery['returntoquery'] );
-   $query['returntoquery'] = wfArrayToCgi( $returntoquery 
);
-   $personal_urls['login']['href'] = 
\SpecialPage::getTitleFor( 'OAuthLogin', 'init' )-getFullURL( $query );
+   if ( $title-isSpecial( 'Userlogout' ) ) {
+   $query['returnto'] =  $wgRequest-getVal( 
'returnto', 'Main_Page' );
+   $query['returntoquery'] =  $wgRequest-getVal( 
'returntoquery' );
+   } else {
+   $query['returnto'] = $title-getPrefixedText();
+   $returntoquery = $wgRequest-getValues();
+   unset( $returntoquery['title'] );
+   unset( $returntoquery['returnto'] );
+   unset( $returntoquery['returntoquery'] );
+   $query['returntoquery'] = wfArrayToCgi( 
$returntoquery );
+   }
+   $personal_urls['login']['href'] =
+   \SpecialPage::getTitleFor( 'OAuthLogin', 'init' 
)-getFullURL( $query );
if ( $wgOAuthAuthenticationRemoteName ) {
$personal_urls['login']['text'] = wfMessage( 
'oauthauth-login',
$wgOAuthAuthenticationRemoteName 
)-text();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3af65e32a32bb7fcf9cd94635f9d84192b8ea03
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuthAuthentication
Gerrit-Branch: master
Gerrit-Owner: CSteipp cste...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: cfb20ef..591f3fc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: cfb20ef..591f3fc
..

Syncronize VisualEditor: cfb20ef..591f3fc

Change-Id: I8fd00468739ed7f959079ebbbfd7e3b2dba513e7
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/41/174441/1

diff --git a/VisualEditor b/VisualEditor
index cfb20ef..591f3fc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit cfb20ef8a1626ddc648e11be56ed92fdf568ead9
+Subproject commit 591f3fcedbc2c77befb43db314e204bfb35f5111

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fd00468739ed7f959079ebbbfd7e3b2dba513e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] API i18n: Fix consistency in messages - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: API i18n: Fix consistency in messages
..


API i18n: Fix consistency in messages

Fixed consistency in two messages and added article to a third.
Affected messages:
* apihelp-visualeditor-description
* apihelp-visualeditor-param-oldid
* apihelp-visualeditoredit-param-oldid

Reported at:
https://translatewiki.net/wiki/MediaWiki:Apihelp-visualeditor-param-oldid/sv
https://translatewiki.net/wiki/MediaWiki:Apihelp-visualeditoredit-param-oldid/sv

Change-Id: I054cf021482276c3676e91d9cf9f6fcdfc12d583
---
M modules/ve-mw/i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  Nemo bis: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 56adcc7..9d4cddf 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -18,12 +18,12 @@
},
accesskey-ca-editsource: e,
accesskey-ca-ve-edit: v,
-   apihelp-visualeditor-description: Returns HTML5 for a page from the 
parsoid service.,
+   apihelp-visualeditor-description: Returns HTML5 for a page from the 
Parsoid service.,
apihelp-visualeditor-param-basetimestamp: When saving, set this to 
the timestamp of the revision that was edited. Used to detect edit conflicts.,
apihelp-visualeditor-param-cachekey: For serialize or diff, use the 
result of a previous serializeforcache request with this key. Overrides 
$1html.,
apihelp-visualeditor-param-format: ,
apihelp-visualeditor-param-html: HTML to send to Parsoid to convert 
to wikitext.,
-   apihelp-visualeditor-param-oldid: The revision number to use 
(defaults to latest version).,
+   apihelp-visualeditor-param-oldid: The revision number to use 
(defaults to latest revision).,
apihelp-visualeditor-param-paction: Action to perform.,
apihelp-visualeditor-param-page: The page to perform actions on.,
apihelp-visualeditor-param-pst: Pre-save transform wikitext before 
sending it to Parsoid (paction=parsefragment).,
@@ -37,7 +37,7 @@
apihelp-visualeditoredit-param-html: HTML to send to Parsoid in 
exchange for wikitext.,
apihelp-visualeditoredit-param-minor: Flag for minor edit.,
apihelp-visualeditoredit-param-needcheck: When saving, set this 
parameter if the revision might have roundtrip problems. This will result in 
the edit being tagged.,
-   apihelp-visualeditoredit-param-oldid: The revision number to use. 
Defaults to latest revision. Use 0 for new page.,
+   apihelp-visualeditoredit-param-oldid: The revision number to use. 
Defaults to latest revision. Use 0 for a new page.,
apihelp-visualeditoredit-param-page: The page to perform actions 
on.,
apihelp-visualeditoredit-param-starttimestamp: When saving, set this 
to the timestamp of when the page was loaded. Used to detect edit conflicts.,
apihelp-visualeditoredit-param-summary: Edit summary.,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I054cf021482276c3676e91d9cf9f6fcdfc12d583
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil lokal.pro...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: cfb20ef..591f3fc - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: cfb20ef..591f3fc
..


Syncronize VisualEditor: cfb20ef..591f3fc

Change-Id: I8fd00468739ed7f959079ebbbfd7e3b2dba513e7
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index cfb20ef..591f3fc 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit cfb20ef8a1626ddc648e11be56ed92fdf568ead9
+Subproject commit 591f3fcedbc2c77befb43db314e204bfb35f5111

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fd00468739ed7f959079ebbbfd7e3b2dba513e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org
Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Segment enwiki's cirrus poolcounter traffic from the rest - change (operations/mediawiki-config)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Segment enwiki's cirrus poolcounter traffic from the rest
..

Segment enwiki's cirrus poolcounter traffic from the rest

Change-Id: Ia6a4e29b49b96bcaab3b39eb608935b4065fd00d
---
M wmf-config/CirrusSearch-production.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index 0ae8923..4fbdf8c 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -39,3 +39,7 @@
$wgCirrusSearchInterwikiSources = $interwikiSearchConf;
$wgCirrusSearchInterwikiCacheTime = 60;
 }
+
+if ( $wgDBname == 'enwiki' ) {
+   $wgCirrusSearchPoolCounterKey .= '_enwiki';
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6a4e29b49b96bcaab3b39eb608935b4065fd00d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Include spark CDH .deb in apt - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Include spark CDH .deb in apt
..


Include spark CDH .deb in apt

Change-Id: Id8da50f2015dacf7af9cf4b799bac59a37c784da
---
M modules/install-server/files/reprepro/updates
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/install-server/files/reprepro/updates 
b/modules/install-server/files/reprepro/updates
index e0887a6..e713b23 100644
--- a/modules/install-server/files/reprepro/updates
+++ b/modules/install-server/files/reprepro/updates
@@ -16,7 +16,7 @@
 Suite: precise-cdh5.0.2
 Architectures: amd64 source
 VerifyRelease: 327574EE02A818DD
-ListShellHook: grep-dctrl -e -S 
'^zookeeper$|^hadoop$|^hadoop-0.20-mapreduce$|^bigtop-jsvc$|^bigtop-utils$|^sqoop$|^hbase$|^pig$|^pig-udf-datafu$|^hive$|^oozie$|^hue$|^bigtop-tomcat$|^spark$|^avro-libs$|^parquet$|^parquet-format$'
  || [ $? -eq 1 ]
+ListShellHook: grep-dctrl -e -S 
'^zookeeper$|^hadoop$|^hadoop-0.20-mapreduce$|^bigtop-jsvc$|^bigtop-utils$|^sqoop$|^hbase$|^pig$|^pig-udf-datafu$|^hive$|^oozie$|^hue$|^bigtop-tomcat$|^spark$|^avro-libs$|^parquet$|^parquet-format$|^spark-core$|^spark-history-server$|^spark-master$|^spark-python$|^spark-worker$'
  || [ $? -eq 1 ]
 
 Name: hwraid
 Method: http://hwraid.le-vert.net/ubuntu

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8da50f2015dacf7af9cf4b799bac59a37c784da
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Hygiene: Use the core AutoloadGenerator - change (mediawiki...Echo)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Hygiene: Use the core AutoloadGenerator
..

Hygiene: Use the core AutoloadGenerator

Change-Id: I500bb17680a8d0756f09d1f57a0e1a02439bf618
---
M autoload.php
M scripts/gen-autoload.php
2 files changed, 102 insertions(+), 224 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/44/17/1

diff --git a/autoload.php b/autoload.php
index b856469..092d347 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1,97 +1,102 @@
 ?php
+// This file is generated by scripts/gen-autoload.php, do not adjust manually
 
-$wgAutoloadClasses['ApiEchoMarkRead'] = __DIR__ . '/api/ApiEchoMarkRead.php';
-$wgAutoloadClasses['ApiEchoMarkReadTest'] = __DIR__ . 
'/tests/phpunit/api/ApiEchoMarkReadTest.php';
-$wgAutoloadClasses['ApiEchoNotifications'] = __DIR__ . 
'/api/ApiEchoNotifications.php';
-$wgAutoloadClasses['ApiEchoNotificationsTest'] = __DIR__ . 
'/tests/phpunit/api/ApiEchoNotificationsTest.php';
-$wgAutoloadClasses['BatchRowUpdateTest'] = __DIR__ . 
'/tests/phpunit/includes/BatchRowUpdateTest.php';
-$wgAutoloadClasses['CallbackFilterIterator'] = __DIR__ . 
'/includes/iterator/CallbackFilterIterator.php';
-$wgAutoloadClasses['ContainmentSetTest'] = __DIR__ . 
'/tests/phpunit/includes/ContainmentSetTest.php';
-$wgAutoloadClasses['EchoAbstractEntity'] = __DIR__ . 
'/model/AbstractEntity.php';
-$wgAutoloadClasses['EchoAbstractMapper'] = __DIR__ . 
'/includes/mapper/AbstractMapper.php';
-$wgAutoloadClasses['EchoAbstractMapperStub'] = __DIR__ . 
'/tests/phpunit/includes/mapper/AbstractMapperTest.php';
-$wgAutoloadClasses['EchoAbstractMapperTest'] = __DIR__ . 
'/tests/phpunit/includes/mapper/AbstractMapperTest.php';
-$wgAutoloadClasses['EchoArrayList'] = __DIR__ . '/includes/ContainmentSet.php';
-$wgAutoloadClasses['EchoAttributeManager'] = __DIR__ . 
'/includes/AttributeManager.php';
-$wgAutoloadClasses['EchoAttributeManagerTest'] = __DIR__ . 
'/tests/phpunit/includes/AttributeManagerTest.php';
-$wgAutoloadClasses['EchoBasicFormatter'] = __DIR__ . 
'/formatters/BasicFormatter.php';
-$wgAutoloadClasses['EchoBatchRowIterator'] = __DIR__ . 
'/includes/BatchRowUpdate.php';
-$wgAutoloadClasses['EchoBatchRowUpdate'] = __DIR__ . 
'/includes/BatchRowUpdate.php';
-$wgAutoloadClasses['EchoBatchRowWriter'] = __DIR__ . 
'/includes/BatchRowUpdate.php';
-$wgAutoloadClasses['EchoCachedList'] = __DIR__ . 
'/includes/ContainmentSet.php';
-$wgAutoloadClasses['EchoCallbackIterator'] = __DIR__ . 
'/includes/iterator/CallbackIterator.php';
-$wgAutoloadClasses['EchoCatchableFatalErrorException'] = __DIR__ . 
'/includes/exception/CatchableFatalErrorException.php';
-$wgAutoloadClasses['EchoCommentFormatter'] = __DIR__ . 
'/formatters/CommentFormatter.php';
-$wgAutoloadClasses['EchoContainmentList'] = __DIR__ . 
'/includes/ContainmentSet.php';
-$wgAutoloadClasses['EchoContainmentSet'] = __DIR__ . 
'/includes/ContainmentSet.php';
-$wgAutoloadClasses['EchoDataOutputFormatter'] = __DIR__ . 
'/includes/DataOutputFormatter.php';
-$wgAutoloadClasses['EchoDeferredMarkAsReadUpdate'] = __DIR__ . 
'/includes/DeferredMarkAsReadUpdate.php';
-$wgAutoloadClasses['EchoDiffGroup'] = __DIR__ . '/includes/DiffParser.php';
-$wgAutoloadClasses['EchoDiffParser'] = __DIR__ . '/includes/DiffParser.php';
-$wgAutoloadClasses['EchoDiffParserTest'] = __DIR__ . 
'/tests/phpunit/includes/DiffParserTest.php';
-$wgAutoloadClasses['EchoDiscussionParser'] = __DIR__ . 
'/includes/DiscussionParser.php';
-$wgAutoloadClasses['EchoDiscussionParserTest'] = __DIR__ . 
'/tests/phpunit/includes/DiscussionParserTest.php';
-$wgAutoloadClasses['EchoEditFormatter'] = __DIR__ . 
'/formatters/EditFormatter.php';
-$wgAutoloadClasses['EchoEditUserTalkFormatter'] = __DIR__ . 
'/formatters/EditUserTalkFormatter.php';
-$wgAutoloadClasses['EchoEmailDecorator'] = __DIR__ . 
'/includes/EmailFormatter.php';
-$wgAutoloadClasses['EchoEmailDigest'] = __DIR__ . 
'/includes/EmailFormatter.php';
-$wgAutoloadClasses['EchoEmailFormatter'] = __DIR__ . 
'/includes/EmailFormatter.php';
-$wgAutoloadClasses['EchoEmailFormatterTest'] = __DIR__ . 
'/tests/phpunit/includes/EmailFormatterTest.php';
-$wgAutoloadClasses['EchoEmailMode'] = __DIR__ . '/includes/EmailFormatter.php';
-$wgAutoloadClasses['EchoEmailSingle'] = __DIR__ . 
'/includes/EmailFormatter.php';
-$wgAutoloadClasses['EchoEvent'] = __DIR__ . '/model/Event.php';
-$wgAutoloadClasses['EchoEventMapper'] = __DIR__ . 
'/includes/mapper/EventMapper.php';
-$wgAutoloadClasses['EchoEventMapperTest'] = __DIR__ . 
'/tests/phpunit/includes/mapper/EventMapperTest.php';
-$wgAutoloadClasses['EchoExecuteFirstArgumentStub'] = __DIR__ . 
'/tests/phpunit/includes/mapper/NotificationMapperTest.php';
-$wgAutoloadClasses['EchoFilteredSequentialIterator'] = __DIR__ . 
'/includes/iterator/FilteredSequentialIterator.php';
-$wgAutoloadClasses['EchoHTMLEmailDecorator'] = 

[MediaWiki-commits] [Gerrit] Return nil when mw.entity.label and sitelink don't find anyt... - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Return nil when mw.entity.label and sitelink don't find anything
..

Return nil when mw.entity.label and sitelink don't find anything

this is the old behavior and we ought not to change this, else
we break various lua modules like on Russian Wikipedia:

https://ru.wikipedia.org/wiki/%D0%A8%D0%B0%D0%B1%D0%BB%D0%BE%D0%BD:Wikidata

Bug: 73615
Change-Id: I57b825e9020d3e6910188edcbe2da728fa2bef54
---
M client/includes/scribunto/WikibaseLuaBindings.php
M client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M 
client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
4 files changed, 18 insertions(+), 7 deletions(-)


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

diff --git a/client/includes/scribunto/WikibaseLuaBindings.php 
b/client/includes/scribunto/WikibaseLuaBindings.php
index b068fbf..d1b4d8a 100644
--- a/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/client/includes/scribunto/WikibaseLuaBindings.php
@@ -270,15 +270,15 @@
try {
$entityId = $this-entityIdParser-parse( 
$prefixedEntityId );
} catch( EntityIdParsingException $e ) {
-   return '';
+   return null;
}
 
try {
$label = $this-labelLookup-getLabel( $entityId );
} catch ( StorageException $ex ) {
-   return '';
+   return null;
} catch ( OutOfBoundsException $ex ) {
-   return '';
+   return null;
}
 
// NOTE: This tracks a label usage in the wiki's content 
language.
@@ -300,12 +300,12 @@
try {
$itemId = new ItemId( $prefixedEntityId );
} catch( InvalidArgumentException $e ) {
-   return '';
+   return null;
}
 
$item = $this-entityLookup-getEntity( $itemId );
if ( !$item || !$item-getSiteLinkList()-hasLinkWithSiteId( 
$this-siteId ) ) {
-   return '';
+   return null;
}
 
$this-usageAccumulator-addPageUsage( $itemId );
diff --git 
a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua 
b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
index 2130484..5452d64 100644
--- a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
+++ b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
@@ -59,9 +59,18 @@
  args = { 'Q32487' },
  expect = { 'Lua Test Item' }
},
+   { name = 'mw.wikibase.label', func = mw.wikibase.label, type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
+   },
{ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
  args = { 'Q32487' },
  expect = { 'WikibaseClientLuaTest' }
+   },
+   {
+ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
}
 }
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index b14df57..60408f0 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -150,7 +150,7 @@
public function getLabelProvider() {
return array(
array( 'LabelString', 'Q123' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
@@ -180,7 +180,7 @@
public function getSiteLinkPageNameProvider() {
return array(
array( 'Beer', 'Q666' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
index ffeab0c..180292e 100644
--- 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
+++ 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
@@ -83,6 +83,8 @@
 
$this-createTestItem( new ItemId( 'Q32487' ), $labels, array( 
$statement1, $statement2 ), $siteLinks );
 
+   $this-createTestItem( new 

[MediaWiki-commits] [Gerrit] Segment enwiki's cirrus poolcounter traffic from the rest - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Segment enwiki's cirrus poolcounter traffic from the rest
..


Segment enwiki's cirrus poolcounter traffic from the rest

Change-Id: Ia6a4e29b49b96bcaab3b39eb608935b4065fd00d
---
M wmf-config/CirrusSearch-production.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CirrusSearch-production.php 
b/wmf-config/CirrusSearch-production.php
index 0ae8923..4fbdf8c 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -39,3 +39,7 @@
$wgCirrusSearchInterwikiSources = $interwikiSearchConf;
$wgCirrusSearchInterwikiCacheTime = 60;
 }
+
+if ( $wgDBname == 'enwiki' ) {
+   $wgCirrusSearchPoolCounterKey .= '_enwiki';
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6a4e29b49b96bcaab3b39eb608935b4065fd00d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Return nil when mw.entity.label and sitelink don't find anyt... - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Return nil when mw.entity.label and sitelink don't find anything
..

Return nil when mw.entity.label and sitelink don't find anything

this is the old behavior and we ought not to change this, else
we break various lua modules like on Russian Wikipedia:

https://ru.wikipedia.org/wiki/%D0%A8%D0%B0%D0%B1%D0%BB%D0%BE%D0%BD:Wikidata

Bug: 73615
Change-Id: I57b825e9020d3e6910188edcbe2da728fa2bef54
---
M client/includes/scribunto/WikibaseLuaBindings.php
M client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M 
client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
4 files changed, 18 insertions(+), 7 deletions(-)


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

diff --git a/client/includes/scribunto/WikibaseLuaBindings.php 
b/client/includes/scribunto/WikibaseLuaBindings.php
index 60eb008..a23e7f4 100644
--- a/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/client/includes/scribunto/WikibaseLuaBindings.php
@@ -259,15 +259,15 @@
try {
$entityId = $this-entityIdParser-parse( 
$prefixedEntityId );
} catch( EntityIdParsingException $e ) {
-   return '';
+   return null;
}
 
try {
$label = $this-labelLookup-getLabel( $entityId );
} catch ( StorageException $ex ) {
-   return '';
+   return null;
} catch ( OutOfBoundsException $ex ) {
-   return '';
+   return null;
}
 
return $label;
@@ -283,12 +283,12 @@
try {
$itemId = new ItemId( $prefixedEntityId );
} catch( InvalidArgumentException $e ) {
-   return '';
+   return null;
}
 
$item = $this-entityLookup-getEntity( $itemId );
if ( !$item || !$item-getSiteLinkList()-hasLinkWithSiteId( 
$this-siteId ) ) {
-   return '';
+   return null;
}
 
return $item-getSiteLinkList()-getBySiteId( $this-siteId 
)-getPageName();
diff --git 
a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua 
b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
index 2130484..5452d64 100644
--- a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
+++ b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
@@ -59,9 +59,18 @@
  args = { 'Q32487' },
  expect = { 'Lua Test Item' }
},
+   { name = 'mw.wikibase.label', func = mw.wikibase.label, type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
+   },
{ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
  args = { 'Q32487' },
  expect = { 'WikibaseClientLuaTest' }
+   },
+   {
+ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
}
 }
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index 0692c74..55a1b9c 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -116,7 +116,7 @@
public function getLabelProvider() {
return array(
array( 'LabelString', 'Q123' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
@@ -134,7 +134,7 @@
public function getSiteLinkPageNameProvider() {
return array(
array( 'Beer', 'Q666' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
index 0d1f72c..69ff18e 100644
--- 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
+++ 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
@@ -80,6 +80,8 @@
 
$this-createTestItem( new ItemId( 'Q32487' ), $labels, array( 
$statement1, $statement2 ), $siteLinks );
 
+   $this-createTestItem( new ItemId( 'Q32488' ), array(), 

[MediaWiki-commits] [Gerrit] Return nil when mw.entity.label and sitelink don't find anyt... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Return nil when mw.entity.label and sitelink don't find anything
..


Return nil when mw.entity.label and sitelink don't find anything

this is the old behavior and we ought not to change this, else
we break various lua modules like on Russian Wikipedia:

https://ru.wikipedia.org/wiki/%D0%A8%D0%B0%D0%B1%D0%BB%D0%BE%D0%BD:Wikidata

Bug: 73615
Change-Id: I57b825e9020d3e6910188edcbe2da728fa2bef54
---
M client/includes/scribunto/WikibaseLuaBindings.php
M client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M 
client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
4 files changed, 18 insertions(+), 7 deletions(-)

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



diff --git a/client/includes/scribunto/WikibaseLuaBindings.php 
b/client/includes/scribunto/WikibaseLuaBindings.php
index b068fbf..d1b4d8a 100644
--- a/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/client/includes/scribunto/WikibaseLuaBindings.php
@@ -270,15 +270,15 @@
try {
$entityId = $this-entityIdParser-parse( 
$prefixedEntityId );
} catch( EntityIdParsingException $e ) {
-   return '';
+   return null;
}
 
try {
$label = $this-labelLookup-getLabel( $entityId );
} catch ( StorageException $ex ) {
-   return '';
+   return null;
} catch ( OutOfBoundsException $ex ) {
-   return '';
+   return null;
}
 
// NOTE: This tracks a label usage in the wiki's content 
language.
@@ -300,12 +300,12 @@
try {
$itemId = new ItemId( $prefixedEntityId );
} catch( InvalidArgumentException $e ) {
-   return '';
+   return null;
}
 
$item = $this-entityLookup-getEntity( $itemId );
if ( !$item || !$item-getSiteLinkList()-hasLinkWithSiteId( 
$this-siteId ) ) {
-   return '';
+   return null;
}
 
$this-usageAccumulator-addPageUsage( $itemId );
diff --git 
a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua 
b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
index 2130484..5452d64 100644
--- a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
+++ b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
@@ -59,9 +59,18 @@
  args = { 'Q32487' },
  expect = { 'Lua Test Item' }
},
+   { name = 'mw.wikibase.label', func = mw.wikibase.label, type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
+   },
{ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
  args = { 'Q32487' },
  expect = { 'WikibaseClientLuaTest' }
+   },
+   {
+ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
}
 }
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index b14df57..60408f0 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -150,7 +150,7 @@
public function getLabelProvider() {
return array(
array( 'LabelString', 'Q123' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
@@ -180,7 +180,7 @@
public function getSiteLinkPageNameProvider() {
return array(
array( 'Beer', 'Q666' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
index ffeab0c..180292e 100644
--- 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
+++ 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
@@ -83,6 +83,8 @@
 
$this-createTestItem( new ItemId( 'Q32487' ), $labels, array( 
$statement1, $statement2 ), $siteLinks );
 
+   $this-createTestItem( new ItemId( 'Q32488' ), array(), array( 
$statement1 ), 

[MediaWiki-commits] [Gerrit] [BrowserTest] WIP sort the VE page object - change (mediawiki...VisualEditor)

[Cmcmahon (Code Review)]

Cmcmahon has uploaded a new change for review.

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

Change subject: [BrowserTest] WIP sort the VE page object
..

[BrowserTest] WIP sort the VE page object

also remove some duplicate code, more to come

Change-Id: I80106af17ac123cc50c3aefd3b131185f50749ce
---
M modules/ve-mw/tests/browser/features/cite.feature
M modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
3 files changed, 123 insertions(+), 151 deletions(-)


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

diff --git a/modules/ve-mw/tests/browser/features/cite.feature 
b/modules/ve-mw/tests/browser/features/cite.feature
index 38eba4d..c595b48 100644
--- a/modules/ve-mw/tests/browser/features/cite.feature
+++ b/modules/ve-mw/tests/browser/features/cite.feature
@@ -39,7 +39,7 @@
   And I fill in the seventh textarea with Location of publication
   And I fill in the eighth textarea with 123
   And the Book input field titles are in the correct order
-  And I click Book Add more information
+  And I click Add more information
   And I type in a field name New book field
   And I click the new field label
   And I fill in the new field New book field contents
diff --git 
a/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb 
b/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
index 9bead46..18cbcc5 100644
--- a/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
+++ b/modules/ve-mw/tests/browser/features/step_definitions/cite_steps.rb
@@ -18,10 +18,6 @@
   on(VisualEditorPage).cite_book_element.when_present.click
 end
 
-When(/^I click Book Add more information$/) do
-  
on(VisualEditorPage).book_add_more_information_button_element.when_present.click
-end
-
 When(/^I click Insert Citation$/) do
   on(VisualEditorPage).insert_citation_element.when_present.click
 end
diff --git 
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index 10c1976..096d63f 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -1,110 +1,13 @@
 class VisualEditorPage
   include PageObject
-
   include URL
   page_url 
URL.url(User:#{ENV['MEDIAWIKI_USER']}/#{ENV['BROWSER']}?vehidebetadialog=trueveaction=edit)
-  span(:bullet_number_selector, class: oo-ui-iconElement-icon 
oo-ui-icon-bullet-list)
-  span(:cite_basic_reference, css: .oo-ui-icon-reference)
-  span(:cite_button, text: Cite)
-  div(:cite_select, css: div.oo-ui-widget:nth-child(5)  div:nth-child(2))
-  a(:cite_book, css: .oo-ui-tool-name-cite-book  a:nth-child(1))
-  a(:cite_journal, css: .oo-ui-tool-name-cite-journal  a:nth-child(1))
-  a(:cite_news, css: .oo-ui-tool-name-cite-news  a:nth-child(1))
-  span(:cite_website, css: .oo-ui-icon-ref-cite-web)
-  div(:content, class: ve-ce-branchNode)
 
-  span(:decrease_indentation, class: oo-ui-iconElement-icon 
oo-ui-icon-outdent-list)
-  div(:disabled_save_button, class: oo-ui-widget oo-ui-widget-disabled 
oo-ui-buttonElement oo-ui-buttonElement-framed oo-ui-labelElement 
oo-ui-flaggedElement-constructive oo-ui-buttonWidget ve-ui-toolbar-saveButton)
-  span(:downarrow, class: oo-ui-indicatorElement-indicator 
oo-ui-indicator-down)
-  a(:edit_ve, title: /Edit this page with VisualEditor/)
-  a(:edit_wikitext, title: /You can edit this page\./)
-  a(:heading, text: /Heading/)
-  span(:hamburger_menu, css: div.oo-ui-listToolGroup:nth-child(2)  
span:nth-child(1)  span:nth-child(3))
-  span(:increase_indentation, class: oo-ui-iconElement-icon 
oo-ui-icon-indent-list)
-  span(:insert_menu, class: oo-ui-popupToolGroup-handle, index: 4)
-  div(:insert_references, class: oo-ui-processDialog-location)
-  div(:ip_warning, class: ve-ui-mwNoticesPopupTool-item, text: /Your IP 
address/)
-
-  div(:medium_dialog, class: oo-ui-window oo-ui-dialog oo-ui-dialog-open 
oo-ui-dialog-medium)
-  span(:options_in_hamburger, class: oo-ui-tool-title, text: Options)
-  span(:option_advanced_settings, class: oo-ui-tool-title, text: Advanced 
settings)
-  span(:option_page_settings, class: oo-ui-tool-title, text: Page settings)
-  div(:page_text, id: mw-content-text)
-  a(:page_title, text: /Page title/)
-  a(:paragraph, text: /Paragraph/)
-  a(:preformatted, text: /Preformatted/)
-  span(:refs_link, text: Reference)
-  div(:save_disabled, class: oo-ui-widget oo-ui-widget-disabled 
oo-ui-flaggedElement-constructive oo-ui-.oo-ui-buttonElement-framed)
-  a(:save_page, css: div.ve-init-mw-viewPageTarget-toolbar-actions  
div.oo-ui-flaggedElement-constructive  a)
-  div(:save_enabled, css: div.ve-init-mw-viewPageTarget-toolbar-actions  

[MediaWiki-commits] [Gerrit] Replaced some broken single-quotes - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Replaced some broken single-quotes
..

Replaced some broken single-quotes

Change-Id: Ie3b8c9508e419c8a99e3c71a99419e3820b4694b
---
M modules/openstack/manifests/adminscripts.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/openstack/manifests/adminscripts.pp 
b/modules/openstack/manifests/adminscripts.pp
index 95bba83..0787918 100644
--- a/modules/openstack/manifests/adminscripts.pp
+++ b/modules/openstack/manifests/adminscripts.pp
@@ -26,7 +26,7 @@
 # (specifically, pmtpa to eqiad)
 file { '/root/dc-migrate':
 ensure = present,
-source = 
'puppet:///modules/openstack/${openstack_version}/virtscripts/dc-migrate',
+source = 
puppet:///modules/openstack/${openstack_version}/virtscripts/dc-migrate,
 mode   = '0755',
 owner  = 'root',
 group  = 'root',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3b8c9508e419c8a99e3c71a99419e3820b4694b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update lessc.inc.php - change (mediawiki/core)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Update lessc.inc.php
..

Update lessc.inc.php

* This update lessc.inc.php to latest patch at 
https://github.com/leafo/lessphp/blob/011afcca8e6f1000a6e789921ba805fa578271a3/lessc.inc.php

Source of file

* 
https://github.com/leafo/lessphp/blob/011afcca8e6f1000a6e789921ba805fa578271a3/lessc.inc.php

Fixes file link

* https://github.com/leafo/lessphp/issues/302

Change-Id: Ic21b97e52ec99b8eef094a902ee346cf40a9f174
---
M includes/libs/lessc.inc.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/includes/libs/lessc.inc.php b/includes/libs/lessc.inc.php
index 61ed771..4b8e478 100644
--- a/includes/libs/lessc.inc.php
+++ b/includes/libs/lessc.inc.php
@@ -1,7 +1,7 @@
 ?php
 // @codingStandardsIgnoreFile File external to MediaWiki. Ignore coding 
conventions checks.
 /**
- * lessphp v0.4.0@2cc77e3c7b
+ * lessphp v0.4.0@011afcca8e 
  * http://leafo.net/lessphp
  *
  * LESS CSS compiler, adapted from http://lesscss.org
@@ -374,9 +374,9 @@
$other = array_merge($other, $stack);
 
if ($split) {
-   return array(array_merge($vars, $imports), $other);
+   return array(array_merge($imports, $vars), $other);
} else {
-   return array_merge($vars, $imports, $other);
+   return array_merge($imports, $vars, $other);
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic21b97e52ec99b8eef094a902ee346cf40a9f174
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com

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

[MediaWiki-commits] [Gerrit] Replaced some broken single-quotes - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Replaced some broken single-quotes
..


Replaced some broken single-quotes

Change-Id: Ie3b8c9508e419c8a99e3c71a99419e3820b4694b
---
M modules/openstack/manifests/adminscripts.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/openstack/manifests/adminscripts.pp 
b/modules/openstack/manifests/adminscripts.pp
index 95bba83..0787918 100644
--- a/modules/openstack/manifests/adminscripts.pp
+++ b/modules/openstack/manifests/adminscripts.pp
@@ -26,7 +26,7 @@
 # (specifically, pmtpa to eqiad)
 file { '/root/dc-migrate':
 ensure = present,
-source = 
'puppet:///modules/openstack/${openstack_version}/virtscripts/dc-migrate',
+source = 
puppet:///modules/openstack/${openstack_version}/virtscripts/dc-migrate,
 mode   = '0755',
 owner  = 'root',
 group  = 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3b8c9508e419c8a99e3c71a99419e3820b4694b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Return nil when mw.entity.label and sitelink don't find anyt... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Return nil when mw.entity.label and sitelink don't find anything
..


Return nil when mw.entity.label and sitelink don't find anything

this is the old behavior and we ought not to change this, else
we break various lua modules like on Russian Wikipedia:

https://ru.wikipedia.org/wiki/%D0%A8%D0%B0%D0%B1%D0%BB%D0%BE%D0%BD:Wikidata

Bug: 73615
Change-Id: I57b825e9020d3e6910188edcbe2da728fa2bef54
---
M client/includes/scribunto/WikibaseLuaBindings.php
M client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M 
client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
4 files changed, 18 insertions(+), 7 deletions(-)

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



diff --git a/client/includes/scribunto/WikibaseLuaBindings.php 
b/client/includes/scribunto/WikibaseLuaBindings.php
index 60eb008..a23e7f4 100644
--- a/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/client/includes/scribunto/WikibaseLuaBindings.php
@@ -259,15 +259,15 @@
try {
$entityId = $this-entityIdParser-parse( 
$prefixedEntityId );
} catch( EntityIdParsingException $e ) {
-   return '';
+   return null;
}
 
try {
$label = $this-labelLookup-getLabel( $entityId );
} catch ( StorageException $ex ) {
-   return '';
+   return null;
} catch ( OutOfBoundsException $ex ) {
-   return '';
+   return null;
}
 
return $label;
@@ -283,12 +283,12 @@
try {
$itemId = new ItemId( $prefixedEntityId );
} catch( InvalidArgumentException $e ) {
-   return '';
+   return null;
}
 
$item = $this-entityLookup-getEntity( $itemId );
if ( !$item || !$item-getSiteLinkList()-hasLinkWithSiteId( 
$this-siteId ) ) {
-   return '';
+   return null;
}
 
return $item-getSiteLinkList()-getBySiteId( $this-siteId 
)-getPageName();
diff --git 
a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua 
b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
index 2130484..5452d64 100644
--- a/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
+++ b/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
@@ -59,9 +59,18 @@
  args = { 'Q32487' },
  expect = { 'Lua Test Item' }
},
+   { name = 'mw.wikibase.label', func = mw.wikibase.label, type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
+   },
{ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
  args = { 'Q32487' },
  expect = { 'WikibaseClientLuaTest' }
+   },
+   {
+ name = 'mw.wikibase.sitelink', func = mw.wikibase.sitelink, 
type='ToString',
+ args = { 'Q32488' },
+ expect = { nil }
}
 }
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index 0692c74..55a1b9c 100644
--- a/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++ b/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -116,7 +116,7 @@
public function getLabelProvider() {
return array(
array( 'LabelString', 'Q123' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
@@ -134,7 +134,7 @@
public function getSiteLinkPageNameProvider() {
return array(
array( 'Beer', 'Q666' ),
-   array( '', 'DoesntExist' )
+   array( null, 'DoesntExist' )
);
}
 
diff --git 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
index 0d1f72c..69ff18e 100644
--- 
a/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
+++ 
b/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
@@ -80,6 +80,8 @@
 
$this-createTestItem( new ItemId( 'Q32487' ), $labels, array( 
$statement1, $statement2 ), $siteLinks );
 
+   $this-createTestItem( new ItemId( 'Q32488' ), array(), array( 
$statement1 ), array() );
+
// 

[MediaWiki-commits] [Gerrit] s/eqiad/ulsfo/ as backup for AS/* + RU with esams primary - change (operations/dns)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: s/eqiad/ulsfo/ as backup for AS/* + RU with esams primary
..


s/eqiad/ulsfo/ as backup for AS/* + RU with esams primary

Of those with esams as the primary, the ones in Asia and RU are
switched from [esams, eqiad] to [esams, ulsfo] as a first-order
approximation of a semi-intelligent way to split traffic with
esams unavailable.

Will use this as a diff baseline for several changes going forward
today for the esams temporary outage and adjust as appropriate.

Change-Id: I879c3bf6389b34f23b21641fa8729efab2d01670
---
M config-geo
1 file changed, 19 insertions(+), 19 deletions(-)

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



diff --git a/config-geo b/config-geo
index d2fdba4..10bf65b 100644
--- a/config-geo
+++ b/config-geo
@@ -8,37 +8,37 @@
 # use ISO 3166-2 official names
 AF = [esams, eqiad],
 AS = {
-AE = [esams, eqiad], # United Arab Emirates
+AE = [esams, ulsfo], # ESAMS-ULSFO # United Arab Emirates
 AF = [eqiad   ], # Afghanistan
-AM = [esams, eqiad], # Armenia
+AM = [esams, ulsfo], # ESAMS-ULSFO # Armenia
 AP = [ulsfo, eqiad], # Asia-Pacific region (misc)
-AZ = [esams, eqiad], # Azerbaijan
+AZ = [esams, ulsfo], # ESAMS-ULSFO # Azerbaijan
 BD = [ulsfo, eqiad], # Bangladesh
-BH = [esams, eqiad], # Bahrain
+BH = [esams, ulsfo], # ESAMS-ULSFO # Bahrain
 BN = [ulsfo, eqiad], # Brunei Darussalam
 BT = [ulsfo, eqiad], # Bhutan
 CC = [ulsfo, eqiad], # Cocos (Keeling) Islands
 CN = [eqiad   ], # China
 CX = [ulsfo, eqiad], # Christmas Island
-CY = [esams, eqiad], # Cyprus
-GE = [esams, eqiad], # Georgia
+CY = [esams, ulsfo], # ESAMS-ULSFO # Cyprus
+GE = [esams, ulsfo], # ESAMS-ULSFO # Georgia
 HK = [ulsfo, eqiad], # Hong Kong
 ID = [ulsfo, eqiad], # Indonesia
-IL = [esams, eqiad], # Israel
+IL = [esams, ulsfo], # ESAMS-ULSFO # Israel
 IN = [eqiad   ], # India
 IO = [eqiad   ], # British Indian Ocean Territory
-IQ = [esams, eqiad], # Iraq
-IR = [esams, eqiad], # Iran (Islamic Republic of)
-JO = [esams, eqiad], # Jordan
+IQ = [esams, ulsfo], # ESAMS-ULSFO # Iraq
+IR = [esams, ulsfo], # ESAMS-ULSFO # Iran (Islamic 
Republic of)
+JO = [esams, ulsfo], # ESAMS-ULSFO # Jordan
 JP = [ulsfo, eqiad], # Japan
 KG = [eqiad   ], # Kyrgyzstan
 KH = [ulsfo, eqiad], # Cambodia
 KP = [ulsfo, eqiad], # Korea, Democratic People's 
Republic of
 KR = [ulsfo, eqiad], # Korea, Republic of
-KW = [esams, eqiad], # Kuwait
+KW = [esams, ulsfo], # ESAMS-ULSFO # Kuwait
 KZ = [eqiad   ], # Kazakhstan
 LA = [ulsfo, eqiad], # Lao People's Democratic Republic
-LB = [esams, eqiad], # Lebanon
+LB = [esams, ulsfo], # ESAMS-ULSFO # Lebanon
 LK = [eqiad   ], # Sri Lanka
 MM = [ulsfo, eqiad], # Myanmar
 MN = [ulsfo, eqiad], # Mongolia
@@ -46,14 +46,14 @@
 MV = [ulsfo, eqiad], # Maldives
 MY = [ulsfo, eqiad], # Malaysia
 NP = [ulsfo, eqiad], # Nepal
-OM = [esams, eqiad], # Oman
+OM = [esams, ulsfo], # ESAMS-ULSFO # Oman
 PH = [ulsfo, eqiad], # Philippines
 PK = [eqiad   ], # Pakistan
-PS = [esams, eqiad], # Palestine, State of
-QA = [esams, eqiad], # Qatar
-SA = [esams, eqiad], # Saudi Arabia
+PS = [esams, ulsfo], # ESAMS-ULSFO # Palestine, State of
+QA = [esams, ulsfo], # ESAMS-ULSFO # Qatar
+SA = [esams, ulsfo], # ESAMS-ULSFO # Saudi Arabia
 SG = [ulsfo, eqiad], # Singapore
-SY = [esams, eqiad], # Syrian Arab Republic
+SY = [esams, ulsfo], # ESAMS-ULSFO # Syrian Arab Republic
 TH = [ulsfo, eqiad], # Thailand
 TJ = [eqiad   ], # Tajikistan
 TL = [ulsfo, eqiad], # Timor-Leste
@@ -61,7 +61,7 @@
 TW = [ulsfo, 

[MediaWiki-commits] [Gerrit] Turn off keystone/redis for the icehouse upgrade. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Turn off keystone/redis for the icehouse upgrade.
..

Turn off keystone/redis for the icehouse upgrade.

This is broken and I need to get things working before I investigate.

Change-Id: I388006c9b4561f90abb8d39b332fc3f9d304c80a
---
M manifests/role/keystone.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/174450/1

diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index c4b38ec..8064a53 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -45,7 +45,8 @@
 }
 },
 token_driver = $::realm ? {
-'production' = 'redis',
+# Temporarily disable the redis keystone driver... it doesn't work 
in icehouse
+'production' = 'normal',
 'labs'   = 'redis',
 },
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I388006c9b4561f90abb8d39b332fc3f9d304c80a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Turn off keystone/redis for the icehouse upgrade. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Turn off keystone/redis for the icehouse upgrade.
..


Turn off keystone/redis for the icehouse upgrade.

This is broken and I need to get things working before I investigate.

Change-Id: I388006c9b4561f90abb8d39b332fc3f9d304c80a
---
M manifests/role/keystone.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/manifests/role/keystone.pp b/manifests/role/keystone.pp
index c4b38ec..8064a53 100644
--- a/manifests/role/keystone.pp
+++ b/manifests/role/keystone.pp
@@ -45,7 +45,8 @@
 }
 },
 token_driver = $::realm ? {
-'production' = 'redis',
+# Temporarily disable the redis keystone driver... it doesn't work 
in icehouse
+'production' = 'normal',
 'labs'   = 'redis',
 },
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I388006c9b4561f90abb8d39b332fc3f9d304c80a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Revert Revert Enable JPG thumbnail chaining on all wikis e... - change (operations/mediawiki-config)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Revert Revert Enable JPG thumbnail chaining on all wikis 
except commons
..

Revert Revert Enable JPG thumbnail chaining on all wikis except commons

This reverts commit 3c587287fb833495fb15c305ac08edcc679f4192.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 743a0a0..37615ed 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14277,6 +14277,16 @@
'default' = 'upload.svc.eqiad.wmnet',
 ),
 
+// Thumbnail chaining
+'wgThumbnailBuckets' = array(
+   'default' = array( 128, 256, 512, 1024, 2048, 4096 ),
+   'commonswiki' = array(),
+),
+
+'wgThumbnailMinimumBucketDistance' = array(
+   'default' = 32,
+),
+
 );
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I236af6b26bc0624e8cc02f43831ad5e043baa2ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] [WIP] objectcache: Use Psr\Log\LoggerInterface instead of wf... - change (mediawiki/core)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: [WIP] objectcache: Use Psr\Log\LoggerInterface instead of 
wfDebug
..

[WIP] objectcache: Use Psr\Log\LoggerInterface instead of wfDebug

ObjectCache::newFromParams() will handle a 'loggroup' parameter
specially, getting an instance of MWLogger to pass to the BagsOStuff.

BagOStuff now has a getLogger() function which returns a
Psr\Log\LoggerInterface.

The goal of this is to make the logging in BagOStuff non-MediaWiki
specific, in the hopes of separating it out into a separate library
in the future.

Change-Id: I8a8e278e6f028814499d8457d6d5341d03eabc7a
---
M includes/DefaultSettings.php
M includes/objectcache/BagOStuff.php
M includes/objectcache/HashBagOStuff.php
M includes/objectcache/MemcachedBagOStuff.php
M includes/objectcache/MemcachedClient.php
M includes/objectcache/MemcachedPeclBagOStuff.php
M includes/objectcache/MemcachedPhpBagOStuff.php
M includes/objectcache/MultiWriteBagOStuff.php
M includes/objectcache/ObjectCache.php
M includes/objectcache/RedisBagOStuff.php
M includes/objectcache/SqlBagOStuff.php
11 files changed, 81 insertions(+), 23 deletions(-)


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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e822655..2e3e6d5 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2101,17 +2101,17 @@
  */
 $wgObjectCaches = array(
CACHE_NONE = array( 'class' = 'EmptyBagOStuff' ),
-   CACHE_DB = array( 'class' = 'SqlBagOStuff' ),
+   CACHE_DB = array( 'class' = 'SqlBagOStuff', 'loggroup' = 
'SQLBagOStuff' ),
 
CACHE_ANYTHING = array( 'factory' = 'ObjectCache::newAnything' ),
CACHE_ACCEL = array( 'factory' = 'ObjectCache::newAccelerator' ),
-   CACHE_MEMCACHED = array( 'factory' = 'ObjectCache::newMemcached' ),
+   CACHE_MEMCACHED = array( 'factory' = 'ObjectCache::newMemcached', 
'loggroup' = 'memcached' ),
 
'apc' = array( 'class' = 'APCBagOStuff' ),
'xcache' = array( 'class' = 'XCacheBagOStuff' ),
'wincache' = array( 'class' = 'WinCacheBagOStuff' ),
-   'memcached-php' = array( 'class' = 'MemcachedPhpBagOStuff' ),
-   'memcached-pecl' = array( 'class' = 'MemcachedPeclBagOStuff' ),
+   'memcached-php' = array( 'class' = 'MemcachedPhpBagOStuff', 
'loggroup' = 'memcached' ),
+   'memcached-pecl' = array( 'class' = 'MemcachedPeclBagOStuff', 
'loggroup' = 'memcached' ),
'hash' = array( 'class' = 'HashBagOStuff' ),
 );
 
diff --git a/includes/objectcache/BagOStuff.php 
b/includes/objectcache/BagOStuff.php
index 1978c3e..7705cdc 100644
--- a/includes/objectcache/BagOStuff.php
+++ b/includes/objectcache/BagOStuff.php
@@ -27,6 +27,8 @@
 /**
  * @defgroup Cache Cache
  */
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 /**
  * interface is intended to be more or less compatible with
@@ -45,11 +47,40 @@
 
protected $lastError = self::ERR_NONE;
 
+   /**
+* @var LoggerInterface
+*/
+   protected $logger;
+
/** Possible values for getLastError() */
const ERR_NONE = 0; // no error
const ERR_NO_RESPONSE = 1; // no response
const ERR_UNREACHABLE = 2; // can't connect
const ERR_UNEXPECTED = 3; // response gave some error
+
+   public function __construct( $params ) {
+   if ( isset( $params['logger'] ) ) {
+   $this-setLogger( $params['logger'] );
+   }
+   }
+
+   /**
+* @param LoggerInterface $logger
+*/
+   public function setLogger( LoggerInterface $logger ) {
+   $this-logger = $logger;
+   }
+
+   /**
+* @return LoggerInterface
+*/
+   protected function getLogger() {
+   if ( !$this-logger ) {
+   $this-logger = new NullLogger();
+   }
+
+   return $this-logger;
+   }
 
/**
 * @param bool $bool
@@ -358,7 +389,7 @@
public function debug( $text ) {
if ( $this-debugMode ) {
$class = get_class( $this );
-   wfDebug( $class debug: $text\n );
+   $this-getLogger()-debug( $class debug: $text\n );
}
}
 
diff --git a/includes/objectcache/HashBagOStuff.php 
b/includes/objectcache/HashBagOStuff.php
index 06a0865..6da1882 100644
--- a/includes/objectcache/HashBagOStuff.php
+++ b/includes/objectcache/HashBagOStuff.php
@@ -31,7 +31,8 @@
/** @var array */
protected $bag;
 
-   function __construct() {
+   function __construct( $params = array() ) {
+   parent::__construct( $params );
$this-bag = array();
}
 
diff --git a/includes/objectcache/MemcachedBagOStuff.php 

[MediaWiki-commits] [Gerrit] Don't re-apply EXIF rotation to chained thumbnails - change (mediawiki/core)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Don't re-apply EXIF rotation to chained thumbnails
..

Don't re-apply EXIF rotation to chained thumbnails

Change-Id: I2f0674e4aea508ad7e00b7742a9d47bd0659e399
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/600
Bug: 67525
Bug: 73352
---
M includes/media/Bitmap.php
M includes/media/TransformationalImageHandler.php
2 files changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/53/174453/1

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index e81b37d..0292af8 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -142,7 +142,7 @@
$env['MAGICK_TMPDIR'] = $wgImageMagickTempDir;
}
 
-   $rotation = $this-getRotation( $image );
+   $rotation = isset( $params['disableRotation'] ) ? 0 : 
$this-getRotation( $image );
list( $width, $height ) = $this-extractPreRotationDimensions( 
$params, $rotation );
 
$cmd = call_user_func_array( 'wfEscapeShellArg', array_merge(
@@ -223,7 +223,7 @@
}
}
 
-   $rotation = $this-getRotation( $image );
+   $rotation = isset( $params['disableRotation'] ) ? 0 : 
$this-getRotation( $image );
list( $width, $height ) = 
$this-extractPreRotationDimensions( $params, $rotation );
 
$im-setImageBackgroundColor( new ImagickPixel( 'white' 
) );
@@ -344,7 +344,7 @@
 
$src_image = call_user_func( $loader, $params['srcPath'] );
 
-   $rotation = function_exists( 'imagerotate' ) ? 
$this-getRotation( $image ) : 0;
+   $rotation = function_exists( 'imagerotate' )  !isset( 
$params['disableRotation'] )  ? $this-getRotation( $image ) : 0;
list( $width, $height ) = $this-extractPreRotationDimensions( 
$params, $rotation );
$dst_image = imagecreatetruecolor( $width, $height );
 
diff --git a/includes/media/TransformationalImageHandler.php 
b/includes/media/TransformationalImageHandler.php
index 3e3be3d..b3ae296 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -216,6 +216,12 @@
# Transform functions and binaries need a FS source file
$thumbnailSource = $this-getThumbnailSource( $image, $params );
 
+   // If the source isn't the original, disable EXIF rotation 
because it's already been applied
+   if ( $scalerParams['srcWidth'] != $thumbnailSource['width']
+   || $scalerParams['srcHeight'] != 
$thumbnailSource['height'] ) {
+   $scalerParams['disableRotation'] = true;
+   }
+
$scalerParams['srcPath'] = $thumbnailSource['path'];
$scalerParams['srcWidth'] = $thumbnailSource['width'];
$scalerParams['srcHeight'] = $thumbnailSource['height'];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f0674e4aea508ad7e00b7742a9d47bd0659e399
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Gilles gdu...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add ESAMS-EQIAD comments matching prev commit - change (operations/dns)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Add ESAMS-EQIAD comments matching prev commit
..

Add ESAMS-EQIAD comments matching prev commit

make it easier to keep track as things happen...

Change-Id: Ie99b97e452436c7c378bbe4f4564a28c0ef33295
---
M config-geo
1 file changed, 56 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/54/174454/1

diff --git a/config-geo b/config-geo
index 10bf65b..7211c3e 100644
--- a/config-geo
+++ b/config-geo
@@ -6,7 +6,7 @@
 datacenters = [eqiad esams ulsfo]
 map = {
 # use ISO 3166-2 official names
-AF = [esams, eqiad],
+AF = [esams, eqiad], # ESAMS-EQIAD
 AS = {
 AE = [esams, ulsfo], # ESAMS-ULSFO # United Arab Emirates
 AF = [eqiad   ], # Afghanistan
@@ -64,59 +64,59 @@
 YE = [esams, ulsfo], # ESAMS-ULSFO # Yemen
 },
 EU = {
-AD = [esams, eqiad], # Andorra
-AL = [esams, eqiad], # Albania
-AT = [esams, eqiad], # Austria
-AX = [esams, eqiad], # Åland Islands
-BA = [esams, eqiad], # Bosnia and Herzegowina
-BE = [esams, eqiad], # Belgium
-BG = [esams, eqiad], # Bulgaria
-BY = [esams, eqiad], # Belarus
-CH = [esams, eqiad], # Switzerland
-CZ = [esams, eqiad], # Czech Republic
-DE = [esams, eqiad], # Germany
-DK = [esams, eqiad], # Denmark
-EE = [esams, eqiad], # Estonia
-ES = [esams, eqiad], # Spain
-EU = [esams, eqiad], # Europe region (misc)
-FI = [esams, eqiad], # Finland
-FO = [esams, eqiad], # Faroe Islands
-FR = [esams, eqiad], # France
-GB = [esams, eqiad], # United Kingdom
-GG = [esams, eqiad], # Guernsey
-GI = [esams, eqiad], # Gibraltar
-GR = [esams, eqiad], # Greece
-HR = [esams, eqiad], # Croatia (local name Hrvatska)
-HU = [esams, eqiad], # Hungary
-IE = [esams, eqiad], # Ireland
-IM = [esams, eqiad], # Isle of Man
-IS = [esams, eqiad], # Iceland
-IT = [esams, eqiad], # Italy
-JE = [esams, eqiad], # Jersey
-LI = [esams, eqiad], # Liechtenstein
-LT = [esams, eqiad], # Lithuania
-LU = [esams, eqiad], # Luxembourg
-LV = [esams, eqiad], # Latvia
-MC = [esams, eqiad], # Monaco
-MD = [esams, eqiad], # Moldova, Republic of
-ME = [esams, eqiad], # Montenegro
-MK = [esams, eqiad], # Macedonia, the Former Yugoslav 
Republic of
-MT = [esams, eqiad], # Malta
-NL = [esams, eqiad], # Netherlands
-NO = [esams, eqiad], # Norway
-PL = [esams, eqiad], # Poland
-PT = [esams, eqiad], # Portugal
-RO = [esams, eqiad], # Romania
-RS = [esams, eqiad], # Serbia
+AD = [esams, eqiad], # ESAMS-EQIAD # Andorra
+AL = [esams, eqiad], # ESAMS-EQIAD # Albania
+AT = [esams, eqiad], # ESAMS-EQIAD # Austria
+AX = [esams, eqiad], # ESAMS-EQIAD # Åland Islands
+BA = [esams, eqiad], # ESAMS-EQIAD # Bosnia and 
Herzegowina
+BE = [esams, eqiad], # ESAMS-EQIAD # Belgium
+BG = [esams, eqiad], # ESAMS-EQIAD # Bulgaria
+BY = [esams, eqiad], # ESAMS-EQIAD # Belarus
+CH = [esams, eqiad], # ESAMS-EQIAD # Switzerland
+CZ = [esams, eqiad], # ESAMS-EQIAD # Czech Republic
+DE = [esams, eqiad], # ESAMS-EQIAD # Germany
+DK = [esams, eqiad], # ESAMS-EQIAD # Denmark
+EE = [esams, eqiad], # ESAMS-EQIAD # Estonia
+ES = [esams, eqiad], # ESAMS-EQIAD # Spain
+EU = [esams, eqiad], # ESAMS-EQIAD # Europe region (misc)
+FI = [esams, eqiad], # ESAMS-EQIAD # Finland
+FO = [esams, eqiad], # ESAMS-EQIAD # Faroe Islands
+FR = [esams, eqiad], # ESAMS-EQIAD # France
+GB = [esams, eqiad], # ESAMS-EQIAD # United Kingdom
+GG = [esams, eqiad], # ESAMS-EQIAD # Guernsey
+GI = [esams, eqiad], # 

[MediaWiki-commits] [Gerrit] Add ESAMS-EQIAD comments matching prev commit - change (operations/dns)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Add ESAMS-EQIAD comments matching prev commit
..


Add ESAMS-EQIAD comments matching prev commit

make it easier to keep track as things happen...

Change-Id: Ie99b97e452436c7c378bbe4f4564a28c0ef33295
---
M config-geo
1 file changed, 56 insertions(+), 56 deletions(-)

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



diff --git a/config-geo b/config-geo
index 10bf65b..7211c3e 100644
--- a/config-geo
+++ b/config-geo
@@ -6,7 +6,7 @@
 datacenters = [eqiad esams ulsfo]
 map = {
 # use ISO 3166-2 official names
-AF = [esams, eqiad],
+AF = [esams, eqiad], # ESAMS-EQIAD
 AS = {
 AE = [esams, ulsfo], # ESAMS-ULSFO # United Arab Emirates
 AF = [eqiad   ], # Afghanistan
@@ -64,59 +64,59 @@
 YE = [esams, ulsfo], # ESAMS-ULSFO # Yemen
 },
 EU = {
-AD = [esams, eqiad], # Andorra
-AL = [esams, eqiad], # Albania
-AT = [esams, eqiad], # Austria
-AX = [esams, eqiad], # Åland Islands
-BA = [esams, eqiad], # Bosnia and Herzegowina
-BE = [esams, eqiad], # Belgium
-BG = [esams, eqiad], # Bulgaria
-BY = [esams, eqiad], # Belarus
-CH = [esams, eqiad], # Switzerland
-CZ = [esams, eqiad], # Czech Republic
-DE = [esams, eqiad], # Germany
-DK = [esams, eqiad], # Denmark
-EE = [esams, eqiad], # Estonia
-ES = [esams, eqiad], # Spain
-EU = [esams, eqiad], # Europe region (misc)
-FI = [esams, eqiad], # Finland
-FO = [esams, eqiad], # Faroe Islands
-FR = [esams, eqiad], # France
-GB = [esams, eqiad], # United Kingdom
-GG = [esams, eqiad], # Guernsey
-GI = [esams, eqiad], # Gibraltar
-GR = [esams, eqiad], # Greece
-HR = [esams, eqiad], # Croatia (local name Hrvatska)
-HU = [esams, eqiad], # Hungary
-IE = [esams, eqiad], # Ireland
-IM = [esams, eqiad], # Isle of Man
-IS = [esams, eqiad], # Iceland
-IT = [esams, eqiad], # Italy
-JE = [esams, eqiad], # Jersey
-LI = [esams, eqiad], # Liechtenstein
-LT = [esams, eqiad], # Lithuania
-LU = [esams, eqiad], # Luxembourg
-LV = [esams, eqiad], # Latvia
-MC = [esams, eqiad], # Monaco
-MD = [esams, eqiad], # Moldova, Republic of
-ME = [esams, eqiad], # Montenegro
-MK = [esams, eqiad], # Macedonia, the Former Yugoslav 
Republic of
-MT = [esams, eqiad], # Malta
-NL = [esams, eqiad], # Netherlands
-NO = [esams, eqiad], # Norway
-PL = [esams, eqiad], # Poland
-PT = [esams, eqiad], # Portugal
-RO = [esams, eqiad], # Romania
-RS = [esams, eqiad], # Serbia
+AD = [esams, eqiad], # ESAMS-EQIAD # Andorra
+AL = [esams, eqiad], # ESAMS-EQIAD # Albania
+AT = [esams, eqiad], # ESAMS-EQIAD # Austria
+AX = [esams, eqiad], # ESAMS-EQIAD # Åland Islands
+BA = [esams, eqiad], # ESAMS-EQIAD # Bosnia and 
Herzegowina
+BE = [esams, eqiad], # ESAMS-EQIAD # Belgium
+BG = [esams, eqiad], # ESAMS-EQIAD # Bulgaria
+BY = [esams, eqiad], # ESAMS-EQIAD # Belarus
+CH = [esams, eqiad], # ESAMS-EQIAD # Switzerland
+CZ = [esams, eqiad], # ESAMS-EQIAD # Czech Republic
+DE = [esams, eqiad], # ESAMS-EQIAD # Germany
+DK = [esams, eqiad], # ESAMS-EQIAD # Denmark
+EE = [esams, eqiad], # ESAMS-EQIAD # Estonia
+ES = [esams, eqiad], # ESAMS-EQIAD # Spain
+EU = [esams, eqiad], # ESAMS-EQIAD # Europe region (misc)
+FI = [esams, eqiad], # ESAMS-EQIAD # Finland
+FO = [esams, eqiad], # ESAMS-EQIAD # Faroe Islands
+FR = [esams, eqiad], # ESAMS-EQIAD # France
+GB = [esams, eqiad], # ESAMS-EQIAD # United Kingdom
+GG = [esams, eqiad], # ESAMS-EQIAD # Guernsey
+GI = [esams, eqiad], # ESAMS-EQIAD # Gibraltar
+GR = 

[MediaWiki-commits] [Gerrit] Made the VERP address generation optional - change (mediawiki...BounceHandler)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Made the VERP address generation optional
..

Made the VERP address generation optional

Now, the admin can chose whether or not to start producing VERP address
on send emails.

Change-Id: I0e62994bcfe709c8969379f3bea159c9b52d0dfb
(cherry picked from commit b8a835d34e091e5022948df49b7d2b5a33f170a3)
---
M BounceHandler.php
M BounceHandlerHooks.php
2 files changed, 4 insertions(+), 1 deletion(-)


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

diff --git a/BounceHandler.php b/BounceHandler.php
index 187f73e..e1e3ec2 100644
--- a/BounceHandler.php
+++ b/BounceHandler.php
@@ -49,6 +49,7 @@
 
 /**
  * VERP Configurations
+ * $wgGenerateVERP -  Toggle VERP generation
  * wgVERPprefix - The prefix of the VERP address.
  * wgVERPdomainPart - The domain part of the VERP email address, defaults to 
$wgServerName
  * wgVERPalgorithm - Algorithm to hash the return path address.Possible 
algorithms are
@@ -56,6 +57,7 @@
  * wgVERPsecret - The secret key to hash the return path address
  * wgBounceHandlerUnconfirmUsers - Toggle the user un-subscribe action
  */
+$wgGenerateVERP = true;
 $wgVERPprefix = 'wiki';
 $wgVERPalgorithm = 'md5';
 $wgVERPsecret = 'MediawikiVERP';
diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php
index 75edb7c..35f8998 100644
--- a/BounceHandlerHooks.php
+++ b/BounceHandlerHooks.php
@@ -14,7 +14,8 @@
 * @throws InvalidArgumentException
 */
public static function onVERPAddressGenerate( array $recip, 
$returnPath ) {
-   if ( count( $recip ) === 1 ) {
+   global $wgGenerateVERP;
+   if ( $wgGenerateVERP  count( $recip ) === 1 ) {
self::generateVerp( $recip[0], $returnPath );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e62994bcfe709c8969379f3bea159c9b52d0dfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com

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

[MediaWiki-commits] [Gerrit] Add logging context to database logs - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add logging context to database logs
..


Add logging context to database logs

* Add optional $context parameter to wfDebug, wfDebugLog, wfLogDBError
  and wfErrorLog that will be passed to MWLogger.
* Add support for PSR-3 style log message parameter interpolation in
  MWLoggerLegacyLogger.
* Add context information to wfLogDBError calls made from DatabaseBase,
  DatabaseMysqlBase and LoadBalancer instances.
* Deprecate wfDebugTimer() which now appears to be unused.

Change-Id: Ic90d593d00a2b0b5b80ed205908cbe624042603c
---
M includes/GlobalFunctions.php
M includes/db/Database.php
M includes/db/DatabaseMysqlBase.php
M includes/db/LoadBalancer.php
M includes/debug/logger/legacy/Logger.php
A tests/phpunit/includes/debug/logging/legacy/LoggerTest.php
6 files changed, 214 insertions(+), 30 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 71c3791..25b352b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -950,6 +950,8 @@
  * $wgDebugRawPage - if false, 'action=raw' hits will not result in debug 
output.
  * $wgDebugComments - if on, some debug items may appear in comments in the 
HTML output.
  *
+ * @since 1.25 support for additional context data
+ *
  * @param string $text
  * @param string|bool $dest Destination of the message:
  * - 'all': both to the log and HTML (debug toolbar or HTML comments)
@@ -957,9 +959,11 @@
  *   For backward compatibility, it can also take a boolean:
  * - true: same as 'all'
  * - false: same as 'log'
+ * @param array $context Additional logging context data
  */
-function wfDebug( $text, $dest = 'all' ) {
+function wfDebug( $text, $dest = 'all', array $context = array() ) {
global $wgDebugRawPage, $wgDebugLogPrefix;
+   global $wgDebugTimestamps, $wgRequestTime;
 
if ( !$wgDebugRawPage  wfIsDebugRawPage() ) {
return;
@@ -972,23 +976,36 @@
$dest = 'log';
}
 
-   $timer = wfDebugTimer();
-   if ( $timer !== '' ) {
-   // Prepend elapsed request time and real memory usage to each 
line
-   $text = preg_replace( '/[^\n]/', $timer . '\0', $text, 1 );
+   $text = trim( $text );
+
+   // Inline logic from deprecated wfDebugTimer()
+   if ( $wgDebugTimestamps ) {
+   $context['seconds_elapsed'] = sprintf(
+   '%6.4f',
+   microtime( true ) - $wgRequestTime
+   );
+   $context['memory_used'] = sprintf(
+   '%5.1fM',
+   ( memory_get_usage( true ) / ( 1024 * 1024 ) )
+   );
}
 
if ( $dest === 'all' ) {
-   MWDebug::debugMsg( $text );
+   $prefix = '';
+   if ( $wgDebugTimestamps ) {
+   // Prepend elapsed request time and real memory usage 
with two
+   // trailing spaces.
+   $prefix = {$context['seconds_elapsed']} 
{$context['memory_used']}  ;
+   }
+   MWDebug::debugMsg( {$prefix}{$text} );
}
 
-   $ctx = array();
if ( $wgDebugLogPrefix !== '' ) {
-   $ctx['prefix'] = $wgDebugLogPrefix;
+   $context['prefix'] = $wgDebugLogPrefix;
}
 
$logger = MWLogger::getInstance( 'wfDebug' );
-   $logger-debug( rtrim( $text, \n ), $ctx );
+   $logger-debug( $text, $context );
 }
 
 /**
@@ -1017,10 +1034,13 @@
 /**
  * Get microsecond timestamps for debug logs
  *
+ * @deprecated since 1.25
  * @return string
  */
 function wfDebugTimer() {
global $wgDebugTimestamps, $wgRequestTime;
+
+   wfDeprecated( __METHOD__, '1.25' );
 
if ( !$wgDebugTimestamps ) {
return '';
@@ -1054,6 +1074,7 @@
  * a sampling factor.
  *
  * @since 1.23 support for sampling log messages via $wgDebugLogGroups.
+ * @since 1.25 support for additional context data
  *
  * @param string $logGroup
  * @param string $text
@@ -1065,8 +1086,11 @@
  *   For backward compatibility, it can also take a boolean:
  * - true: same as 'all'
  * - false: same as 'private'
+ * @param array $context Additional logging context data
  */
-function wfDebugLog( $logGroup, $text, $dest = 'all' ) {
+function wfDebugLog(
+   $logGroup, $text, $dest = 'all', array $context = array()
+) {
// Turn $dest into a string if it's a boolean (for b/c)
if ( $dest === true ) {
$dest = 'all';
@@ -1081,19 +1105,21 @@
}
 
$logger = MWLogger::getInstance( $logGroup );
-   $logger-debug( $text, array(
-   'private' = ( $dest === 'private' ),
-   ) );
+   $context['private'] = ( $dest === 'private' );
+   

[MediaWiki-commits] [Gerrit] Made the VERP address generation optional - change (mediawiki...BounceHandler)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Made the VERP address generation optional
..


Made the VERP address generation optional

Now, the admin can chose whether or not to start producing VERP address
on send emails.

Change-Id: I0e62994bcfe709c8969379f3bea159c9b52d0dfb
(cherry picked from commit b8a835d34e091e5022948df49b7d2b5a33f170a3)
---
M BounceHandler.php
M BounceHandlerHooks.php
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/BounceHandler.php b/BounceHandler.php
index 187f73e..e1e3ec2 100644
--- a/BounceHandler.php
+++ b/BounceHandler.php
@@ -49,6 +49,7 @@
 
 /**
  * VERP Configurations
+ * $wgGenerateVERP -  Toggle VERP generation
  * wgVERPprefix - The prefix of the VERP address.
  * wgVERPdomainPart - The domain part of the VERP email address, defaults to 
$wgServerName
  * wgVERPalgorithm - Algorithm to hash the return path address.Possible 
algorithms are
@@ -56,6 +57,7 @@
  * wgVERPsecret - The secret key to hash the return path address
  * wgBounceHandlerUnconfirmUsers - Toggle the user un-subscribe action
  */
+$wgGenerateVERP = true;
 $wgVERPprefix = 'wiki';
 $wgVERPalgorithm = 'md5';
 $wgVERPsecret = 'MediawikiVERP';
diff --git a/BounceHandlerHooks.php b/BounceHandlerHooks.php
index 75edb7c..35f8998 100644
--- a/BounceHandlerHooks.php
+++ b/BounceHandlerHooks.php
@@ -14,7 +14,8 @@
 * @throws InvalidArgumentException
 */
public static function onVERPAddressGenerate( array $recip, 
$returnPath ) {
-   if ( count( $recip ) === 1 ) {
+   global $wgGenerateVERP;
+   if ( $wgGenerateVERP  count( $recip ) === 1 ) {
self::generateVerp( $recip[0], $returnPath );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e62994bcfe709c8969379f3bea159c9b52d0dfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Deploy BounceHandler extension to production - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Deploy BounceHandler extension to production
..


Deploy BounceHandler extension to production

*Deploy only on Selected Wikis.
Depends on I7badb2383a3e4d6d78e28bea6a97c5a51d5be64d

Bug: 69019
Change-Id: I2a5f118ae2a651040c43275d269bfe6114fb971c
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 23 insertions(+), 4 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index fa68039..e3128ee 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -130,10 +130,13 @@
);
 }
 
-// BounceHandler
-require_once( $IP/extensions/BounceHandler/BounceHandler.php );
-//$wgVERPsecret = ''; // This was set in PrivateSettings.php by Legoktm
-$wgBounceHandlerUnconfirmUsers = false;
+// Labs override for BounceHandler
+if ( $wmgUseBounceHandler ) {
+   //$wgVERPsecret = ''; // This was set in PrivateSettings.php by Legoktm
+   $wgBounceHandlerCluster = false;
+   $wgBounceHandlerSharedDB = false;
+   $wgBounceHandlerInternalIPs = array( '127.0.0.1', '::1' );
+}
 
 if ( $wmgUseTimedMediaHandler ) {
$wgMwEmbedModuleConfig[ 'MediaWiki.ApiProviders' ] =  array(
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index be16b16..b307d58 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2203,6 +2203,16 @@
$wgBabelUseUserLanguage = $wmgBabelUseUserLanguage;
 }
 
+if ( $wmgUseBounceHandler ) {
+   require_once $IP/extensions/BounceHandler/BounceHandler.php;
+   // $wmgVERPsecret is set in PrivateSettings.php
+   $wgVERPsecret = $wmgVERPsecret;
+   $wgBounceHandlerUnconfirmUsers = false;
+   $wgBounceHandlerCluster = 'extension1';
+   $wgBounceHandlerSharedDB = 'wikishared';
+   $wgBounceHandlerInternalIPs = array( '208.80.154.90', '208.80.154.89' 
); # polonium and lead
+}
+
 if ( $wmgUseTranslate ) {
require_once( $IP/extensions/Translate/Translate.php );
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 571fa6f..3018ba6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12985,6 +12985,12 @@
'wikidata' = true,
 ),
 
+'wmgUseBounceHandler' = array(
+   'default' = false,
+   'testwiki' = true,
+   'test2wiki' = true
+),
+
 'wmgUseTranslate' = array(
'default' = false,
'bewikimedia' = true, // bug 37391

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a5f118ae2a651040c43275d269bfe6114fb971c
Gerrit-PatchSet: 8
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update Wikidata, fixes for geo precision and lua - change (mediawiki...Wikidata)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Update Wikidata, fixes for geo precision and lua
..

Update Wikidata, fixes for geo precision and lua

Change-Id: I24bd8e5eec8120e3a01e1ae38af24e93d61d51ca
---
M composer.json
M composer.lock
M extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
M vendor/composer/installed.json
M vendor/data-values/geo/Geo.php
M vendor/data-values/geo/README.md
M vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
M vendor/data-values/geo/src/Parsers/DdCoordinateParser.php
M vendor/data-values/geo/src/Parsers/DmCoordinateParser.php
M vendor/data-values/geo/src/Parsers/DmsCoordinateParser.php
M vendor/data-values/geo/src/Parsers/FloatCoordinateParser.php
M vendor/data-values/geo/src/Parsers/GlobeCoordinateParser.php
M vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
M vendor/data-values/geo/tests/unit/Parsers/GlobeCoordinateParserTest.php
17 files changed, 271 insertions(+), 162 deletions(-)


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

diff --git a/composer.json b/composer.json
index 953a1f9..c97e3c5 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,10 @@
 {
 type: vcs,
 url: https://github.com/wmde/WikimediaBadges.git;
+},
+{
+type: vcs,
+url: https://github.com/DataValues/Geo.git;
 }
 ],
 require: {
@@ -32,4 +36,4 @@
 config: {
 autoloader-suffix: wikidata_1_25wmf8
 }
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 0fa0d7e..c4891f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 This file is @generated automatically
 ],
-hash: 836d5d5db2417ec66656ce18e8689802,
+hash: 212a0758023436b3e764996d7d305cdb,
 packages: [
 {
 name: composer/installers,
@@ -258,16 +258,16 @@
 },
 {
 name: data-values/geo,
-version: 1.1.1,
+version: 1.1.3,
 source: {
 type: git,
 url: https://github.com/DataValues/Geo.git;,
-reference: ab544944fddefbf1a9db80b7e122e912d6b70dc0
+reference: ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/DataValues/Geo/zipball/ab544944fddefbf1a9db80b7e122e912d6b70dc0;,
-reference: ab544944fddefbf1a9db80b7e122e912d6b70dc0,
+url: 
https://api.github.com/repos/DataValues/Geo/zipball/ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645;,
+reference: ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645,
 shasum: 
 },
 require: {
@@ -290,7 +290,6 @@
 DataValues\\Geo\\: src
 }
 },
-notification-url: https://packagist.org/downloads/;,
 license: [
 GPL-2.0+
 ],
@@ -317,7 +316,12 @@
 parsers,
 wikidata
 ],
-time: 2014-10-21 09:35:45
+support: {
+irc: irc://irc.freenode.net/wikidata,
+source: https://github.com/DataValues/Geo/tree/1.1.3;,
+issues: https://github.com/DataValues/Geo/issues;
+},
+time: 2014-11-19 17:53:17
 },
 {
 name: data-values/interfaces,
@@ -767,7 +771,9 @@
 psr-4: {
 PropertySuggester\\: src/PropertySuggester/
 },
-files: [],
+files: [
+
+],
 classmap: [
 PropertySuggesterHooks.php,
 maintenance/UpdateTable.php
@@ -1185,7 +1191,7 @@
 source: {
 type: git,
 url: 
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: 09f4b4af833e2dcc1c5597260924b9cc824edf9b
+reference: f23cc183c2c2cef60fce53231df8b4a4d09d96a6
 },
 require: {
 data-values/common: ~0.2.0,
@@ -1253,7 +1259,7 @@
 issues: https://bugzilla.wikimedia.org/;,
 irc: irc://irc.freenode.net/wikidata
 },
-time: 2014-11-19 08:14:02
+time: 2014-11-19 17:29:23
 

[MediaWiki-commits] [Gerrit] Update BounceHandler to 1.25wmf8 HEAD - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has submitted this change and it was merged.

Change subject: Update BounceHandler to 1.25wmf8 HEAD
..


Update BounceHandler to 1.25wmf8 HEAD

Change-Id: I9b26893c5cc7610a8c9a1f6a317f4958daf4fea1
---
M extensions/BounceHandler
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/BounceHandler b/extensions/BounceHandler
index 9d2f650..98dc8dc 16
--- a/extensions/BounceHandler
+++ b/extensions/BounceHandler
-Subproject commit 9d2f650975583ceccda98784b5d6f2b72e4cc2b9
+Subproject commit 98dc8dcf86e0289cd6fcf7b2b913df21480fe540

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b26893c5cc7610a8c9a1f6a317f4958daf4fea1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Use Parser::SFH_NO_HASH class const - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Use Parser::SFH_NO_HASH class const
..


Use Parser::SFH_NO_HASH class const

Instead of the global const

Change-Id: Ice4050bd8bc406a4fe84ea35b1912f8057cd4536
---
M client/includes/hooks/ParserFunctionRegistrant.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved



diff --git a/client/includes/hooks/ParserFunctionRegistrant.php 
b/client/includes/hooks/ParserFunctionRegistrant.php
index 7797f78..d95cb00 100644
--- a/client/includes/hooks/ParserFunctionRegistrant.php
+++ b/client/includes/hooks/ParserFunctionRegistrant.php
@@ -31,7 +31,7 @@
$parser-setFunctionHook(
'noexternallanglinks',
'\Wikibase\NoLangLinkHandler::handle',
-   SFH_NO_HASH
+   Parser::SFH_NO_HASH
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice4050bd8bc406a4fe84ea35b1912f8057cd4536
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Make User::idFromName user-input-safe again - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Make User::idFromName user-input-safe again
..

Make User::idFromName user-input-safe again

In trying to avoid hitting RequestContext::getLanguage() from a call to
User::idFromName(), I05aacd30 made it no longer safe for user input.

A closer analysis of the call stack involved reveals that
Title::makeTitleSafe() is constructing a prefixed dbkey using the
localized name for NS_USER, and then Language::getNsIndex() is needing
to get the variant in order to handle that localized name. But if we use
the canonical name for NS_USER, Language::getNsIndex() short-circuits
and skips the problematic code path.

And it turns out that it doesn't actually matter which prefix
Title::makeTitleSafe() uses, since the prefix doesn't make it anywhere
into the resulting Title object. So let's revert I05aacd30 and Ibeef0409
and just do that instead.

Change-Id: Ib902573996c69d1e77527cc7b2faf4e7fa5d3daf
---
M includes/Title.php
M includes/User.php
2 files changed, 17 insertions(+), 8 deletions(-)


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

diff --git a/includes/Title.php b/includes/Title.php
index b97d36a..f913859 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -503,7 +503,7 @@
}
 
$t = new Title();
-   $t-mDbkeyform = Title::makeName( $ns, $title, $fragment, 
$interwiki );
+   $t-mDbkeyform = Title::makeName( $ns, $title, $fragment, 
$interwiki, true );
if ( $t-secureAndSplit() ) {
return $t;
} else {
@@ -747,12 +747,20 @@
 * @param string $title The DB key form the title
 * @param string $fragment The link fragment (after the #)
 * @param string $interwiki The interwiki prefix
+* @param boolean $canoncialNamespace If true, use the canonical name 
for
+*   $ns instead of the localized version.
 * @return string The prefixed form of the title
 */
-   public static function makeName( $ns, $title, $fragment = '', 
$interwiki = '' ) {
+   public static function makeName( $ns, $title, $fragment = '', 
$interwiki = '',
+   $canoncialNamespace = false
+   ) {
global $wgContLang;
 
-   $namespace = $wgContLang-getNsText( $ns );
+   if ( $canoncialNamespace ) {
+   $namespace = MWNamespace::getCanonicalName( $ns );
+   } else {
+   $namespace = $wgContLang-getNsText( $ns );
+   }
$name = $namespace == '' ? $title : $namespace:$title;
if ( strval( $interwiki ) != '' ) {
$name = $interwiki:$name;
diff --git a/includes/User.php b/includes/User.php
index feaf364..8fcdab2 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -565,14 +565,15 @@
 * @return int|null The corresponding user's ID, or null if user is 
nonexistent
 */
public static function idFromName( $name ) {
+   $nt = Title::makeTitleSafe( NS_USER, $name );
+   if ( is_null( $nt ) ) {
+   // Illegal name
+   return null;
+   }
+
if ( isset( self::$idCacheByName[$name] ) ) {
return self::$idCacheByName[$name];
}
-
-   // We don't want to call Title::makeTitleSafe yet, since that 
call path
-   // ends up needing the user language, which ends up trying to 
load the
-   // user object, which ends up back here (bug 54193).
-   $nt = Title::makeTitle( NS_USER, Title::capitalize( $name, 
NS_USER ) );
 
$dbr = wfGetDB( DB_SLAVE );
$s = $dbr-selectRow(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib902573996c69d1e77527cc7b2faf4e7fa5d3daf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Another icehouse glance update. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Another icehouse glance update.
..

Another icehouse glance update.

Change-Id: Icc6cd2cd7d8e9d4f727d1b7d8e4d578a1f0d8ea4
---
M modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/174459/1

diff --git 
a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb 
b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
index 6b1dcb7..700f429 100644
--- a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
@@ -22,10 +22,6 @@
 # Not supported on OS X.
 #tcp_keepidle = 600
 
-# SQLAlchemy connection string for the reference implementation
-# registry server. Any valid SQLAlchemy connection string is fine.
-# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-sql_connection = mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
 
 # Period in seconds after which SQLAlchemy should reestablish its connection
 # to the database.
@@ -86,3 +82,10 @@
 # [pipeline:glance-registry-keystone], you would configure the flavor below
 # as 'keystone'.
 flavor=keystone
+
+[database]
+
+# SQLAlchemy connection string for the reference implementation
+# registry server. Any valid SQLAlchemy connection string is fine.
+# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+connection = mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc6cd2cd7d8e9d4f727d1b7d8e4d578a1f0d8ea4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Another icehouse glance update. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Another icehouse glance update.
..


Another icehouse glance update.

Change-Id: Icc6cd2cd7d8e9d4f727d1b7d8e4d578a1f0d8ea4
---
M modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
1 file changed, 7 insertions(+), 4 deletions(-)

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



diff --git 
a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb 
b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
index 6b1dcb7..700f429 100644
--- a/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
+++ b/modules/openstack/templates/icehouse/glance/glance-registry.conf.erb
@@ -22,10 +22,6 @@
 # Not supported on OS X.
 #tcp_keepidle = 600
 
-# SQLAlchemy connection string for the reference implementation
-# registry server. Any valid SQLAlchemy connection string is fine.
-# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
-sql_connection = mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %
 
 # Period in seconds after which SQLAlchemy should reestablish its connection
 # to the database.
@@ -86,3 +82,10 @@
 # [pipeline:glance-registry-keystone], you would configure the flavor below
 # as 'keystone'.
 flavor=keystone
+
+[database]
+
+# SQLAlchemy connection string for the reference implementation
+# registry server. Any valid SQLAlchemy connection string is fine.
+# See: 
http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+connection = mysql://%= glanceconfig[db_user] %:%= 
glanceconfig[db_pass] %@%= glanceconfig[db_host] %/%= 
glanceconfig[db_name] %

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc6cd2cd7d8e9d4f727d1b7d8e4d578a1f0d8ea4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Make BounceHandler extension work on test2wiki - change (operations/puppet)

[Jgreen (Code Review)]

Jgreen has submitted this change and it was merged.

Change subject: Make BounceHandler extension work on test2wiki
..


Make BounceHandler extension work on test2wiki

Before mass-rollout in production, its safe to do a prod level test in test2wiki
* Removed +local_domain from the realm switch as it was no longer required there
* Made exim listen to bounces with $local_part as 'wikimedia.org'

Change-Id: I7badb2383a3e4d6d78e28bea6a97c5a51d5be64d
---
M manifests/role/mail.pp
1 file changed, 13 insertions(+), 19 deletions(-)

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



diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index e0c5fea..86027a8 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -32,24 +32,13 @@
 ]
 $verp_post_connect_server = 'mediawiki-verp.wmflabs.org'
 $verp_bounce_post_url = 
'http://mediawiki-verp.wmflabs.org/w/api.php'
-$local_domains  = [
-'+system_domains',
-'+wikimedia_domains',
-'+legacy_mailman_domains',
-'mediawiki-verp.wmflabs.org'
-]
 }
 'production': {
-# currently not used as bouncehandler extension is not yet 
installed in production
-# the api urls should change once the extension gets installed
-$verp_domains   = [ ]
-$verp_post_connect_server = 'login.wikimedia.org'
-$verp_bounce_post_url = 
appservers.svc.${::mw_primary}.wmnet/w/api.php
-$local_domains  = [
-'+system_domains',
-'+wikimedia_domains',
-'+legacy_mailman_domains'
+$verp_domains   = [
+'wikimedia.org'
 ]
+$verp_post_connect_server = 'test2.wikipedia.org'
+$verp_bounce_post_url = 
appservers.svc.${::mw_primary}.wmnet/w/api.php
 }
 default: {
 fail('unknown realm, should be labs or production')
@@ -57,14 +46,19 @@
 }
 
 class { 'exim::roled':
-local_domains= $local_domains,
+verp_domains = $verp_domains,
+verp_post_connect_server = $verp_post_connect_server,
+verp_bounce_post_url = $verp_bounce_post_url,
+local_domains= [
+'+system_domains',
+'+wikimedia_domains',
+'+legacy_mailman_domains',
+'+verp_domains',
+],
 enable_mail_relay= 'primary',
 enable_external_mail = true,
 mediawiki_relay  = true,
 enable_spamassassin  = true,
-verp_domains = $verp_domains,
-verp_post_connect_server = $verp_post_connect_server,
-verp_bounce_post_url = $verp_bounce_post_url,
 }
 
 Class['spamassassin'] - Class['exim::roled']

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7badb2383a3e4d6d78e28bea6a97c5a51d5be64d
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: 01tonythomas 01tonytho...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: CSteipp cste...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update Wikidata, fixes for geo precision and lua - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update Wikidata, fixes for geo precision and lua
..


Update Wikidata, fixes for geo precision and lua

Change-Id: I24bd8e5eec8120e3a01e1ae38af24e93d61d51ca
---
M composer.json
M composer.lock
M extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/LuaWikibaseLibraryTests.lua
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M 
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php
M vendor/composer/installed.json
M vendor/data-values/geo/Geo.php
M vendor/data-values/geo/README.md
M vendor/data-values/geo/src/Formatters/GeoCoordinateFormatter.php
M vendor/data-values/geo/src/Parsers/DdCoordinateParser.php
M vendor/data-values/geo/src/Parsers/DmCoordinateParser.php
M vendor/data-values/geo/src/Parsers/DmsCoordinateParser.php
M vendor/data-values/geo/src/Parsers/FloatCoordinateParser.php
M vendor/data-values/geo/src/Parsers/GlobeCoordinateParser.php
M vendor/data-values/geo/tests/unit/Formatters/GeoCoordinateFormatterTest.php
M vendor/data-values/geo/tests/unit/Parsers/GlobeCoordinateParserTest.php
17 files changed, 273 insertions(+), 162 deletions(-)

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



diff --git a/composer.json b/composer.json
index 953a1f9..419c9d1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,4 +1,6 @@
 {
+name: wikibase/wikidata,
+description: Wikidata build, including related components used for 
wikidata.org.,
 repositories: [
 {
 type: vcs,
@@ -11,6 +13,10 @@
 {
 type: vcs,
 url: https://github.com/wmde/WikimediaBadges.git;
+},
+{
+type: vcs,
+url: https://github.com/DataValues/Geo.git;
 }
 ],
 require: {
@@ -32,4 +38,4 @@
 config: {
 autoloader-suffix: wikidata_1_25wmf8
 }
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 0fa0d7e..c4891f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 This file is @generated automatically
 ],
-hash: 836d5d5db2417ec66656ce18e8689802,
+hash: 212a0758023436b3e764996d7d305cdb,
 packages: [
 {
 name: composer/installers,
@@ -258,16 +258,16 @@
 },
 {
 name: data-values/geo,
-version: 1.1.1,
+version: 1.1.3,
 source: {
 type: git,
 url: https://github.com/DataValues/Geo.git;,
-reference: ab544944fddefbf1a9db80b7e122e912d6b70dc0
+reference: ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645
 },
 dist: {
 type: zip,
-url: 
https://api.github.com/repos/DataValues/Geo/zipball/ab544944fddefbf1a9db80b7e122e912d6b70dc0;,
-reference: ab544944fddefbf1a9db80b7e122e912d6b70dc0,
+url: 
https://api.github.com/repos/DataValues/Geo/zipball/ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645;,
+reference: ed6d1e54302e7e455b27d4e54d2bfb1e3cfe8645,
 shasum: 
 },
 require: {
@@ -290,7 +290,6 @@
 DataValues\\Geo\\: src
 }
 },
-notification-url: https://packagist.org/downloads/;,
 license: [
 GPL-2.0+
 ],
@@ -317,7 +316,12 @@
 parsers,
 wikidata
 ],
-time: 2014-10-21 09:35:45
+support: {
+irc: irc://irc.freenode.net/wikidata,
+source: https://github.com/DataValues/Geo/tree/1.1.3;,
+issues: https://github.com/DataValues/Geo/issues;
+},
+time: 2014-11-19 17:53:17
 },
 {
 name: data-values/interfaces,
@@ -767,7 +771,9 @@
 psr-4: {
 PropertySuggester\\: src/PropertySuggester/
 },
-files: [],
+files: [
+
+],
 classmap: [
 PropertySuggesterHooks.php,
 maintenance/UpdateTable.php
@@ -1185,7 +1191,7 @@
 source: {
 type: git,
 url: 
https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git;,
-reference: 09f4b4af833e2dcc1c5597260924b9cc824edf9b
+reference: f23cc183c2c2cef60fce53231df8b4a4d09d96a6
 },
 require: {
 data-values/common: ~0.2.0,
@@ -1253,7 +1259,7 @@
 issues: https://bugzilla.wikimedia.org/;,
 

[MediaWiki-commits] [Gerrit] LQT import Postprocessing. - change (mediawiki...Flow)

[Werdna (Code Review)]

Werdna has uploaded a new change for review.

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

Change subject: LQT import Postprocessing.
..

LQT import Postprocessing.

Redirect thread page to topic page.
Rewrite watchlist entries.

Change-Id: I3958443b74f1c228aa1f658cda73a0458c0eec85
---
M autoload.php
M i18n/en.json
M includes/Import/Importer.php
M includes/Import/LiquidThreadsApi/Objects.php
A includes/Import/postprocessing/LqtRedirector.php
A includes/Import/postprocessing/Postprocessor.php
M maintenance/convertLqt.php
7 files changed, 124 insertions(+), 1 deletion(-)


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

diff --git a/autoload.php b/autoload.php
index 1940ceb..8c2d9bf 100644
--- a/autoload.php
+++ b/autoload.php
@@ -173,6 +173,7 @@
 $wgAutoloadClasses['Flow\\Import\\ImportException'] = __DIR__ . 
'/includes/Import/ImportSource.php';
 $wgAutoloadClasses['Flow\\Import\\ImportSourceStore'] = __DIR__ . 
'/includes/Import/ImportSourceStore.php';
 $wgAutoloadClasses['Flow\\Import\\Importer'] = __DIR__ . 
'/includes/Import/Importer.php';
+$wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ApiBackend'] = __DIR__ . 
'/includes/Import/LiquidThreadsApi/Source.php';
 $wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\ApiNotFoundException'] = 
__DIR__ . '/includes/Import/LiquidThreadsApi/Source.php';
 $wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\CachedApiData'] = __DIR__ 
. '/includes/Import/LiquidThreadsApi/CachedData.php';
 $wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\CachedData'] = __DIR__ . 
'/includes/Import/LiquidThreadsApi/CachedData.php';
@@ -192,6 +193,10 @@
 $wgAutoloadClasses['Flow\\Import\\LiquidThreadsApi\\TopicIterator'] = __DIR__ 
. '/includes/Import/LiquidThreadsApi/Iterators.php';
 $wgAutoloadClasses['Flow\\Import\\NullImportSourceStore'] = __DIR__ . 
'/includes/Import/ImportSourceStore.php';
 $wgAutoloadClasses['Flow\\Import\\PageImportState'] = __DIR__ . 
'/includes/Import/Importer.php';
+$wgAutoloadClasses['Flow\\Import\\Postprocessing\\LqtRedirector'] = __DIR__ . 
'/includes/Import/postprocessing/LqtRedirector.php';
+$wgAutoloadClasses['Flow\\Import\\Postprocessing\\PostprocessingException'] = 
__DIR__ . '/includes/Import/postprocessing/Postprocessor.php';
+$wgAutoloadClasses['Flow\\Import\\Postprocessing\\Postprocessor'] = __DIR__ . 
'/includes/Import/postprocessing/Postprocessor.php';
+$wgAutoloadClasses['Flow\\Import\\Postprocessing\\ProcessorGroup'] = __DIR__ . 
'/includes/Import/postprocessing/Postprocessor.php';
 $wgAutoloadClasses['Flow\\Import\\TalkpageImportOperation'] = __DIR__ . 
'/includes/Import/Importer.php';
 $wgAutoloadClasses['Flow\\Import\\TopicImportState'] = __DIR__ . 
'/includes/Import/Importer.php';
 $wgAutoloadClasses['Flow\\LinksTableUpdater'] = __DIR__ . 
'/includes/LinksTableUpdater.php';
diff --git a/i18n/en.json b/i18n/en.json
index 369a75c..63b5354 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -457,5 +457,6 @@
apihelp-query+flowinfo-description: Get basic Flow information about 
a page.,
apihelp-query+flowinfo-example-1: Fetch Flow information about 
[[Talk:Sandbox]], [[Main Page]], and [[Talk:Flow]],
flow-edited: Edited,
-   flow-edited-by: Edited by $1
+   flow-edited-by: Edited by $1,
+   flow-lqt-redirect-reason: Redirecting retired LiquidThreads post to 
its converted Flow post
 }
diff --git a/includes/Import/Importer.php b/includes/Import/Importer.php
index f2644f0..25aa862 100644
--- a/includes/Import/Importer.php
+++ b/includes/Import/Importer.php
@@ -6,6 +6,8 @@
 use Flow\Data\ManagerGroup;
 use Flow\DbFactory;
 use Flow\Exception\FlowException;
+use Flow\Import\Postprocessing\ProcessorGroup;
+use Flow\Import\Postprocessing\Postprocessor;
 use Flow\Model\AbstractRevision;
 use Flow\Model\Header;
 use Flow\Model\PostRevision;
@@ -41,6 +43,8 @@
protected $dbFactory;
/** @var bool */
protected $allowUnknownUsernames;
+   /** @var ProcessorGroup **/
+   protected $postprocessors;
 
public function __construct(
ManagerGroup $storage,
@@ -52,6 +56,11 @@
$this-workflowLoaderFactory = $workflowLoaderFactory;
$this-cache = $cache;
$this-dbFactory = $dbFactory;
+   $this-postprocessors = new ProcessorGroup( array( 
'afterTopicImported', 'afterPostImported' ) );
+   }
+
+   public function addPostprocessor( Postprocessor $proc ) {
+   $this-postprocessors-add( $proc );
}
 
/**
@@ -90,6 +99,7 @@
$this-logger ?: new NullLogger,
$this-cache,
$this-dbFactory,
+   $this-postprocessors,
$this-allowUnknownUsernames
) );
}
@@ -185,6 +195,7 @@
LoggerInterface $logger,
BufferedCache 

[MediaWiki-commits] [Gerrit] Upgrade labnet1001 to icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Upgrade labnet1001 to icehouse
..


Upgrade labnet1001 to icehouse

Change-Id: I35cd0ba3e3614499878f669361360f1790b5cfe4
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 2c778d2..a853af5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2882,7 +2882,7 @@
 
 node 'labnet1001.eqiad.wmnet' {
 $cluster = 'virt'
-$openstack_version = 'havana'
+$openstack_version = 'icehouse'
 $use_neutron = false
 
 $ganglia_aggregator = true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35cd0ba3e3614499878f669361360f1790b5cfe4
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update Wikidata, fix for geo precision and lua - change (mediawiki/core)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Update Wikidata, fix for geo precision and lua
..

Update Wikidata, fix for geo precision and lua

see I24bd8e5 for actual changes

Change-Id: Ie105a80aa776769eb0dae8a44cda0b7dbe018fb5
---
M extensions/Wikidata
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/61/174461/1

diff --git a/extensions/Wikidata b/extensions/Wikidata
index 9a0b833..092b3da 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
-Subproject commit 9a0b833ff213047955c6d5462234216cb41f7e5f
+Subproject commit 092b3daa321708f0f510bebbc6264fe0e36ad84c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie105a80aa776769eb0dae8a44cda0b7dbe018fb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Aude aude.w...@gmail.com

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

[MediaWiki-commits] [Gerrit] Use cdb library and provide a back-compat layer - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Use cdb library and provide a back-compat layer
..


Use cdb library and provide a back-compat layer

The new cdb library is pulled in via composer. Since the
library uses namespaces, a backwards-compatability layer
is provided for the old class names:
* CdbReader
* CdbWriter
* CdbException

The PHP/DBA-specific classes should never have been used directly.

Depends on I98302bdf1 in mediawiki/vendor

Change-Id: I39549ac8540b262cf91f7d1830d36327afb3033d
---
M autoload.php
M composer.json
R includes/CdbCompat.php
M includes/cache/LocalisationCache.php
M includes/interwiki/Interwiki.php
D includes/libs/cdb/CdbFunctions.php
D includes/libs/cdb/CdbReader.php
D includes/libs/cdb/CdbReaderDBA.php
D includes/libs/cdb/CdbReaderPHP.php
D includes/libs/cdb/CdbWriter.php
D includes/libs/cdb/CdbWriterDBA.php
D includes/libs/cdb/CdbWriterPHP.php
M maintenance/cdb.php
D tests/phpunit/includes/libs/cdb/CdbTest.php
14 files changed, 34 insertions(+), 924 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index bc039e9..5239edc 100644
--- a/autoload.php
+++ b/autoload.php
@@ -189,14 +189,9 @@
'CategoryPage' = __DIR__ . '/includes/page/CategoryPage.php',
'CategoryPager' = __DIR__ . '/includes/specials/SpecialCategories.php',
'CategoryViewer' = __DIR__ . '/includes/CategoryViewer.php',
-   'CdbException' = __DIR__ . '/includes/libs/cdb/CdbException.php',
-   'CdbFunctions' = __DIR__ . '/includes/libs/cdb/CdbFunctions.php',
-   'CdbReader' = __DIR__ . '/includes/libs/cdb/CdbReader.php',
-   'CdbReaderDBA' = __DIR__ . '/includes/libs/cdb/CdbReaderDBA.php',
-   'CdbReaderPHP' = __DIR__ . '/includes/libs/cdb/CdbReaderPHP.php',
-   'CdbWriter' = __DIR__ . '/includes/libs/cdb/CdbWriter.php',
-   'CdbWriterDBA' = __DIR__ . '/includes/libs/cdb/CdbWriterDBA.php',
-   'CdbWriterPHP' = __DIR__ . '/includes/libs/cdb/CdbWriterPHP.php',
+   'CdbException' = __DIR__ . '/includes/CdbCompat.php',
+   'CdbReader' = __DIR__ . '/includes/CdbCompat.php',
+   'CdbWriter' = __DIR__ . '/includes/CdbCompat.php',
'CgzCopyTransaction' = __DIR__ . 
'/maintenance/storage/recompressTracked.php',
'ChangePassword' = __DIR__ . '/maintenance/changePassword.php',
'ChangeTags' = __DIR__ . '/includes/ChangeTags.php',
@@ -1316,4 +1311,4 @@
'lessc_formatter_lessjs' = __DIR__ . '/includes/libs/lessc.inc.php',
'lessc_parser' = __DIR__ . '/includes/libs/lessc.inc.php',
'profile_point' = __DIR__ . '/profileinfo.php',
-);
\ No newline at end of file
+);
diff --git a/composer.json b/composer.json
index 61f30ce..834e14f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,8 @@
require: {
php: =5.3.3,
psr/log: 1.0.0,
-   cssjanus/cssjanus: 1.1.0
+   cssjanus/cssjanus: 1.1.0,
+   cdb/cdb: 1.0.0
},
require-dev: {
phpunit/phpunit: *
diff --git a/includes/libs/cdb/CdbException.php b/includes/CdbCompat.php
similarity index 64%
rename from includes/libs/cdb/CdbException.php
rename to includes/CdbCompat.php
index 6cda529..0c00b39 100644
--- a/includes/libs/cdb/CdbException.php
+++ b/includes/CdbCompat.php
@@ -18,9 +18,25 @@
  * @file
  */
 
-/**
- * Exception for Cdb errors.
- * This explicitly doesn't subclass MWException to encourage reuse.
+/***
+ * This file contains a set of backwards-compatability class names
+ * after the cdb functions were moved out into a separate library
+ * and put under a proper namespace
+ *
+ * @since 1.25
  */
-class CdbException extends Exception {
-}
+
+/**
+ * @deprecated since 1.25
+ */
+abstract class CdbReader extends \Cdb\Reader {}
+
+/**
+ * @deprecated since 1.25
+ */
+abstract class CdbWriter extends \Cdb\Writer {}
+
+/**
+ * @deprecated since 1.25
+ */
+class CdbException extends \Cdb\Exception {}
diff --git a/includes/cache/LocalisationCache.php 
b/includes/cache/LocalisationCache.php
index ae27fba..2a3cd38 100644
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -20,6 +20,9 @@
  * @file
  */
 
+use Cdb\Exception as CdbException;
+use Cdb\Reader as CdbReader;
+use Cdb\Writer as CdbWriter;
 /**
  * Class for caching the contents of localisation files, Messages*.php
  * and *.i18n.php.
diff --git a/includes/interwiki/Interwiki.php b/includes/interwiki/Interwiki.php
index 55b2506..37a9fcf 100644
--- a/includes/interwiki/Interwiki.php
+++ b/includes/interwiki/Interwiki.php
@@ -19,6 +19,8 @@
  *
  * @file
  */
+use \Cdb\Exception as CdbException;
+use \Cdb\Reader as CdbReader;
 
 /**
  * The interwiki class
diff --git a/includes/libs/cdb/CdbFunctions.php 
b/includes/libs/cdb/CdbFunctions.php
deleted 

[MediaWiki-commits] [Gerrit] Tweaks to Recent Searches. - change (apps...wikipedia)

[Brion VIBBER (Code Review)]

Brion VIBBER has submitted this change and it was merged.

Change subject: Tweaks to Recent Searches.
..


Tweaks to Recent Searches.

Also now handles really long search terms. As much as I'm
normally against truncation and ..., this is a good
place for it.

Change-Id: I3a0175d103f8e96d424abee604836603922d2452
---
M wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
M wikipedia/View Controllers/RecentSearches/RecentSearchCell.xib
2 files changed, 62 insertions(+), 8 deletions(-)

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



diff --git a/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m 
b/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
index 602c348..08eb1be 100644
--- a/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
+++ b/wikipedia/View Controllers/RecentSearches/RecentSearchCell.m
@@ -5,22 +5,41 @@
 #import PaddedLabel.h
 #import NSObject+ConstraintsScale.h
 #import Defines.h
+#import WikiGlyph_Chars.h
 
 #define FONT_SIZE (16.0f * MENUS_SCALE_MULTIPLIER)
-#define FONT_COLOR [UIColor grayColor];
+#define FONT_COLOR [UIColor grayColor]
+#define ICON_SIZE (20.0f * MENUS_SCALE_MULTIPLIER)
+#define ICON_GLYPH WIKIGLYPH_MAGNIFYING_GLASS
+#define BORDER_COLOR [UIColor colorWithWhite:0.9 alpha:1.0]
+#define MAGNIFY_ICON_COLOR [UIColor colorWithWhite:0.8 alpha:1.0]
+
+@interface RecentSearchCell()
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint 
*topBorderHeightConstraint;
+@property (weak, nonatomic) IBOutlet UIView *topBorderView;
+@property (strong, nonatomic) NSAttributedString *magnifyIconString;
+@property (weak, nonatomic) IBOutlet PaddedLabel *iconLabel;
+
+@end
 
 @implementation RecentSearchCell
 
-- (void)awakeFromNib {
-// Initialization code
-
+- (void)awakeFromNib
+{
 self.selectionStyle = UITableViewCellSelectionStyleNone;
 
+self.iconLabel.attributedText = [self getAttributedIconString];
+self.topBorderView.backgroundColor = BORDER_COLOR;
+self.topBorderHeightConstraint.constant = 1.0f / [UIScreen 
mainScreen].scale;
 self.label.font = [UIFont systemFontOfSize:FONT_SIZE];
 
+self.label.numberOfLines = 1;
+self.label.lineBreakMode = NSLineBreakByTruncatingTail; // -- Don't make 
truncating a habit! :) Is bad.
+
 self.label.textColor = FONT_COLOR;
 
-[self adjustConstraintsScaleForViews:@[self.label]];
+[self adjustConstraintsScaleForViews:@[self.label, self.iconLabel]];
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
@@ -29,4 +48,14 @@
 // Configure the view for the selected state
 }
 
+-(NSAttributedString *)getAttributedIconString
+{
+return [[NSAttributedString alloc] initWithString: ICON_GLYPH
+   attributes: @{
+ NSFontAttributeName: 
[UIFont fontWithName:@WikiFont-Glyphs size:ICON_SIZE],
+ 
NSForegroundColorAttributeName : MAGNIFY_ICON_COLOR,
+ 
NSBaselineOffsetAttributeName: @0
+ }];
+}
+
 @end
diff --git a/wikipedia/View Controllers/RecentSearches/RecentSearchCell.xib 
b/wikipedia/View Controllers/RecentSearches/RecentSearchCell.xib
index 990eb32..15c5d5b 100644
--- a/wikipedia/View Controllers/RecentSearches/RecentSearchCell.xib
+++ b/wikipedia/View Controllers/RecentSearches/RecentSearchCell.xib
@@ -15,23 +15,48 @@
 autoresizingMask key=autoresizingMask/
 subviews
 label opaque=NO userInteractionEnabled=NO 
contentMode=left horizontalHuggingPriority=251 
verticalHuggingPriority=251 text=Label lineBreakMode=wordWrap 
numberOfLines=0 baselineAdjustment=alignBaselines adjustsFontSizeToFit=NO 
translatesAutoresizingMaskIntoConstraints=NO id=wta-pq-kUh 
customClass=PaddedLabel
-rect key=frame x=16 y=5 width=306 
height=65/
+rect key=frame x=46 y=5 width=276 
height=65/
+fontDescription key=fontDescription type=system 
pointSize=17/
+color key=textColor 
cocoaTouchSystemColor=darkTextColor/
+nil key=highlightedColor/
+/label
+view contentMode=scaleToFill 
translatesAutoresizingMaskIntoConstraints=NO id=WF0-wK-GT2 userLabel=Top 
Border View
+rect key=frame x=0.0 y=0.0 width=338 
height=1/
+color key=backgroundColor 
white=0.3 alpha=1 colorSpace=calibratedWhite/
+constraints
+constraint firstAttribute=height constant=1 
id=UG4-bJ-juH/
+/constraints
+/view
+label opaque=NO userInteractionEnabled=NO 
contentMode=left 

[MediaWiki-commits] [Gerrit] Update labs compute nodes to icehouse - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Update labs compute nodes to icehouse
..


Update labs compute nodes to icehouse

Change-Id: I03893eef9f03a53802b9979c0ee9a1a9055861cb
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a853af5..298162a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2900,7 +2900,7 @@
 
 node /virt100[1-9].eqiad.wmnet/ {
 $cluster = 'virt'
-$openstack_version = 'havana'
+$openstack_version = 'icehouse'
 $use_neutron = false
 
 include admin

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I03893eef9f03a53802b9979c0ee9a1a9055861cb
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Profiler: move debug() back to base class - change (mediawiki/core)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Profiler: move debug() back to base class
..

Profiler: move debug() back to base class

ProfilerXhprof still uses this when $wgDebugFunctionEntry is true

Change-Id: Id7eb7f050c34533ff2611ff691f6f4a9a703dc59
---
M includes/profiler/Profiler.php
M includes/profiler/ProfilerStandard.php
2 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/174462/1

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index f2bdc84..2d54b47 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -235,4 +235,15 @@
 * @return string
 */
abstract public function getOutput();
+
+   /**
+* Add an entry in the debug log file
+*
+* @param string $s String to output
+*/
+   protected function debug( $s ) {
+   if ( function_exists( 'wfDebug' ) ) {
+   wfDebug( $s );
+   }
+   }
 }
diff --git a/includes/profiler/ProfilerStandard.php 
b/includes/profiler/ProfilerStandard.php
index 15c5cdd..b03b0e3 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -588,17 +588,6 @@
}
 
/**
-* Add an entry in the debug log file
-*
-* @param string $s String to output
-*/
-   protected function debug( $s ) {
-   if ( function_exists( 'wfDebug' ) ) {
-   wfDebug( $s );
-   }
-   }
-
-   /**
 * Add an entry in the debug log group
 *
 * @param string $group Group to send the message to

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7eb7f050c34533ff2611ff691f6f4a9a703dc59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Made lang picker define delegate for selection notification. - change (apps...wikipedia)

[Brion VIBBER (Code Review)]

Brion VIBBER has submitted this change and it was merged.

Change subject: Made lang picker define delegate for selection notification.
..


Made lang picker define delegate for selection notification.

Got rid of a weird compiler warning related to NAV define.

Fixed scale of Searching... message on iPad.

Change-Id: Ie85937244af7f04255d2594144a027b00afcb34a
---
M wikipedia/View Controllers/Languages/LanguagesViewController.h
M wikipedia/View Controllers/Languages/LanguagesViewController.m
M wikipedia/View Controllers/Navigation/Center/CenterNavController.h
M wikipedia/View Controllers/Navigation/Center/CenterNavController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/SearchResults/SearchMessageLabel.m
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/Wikipedia-Prefix.pch
9 files changed, 47 insertions(+), 74 deletions(-)

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



diff --git a/wikipedia/View Controllers/Languages/LanguagesViewController.h 
b/wikipedia/View Controllers/Languages/LanguagesViewController.h
index 299ed87..131ad36 100644
--- a/wikipedia/View Controllers/Languages/LanguagesViewController.h
+++ b/wikipedia/View Controllers/Languages/LanguagesViewController.h
@@ -5,6 +5,13 @@
 #import TopMenuViewController.h
 #import FetcherBase.h
 
+@class LanguagesViewController;
+
+// Protocol for notifying languageSelectionDelegate that selection was made.
+@protocol LanguageSelectionDelegate NSObject
+- (void)languageSelected:(NSDictionary *)langData 
sender:(LanguagesViewController *)sender;
+@end
+
 @interface LanguagesViewController : UIViewController UITableViewDataSource, 
UITableViewDelegate, FetchFinishedDelegate
 
 @property (nonatomic) BOOL downloadLanguagesForCurrentArticle;
@@ -17,4 +24,7 @@
 
 @property (strong, nonatomic) IBOutlet UITableView *tableView;
 
+// Object to receive languageSelected:sender: notifications.
+@property (nonatomic, weak) id LanguageSelectionDelegate 
languageSelectionDelegate;
+
 @end
diff --git a/wikipedia/View Controllers/Languages/LanguagesViewController.m 
b/wikipedia/View Controllers/Languages/LanguagesViewController.m
index 4ef6f17..21075ca 100644
--- a/wikipedia/View Controllers/Languages/LanguagesViewController.m
+++ b/wikipedia/View Controllers/Languages/LanguagesViewController.m
@@ -259,10 +259,7 @@
 - (void)tableView:(UITableView *)tableView 
didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
 NSDictionary *selectedLangInfo = self.filteredLanguagesData[indexPath.row];
-
-[[NSNotificationCenter defaultCenter] postNotificationName: 
@LanguageItemSelected
-object: self
-  userInfo: 
selectedLangInfo];
+[self.languageSelectionDelegate languageSelected:selectedLangInfo 
sender:self];
 }
 
 #pragma mark - Memory
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.h 
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
index 85d7aa0..5e74975 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.h
@@ -34,6 +34,8 @@
 -(ArticleDiscoveryMethod)getDiscoveryMethodForString:(NSString *)string;
 -(NSString *)getStringForDiscoveryMethod:(ArticleDiscoveryMethod)method;
 
+-(void)switchPreferredLanguageToId:(NSString *)languageId name:(NSString 
*)name;
+
 @property (nonatomic) BOOL isTransitioningBetweenViewControllers;
 
 @end
diff --git a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m 
b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
index 99f8a02..9df9461 100644
--- a/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
+++ b/wikipedia/View Controllers/Navigation/Center/CenterNavController.m
@@ -209,7 +209,7 @@
domain: [SessionSingleton 
sharedInstance].currentArticleDomain];
 }];
 if (!articleID) {
-[NAV loadTodaysArticle];
+[self loadTodaysArticle];
 }
 }
 
@@ -233,7 +233,7 @@
 NSString *title = (NSString *)userData;
 if (title) {
 MWPageTitle *pageTitle = [MWPageTitle 
titleWithString:title];
-[NAV loadArticleWithTitle: pageTitle
+[self loadArticleWithTitle: pageTitle
domain: [SessionSingleton 
sharedInstance].domain
  animated: YES
   discoveryMethod: DISCOVERY_METHOD_RANDOM
@@ -245,10 +245,28 @@
 case FETCH_FINAL_STATUS_CANCELLED:
 break;
 case FETCH_FINAL_STATUS_FAILED:
-//[NAV 

[MediaWiki-commits] [Gerrit] Update Wikidata, fix for geo precision and lua - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has submitted this change and it was merged.

Change subject: Update Wikidata, fix for geo precision and lua
..


Update Wikidata, fix for geo precision and lua

see I24bd8e5 for actual changes

Change-Id: Ie105a80aa776769eb0dae8a44cda0b7dbe018fb5
---
M extensions/Wikidata
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/Wikidata b/extensions/Wikidata
index 9a0b833..092b3da 16
--- a/extensions/Wikidata
+++ b/extensions/Wikidata
-Subproject commit 9a0b833ff213047955c6d5462234216cb41f7e5f
+Subproject commit 092b3daa321708f0f510bebbc6264fe0e36ad84c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie105a80aa776769eb0dae8a44cda0b7dbe018fb5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf8
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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