date:20160210

[MediaWiki-commits] [Gerrit] Don't send mention notification for first-post if already me... - change (mediawiki...Flow)

2016-02-10 Thread Matthias Mullie (Code Review)

Matthias Mullie has uploaded a new change for review.

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

Change subject: Don't send mention notification for first-post if already 
mentioned in title
..

Don't send mention notification for first-post if already mentioned in title

Bug: T126345
Change-Id: I9a6a36c1f88149563e873d0d1ed9cf431d3d58d9
---
M includes/Notifications/Controller.php
1 file changed, 31 insertions(+), 24 deletions(-)


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

diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index fbb5979..b10c49c 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -89,17 +89,14 @@
 
$user = $revision->getUser();
$events = array();
-   $mentionEvent = $this->generateMentionEvent( $revision, 
$topicRevision, $topicWorkflow, $user );
-   if ( $mentionEvent ) {
-   $events[] = $mentionEvent;
-   }
+   $mentionedUsers = $this->getMentionedUsers( $revision, 
$topicWorkflow->getOwnerTitle() );
 
$extraData['revision-id'] = $revision->getRevisionId();
$extraData['post-id'] = $revision->getPostId();
$extraData['topic-workflow'] = $topicWorkflow->getId();
$extraData['target-page'] = 
$topicWorkflow->getArticleTitle()->getArticleID();
// pass along mentioned users to other notification, so it 
knows who to ignore
-   $extraData['mentioned-users'] = $mentionEvent ? 
$mentionEvent->getExtraParam( 'mentioned-users' ) : array();
+   $extraData['mentioned-users'] = $mentionedUsers;
 
switch( $eventName ) {
case 'flow-post-reply':
@@ -113,7 +110,16 @@
// title), we don't want to send the 
flow-post-reply notification,
// because users will already receive 
flow-new-topic as well
if ( $this->isFirstPost( $revision, 
$topicWorkflow ) ) {
-   return $events;
+   // if users were mentioned here, we'll 
want to make sure
+   // that they weren't also mentioned in 
the topic title (in
+   // which case they would get 2 
notifications...)
+   if ( $mentionedUsers ) {
+   $mentionedInTitle = 
$this->getMentionedUsers( $topicRevision, $topicWorkflow->getArticleTitle() );
+   $mentionedUsers = 
array_diff_key( $mentionedUsers, $mentionedInTitle );
+   $extraData['mentioned-users'] = 
$mentionedUsers;
+   }
+
+   return $this->generateMentionEvent( 
$revision, $topicRevision, $topicWorkflow, $user, $mentionedUsers );
}
 
break;
@@ -144,7 +150,10 @@
$info['timestamp'] = $data['timestamp'];
}
 
-   array_unshift( $events, EchoEvent::create( $info ) );
+   $events = array( EchoEvent::create( $info ) );
+   if ( $mentionedUsers ) {
+   $events[] = $this->generateMentionEvent( $revision, 
$topicRevision, $topicWorkflow, $user, $mentionedUsers );
+   }
 
return $events;
}
@@ -185,17 +194,7 @@
throw new FlowException( 'Expected Workflow but 
received ' . get_class( $boardWorkflow ) );
}
 
-   $mentionEvent = $this->generateMentionEvent( $topicTitle, 
$topicTitle, $topicWorkflow, $user );
-   $mentionedUsers = array();
-   if ( $mentionEvent ) {
-   $events[] = $mentionEvent;
-   $mentionedUsers = $mentionEvent->getExtraParam( 
'mentioned-users' );
-   }
-
-   // also look at users mentioned in first post: if there are 
any, this
-   // notification shouldn't go through (because they'll already 
receive
-   // the mention notification)
-   $mentionedUsers += $this->getMentionedUsers( $firstPost, 
$topicWorkflow->getArticleTitle() );
+   $mentionedUsers = $this->getMentionedUsers( $topicTitle, 
$topicWorkflow->getOwnerTitle() );
 
$events = array();
$events[] = EchoEvent::create( array(
@@ -216,9 +215,16 @@

$topicWorkflow->getArticleTitle()->getArticleID( Title::GAID_FOR_UPDATE ),
),
// pass

[MediaWiki-commits] [Gerrit] puppetmaster: adapt wmf-reimage to use remote salt calls - change (operations/puppet)

2016-02-10 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: puppetmaster: adapt wmf-reimage to use remote salt calls
..


puppetmaster: adapt wmf-reimage to use remote salt calls

Since puppetmaster and saltmaster are not on the same machine anymore,
we cannot run salt-key locally anymore.

We use a salt runner to execute actions on the master, and get feedback
from our actions.

Bug: T124761
Change-Id: If62bb08f84670b4d290ef34fa8e191a92a8ed1ef
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 25 insertions(+), 20 deletions(-)

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



diff --git a/modules/puppetmaster/files/wmf-reimage 
b/modules/puppetmaster/files/wmf-reimage
index 95e93ab..e7a3bef 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Helper script for reimaging a server.
 # Author: Giuseppe Lavagetto
-# Copyright (c) 2014 the Wikimedia Foundation
+# Copyright (c) 2014-2016 the Wikimedia Foundation
 set -e
 set -u
 SLEEPTIME=60
@@ -27,24 +27,31 @@
 /usr/local/sbin/puppetstoredconfigclean.rb ${nodename}
 }
 
+function __salt_key {
+# Executes a salt key action via salt-call
+local action=${1}
+local nodename=${2}
+local expected=${3}
+local retval=$(salt-call --log-level=warning --output=json publish.runner 
"keys.${action}" ${nodename} | jq --monochrome-output ".local.status == 
\"${expected}\"")
+if [ "${retval}" == "true" ]; then
+return 0
+else
+return 1
+fi
+}
+
 function clean_salt {
 nodename=${1}
 force_yes=${2}
 log "cleaning salt key cache for ${nodename}"
 # delete the key only if it has been accepted already, we are going to
 # ask confirmation later about unaccepted keys
-if salt-key --list accepted | fgrep -q ${nodename}; then
-if [ ${force_yes} -eq 1 ]; then
-salt-key -y --rotate-aes-key= --delete ${nodename}
-else
-salt-key --rotate-aes-key= --delete ${nodename}
+if  __salt_key status ${nodename} "accepted"; then
+if ! __salt_key delete ${nodename} "done"; then
+log "unable to clean salt key, please check manually"
+log "Maybe you need to use the -n switch?"
+exit 1
 fi
-fi
-# salt-key --delete above exits 0 regardless, double check
-if salt-key --list accepted | fgrep -q ${nodename}; then
-log "unable to clean salt key, please check manually"
-log "Maybe you need to use the -n switch?"
-exit 1
 fi
 }
 
@@ -84,18 +91,16 @@
 log "Seeking the SALT node key to add"
 log "This is the time to start a puppet run on the host."
 while true; do
-if ! salt-key --list unaccepted | fgrep -q ${nodename}; then
+if ! __salt_key status ${nodename} "accepted"; then
 echo -n "."
 sleep $SLEEPTIME
 continue
-fi;
-echo "+"
-if [ ${force_yes} -eq 1 ]; then
-salt-key -y -a ${nodename}
-else
-salt-key -a ${nodename}
 fi
-break
+
+if __salt_key accept ${nodename} "done"; then
+echo "+"
+break
+fi
 done
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If62bb08f84670b4d290ef34fa8e191a92a8ed1ef
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Validate sections against AbuseFilter on save - change (mediawiki...ContentTranslation)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Validate sections against AbuseFilter on save
..


Validate sections against AbuseFilter on save

The cxsave API returns validation results now.

Change-Id: I3eb8ab4f3ab5ba7b2f2f302419facc1f42e33fdc
---
M api/ApiContentTranslationSave.php
1 file changed, 30 insertions(+), 1 deletion(-)

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



diff --git a/api/ApiContentTranslationSave.php 
b/api/ApiContentTranslationSave.php
index bcb09bc..2df58a7 100644
--- a/api/ApiContentTranslationSave.php
+++ b/api/ApiContentTranslationSave.php
@@ -6,8 +6,10 @@
  * @license GPL-2.0+
  */
 
+use ContentTranslation\AbuseFilterCheck;
 use ContentTranslation\Translation;
 use ContentTranslation\Database;
+use ContentTranslation\RestbaseClient;
 use ContentTranslation\Translator;
 use ContentTranslation\TranslationUnit;
 use ContentTranslation\TranslationStorageManager;
@@ -47,6 +49,9 @@
// Translation does not exist or belong to another 
translator
$this->dieUsage( 'Invalid translation ID: ' . 
$params['translationid'] );
}
+
+   $validationResults = array();
+
foreach ( $translationUnits as $tuData ) {
$tuData['translationId'] = $translationId;
if ( !isset( $tuData['sectionId'] ) || !isset( 
$tuData['origin'] ) ) {
@@ -54,14 +59,38 @@
}
$translationUnit = new TranslationUnit( $tuData );
TranslationStorageManager::save( $translationUnit );
+
+   $validationResults[$translationUnit->getSectionId()] =
+   $this->validateTranslationUnit(
+   \Title::newFromText( 
$translation['targetTitle'] ),
+   $translationUnit
+   );
}
 
$result = array(
-   'result' => 'success'
+   'result' => 'success',
+   'validations' => $validationResults
);
$this->getResult()->addValue( null, $this->getModuleName(), 
$result );
}
 
+   /**
+* Validate the section content using AbuseFilterCheck
+* @param \Title $title Target title
+* @param TranslationUnit $translationUnit
+* @return array List of any rule violations
+*/
+   protected function validateTranslationUnit( \Title $title, 
TranslationUnit $translationUnit ) {
+   $checker = new AbuseFilterCheck();
+   $restbaseClient = new RestbaseClient( $this->getConfig() );
+   $sectionHTML = $translationUnit->getContent();
+
+   // The section content is HTML. AbuseFilter need wikitext.
+   $text = $restbaseClient->convertHtmlToWikitext( $title, 
$sectionHTML );
+
+   return $checker->checkSection( $this->getUser(), $title, $text 
);
+   }
+
public function getAllowedParams() {
return array(
'translationid' => array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb8ab4f3ab5ba7b2f2f302419facc1f42e33fdc
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pagegenerators.py: refactoring of arg parsing - change (pywikibot/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: pagegenerators.py: refactoring of arg parsing
..


pagegenerators.py: refactoring of arg parsing

Refactoring of arg parsing:
- length checking logic per argument is avoided.
- number of local variables has been reduced.
- logic and variable names are uniform for all args.

Signed-off-by: xqt 

Change-Id: If3f091750bf8eb01fa19cf67185afd4eca6b8d60
---
M pywikibot/pagegenerators.py
1 file changed, 199 insertions(+), 258 deletions(-)

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



diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 7ccf929..521dd98 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -162,8 +162,8 @@
 -imagesused   Work on all images that contained on a certain page.
   Argument can also be given as "-imagesused:linkingpagetitle".
 
--newimagesWork on the 100 newest images. If given as -newimages:x,
-  will work on the x newest images.
+-newimagesIf given as -newimages:x, it will work on the x newest 
images.
+  Otherwise asks to input the number of wanted images.
 
 -newpages Work on the most recent new pages. If given as -newpages:x,
   will work on the x newest pages.
@@ -478,9 +478,22 @@
 
 return dupfiltergen
 
-def getCategory(self, arg):
-"""Return Category and start as defined by arg."""
-categoryname = arg.partition(':')[2]
+def getCategory(self, category):
+"""
+Return Category and start as defined by category.
+
+@param category: category name with start parameter
+@type category: str
+@rtype: tuple
+"""
+if category.startswith('-'):  # old arg parameter
+categoryname = category.partition(':')[2]
+issue_deprecation_warning(
+'The usage of "{0}" as actual parameter of '
+'pagegenerators.getCategory'.format(category),
+categoryname, 2, ArgumentDeprecationWarning)
+else:
+categoryname = category
 if not categoryname:
 categoryname = i18n.input(
 'pywikibot-enter-category-name',
@@ -502,10 +515,16 @@
 defaultNamespace=14))
 return cat, startfrom
 
-def getCategoryGen(self, arg, recurse=False, content=False,
+def getCategoryGen(self, category, recurse=False, content=False,
gen_func=None):
-"""Return generator based on Category defined by arg and gen_func."""
-cat, startfrom = self.getCategory(arg)
+"""
+Return generator based on Category defined by category and gen_func.
+
+@param category: category name with start parameter
+@type category: str
+@rtype generator
+"""
+cat, startfrom = self.getCategory(category)
 
 return gen_func(cat,
 start=startfrom,
@@ -551,289 +570,218 @@
 arguments have been parsed to get the final output generator.
 
 """
+def intNone(v):
+"""Return None if v is None or '' else return int(v)."""
+return v if (v is None or v is '') else int(v)
+
+arg, sep, value = arg.partition(':')
+if value == '':
+value = None
+
 gen = None
-if arg.startswith('-filelinks'):
-fileLinksPageTitle = arg[11:]
-if not fileLinksPageTitle:
-fileLinksPageTitle = i18n.input(
+
+if arg == '-filelinks':
+if not value:
+value = i18n.input(
 'pywikibot-enter-file-links-processing',
 fallback_prompt='Links to which file page should be '
 'processed?')
-if fileLinksPageTitle.startswith(self.site.namespace(6) + ':'):
-fileLinksPage = pywikibot.FilePage(self.site,
-   fileLinksPageTitle)
-else:
-fileLinksPage = pywikibot.FilePage(self.site,
-   'Image:' +
-   fileLinksPageTitle)
-gen = FileLinksGenerator(fileLinksPage)
-elif arg.startswith('-unusedfiles'):
-if len(arg) == 12:
-gen = UnusedFilesGenerator(site=self.site)
-else:
-gen = UnusedFilesGenerator(total=int(arg[13:]), site=self.site)
-elif arg.startswith('-lonelypages'):
-if len(arg) == 12:
-gen = LonelyPagesPageGenerator(site=self.site)
-else:
-gen =

[MediaWiki-commits] [Gerrit] [IMPR] Simplify arg parsing in handle_args method - change (pywikibot/core)

2016-02-10 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: [IMPR] Simplify arg parsing in handle_args method
..

[IMPR] Simplify arg parsing in handle_args method

- avoid length checking logic per argument

Change-Id: If4ab0092f4542c341a3515b530360cf048b29572
---
M scripts/blockpageschecker.py
1 file changed, 9 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/82/269682/1

diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index 66824e5..00d2c08 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -228,21 +228,19 @@
 
 # Process local args
 for arg in local_args:
-if arg == '-always':
+option, sep, value = arg.partition(':')
+if option == '-always':
 always = True
-elif arg == '-move':
+elif option == '-move':
 moveBlockCheck = True
-elif arg == '-show':
+elif option == '-show':
 show = True
-elif arg.startswith('-protectedpages'):
+elif option in ('-protectedpages', '-moveprotected'):
 protectedpages = True
-if len(arg) > 15:
-namespace = int(arg[16:])
-elif arg.startswith('-moveprotected'):
-protectedpages = True
-protectType = 'move'
-if len(arg) > 14:
-namespace = int(arg[15:])
+if option == '-moveprotected':
+protectType = 'move' 
+if value:
+namespace = int(value)
 else:
 genFactory.handleArg(arg)
 

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

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

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

[MediaWiki-commits] [Gerrit] Wikibase: use extension-unittests-composer - change (integration/config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Wikibase: use extension-unittests-composer
..


Wikibase: use extension-unittests-composer

to replace a special job

This in effect also adds a few jobs that are necessary
for PHP 5.5 support.

Bug: T126441
Change-Id: Ifa4585d6a4dbf7a7097cb598576a552d0c3b1de9
---
M jjb/wikidata.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 3 insertions(+), 13 deletions(-)

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

Objections:
  Paladox: There's a problem with this change, please improve



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index a584b94..db164ee 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -100,7 +100,6 @@
 repoorclient: 'repo'
 dependencies: 'CirrusSearch,Elastica,GeoData,cldr'
 dbflavor:
-  - mysql
   - sqlite
 phpflavor:
   - php53
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 75fff8f..490178e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7240,32 +7240,23 @@
 template:
   - name: npm
   - name: composer-test
+  - name: extension-unittests-composer
   - name: extension-qunit-composer
 check:
   - jshint
   - jsonlint
-  - php53lint
-  - composer-validate
 php53:  # 'check php53'
-  - mwext-Wikibase-repo-tests-mysql-php53
   - mwext-Wikibase-repo-tests-sqlite-php53
   - mwext-Wikibase-client-tests-mysql-php53
   - mwext-Wikibase-client-tests-sqlite-php53
 test:
-  - php53lint
-  - composer-validate
   - mwext-mw-selenium-composer
-  - mwext-Wikibase-repo-tests-mysql-hhvm
   - mwext-Wikibase-repo-tests-sqlite-hhvm
   - mwext-Wikibase-client-tests-mysql-hhvm
   - mwext-Wikibase-client-tests-sqlite-hhvm
 gate-and-submit:
-  - php53lint
-  - composer-validate
   - mwext-mw-selenium-composer
-  - mwext-Wikibase-repo-tests-mysql-php53
   - mwext-Wikibase-repo-tests-sqlite-php53
-  - mwext-Wikibase-repo-tests-mysql-hhvm
   - mwext-Wikibase-repo-tests-sqlite-hhvm
   - mwext-Wikibase-client-tests-mysql-php53
   - mwext-Wikibase-client-tests-sqlite-php53
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 2133715..1a8621c 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -81,8 +81,8 @@
 'VikiSemanticTitle': ['VIKI'],
 'VikiTitleIcon': ['VIKI'],
 'VisualEditor': ['Cite'],
-'Wikibase': ['cldr', 'Elastica', 'GeoData', 'Scribunto',
- 'Capiunto'],
+'Wikibase': ['CirrusSearch', 'cldr', 'Elastica', 'GeoData',
+ 'Scribunto', 'Capiunto'],
 'WikibaseQuality': ['Wikibase'],
 'WikibaseQualityConstraints': ['Wikibase', 'WikibaseQuality'],
 'WikibaseQualityExternalValidation': ['Wikibase', 'WikibaseQuality'],

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

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

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

[MediaWiki-commits] [Gerrit] Adding support for PXE Jessie Installer to mcXXXX hosts. - change (operations/puppet)

2016-02-10 Thread Elukey (Code Review)

Elukey has uploaded a new change for review.

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

Change subject: Adding support for PXE Jessie Installer to mc hosts.
..

Adding support for PXE Jessie Installer to mc hosts.

Bug: T123711
Change-Id: I0d53f09db26d325b087fc6a029165fff6d622e56
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 24 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/269668/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 479e358..1cb90ce 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3068,42 +3068,58 @@
 host mc1006 {
hardware ethernet 00:1b:21:70:8d:e3;
fixed-address mc1006.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1007 {
hardware ethernet 00:1b:21:70:8d:45;
fixed-address mc1007.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1008 {
hardware ethernet 00:1b:21:70:8d:3f;
fixed-address mc1008.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 
 host mc1009 {
hardware ethernet 90:e2:ba:18:95:64;
fixed-address mc1009.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1010 {
hardware ethernet 90:e2:ba:1d:48:e4;
fixed-address mc1010.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1011 {
hardware ethernet 90:e2:ba:18:93:9c;
fixed-address mc1011.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1012 {
hardware ethernet 90:e2:ba:18:97:30;
fixed-address mc1012.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1013 {
hardware ethernet 90:e2:ba:18:92:4c;
fixed-address mc1013.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1014 {
@@ -3114,25 +3130,29 @@
 host mc1015 {
hardware ethernet 90:e2:ba:18:96:7c;
fixed-address mc1015.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1016 {
hardware ethernet 90:e2:ba:18:91:88;
fixed-address mc1016.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1017 {
hardware ethernet 00:10:18:ef:fe:10;
fixed-address mc1017.eqiad.wmnet;
-   option pxelinux.pathprefix "precise-installer/";
-   filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1018 {
hardware ethernet 00:10:18:ef:f6:d0;
fixed-address mc1018.eqiad.wmnet;
-   option pxelinux.pathprefix "precise-installer/";
-   filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc2001 {

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

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

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

[MediaWiki-commits] [Gerrit] Port Varnish systemd unit file to Varnish 4 - change (operations/puppet)

2016-02-10 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Port Varnish systemd unit file to Varnish 4
..


Port Varnish systemd unit file to Varnish 4

- Use thread_pool_min, thread_pool_max and thread_pool_timeout instead
  of -w INT,INT,INT
- Rename shm_reclen into vsl_reclen. Although shm_reclen is still
  accepted, varnishd(1) suggests to use vsl_reclen instead
- Drop -p user=varnish, Varnish 4 runs as user varnish by default
- Drop -p shm_workspace, it is gone without much explanation

Bug: T122880
Change-Id: I6dd3a0da9e2645a3dfc58da5599e24c921a88e80
---
M modules/varnish/templates/initscripts/varnish.systemd.erb
1 file changed, 10 insertions(+), 2 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb 
b/modules/varnish/templates/initscripts/varnish.systemd.erb
index 7fb8692..6d3f020 100644
--- a/modules/varnish/templates/initscripts/varnish.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnish.systemd.erb
@@ -16,12 +16,20 @@
 -a <%= @ports.map { |p| ":"+p }.join(",") -%> \
 -T 127.0.0.1:<%= @admin_port -%> \
 -f /etc/varnish/wikimedia_<%= @vcl -%>.vcl \
+<% if @varnish_version4 -%>
+-p thread_pool_min=250 -p thread_pool_max=<%= @processorcount.to_i * 250 -%> 
-p thread_pool_timeout=120 \
+-p vsl_reclen=2048 \
+<% else -%>
 -w 250,<%= @processorcount.to_i * 250 -%>,120 \
+-p shm_reclen=2048 \
+-p user=varnish \
+-p shm_workspace=16384 \
+<% end -%>
 -S /etc/varnish/secret \
 <%= @storage -%> \
--p user=varnish -p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
+-p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
 -p listen_depth=4096 -p session_max=20 -p vcc_err_unref=off \
--p nuke_limit=300 -p shm_workspace=16384 -p shm_reclen=2048 \
+-p nuke_limit=300 \
 -p http_req_size=24576 \
 <%= @runtime_params -%> \
 <%= @extraopts -%> \

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

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

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

[MediaWiki-commits] [Gerrit] Exclude bots - change (mediawiki...ORES)

2016-02-10 Thread Ladsgroup (Code Review)

Ladsgroup has uploaded a new change for review.

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

Change subject: Exclude bots
..

Exclude bots

Change-Id: Id43788effdf5a5928d00c64f51bfebe6bbb3dda4
---
M extension.json
M includes/Hooks.php
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/72/269672/1

diff --git a/extension.json b/extension.json
index 17833cd..c0ee904 100644
--- a/extension.json
+++ b/extension.json
@@ -71,6 +71,7 @@
},
"config": {
"OresBaseUrl": "https://ores.wmflabs.org/;,
+   "OresExcludeBots": true,
"OresModels": [
"damaging",
"goodfaith",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index b2d88f5..97bbef2 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -36,6 +36,11 @@
 * Ask the ORES server for scores on this recent change
 */
public static function onRecentChange_save( RecentChange $rc ) {
+   global $wgOresExcludeBots;
+   if ( $rc->getAttribute( 'rc_bot' ) && $wgOresExcludeBots ) {
+   return true;
+   }
+
if ( $rc->getAttribute( 'rc_type' ) === RC_EDIT ) {
$logger = LoggerFactory::getInstance( 'ORES' );
$logger->debug( 'Processing edit' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id43788effdf5a5928d00c64f51bfebe6bbb3dda4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] Temporary remove of mc1006.eqiad from the redis/memcached po... - change (operations/puppet)

2016-02-10 Thread Elukey (Code Review)

Elukey has submitted this change and it was merged.

Change subject: Temporary remove of mc1006.eqiad from the redis/memcached pool 
for maintenance.
..


Temporary remove of mc1006.eqiad from the redis/memcached pool for maintenance.

Bug: T123711
Change-Id: I220661038453e063f04e75188878897afc312ec8
---
M hieradata/common/mediawiki/redis_servers.yaml
M hieradata/eqiad.yaml
2 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/hieradata/common/mediawiki/redis_servers.yaml 
b/hieradata/common/mediawiki/redis_servers.yaml
index da819d2..1f84ec4 100644
--- a/hieradata/common/mediawiki/redis_servers.yaml
+++ b/hieradata/common/mediawiki/redis_servers.yaml
@@ -4,7 +4,6 @@
   - '10.64.0.182:6379:1 "shard03"'
   - '10.64.0.183:6379:1 "shard04"'
   - '10.64.0.184:6379:1 "shard05"'
-  - '10.64.0.185:6379:1 "shard06"'
   - '10.64.32.161:6379:1 "shard07"'
   - '10.64.32.162:6379:1 "shard08"'
   - '10.64.32.163:6379:1 "shard09"'
@@ -19,7 +18,7 @@
   - '10.64.48.96:6379:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
-
+# - '10.64.0.185:6379:1 "shard06"'
 
 codfw:
   - '10.192.0.34:6379:1 "shard01"'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 1530b64..682088c 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -7,7 +7,6 @@
   - '10.64.0.182:11211:1'
   - '10.64.0.183:11211:1 "shard04"'
   - '10.64.0.184:11211:1 "shard05"'
-  - '10.64.0.185:11211:1'
   - '10.64.32.161:11211:1 "shard07"'
   - '10.64.32.162:11211:1 "shard08"'
   - '10.64.32.163:11211:1 "shard09"'
@@ -22,6 +21,7 @@
   - '10.64.48.96:11211:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
+# - '10.64.0.185:11211:1'
 
 #
 # Ganglia

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I220661038453e063f04e75188878897afc312ec8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [WiP] BSApiExtJSStoreBase: Implemted 'date' filter - change (mediawiki...BlueSpiceFoundation)

2016-02-10 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: [WiP] BSApiExtJSStoreBase: Implemted 'date' filter
..

[WiP] BSApiExtJSStoreBase: Implemted 'date' filter

Adding implementation for ExtJS filter of type 'date'

THIS IS WORK IN PROGRESS. DO NOT MERGE.

Change-Id: I795bb89016c8be2d9c57b33ed138080784d27539
---
M includes/api/BSApiExtJSStoreBase.php
1 file changed, 27 insertions(+), 1 deletion(-)


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

diff --git a/includes/api/BSApiExtJSStoreBase.php 
b/includes/api/BSApiExtJSStoreBase.php
index 46b5fe2..60a8032 100644
--- a/includes/api/BSApiExtJSStoreBase.php
+++ b/includes/api/BSApiExtJSStoreBase.php
@@ -328,7 +328,14 @@
return false;
}
}
-   //TODO: Implement for type 'date' and 'datetime'
+
+   if( $oFilter->type == 'date' ) {
+   $bFilterApplies = $this->filterDate( $oFilter, 
$aDataSet );
+   if( !$bFilterApplies ) {
+   return false;
+   }
+   }
+   //TODO: Implement for type 'datetime'
}
 
return true;
@@ -427,6 +434,25 @@
}
 
/**
+* Performs filtering based on given filter of type bool on a dataset
+* @param object $oFilter
+* @param object $aDataSet
+*/
+   public function filterDate( $oFilter, $aDataSet ) {
+   $oFilterDate = MWTimestamp::getInstance( $oFilter->value 
)->timestamp;
+   $oFieldValue = MWTimestamp::getInstance( $aDataSet->{ 
$oFilter->field } )->timestamp;
+
+   switch( $oFilter->comparison ) {
+   case 'gt':
+   return $oFieldValue > $oFilterValue;
+   case 'lt':
+   return $oFieldValue < $oFilterValue;
+   case 'eq':
+   return $oFieldValue === $oFilterValue;
+   }
+   }
+
+   /**
 * Applies pagination on the result
 * @param array $aProcessedData The filtered result
 * @return array a trimmed version of the result

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I795bb89016c8be2d9c57b33ed138080784d27539
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] In Installer, set the user to an anon in RequestContext, not... - change (mediawiki/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: In Installer, set the user to an anon in RequestContext, not 
just wgUser
..


In Installer, set the user to an anon in RequestContext, not just wgUser

This hack to prevent $wgUser being loaded was apparently not updated
when RequestContext was introduced.

Fixes T126177 independently of I13d8aa1453c

Bug: T126177
Change-Id: Iedceec3044352e433710d97d5c7c81fff1a6a3e5
---
M includes/installer/Installer.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index e61e2d2..ca1d8a3 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -385,6 +385,7 @@
 
// Having a user with id = 0 safeguards us from DB access via 
User::loadOptions().
$wgUser = User::newFromId( 0 );
+   RequestContext::getMain()->setUser( $wgUser );
 
$this->settings = $this->internalDefaults;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedceec3044352e433710d97d5c7c81fff1a6a3e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Waldir 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] In Installer, set the context language early to avoid loadin... - change (mediawiki/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: In Installer, set the context language early to avoid loading 
from User
..


In Installer, set the context language early to avoid loading from User

Set the context language early, even before the session is loaded, to
avoid attempting to call User::loadFromSession(). Also update the things
that set $wgLang to also set it in RequestContext.

Passing $wgUser through to the ParserOptions constructor isn't strictly
necessary right now, but it does at least show the intended data flow
and is more robust to future changes in the way the language is passed
through to ParserOptions.

Fixes bug T126177 independently of my other two patches.

Bug: T126177
Change-Id: I15eb9cdce7805382d96b6fc6ffb9b25855876417
---
M includes/installer/CliInstaller.php
M includes/installer/Installer.php
M mw-config/index.php
3 files changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/installer/CliInstaller.php 
b/includes/installer/CliInstaller.php
index 7290740..55ec8df 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -75,6 +75,7 @@
$wgContLang = Language::factory( $option['lang'] );
$wgLang = Language::factory( $option['lang'] );
$wgLanguageCode = $option['lang'];
+   RequestContext::getMain()->setLanguage( $wgLang );
}
 
$this->setVar( 'wgSitename', $siteName );
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index e61e2d2..f7458c4 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -361,6 +361,10 @@
public function __construct() {
global $wgMessagesDirs, $wgUser;
 
+   // Don't attempt to load user language options (T126177)
+   // This will be overridden in the web installer with the 
user-specified language
+   RequestContext::getMain()->setLanguage( 'en' );
+
// Disable the i18n cache
Language::getLocalisationCache()->disableBackend();
// Disable LoadBalancer and wfGetDB etc.
@@ -405,7 +409,7 @@
}
 
$this->parserTitle = Title::newFromText( 'Installer' );
-   $this->parserOptions = new ParserOptions; // language will be 
wrong :(
+   $this->parserOptions = new ParserOptions( $wgUser ); // 
language will be wrong :(
$this->parserOptions->setEditSection( false );
}
 
diff --git a/mw-config/index.php b/mw-config/index.php
index 31b201c..75a93a3 100644
--- a/mw-config/index.php
+++ b/mw-config/index.php
@@ -71,6 +71,7 @@
$langCode = 'en';
}
$wgLang = Language::factory( $langCode );
+   RequestContext::getMain()->setLanguage( $wgLang );
 
$installer->setParserLanguage( $wgLang );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15eb9cdce7805382d96b6fc6ffb9b25855876417
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Wikibase: use extension-unittests-composer - change (integration/config)

2016-02-10 Thread JanZerebecki (Code Review)

JanZerebecki has uploaded a new change for review.

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

Change subject: Wikibase: use extension-unittests-composer
..

Wikibase: use extension-unittests-composer

to replace a special job

Change-Id: Ifa4585d6a4dbf7a7097cb598576a552d0c3b1de9
---
M jjb/wikidata.yaml
M zuul/layout.yaml
M zuul/parameter_functions.py
3 files changed, 3 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/93/269693/1

diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index a584b94..db164ee 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -100,7 +100,6 @@
 repoorclient: 'repo'
 dependencies: 'CirrusSearch,Elastica,GeoData,cldr'
 dbflavor:
-  - mysql
   - sqlite
 phpflavor:
   - php53
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 75fff8f..490178e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7240,32 +7240,23 @@
 template:
   - name: npm
   - name: composer-test
+  - name: extension-unittests-composer
   - name: extension-qunit-composer
 check:
   - jshint
   - jsonlint
-  - php53lint
-  - composer-validate
 php53:  # 'check php53'
-  - mwext-Wikibase-repo-tests-mysql-php53
   - mwext-Wikibase-repo-tests-sqlite-php53
   - mwext-Wikibase-client-tests-mysql-php53
   - mwext-Wikibase-client-tests-sqlite-php53
 test:
-  - php53lint
-  - composer-validate
   - mwext-mw-selenium-composer
-  - mwext-Wikibase-repo-tests-mysql-hhvm
   - mwext-Wikibase-repo-tests-sqlite-hhvm
   - mwext-Wikibase-client-tests-mysql-hhvm
   - mwext-Wikibase-client-tests-sqlite-hhvm
 gate-and-submit:
-  - php53lint
-  - composer-validate
   - mwext-mw-selenium-composer
-  - mwext-Wikibase-repo-tests-mysql-php53
   - mwext-Wikibase-repo-tests-sqlite-php53
-  - mwext-Wikibase-repo-tests-mysql-hhvm
   - mwext-Wikibase-repo-tests-sqlite-hhvm
   - mwext-Wikibase-client-tests-mysql-php53
   - mwext-Wikibase-client-tests-sqlite-php53
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 2133715..1a8621c 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -81,8 +81,8 @@
 'VikiSemanticTitle': ['VIKI'],
 'VikiTitleIcon': ['VIKI'],
 'VisualEditor': ['Cite'],
-'Wikibase': ['cldr', 'Elastica', 'GeoData', 'Scribunto',
- 'Capiunto'],
+'Wikibase': ['CirrusSearch', 'cldr', 'Elastica', 'GeoData',
+ 'Scribunto', 'Capiunto'],
 'WikibaseQuality': ['Wikibase'],
 'WikibaseQualityConstraints': ['Wikibase', 'WikibaseQuality'],
 'WikibaseQualityExternalValidation': ['Wikibase', 'WikibaseQuality'],

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

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

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

[MediaWiki-commits] [Gerrit] [WIP] Re-organize analytics dumps to their own page - change (operations/puppet)

2016-02-10 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review.

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

Change subject: [WIP] Re-organize analytics dumps to their own page
..

[WIP] Re-organize analytics dumps to their own page

Do not merge this yet - subject to public discussion

Change-Id: Id4b93e5eb161407bd27f05faee8f1964a996ddbc
---
A modules/dataset/files/html/analytics_index.html
M modules/dataset/manifests/html.pp
2 files changed, 166 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/269696/1

diff --git a/modules/dataset/files/html/analytics_index.html 
b/modules/dataset/files/html/analytics_index.html
new file mode 100644
index 000..f05e593
--- /dev/null
+++ b/modules/dataset/files/html/analytics_index.html
@@ -0,0 +1,150 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
+http://www.w3.org/1999/xhtml; xml:lang="en" lang="en" dir="ltr">
+
+
+
+
+
+Wikimedia Downloads: Analytics
+/**/
+
+
+
+
+
+Wikimedia Downloads: Analytics Datasets
+Data compiled by community and staff, from projects hosted by 
the Wikimedia Foundation.
+
+Article statistics
+
+Pageviews: statistics compiled using the 
current Pageview 
Definition.  Available since May 2015.  Download in these formats:
+
+Pageview/projectview data filtered 
to what we believe is only human traffic
+Pageview/projectview 
data from above, compressed without loss, in Erik Zachte's format
+
+
+
+Media statistics
+
+Mediacounts: statistics from all sites on 
media file access.  Available in these formats:
+
+Request counts for the upload 
domain (pictures, movies, audio files)
+
+
+
+Deprecated* datasets
+
+Pagecounts: simple pageview definition.  
Available from 2007 to 2016.  Some of the data does not include counts from the 
mobile site and no filtering of automata is performed.  Download in these 
formats:
+
+Pagecount data collected by 
Domas Mituzas
+Pagecount/projectcount data 
derived by Erik Zachte from Domas Mituzas' archives
+Pagecount/projectcount 
data including mobile/zero sites, starting October 2014
+
+
+
+
+
+
+* Deprecated: no longer updated or maintained; 
replaced by a better dataset.
+
+
+
+
+
diff --git a/modules/dataset/manifests/html.pp 
b/modules/dataset/manifests/html.pp
index a7d0993..85e5af3 100644
--- a/modules/dataset/manifests/html.pp
+++ b/modules/dataset/manifests/html.pp
@@ -1,9 +1,10 @@
 class dataset::html(
-$public   = true,
-$other= true,
-$archive  = true,
-$poty = true,
-$pagecounts_ez = true
+$public = true,
+$other  = true,
+$archive= true,
+$poty   = true,
+$pagecounts_ez  = true,
+

[MediaWiki-commits] [Gerrit] ApiMessage: Use a trait to avoid code duplication - change (mediawiki/core)

2016-02-10 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: ApiMessage: Use a trait to avoid code duplication
..

ApiMessage: Use a trait to avoid code duplication

Change-Id: I19eb63bdc4c4cbd137f4d2101d37c81ce91aa6b3
---
M includes/api/ApiMessage.php
M tests/phpunit/includes/api/ApiMessageTest.php
2 files changed, 48 insertions(+), 74 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/97/269697/1

diff --git a/includes/api/ApiMessage.php b/includes/api/ApiMessage.php
index 5c3434f..f24a7cc 100644
--- a/includes/api/ApiMessage.php
+++ b/includes/api/ApiMessage.php
@@ -64,14 +64,56 @@
 }
 
 /**
+ * Trait to implement the IApiMessage interface for Message subclasses
+ * @since 1.27
+ * @ingroup API
+ */
+trait ApiMessageTrait {
+   protected $apiCode = null;
+   protected $apiData = array();
+
+   public function getApiCode() {
+   return $this->apiCode === null ? $this->getKey() : 
$this->apiCode;
+   }
+
+   public function setApiCode( $code, array $data = null ) {
+   $this->apiCode = $code;
+   if ( $data !== null ) {
+   $this->setApiData( $data );
+   }
+   }
+
+   public function getApiData() {
+   return $this->apiData;
+   }
+
+   public function setApiData( array $data ) {
+   $this->apiData = $data;
+   }
+
+   public function serialize() {
+   return serialize( array(
+   'parent' => parent::serialize(),
+   'apiCode' => $this->apiCode,
+   'apiData' => $this->apiData,
+   ) );
+   }
+
+   public function unserialize( $serialized ) {
+   $data = unserialize( $serialized );
+   parent::unserialize( $data['parent'] );
+   $this->apiCode = $data['apiCode'];
+   $this->apiData = $data['apiData'];
+   }
+}
+
+/**
  * Extension of Message implementing IApiMessage
  * @since 1.25
  * @ingroup API
- * @todo: Would be nice to use a Trait here to avoid code duplication
  */
 class ApiMessage extends Message implements IApiMessage {
-   protected $apiCode = null;
-   protected $apiData = array();
+   use ApiMessageTrait;
 
/**
 * Create an IApiMessage for the message
@@ -119,51 +161,15 @@
$this->apiCode = $code;
$this->apiData = (array)$data;
}
-
-   public function getApiCode() {
-   return $this->apiCode === null ? $this->getKey() : 
$this->apiCode;
-   }
-
-   public function setApiCode( $code, array $data = null ) {
-   $this->apiCode = $code;
-   if ( $data !== null ) {
-   $this->setApiData( $data );
-   }
-   }
-
-   public function getApiData() {
-   return $this->apiData;
-   }
-
-   public function setApiData( array $data ) {
-   $this->apiData = $data;
-   }
-
-   public function serialize() {
-   return serialize( array(
-   'parent' => parent::serialize(),
-   'apiCode' => $this->apiCode,
-   'apiData' => $this->apiData,
-   ) );
-   }
-
-   public function unserialize( $serialized ) {
-   $data = unserialize( $serialized );
-   parent::unserialize( $data['parent'] );
-   $this->apiCode = $data['apiCode'];
-   $this->apiData = $data['apiData'];
-   }
 }
 
 /**
  * Extension of RawMessage implementing IApiMessage
  * @since 1.25
  * @ingroup API
- * @todo: Would be nice to use a Trait here to avoid code duplication
  */
 class ApiRawMessage extends RawMessage implements IApiMessage {
-   protected $apiCode = null;
-   protected $apiData = array();
+   use ApiMessageTrait;
 
/**
 * @param RawMessage|string|array $msg
@@ -188,39 +194,5 @@
}
$this->apiCode = $code;
$this->apiData = (array)$data;
-   }
-
-   public function getApiCode() {
-   return $this->apiCode === null ? $this->getKey() : 
$this->apiCode;
-   }
-
-   public function setApiCode( $code, array $data = null ) {
-   $this->apiCode = $code;
-   if ( $data !== null ) {
-   $this->setApiData( $data );
-   }
-   }
-
-   public function getApiData() {
-   return $this->apiData;
-   }
-
-   public function setApiData( array $data ) {
-   $this->apiData = $data;
-   }
-
-   public function serialize() {
-   return serialize( array(
-   'parent' => parent::serialize(),
-   'apiCode' => $this->apiCode,
-

[MediaWiki-commits] [Gerrit] * [IMPR] Simplify arg parsing in handle_args method - change (pywikibot/core)

2016-02-10 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: * [IMPR] Simplify arg parsing in handle_args method
..

* [IMPR] Simplify arg parsing in handle_args method

- avoid length checking logic per argument
- simplify logic for default values
- logic and variable names are uniform for all args

Change-Id: I30818d229b1462f084faa1dc42945f11083f5e7a
---
M scripts/add_text.py
1 file changed, 19 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/80/269680/1

diff --git a/scripts/add_text.py b/scripts/add_text.py
index f6049f5..4aad637 100755
--- a/scripts/add_text.py
+++ b/scripts/add_text.py
@@ -64,7 +64,7 @@
 
 #
 # (C) Filnik, 2007-2010
-# (C) Pywikibot team, 2007-2015
+# (C) Pywikibot team, 2007-2016
 #
 # Distributed under the terms of the MIT license.
 #
@@ -305,42 +305,30 @@
 
 # Loading the arguments
 for arg in local_args:
-if arg.startswith('-textfile'):
-if len(arg) == 9:
-textfile = pywikibot.input(
-u'Which textfile do you want to add?')
-else:
-textfile = arg[10:]
-elif arg.startswith('-text'):
-if len(arg) == 5:
-addText = pywikibot.input(u'What text do you want to add?')
-else:
-addText = arg[6:]
-elif arg.startswith('-summary'):
-if len(arg) == 8:
-summary = pywikibot.input(u'What summary do you want to use?')
-else:
-summary = arg[9:]
-elif arg.startswith('-excepturl'):
-if len(arg) == 10:
-regexSkipUrl = pywikibot.input(u'What text should I skip?')
-else:
-regexSkipUrl = arg[11:]
-elif arg.startswith('-except'):
-if len(arg) == 7:
-regexSkip = pywikibot.input(u'What text should I skip?')
-else:
-regexSkip = arg[8:]
-elif arg == '-up':
+option, sep, value = arg.partition(':')
+if option == '-textfile':
+textfile = value or pywikibot.input(
+'Which textfile do you want to add?')
+elif option == '-text':
+addText = value or pywikibot.input('What text do you want to add?')
+elif option == '-summary':
+summary = value or pywikibot.input(
+'What summary do you want to use?')
+elif option == '-excepturl':
+regexSkipUrl = value or pywikibot.input('What text should I skip?')
+elif option == '-except':
+regexSkip = value or pywikibot.input('What text should I skip?')
+elif option == '-up':
 up = True
-elif arg == '-noreorder':
+elif option == '-noreorder':
 reorderEnabled = False
-elif arg == '-always':
+elif option == '-always':
 always = True
-elif arg == '-talk' or arg == '-talkpage':
+elif option in ('-talk', '-talkpage'):
 talkPage = True
 else:
 genFactory.handleArg(arg)
+
 if textfile and not addText:
 with codecs.open(textfile, 'r', config.textfile_encoding) as f:
 addText = f.read()

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

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

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

[MediaWiki-commits] [Gerrit] Fix 0.15.11 version number - change (data-values/value-view)

2016-02-10 Thread WMDE

Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Fix 0.15.11 version number
..

Fix 0.15.11 version number

0.15.9 and 0.15.10 are both identical to 0.15.8.

Change-Id: I5a6ddd44f66ee6a7bbd6c2aef7c171ba268427c1
---
M RELEASE-NOTES.md
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/data-values/value-view 
refs/changes/81/269681/1

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 5fcd31d..e687576 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,6 @@
 # ValueView release notes
 
-## 0.15.9 (2016-02-03)
+## 0.15.11 (2016-02-03)
 
 * Correctly detect a changed language code when editing a 
`MonolingualTextValue`
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a6ddd44f66ee6a7bbd6c2aef7c171ba268427c1
Gerrit-PatchSet: 1
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] otrs: Login wikimedia AgentLogo file - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: otrs: Login wikimedia AgentLogo file
..


otrs: Login wikimedia AgentLogo file

Populate a login logo made for wikimedia installation

Bug: T125911
Change-Id: I943da0e6146c44181cd25c5ef66ce97bec8b1f2e
---
A modules/otrs/files/loginlogo_default_wmf.png
M modules/otrs/manifests/init.pp
2 files changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/otrs/files/loginlogo_default_wmf.png 
b/modules/otrs/files/loginlogo_default_wmf.png
new file mode 100644
index 000..658d68c
--- /dev/null
+++ b/modules/otrs/files/loginlogo_default_wmf.png
Binary files differ
diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index 26811c7..7be7b40 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -126,6 +126,13 @@
 mode   => '0664',
 source => 'puppet:///modules/otrs/logo_bg_wmf.png',
 }
+file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/loginlogo_default.png':
+ensure => 'file',
+owner  => 'otrs',
+group  => 'www-data',
+mode   => '0664',
+source => 'puppet:///modules/otrs/loginlogo_default_wmf.png',
+}
 
 # TODO: Remove the safeguard once we are jessie only
 # NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since 
that

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I943da0e6146c44181cd25c5ef66ce97bec8b1f2e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] otrs: Background wikimedia AgentLogo file - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: otrs: Background wikimedia AgentLogo file
..


otrs: Background wikimedia AgentLogo file

Populate a background logo made for wikimedia installation

Bug: T125912
Change-Id: I9de97b91dc8857243bea0d623dd9f92e6d9c9807
---
A modules/otrs/files/logo_bg_wmf.png
M modules/otrs/manifests/init.pp
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/otrs/files/logo_bg_wmf.png 
b/modules/otrs/files/logo_bg_wmf.png
new file mode 100644
index 000..ab28351
--- /dev/null
+++ b/modules/otrs/files/logo_bg_wmf.png
Binary files differ
diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index d97c014..26811c7 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -111,6 +111,7 @@
 source => 'puppet:///modules/otrs/idle_agent_report',
 }
 
+# WMF skin customizations
 file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/icons/product.ico':
 ensure => 'file',
 owner  => 'otrs',
@@ -118,6 +119,13 @@
 mode   => '0664',
 source => 'puppet:///modules/otrs/wmf.ico',
 }
+file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/logo_bg_wmf.png':
+ensure => 'file',
+owner  => 'otrs',
+group  => 'www-data',
+mode   => '0664',
+source => 'puppet:///modules/otrs/logo_bg_wmf.png',
+}
 
 # TODO: Remove the safeguard once we are jessie only
 # NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since 
that

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9de97b91dc8857243bea0d623dd9f92e6d9c9807
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] [bugfix] logentry.page() may return an int value - change (pywikibot/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: [bugfix] logentry.page() may return an int value
..


[bugfix] logentry.page() may return an int value

BlockEntry instance method page() may return an int value when
isAutoblockRemoval is True

Change-Id: I2c6f65c7241bd9f8e3648abc876c2aebbbc3e9d3
---
M tests/logentry_tests.py
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py
index 77c0d88..d48c9fc 100644
--- a/tests/logentry_tests.py
+++ b/tests/logentry_tests.py
@@ -82,7 +82,10 @@
 self.assertIsInstance(logentry.pageid(), int)
 self.assertIsInstance(logentry.timestamp(), pywikibot.Timestamp)
 if 'title' in logentry.data:  # title may be missing
-self.assertIsInstance(logentry.page(), pywikibot.Page)
+if logtype == 'block' and logentry.isAutoblockRemoval:
+self.assertIsInstance(logentry.page(), int)
+else:
+self.assertIsInstance(logentry.page(), pywikibot.Page)
 else:
 self.assertRaises(KeyError, logentry.page)
 self.assertEqual(logentry.type(), logtype)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c6f65c7241bd9f8e3648abc876c2aebbbc3e9d3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Also export qqq for iNaturalist - change (translatewiki)

2016-02-10 Thread Siebrand (Code Review)

Siebrand has uploaded a new change for review.

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

Change subject: Also export qqq for iNaturalist
..

Also export qqq for iNaturalist

Change-Id: Id8db88d4ce6b89b38e6e73ba4c24b029faedf881
---
M bin/repoexport
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/01/269701/1

diff --git a/bin/repoexport b/bin/repoexport
index 71153f4..7c95043 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -71,6 +71,7 @@
 elif [ "$PROJECT" = "inaturalist" ]
 then
php "$EXPORTER" --target . --group=out-inaturalist --lang='*' --skip en 
$THRESHOLD
+   php "$EXPORTER" --target . --group=out-inaturalist --lang qqq
 
 elif [ "$PROJECT" = "intuition" ]
 then

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8db88d4ce6b89b38e6e73ba4c24b029faedf881
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand 

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

[MediaWiki-commits] [Gerrit] Wikibase: use extension-qunit-generic instead of special job - change (integration/config)

2016-02-10 Thread JanZerebecki (Code Review)

JanZerebecki has uploaded a new change for review.

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

Change subject: Wikibase: use extension-qunit-generic instead of special job
..

Wikibase: use extension-qunit-generic instead of special job

Change-Id: I0d9c12983df5f95a4d1fb26850282d2cff8e00fc
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/79/269679/1

diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index d7ba88c..a584b94 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -54,33 +54,6 @@
 results: 'log/junit*.xml'
  - 'mw-teardown-{dbflavor}'
 
-- job-template:
-name: 'mwext-{ext-name}-qunit'
-node: contintLabsSlave && UbuntuTrusty
-concurrent: true
-triggers:
- - zuul
-properties:
- - throttle-one-per-node
-builders:
- - zuul-cloner-extdeps:
- ext-name: '{ext-name}'
- dependencies: '{dependencies}'
- additional-repositories: ''
- - wd-mw-composer-merged-install
- - mw-install-sqlite
- - shell: "cp deps.txt src/extensions_load.txt"
- - wd-wikibase-apply-settings:
-  repoorclient: 'repo' # qunit tests are in lib so this can be either..
-  experimental: 'true'
- - mw-apply-settings
- - mw-run-update-script
- - qunit-karma
-publishers:
- - archive-log-dir
- - localhost-cleanup
- - mw-teardown
-
 # This is a modified version of '{name}-{ext-name}-qunit'.
 # It runs "composer update" before the qunit tests.
 - job:
@@ -145,9 +118,6 @@
   - php53
   - hhvm
 phpunit-params: '--group Wikibase,WikibaseClient'
-
- - 'mwext-{ext-name}-qunit':
-ext-name: 'Wikibase'
 
 - job:
 name: wikidata-gremlin
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 52135f6..6118935 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7240,6 +7240,7 @@
 template:
   - name: npm
   - name: composer-test
+  - name: extension-qunit-generic
 check:
   - jshint
   - jsonlint
@@ -7258,7 +7259,6 @@
   - mwext-Wikibase-repo-tests-sqlite-hhvm
   - mwext-Wikibase-client-tests-mysql-hhvm
   - mwext-Wikibase-client-tests-sqlite-hhvm
-  - mwext-Wikibase-qunit
 gate-and-submit:
   - php53lint
   - composer-validate
@@ -7271,11 +7271,9 @@
   - mwext-Wikibase-client-tests-sqlite-php53
   - mwext-Wikibase-client-tests-mysql-hhvm
   - mwext-Wikibase-client-tests-sqlite-hhvm
-  - mwext-Wikibase-qunit
 experimental:
   - mwext-testextension-php53-composer
   - mwext-testextension-hhvm-composer
-  - mwext-qunit-composer
 
   - name: mediawiki/extensions/WikibaseJavaScriptApi
 template:

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

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

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

[MediaWiki-commits] [Gerrit] otrs: Remove OTRS templates symlink - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: otrs: Remove OTRS templates symlink
..


otrs: Remove OTRS templates symlink

We use to have an OTRS templates symlink to Standard, presumably to
facilitate the migration to the Standard theme of users using OTRS and
silence corresponding logs. With the migration to 5.0.x OTRS, this is no
longer true as no user has the old OTRS theme as a preference. Error
logs no longer indicate the usage of the theme, hence remove the unused
now symlink

Change-Id: I610a04dc7a12cba4661f37f8b10c9c5843b714fb
---
M modules/otrs/manifests/init.pp
1 file changed, 0 insertions(+), 5 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index de3e842..d97c014 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -119,11 +119,6 @@
 source => 'puppet:///modules/otrs/wmf.ico',
 }
 
-file { '/opt/otrs/Kernel/Output/HTML/OTRS':
-ensure => link,
-target => '/opt/otrs/Kernel/Output/HTML/Standard',
-}
-
 # TODO: Remove the safeguard once we are jessie only
 # NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since 
that
 # should not bite back as after the move the 3.2.x install we have will be

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I610a04dc7a12cba4661f37f8b10c9c5843b714fb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Rename variable to use camelCase - change (mediawiki...ORES)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Rename variable to use camelCase
..


Rename variable to use camelCase

camelCase is preferred in MediaWiki. (and generally in php)

Change-Id: Ia40c9818d0fa1f8c6c0b68f8e9f6183b0fcc32f2
---
M includes/Cache.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/Cache.php b/includes/Cache.php
index 7765583..adb7d88 100644
--- a/includes/Cache.php
+++ b/includes/Cache.php
@@ -6,10 +6,10 @@
 
 class Cache {
static protected $modelIds;
-   protected $ClassMap;
+   protected $classMap;
 
public function __construct() {
-   $this->ClassMap = array( 'true' => 1, 'false' => 0,
+   $this->classMap = array( 'true' => 1, 'false' => 0,
'B' => 0, 'C' => 1, 'FA' => 2, 'GA' => 3,
'Start' => 4, 'Stub' => 5 );
}
@@ -41,7 +41,7 @@
$modelId = $this->getModelId( $model );
foreach ( $modelOutputs['probability'] as 
$class => $probability ) {
$ores_is_predicted = $prediction === 
$class;
-   $class = $this->ClassMap[$class];
+   $class = $this->classMap[$class];
if ( $class === 0 ) {
continue;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia40c9818d0fa1f8c6c0b68f8e9f6183b0fcc32f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] admin: add entry for Riccardo - change (operations/puppet)

2016-02-10 Thread Volans (Code Review)

Volans has uploaded a new change for review.

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

Change subject: admin: add entry for Riccardo
..

admin: add entry for Riccardo

Bug: T126434
Change-Id: Ie30841b3ce60e9a1700f8cef5a7d2a4b9ad5449b
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/269690/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 7b9dfb2..9feab6a 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -610,7 +610,7 @@
 gid: 500
 name: cmjohnson
 realname: Chris Johnson
-ssh_keys: 
+ssh_keys:
  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC7y4rw4Np/Xy1MgQYx6dciv+vszegmZjZbh5p7PHdddLI+8wDM2Q7tz+ghm6PkKuUlcwK99fD2ixlb8FoBrznUABTEmaSMBdSIhXS2J81mJ5ycrCeb/+bG9YQ8e1sABjfFSWu07wqUgPZqx6roeduc1fkp9DvH8FasbFZcuPsgkvANwaWm+TTSY8Ik1h7l1bJHIp7iRuLRQ9fZjsZCHD4svfuU3YEyIHKPYmPQFgJn1wyYDKgIbfewcK/rFX43E9Kqd/SpKqapIex1fYWA0/MtbAzVLb3YdX/vWQP6lx4Kwzc6OPzib++RY6bR0zd14IdkGZ2wgwcqR/MRaafotARV
 cmjohnson@wmf-production
  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCLJ4mudiOgAavBVrNMDS2udkG5/LjbYsjHKax1Pi9RkGJymyryiz/NKJKZRP7O0uvHXPqTK9TH77hDODZ5UFzYOtznDjHNma71PLP/+nVF+Vgkm+u91HZkLPbxj21AhRNYU55hLUEO8ZU/nx4O4vNuyCcq/vGVpfYt7tOfTR52bMmx7PGWh4ptIj6CvtjHpgHHPkFN+MDDz3PVTo1ZuSVeGPYFOY2ysBJC29t1wk22r6XdyeSP3SBKkd/2/YUW8GAHphs8AaRuzsfX1aYpc1ph4M+2qnvBqbme6OSWLydcIrDWmxjqbJtQWU83I1zE1N0KebD34ZH73ych4TR4jYJN
 cmjohnson@yubikey
 uid: 2399
@@ -1806,3 +1806,11 @@
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDLvnP1K5xgv41jpUwPkrRR3mkd4+/3zYtP09/MVueOBKAXj8bzHhLtfy36PoRxdKSl897VohQjJGJB1YLI140B7Uusx2NgCuFQnWgMoYOgR0Qszf1Ncn9MUnYfQCRtTFzZcPEstQzXI7Yov7y4mM8lvjdWWQUxsmlxQWrQ433/BTKIDb9rlThyg6NHeTKIsj0d18+WspoQFqnmxKYozd0W0knoL5OkRX1hMgs0sANUgriZjF1n52QxVptjAodzs29DX7cfNELmTyeKQyMeb6K3voiefjAfAvjOiu4aHoGqjSqU9ACIyxulbx0gGcX9SPY5nNyt2LERhqZyEwoDb873
 gleder...@wikimedia.org
 uid: 13593
+  volans:
+ensure: present
+gid: 500
+name: volans
+realname: Riccardo Coccioli
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAACAQC1iu4OcsLv8Nb+sWHDs9RZ4X9mtBpyf+fhJGrbKjFjaXDRVB5h/CXrqsMz8GJH44HJPBj5Gf/4bwvqRy7MLJGwpHjDJv1xeEOc0Oq5Aa/6/k6h8h0tCDWIGw/ghTOX+u9TZBAr4UHnBHjippEi+9G/jougFjQ2Hu9P62yYU69/mqdmXfLV0JnAXZl13vrzrjLyNWvH64tpwly9HLQXFCpxCI5DKUsmeGeJ7N5+o7XKRTDF4+vtCC3Ro3+FnoIzZP8iV+MzDwt4Z51wtmDY3IDl0PBNjI1OjWBrsCaGB6t3nm/5/mq3ggffgcQIXgjYTB6lxjkbYS0tO2oroFopnaVgx65mENIsWaX/YVpI7VOWN5ylVGljkDVZ+iYX7soDOwiBafZyDdQZ9VSNZDvOnt/sbbWCyYWhcreUfXehiNPLKjxugf7LUaXOqePeyg4swKuwQXzyHssdROjNcNScQn8ze0rety9UQwmkEu8TuSSwXBRxUR8uQhtuk9cxUlRw3qs5yljMVcL33JKF7aQ9b84pV2ARqSouD/zAOQSSrjIAdctlAHR5lYmXn1f3Gz5BMgK0vwcgknGsMHAndW/yejYQi8lQGGgq3MCTMcpvf5qJLgCA/myn/C2XQ20snyJg0Ci7lZpQR0r8EZd4kPD3IiYcWlLcLy3aROcnGGZtPl/jkw==
 rcocci...@wikimedia.org
+uid: 14150

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

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

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

[MediaWiki-commits] [Gerrit] admin: Added Riccardo to the Ops group - change (operations/puppet)

2016-02-10 Thread Volans (Code Review)

Volans has uploaded a new change for review.

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

Change subject: admin: Added Riccardo to the Ops group
..

admin: Added Riccardo to the Ops group

Bug: T126434
Change-Id: I4926633f780e267206867ba6dc3769dace255096
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/269691/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 9feab6a..e5194fc 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -14,7 +14,7 @@
 description: include everywhere ops folks
 members: [filippo, jgreen, bblack, andrew, faidon, rush, oblivian, laner, 
yuvipanda,
   dzahn, akosiaris, springle, mark, ariel, cmjohnson, otto, robh, 
tstarling,
-  ori, midom, jmm, jynus, aaron, ema, elukey]
+  ori, midom, jmm, jynus, aaron, ema, elukey, volans]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701

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

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

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

[MediaWiki-commits] [Gerrit] Also export qqq for iNaturalist - change (translatewiki)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Also export qqq for iNaturalist
..


Also export qqq for iNaturalist

Change-Id: Id8db88d4ce6b89b38e6e73ba4c24b029faedf881
---
M bin/repoexport
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/bin/repoexport b/bin/repoexport
index 71153f4..7c95043 100755
--- a/bin/repoexport
+++ b/bin/repoexport
@@ -71,6 +71,7 @@
 elif [ "$PROJECT" = "inaturalist" ]
 then
php "$EXPORTER" --target . --group=out-inaturalist --lang='*' --skip en 
$THRESHOLD
+   php "$EXPORTER" --target . --group=out-inaturalist --lang qqq
 
 elif [ "$PROJECT" = "intuition" ]
 then

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

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

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

[MediaWiki-commits] [Gerrit] getNavigationSidebar: allows html-string injection from exte... - change (mediawiki...BlueSpiceFoundation)

2016-02-10 Thread Dvogel hallowelt (Code Review)

Dvogel hallowelt has uploaded a new change for review.

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

Change subject: getNavigationSidebar: allows html-string injection from 
extensions
..

getNavigationSidebar: allows html-string injection from extensions

Change-Id: I829a09685e6ad841994031b0efce4f2f29008b9d
---
M includes/BsBaseTemplate.php
1 file changed, 48 insertions(+), 42 deletions(-)


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

diff --git a/includes/BsBaseTemplate.php b/includes/BsBaseTemplate.php
index 62e6444..25affc4 100644
--- a/includes/BsBaseTemplate.php
+++ b/includes/BsBaseTemplate.php
@@ -439,55 +439,61 @@
$aOut[] = '';
$aOut[] = '  ' . $sTitle . '';
$aOut[] = '  ';
-   foreach ($cont as $key => $val) {
-   /* $val is created in 
Skin::addToSidebarPlain and contains
-* the following:
-* 'id' -> ID for list item
-* 'active' -> Flag for list item class 
'active'
-* 'text' -> Text for anchor
-* 'href' -> Href for anchot
-* 'rel' -> Rel for anchor
-* 'target' -> Target for anchor
-*/
 
-   if ( strpos( $val['text'], "|" ) !== 
false ) {
-   $aVal = explode( '|', 
$val['text'] );
-   $val['id'] = 'n-' . $aVal[0];
-   }
+   if(!is_array($cont)){
+   $aOut[] = $cont;
+   }
+   else {
+   foreach ($cont as $key => $val) {
+   /* $val is created in 
Skin::addToSidebarPlain and contains
+* the following:
+* 'id' -> ID for list item
+* 'active' -> Flag for list 
item class 'active'
+* 'text' -> Text for anchor
+* 'href' -> Href for anchot
+* 'rel' -> Rel for anchor
+* 'target' -> Target for anchor
+*/
 
-   $sCssClass = (!isset($val['active']) ) 
? ' class="active"' : '';
-   $sTarget = ( isset($val['target']) ) ? 
' target="' . $val['target'] . '"' : '';
-   $sRel = ( isset($val['rel']) ) ? ' 
rel="' . $val['rel'] . '"' : '';
-
-   $aOut[] = '';
-
-   $sTitle = 
htmlspecialchars($val['text']);
-   $sText = htmlspecialchars($val['text']);
-   $sHref = htmlspecialchars($val['href']);
-   $sIcon = '';
-   if ( !empty( $aVal ) ) {
-   $oFile = wfFindFile( $aVal[1] );
-   if ( strpos( $lang = 
$this->translator->translate( $aVal[0] ), "" ) === false ) {
-   $aVal[0] = $lang;
+   if ( strpos( $val['text'], "|" 
) !== false ) {
+   $aVal = explode( '|', 
$val['text'] );
+   $val['id'] = 'n-' . 
$aVal[0];
}
-   $sTitle = 
htmlspecialchars($aVal[0]);
-   $sText = 
htmlspecialchars($aVal[0]);
 
-   if ( is_object( $oFile ) && 
$oFile->exists() ) {
-   if ( 
BsExtensionManager::isContextActive( 'MW::SecureFileStore::Active' ) ) {
-   $sUrl = 
SecureFileStore::secureStuff( $oFile->getUrl(), true );
-   } else {
-   $sUrl = 
$oFile->getUrl();
+

[MediaWiki-commits] [Gerrit] Rename variable to use camelCase - change (mediawiki...ORES)

2016-02-10 Thread Aude (Code Review)

Aude has uploaded a new change for review.

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

Change subject: Rename variable to use camelCase
..

Rename variable to use camelCase

camelCase is preferred in MediaWiki. (and generally in php)

Change-Id: Ia40c9818d0fa1f8c6c0b68f8e9f6183b0fcc32f2
---
M includes/Cache.php
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/includes/Cache.php b/includes/Cache.php
index 7765583..adb7d88 100644
--- a/includes/Cache.php
+++ b/includes/Cache.php
@@ -6,10 +6,10 @@
 
 class Cache {
static protected $modelIds;
-   protected $ClassMap;
+   protected $classMap;
 
public function __construct() {
-   $this->ClassMap = array( 'true' => 1, 'false' => 0,
+   $this->classMap = array( 'true' => 1, 'false' => 0,
'B' => 0, 'C' => 1, 'FA' => 2, 'GA' => 3,
'Start' => 4, 'Stub' => 5 );
}
@@ -41,7 +41,7 @@
$modelId = $this->getModelId( $model );
foreach ( $modelOutputs['probability'] as 
$class => $probability ) {
$ores_is_predicted = $prediction === 
$class;
-   $class = $this->ClassMap[$class];
+   $class = $this->classMap[$class];
if ( $class === 0 ) {
continue;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia40c9818d0fa1f8c6c0b68f8e9f6183b0fcc32f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Aude 

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

[MediaWiki-commits] [Gerrit] Temporary remove of mc1006.eqiad from the redis/memcached po... - change (operations/puppet)

2016-02-10 Thread Elukey (Code Review)

Elukey has uploaded a new change for review.

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

Change subject: Temporary remove of mc1006.eqiad from the redis/memcached pool 
for maintenance.
..

Temporary remove of mc1006.eqiad from the redis/memcached pool for maintenance.

Bug: T123711
Change-Id: I220661038453e063f04e75188878897afc312ec8
---
M hieradata/common/mediawiki/redis_servers.yaml
M hieradata/eqiad.yaml
2 files changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/269677/1

diff --git a/hieradata/common/mediawiki/redis_servers.yaml 
b/hieradata/common/mediawiki/redis_servers.yaml
index da819d2..1f84ec4 100644
--- a/hieradata/common/mediawiki/redis_servers.yaml
+++ b/hieradata/common/mediawiki/redis_servers.yaml
@@ -4,7 +4,6 @@
   - '10.64.0.182:6379:1 "shard03"'
   - '10.64.0.183:6379:1 "shard04"'
   - '10.64.0.184:6379:1 "shard05"'
-  - '10.64.0.185:6379:1 "shard06"'
   - '10.64.32.161:6379:1 "shard07"'
   - '10.64.32.162:6379:1 "shard08"'
   - '10.64.32.163:6379:1 "shard09"'
@@ -19,7 +18,7 @@
   - '10.64.48.96:6379:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
-
+# - '10.64.0.185:6379:1 "shard06"'
 
 codfw:
   - '10.192.0.34:6379:1 "shard01"'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 1530b64..682088c 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -7,7 +7,6 @@
   - '10.64.0.182:11211:1'
   - '10.64.0.183:11211:1 "shard04"'
   - '10.64.0.184:11211:1 "shard05"'
-  - '10.64.0.185:11211:1'
   - '10.64.32.161:11211:1 "shard07"'
   - '10.64.32.162:11211:1 "shard08"'
   - '10.64.32.163:11211:1 "shard09"'
@@ -22,6 +21,7 @@
   - '10.64.48.96:11211:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
+# - '10.64.0.185:11211:1'
 
 #
 # Ganglia

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

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

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

[MediaWiki-commits] [Gerrit] Omit thread_pool_add_delay on Varnish 4 - change (operations/puppet)

2016-02-10 Thread Ema (Code Review)

Ema has uploaded a new change for review.

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

Change subject: Omit thread_pool_add_delay on Varnish 4
..

Omit thread_pool_add_delay on Varnish 4

With Varnish 4 running on modern software/hardware it might not be
necessary to wait after creating a thread.

As we deploy experimental hosts with real traffic we will check
threads_failed and set thread_pool_add_delay (in floating-point
seconds!) only if necessary.

Bug: T126206
Change-Id: I0332374ed44d42a9b2aa0e5957515c826793779d
---
M modules/varnish/templates/initscripts/varnish.systemd.erb
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/269686/1

diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb 
b/modules/varnish/templates/initscripts/varnish.systemd.erb
index 6d3f020..a16418a 100644
--- a/modules/varnish/templates/initscripts/varnish.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnish.systemd.erb
@@ -24,10 +24,11 @@
 -p shm_reclen=2048 \
 -p user=varnish \
 -p shm_workspace=16384 \
+-p thread_pool_add_delay=1 \
 <% end -%>
 -S /etc/varnish/secret \
 <%= @storage -%> \
--p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
+-p thread_pool_stack=131072 \
 -p listen_depth=4096 -p session_max=20 -p vcc_err_unref=off \
 -p nuke_limit=300 \
 -p http_req_size=24576 \

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

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

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

[MediaWiki-commits] [Gerrit] otrs: Background wikimedia AgentLogo file - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: otrs: Background wikimedia AgentLogo file
..

otrs: Background wikimedia AgentLogo file

Populate a login logo made for wikimedia installation

Bug: T125911
Change-Id: I943da0e6146c44181cd25c5ef66ce97bec8b1f2e
---
A modules/otrs/files/loginlogo_default_wmf.png
M modules/otrs/manifests/init.pp
2 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/269685/1

diff --git a/modules/otrs/files/loginlogo_default_wmf.png 
b/modules/otrs/files/loginlogo_default_wmf.png
new file mode 100644
index 000..658d68c
--- /dev/null
+++ b/modules/otrs/files/loginlogo_default_wmf.png
Binary files differ
diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index 26811c7..7be7b40 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -126,6 +126,13 @@
 mode   => '0664',
 source => 'puppet:///modules/otrs/logo_bg_wmf.png',
 }
+file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/loginlogo_default.png':
+ensure => 'file',
+owner  => 'otrs',
+group  => 'www-data',
+mode   => '0664',
+source => 'puppet:///modules/otrs/loginlogo_default_wmf.png',
+}
 
 # TODO: Remove the safeguard once we are jessie only
 # NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since 
that

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I943da0e6146c44181cd25c5ef66ce97bec8b1f2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] disable SPDY for all cache_text - change (operations/puppet)

2016-02-10 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: disable SPDY for all cache_text
..


disable SPDY for all cache_text

Bug: T125979
Change-Id: Id3d656db3b57fdad95ff6a7c196e18e2cffe0e23
---
M hieradata/hosts/cp1008.yaml
M hieradata/role/common/cache/text.yaml
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  BBlack: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml
index 83fc5db..0898300 100644
--- a/hieradata/hosts/cp1008.yaml
+++ b/hieradata/hosts/cp1008.yaml
@@ -1,4 +1,3 @@
 debdeploy::grains:
   debdeploy-cp:
 value: canary
-tlsproxy::localssl::do_spdy: false
diff --git a/hieradata/role/common/cache/text.yaml 
b/hieradata/role/common/cache/text.yaml
index a2b5d1f..b29a14a 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -1,3 +1,4 @@
 cluster: cache_text
 admin::groups:
   - perf-roots
+tlsproxy::localssl::do_spdy: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3d656db3b57fdad95ff6a7c196e18e2cffe0e23
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Linker: Do not show the tool for headings - change (mediawiki...ContentTranslation)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Linker: Do not show the tool for headings
..


Linker: Do not show the tool for headings

Bug: T126312
Change-Id: I275dab84d42ccce9dce45088cbbc183865f28133
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/modules/tools/ext.cx.tools.link.js 
b/modules/tools/ext.cx.tools.link.js
index 83234d6..d9dee6f 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -1204,6 +1204,13 @@
} else if ( selection.jquery && selection.is( 'a' ) ) {
this.$link = selection;
}
+
+   // Do not show the tool for headings.
+   if ( this.getParentSection().is( 'h1, h2, h3, h4, h5, h6' ) ) {
+   this.stop();
+   return;
+   }
+
this.show();
this.listen();
};

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

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

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

[MediaWiki-commits] [Gerrit] Revision is now mandatory for avro monolog channels - change (mediawiki/vagrant)

2016-02-10 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Revision is now mandatory for avro monolog channels
..

Revision is now mandatory for avro monolog channels

Change-Id: I3e6fbd91d5538a1cdd52775298cb4bd316c19c43
---
M puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/69/269669/1

diff --git a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb 
b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
index c3520cb..fe54dcc 100644
--- a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
+++ b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb
@@ -26,8 +26,11 @@
'class' => '\\MediaWiki\\Logger\\Monolog\\AvroFormatter',
'args' => array(
array(
-   'CirrusSearchRequestSet' => file_get_contents(
-   "<%= scope['::service::root_dir'] 
%>/event-schemas/avro/mediawiki/CirrusSearchRequestSet/111448028943.avsc"
+   'CirrusSearchRequestSet' => array(
+   'schema' => file_get_contents(
+   "<%= scope['::service::root_dir'] 
%>/event-schemas/avro/mediawiki/CirrusSearchRequestSet/111448028943.avsc"
+   ),
+   'revision' => 111448028943,
),
),
),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e6fbd91d5538a1cdd52775298cb4bd316c19c43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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

[MediaWiki-commits] [Gerrit] Fix php lint job attributes - change (integration/config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Fix php lint job attributes
..


Fix php lint job attributes

So that php53 is skipped when php55 is not. And also add the file pattern to
the php55 variant.

Bug: T126440
Change-Id: If19e4769e9442f4fe4eb895bc8bbbdd9609ca273
---
M zuul/layout.yaml
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 039a093..52135f6 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -637,6 +637,14 @@
   - name: php53lint
 files:
  - '^.*\.(php|php5|phtml|inc)$'
+skip-if:
+ - project: '^mediawiki/.*$'
+   branch: (?!REL1_2[3-6]$)
+
+  - name: php55lint
+files:
+ - '^.*\.(php|php5|phtml|inc)$'
+branch: (?!REL1_2[3-6]$)
 
   - name: ^mediawiki-phpunit-php53-composer$
 # Release branch 1.23 does not support composer, hhvm variant is done by 
the next filter

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If19e4769e9442f4fe4eb895bc8bbbdd9609ca273
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add support for identifier data type - change (pywikibot/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Add support for identifier data type
..


Add support for identifier data type

No tests could be added to wikibase_tests.py since the data type
is not yet active on wikidata.

No tests added to edit_failiure_tests.py since there is no
additional string validation.

Bug: T123882
Change-Id: I7fd4f5f4bba8a4eb2f83b8b093eb2faf2e64f811
---
M pywikibot/page.py
M tests/wikibase_edit_tests.py
2 files changed, 19 insertions(+), 1 deletion(-)

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



diff --git a/pywikibot/page.py b/pywikibot/page.py
index 244c300..0349676 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4080,6 +4080,7 @@
  'quantity': pywikibot.WbQuantity,
  'monolingualtext': pywikibot.WbMonolingualText,
  'math': basestring,
+ 'external-id': basestring,
  }
 
 value_types = {'wikibase-item': 'wikibase-entityid',
@@ -4087,6 +4088,7 @@
'url': 'string',
'globe-coordinate': 'globecoordinate',
'math': 'string',
+   'external-id': 'string',
}
 
 def __init__(self, site, id=None, datatype=None):
@@ -4628,7 +4630,7 @@
 if self.type == 'wikibase-item':
 value = {'entity-type': 'item',
  'numeric-id': self.getTarget().getID(numeric=True)}
-elif self.type in ('string', 'url', 'math'):
+elif self.type in ('string', 'url', 'math', 'external-id'):
 value = self.getTarget()
 elif self.type == 'commonsMedia':
 value = self.getTarget().title(withNamespace=False)
diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py
index 18f74a4..2f984df 100644
--- a/tests/wikibase_edit_tests.py
+++ b/tests/wikibase_edit_tests.py
@@ -238,6 +238,22 @@
 claim = item.claims['P271'][0]
 self.assertEqual(claim.getTarget(), target)
 
+def test_identifier_edit(self):
+"""Attempt adding a math claim with valid input."""
+testsite = self.get_repo()
+item = self._clean_item(testsite, 'P718')
+
+# set new claim
+claim = pywikibot.page.Claim(testsite, 'P718', datatype='external-id')
+target = 'CrazyURI123_:)'
+claim.setTarget(target)
+item.addClaim(claim)
+
+# confirm new claim
+item.get(force=True)
+claim = item.claims['P718'][0]
+self.assertEqual(claim.getTarget(), target)
+
 
 class TestWikibaseRemoveQualifier(WikibaseTestCase):
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fd4f5f4bba8a4eb2f83b8b093eb2faf2e64f811
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: XZise 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] admin: add gehel to ops - change (operations/puppet)

2016-02-10 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: admin: add gehel to ops
..

admin: add gehel to ops

missing access to ops group

Bug: T125651
Change-Id: I1ed00db4304ec8f900a9b563f36b0f9feef9c5dc
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/74/269674/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 7b9dfb2..dfb2c7e 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -14,7 +14,7 @@
 description: include everywhere ops folks
 members: [filippo, jgreen, bblack, andrew, faidon, rush, oblivian, laner, 
yuvipanda,
   dzahn, akosiaris, springle, mark, ariel, cmjohnson, otto, robh, 
tstarling,
-  ori, midom, jmm, jynus, aaron, ema, elukey]
+  ori, midom, jmm, jynus, aaron, ema, elukey, gehel]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ed00db4304ec8f900a9b563f36b0f9feef9c5dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Exclude bots - change (mediawiki...ORES)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Exclude bots
..


Exclude bots

Change-Id: Id43788effdf5a5928d00c64f51bfebe6bbb3dda4
---
M extension.json
M includes/Hooks.php
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Hoo man: Looks good to me, but someone else must approve
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 17833cd..c0ee904 100644
--- a/extension.json
+++ b/extension.json
@@ -71,6 +71,7 @@
},
"config": {
"OresBaseUrl": "https://ores.wmflabs.org/;,
+   "OresExcludeBots": true,
"OresModels": [
"damaging",
"goodfaith",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index b2d88f5..97bbef2 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -36,6 +36,11 @@
 * Ask the ORES server for scores on this recent change
 */
public static function onRecentChange_save( RecentChange $rc ) {
+   global $wgOresExcludeBots;
+   if ( $rc->getAttribute( 'rc_bot' ) && $wgOresExcludeBots ) {
+   return true;
+   }
+
if ( $rc->getAttribute( 'rc_type' ) === RC_EDIT ) {
$logger = LoggerFactory::getInstance( 'ORES' );
$logger->debug( 'Processing edit' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id43788effdf5a5928d00c64f51bfebe6bbb3dda4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Adamw 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove CORS & CSP Support - change (maps/tilerator)

2016-02-10 Thread Yurik (Code Review)

Yurik has submitted this change and it was merged.

Change subject: Remove CORS & CSP Support
..


Remove CORS & CSP Support

From my understanding, there is no point to support
CORS and CSP settings in the app that is designed
for admin-only usage.

Change-Id: Id2fefdc1388b577165677cbcee816bfc28ab4664
---
M app.js
1 file changed, 3 insertions(+), 13 deletions(-)

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



diff --git a/app.js b/app.js
index 0e5a230..f866804 100644
--- a/app.js
+++ b/app.js
@@ -92,19 +92,9 @@
 
 // set the CORS and CSP headers
 app.all('*', function(req, res, next) {
-if(app.conf.cors !== false) {
-res.header('access-control-allow-origin', app.conf.cors);
-res.header('access-control-allow-headers', 'accept, 
x-requested-with, content-type');
-res.header('access-control-expose-headers', 'etag');
-}
-if(app.conf.csp !== false) {
-res.header('x-xss-protection', '1; mode=block');
-res.header('x-content-type-options', 'nosniff');
-res.header('x-frame-options', 'SAMEORIGIN');
-res.header('content-security-policy', app.conf.csp);
-res.header('x-content-security-policy', app.conf.csp);
-res.header('x-webkit-csp', app.conf.csp);
-}
+//
+// Tilerator is an admin app, there is no point to set app.conf.cors 
and app.conf.csp
+//
 sUtil.initAndLogRequest(req, app);
 next();
 });

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2fefdc1388b577165677cbcee816bfc28ab4664
Gerrit-PatchSet: 1
Gerrit-Project: maps/tilerator
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 

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

[MediaWiki-commits] [Gerrit] Improving cross-browser CSS - Adding autoprefixer - fixing a... - change (wikimedia/portals)

2016-02-10 Thread Jdrewniak (Code Review)

Jdrewniak has uploaded a new change for review.

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

Change subject: Improving cross-browser CSS - Adding autoprefixer - fixing a 
templating bug in typehead
..

Improving cross-browser CSS
- Adding autoprefixer
- fixing a templating bug in typehead

Tested:
- CSS only support in IE7
- JS (typeahead) + CSS support in Android 2.3+, iOS 3+, IE8+, Safari 5+,
Firefox 9+, Chrome 15+, Opera 12+, Windows Phone 8.1

Bug: T125566
Change-Id: I4c80ab65ebdf87e882a411967c2d0ffccef41b38
---
M dev/wikipedia.org/assets/css/style.css
M dev/wikipedia.org/assets/cssnext/_buttons.css
M dev/wikipedia.org/assets/cssnext/_pab1.css
M dev/wikipedia.org/assets/cssnext/_pab2.css
M dev/wikipedia.org/assets/js/wm-typeahead.js
M dev/wikipedia.org/assets/rev-manifest.json
M dev/wikipedia.org/templates/other-projects.item.handlebars
M gulpfile.js
M package.json
A prod/wikipedia.org/assets/js/index-6e2242a1f5.js
D prod/wikipedia.org/assets/js/index-992f5860ac.js
M prod/wikipedia.org/index.html
12 files changed, 246 insertions(+), 147 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals 
refs/changes/73/269673/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c80ab65ebdf87e882a411967c2d0ffccef41b38
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/portals
Gerrit-Branch: search-box
Gerrit-Owner: Jdrewniak 

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

[MediaWiki-commits] [Gerrit] Adding support for PXE Jessie Installer to mcXXXX hosts. - change (operations/puppet)

2016-02-10 Thread Elukey (Code Review)

Elukey has submitted this change and it was merged.

Change subject: Adding support for PXE Jessie Installer to mc hosts.
..


Adding support for PXE Jessie Installer to mc hosts.

Bug: T123711
Change-Id: I0d53f09db26d325b087fc6a029165fff6d622e56
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 26 insertions(+), 4 deletions(-)

Approvals:
  Elukey: Looks good to me, approved
  Filippo Giunchedi: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 479e358..391be2e 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -3068,71 +3068,93 @@
 host mc1006 {
hardware ethernet 00:1b:21:70:8d:e3;
fixed-address mc1006.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1007 {
hardware ethernet 00:1b:21:70:8d:45;
fixed-address mc1007.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1008 {
hardware ethernet 00:1b:21:70:8d:3f;
fixed-address mc1008.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 
 host mc1009 {
hardware ethernet 90:e2:ba:18:95:64;
fixed-address mc1009.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1010 {
hardware ethernet 90:e2:ba:1d:48:e4;
fixed-address mc1010.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1011 {
hardware ethernet 90:e2:ba:18:93:9c;
fixed-address mc1011.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1012 {
hardware ethernet 90:e2:ba:18:97:30;
fixed-address mc1012.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1013 {
hardware ethernet 90:e2:ba:18:92:4c;
fixed-address mc1013.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1014 {
hardware ethernet 90:e2:ba:18:96:58;
fixed-address mc1014.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1015 {
hardware ethernet 90:e2:ba:18:96:7c;
fixed-address mc1015.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1016 {
hardware ethernet 90:e2:ba:18:91:88;
fixed-address mc1016.eqiad.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1017 {
hardware ethernet 00:10:18:ef:fe:10;
fixed-address mc1017.eqiad.wmnet;
-   option pxelinux.pathprefix "precise-installer/";
-   filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc1018 {
hardware ethernet 00:10:18:ef:f6:d0;
fixed-address mc1018.eqiad.wmnet;
-   option pxelinux.pathprefix "precise-installer/";
-   filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host mc2001 {

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

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

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] Add ferm rules for noc role - change (operations/puppet)

2016-02-10 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Add ferm rules for noc role
..

Add ferm rules for noc role

Change-Id: I026355a9d88610e9168e6cdb063364278df28ca2
---
M manifests/role/noc.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/269687/1

diff --git a/manifests/role/noc.pp b/manifests/role/noc.pp
index 39d2cdd..ae45ff3 100644
--- a/manifests/role/noc.pp
+++ b/manifests/role/noc.pp
@@ -3,6 +3,11 @@
 
 system::role { 'role::noc': description => 'noc.wikimedia.org' }
 
+ferm::service { 'noc-http':
+proto   => 'tcp',
+port=> 'http',
+}
+
 include ::noc
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Enable base::firewall for mw1152 - change (operations/puppet)

2016-02-10 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Enable base::firewall for mw1152
..

Enable base::firewall for mw1152

The nutcracker connection tracking rules are provided by the
include of role::mediawiki::common, likewise the SSH pybal
exceptions.

The rules for the HHVM admin port 9002 is provided by the
include of mediawiki::hhvm.

Traffic to port 80 is allowed via the noc role (see dependant
patch)

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/269688/1

diff --git a/manifests/site.pp b/manifests/site.pp
index cc4b99f..3c1663c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1961,6 +1961,7 @@
 role mediawiki::maintenance, mariadb::maintenance, 
mediawiki::generic_monitoring
 include role::noc
 include standard
+include base::firewall
 include ldap::role::client::labs
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] otrs: Fix a typo. s/default/wmf/ - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: otrs: Fix a typo. s/default/wmf/
..

otrs: Fix a typo. s/default/wmf/

Fix the typo in loginlogo_default.png and set it to loginlogo_wmf.png

Bug: T125911
Change-Id: Ief1d806d92eda180def138ff44bf37193625fa5c
---
M modules/otrs/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/269692/1

diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index 7be7b40..d042a81 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -126,7 +126,7 @@
 mode   => '0664',
 source => 'puppet:///modules/otrs/logo_bg_wmf.png',
 }
-file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/loginlogo_default.png':
+file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/loginlogo_wmf.png':
 ensure => 'file',
 owner  => 'otrs',
 group  => 'www-data',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief1d806d92eda180def138ff44bf37193625fa5c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Wikibase: use extension-qunit-composer instead of special job - change (integration/config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Wikibase: use extension-qunit-composer instead of special job
..


Wikibase: use extension-qunit-composer instead of special job

Change-Id: I0d9c12983df5f95a4d1fb26850282d2cff8e00fc
---
M jjb/wikidata.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 33 deletions(-)

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



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index d7ba88c..a584b94 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -54,33 +54,6 @@
 results: 'log/junit*.xml'
  - 'mw-teardown-{dbflavor}'
 
-- job-template:
-name: 'mwext-{ext-name}-qunit'
-node: contintLabsSlave && UbuntuTrusty
-concurrent: true
-triggers:
- - zuul
-properties:
- - throttle-one-per-node
-builders:
- - zuul-cloner-extdeps:
- ext-name: '{ext-name}'
- dependencies: '{dependencies}'
- additional-repositories: ''
- - wd-mw-composer-merged-install
- - mw-install-sqlite
- - shell: "cp deps.txt src/extensions_load.txt"
- - wd-wikibase-apply-settings:
-  repoorclient: 'repo' # qunit tests are in lib so this can be either..
-  experimental: 'true'
- - mw-apply-settings
- - mw-run-update-script
- - qunit-karma
-publishers:
- - archive-log-dir
- - localhost-cleanup
- - mw-teardown
-
 # This is a modified version of '{name}-{ext-name}-qunit'.
 # It runs "composer update" before the qunit tests.
 - job:
@@ -145,9 +118,6 @@
   - php53
   - hhvm
 phpunit-params: '--group Wikibase,WikibaseClient'
-
- - 'mwext-{ext-name}-qunit':
-ext-name: 'Wikibase'
 
 - job:
 name: wikidata-gremlin
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 52135f6..75fff8f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7240,6 +7240,7 @@
 template:
   - name: npm
   - name: composer-test
+  - name: extension-qunit-composer
 check:
   - jshint
   - jsonlint
@@ -7258,7 +7259,6 @@
   - mwext-Wikibase-repo-tests-sqlite-hhvm
   - mwext-Wikibase-client-tests-mysql-hhvm
   - mwext-Wikibase-client-tests-sqlite-hhvm
-  - mwext-Wikibase-qunit
 gate-and-submit:
   - php53lint
   - composer-validate
@@ -7271,11 +7271,9 @@
   - mwext-Wikibase-client-tests-sqlite-php53
   - mwext-Wikibase-client-tests-mysql-hhvm
   - mwext-Wikibase-client-tests-sqlite-hhvm
-  - mwext-Wikibase-qunit
 experimental:
   - mwext-testextension-php53-composer
   - mwext-testextension-hhvm-composer
-  - mwext-qunit-composer
 
   - name: mediawiki/extensions/WikibaseJavaScriptApi
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d9c12983df5f95a4d1fb26850282d2cff8e00fc
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] otrs: Fix a typo. s/default/wmf/ - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: otrs: Fix a typo. s/default/wmf/
..


otrs: Fix a typo. s/default/wmf/

Fix the typo in loginlogo_default.png and set it to loginlogo_wmf.png

Bug: T125911
Change-Id: Ief1d806d92eda180def138ff44bf37193625fa5c
---
M modules/otrs/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index 7be7b40..d042a81 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -126,7 +126,7 @@
 mode   => '0664',
 source => 'puppet:///modules/otrs/logo_bg_wmf.png',
 }
-file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/loginlogo_default.png':
+file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/loginlogo_wmf.png':
 ensure => 'file',
 owner  => 'otrs',
 group  => 'www-data',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief1d806d92eda180def138ff44bf37193625fa5c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Cherry-pick rebase fix from Ic4d581b4d0 - change (mediawiki...ContentTranslation)

2016-02-10 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Cherry-pick rebase fix from Ic4d581b4d0
..

Cherry-pick rebase fix from Ic4d581b4d0

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


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

diff --git a/includes/AbuseFilterCheck.php b/includes/AbuseFilterCheck.php
index 2c35043..7030fda 100644
--- a/includes/AbuseFilterCheck.php
+++ b/includes/AbuseFilterCheck.php
@@ -87,10 +87,10 @@
$rulename = 
\AbuseFilter::$filters[$key]->af_public_comments;
 
if ( isset( $val['warn']['parameters'][0] ) ) {
-   $val['warning_html'] =
+   $val['warn']['messageHtml'] =
wfMessage( 
$val['warn']['parameters'][0] )
->params( $rulename )
-   ->parsed();
+   ->parse();
}
 
$results[$rulename] = $val;

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

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

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

[MediaWiki-commits] [Gerrit] otrs: Remove OTRS templates symlink - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: otrs: Remove OTRS templates symlink
..

otrs: Remove OTRS templates symlink

We use to have an OTRS templates symlink to Standard, presumably to
facilitate the migration to the Standard theme of users using OTRS and
silence corresponding logs. With the migration to 5.0.x OTRS, this is no
longer true as no user has the old OTRS theme as a preference. Error
logs no longer indicate the usage of the theme, hence remove the unused
now symlink

Change-Id: I610a04dc7a12cba4661f37f8b10c9c5843b714fb
---
M modules/otrs/manifests/init.pp
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index de3e842..d97c014 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -119,11 +119,6 @@
 source => 'puppet:///modules/otrs/wmf.ico',
 }
 
-file { '/opt/otrs/Kernel/Output/HTML/OTRS':
-ensure => link,
-target => '/opt/otrs/Kernel/Output/HTML/Standard',
-}
-
 # TODO: Remove the safeguard once we are jessie only
 # NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since 
that
 # should not bite back as after the move the 3.2.x install we have will be

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I610a04dc7a12cba4661f37f8b10c9c5843b714fb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] otrs: Background wikimedia AgentLogo file - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: otrs: Background wikimedia AgentLogo file
..

otrs: Background wikimedia AgentLogo file

Populate a background logo made for wikimedia installation

Bug: T125912
Change-Id: I9de97b91dc8857243bea0d623dd9f92e6d9c9807
---
A modules/otrs/files/logo_bg_wmf.png
M modules/otrs/manifests/init.pp
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/269684/1

diff --git a/modules/otrs/files/logo_bg_wmf.png 
b/modules/otrs/files/logo_bg_wmf.png
new file mode 100644
index 000..ab28351
--- /dev/null
+++ b/modules/otrs/files/logo_bg_wmf.png
Binary files differ
diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index d97c014..26811c7 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -111,6 +111,7 @@
 source => 'puppet:///modules/otrs/idle_agent_report',
 }
 
+# WMF skin customizations
 file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/icons/product.ico':
 ensure => 'file',
 owner  => 'otrs',
@@ -118,6 +119,13 @@
 mode   => '0664',
 source => 'puppet:///modules/otrs/wmf.ico',
 }
+file { 
'/opt/otrs/var/httpd/htdocs/skins/Agent/default/img/logo_bg_wmf.png':
+ensure => 'file',
+owner  => 'otrs',
+group  => 'www-data',
+mode   => '0664',
+source => 'puppet:///modules/otrs/logo_bg_wmf.png',
+}
 
 # TODO: Remove the safeguard once we are jessie only
 # NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since 
that

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9de97b91dc8857243bea0d623dd9f92e6d9c9807
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Enable Math extension on Wikitech - change (operations/mediawiki-config)

2016-02-10 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Enable Math extension on Wikitech
..

Enable Math extension on Wikitech

This extension is needed again, for example by the
Analytics Team.

This is a partial revert of Gerrit change 158409.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 65e91d8..38b1d56 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13596,7 +13596,6 @@
 
 'wmgUseMath' => array(
'default' => true, // moved from MW core
-   'wikitech' => false,
'loginwiki' => false,
'votewiki' => false, // T61702
 ),

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

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

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

[MediaWiki-commits] [Gerrit] [IMPR] Simplify arg parsing in handle_args method - change (pywikibot/core)

2016-02-10 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: [IMPR] Simplify arg parsing in handle_args method
..

[IMPR] Simplify arg parsing in handle_args method

- avoid length checking logic per argument

Change-Id: I026df731ebd78f7fa8aa7bef3a3f2f473e0c84fe
---
M scripts/redirect.py
1 file changed, 25 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/99/269699/1

diff --git a/scripts/redirect.py b/scripts/redirect.py
index edfa28d..9f29b9d 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -742,26 +742,22 @@
 pagename = None
 
 for arg in pywikibot.handle_args(args):
-if arg == 'double' or arg == 'do':
+option, sep, value = arg.partition(':')
+if option in ('double', 'do'):
 action = 'double'
-elif arg == 'broken' or arg == 'br':
+elif option in ('broken', 'br'):
 action = 'broken'
-elif arg == 'both':
+elif option == 'both':
 action = 'both'
-elif arg == '-fullscan':
+elif option == '-fullscan':
 fullscan = True
-elif arg.startswith('-xml'):
-if len(arg) == 4:
-xmlFilename = i18n.input('pywikibot-enter-xml-filename')
-else:
-xmlFilename = arg[5:]
-elif arg.startswith('-moves'):
+elif option == '-xml':
+xmlFilename = value or i18n.input('pywikibot-enter-xml-filename')
+elif option == '-moves':
 moved_pages = True
-elif arg.startswith('-namespace:'):
-ns = arg[11:]
-if ns == '':
-# "-namespace:" does NOT yield -namespace:0 further down the 
road!
-ns = i18n.input('pywikibot-enter-namespace-number')
+elif option == '-namespace':
+# "-namespace:" does NOT yield -namespace:0 further down the road!
+ns = value or i18n.input('pywikibot-enter-namespace-number')
 # TODO: at least for some generators enter a namespace by its name
 # or number
 if ns == '':
@@ -774,21 +770,21 @@
 pass
 if ns not in namespaces:
 namespaces.append(ns)
-elif arg.startswith('-offset:'):
-offset = int(arg[8:])
-elif arg.startswith('-start:'):
-start = arg[7:]
-elif arg.startswith('-until:'):
-until = arg[7:]
-elif arg.startswith('-total:'):
-number = int(arg[7:])
-elif arg.startswith('-step:'):
-step = int(arg[6:])
-elif arg.startswith('-page:'):
-pagename = arg[6:]
-elif arg == '-always':
+elif option == '-offset:':
+offset = int(value)
+elif option == '-start:':
+start = value
+elif option == '-until:':
+until = value
+elif option == '-total:':
+number = int(value)
+elif option == '-step:':
+step = int(value)
+elif option == '-page:':
+pagename = value
+elif option == '-always':
 options['always'] = True
-elif arg == '-delete':
+elif option == '-delete':
 options['delete'] = True
 else:
 pywikibot.output(u'Unknown argument: %s' % arg)

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

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

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

[MediaWiki-commits] [Gerrit] CREATE OR REPLACE view + new s2 master - change (operations/software)

2016-02-10 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review.

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

Change subject: CREATE OR REPLACE view + new s2 master
..

CREATE OR REPLACE view + new s2 master

Replace current heartbeat view if it already exists. Change s2
master from db1024 to db1018.

Change-Id: If6a6fad47c2b77a8549272afbd750c530e6fb82d
---
M maintain-replicas/heartbeat-views.sql
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/00/269700/1

diff --git a/maintain-replicas/heartbeat-views.sql 
b/maintain-replicas/heartbeat-views.sql
index 3bf8ff3..face4ed 100644
--- a/maintain-replicas/heartbeat-views.sql
+++ b/maintain-replicas/heartbeat-views.sql
@@ -2,7 +2,7 @@
 -- This only has to be run once per host
 -- And there is no checks that the underlying tables exist
 CREATE DATABASE IF NOT EXISTS `heartbeat_p`;
-CREATE
+CREATE OR REPLACE
 ALGORITHM=UNDEFINED
 DEFINER=`root`@`localhost`
 SQL SECURITY DEFINER VIEW
@@ -10,7 +10,7 @@
 SELECT (
 CASE
 WHEN (`heartbeat`.`heartbeat`.`file` like 'db1052%') THEN 's1'
-WHEN (`heartbeat`.`heartbeat`.`file` like 'db1024%') THEN 's2'
+WHEN (`heartbeat`.`heartbeat`.`file` like 'db1018%') THEN 's2'
 WHEN (`heartbeat`.`heartbeat`.`file` like 'db1038%') THEN 's3'
 WHEN (`heartbeat`.`heartbeat`.`file` like 'db1040%') THEN 's4'
 WHEN (`heartbeat`.`heartbeat`.`file` like 'db1058%') THEN 's5'

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

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

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

[MediaWiki-commits] [Gerrit] Namespaces configuration on ru.wikisource - change (operations/mediawiki-config)

2016-02-10 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Namespaces configuration on ru.wikisource
..

Namespaces configuration on ru.wikisource

New namespaces:
* 108: Импортировано (Transwiki)
* 109: Обсуждение импортированного (Transwiki talk)

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 65e91d8..21f6b39 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5661,6 +5661,8 @@
105 => 'Обсуждение_страницы',
106 => 'Индекс',
107 => 'Обсуждение_индекса',
+   108 => 'Импортировано', // T123837 (transwiki)
+   109 => 'Обсуждение_импортированного',
),
'sawikisource' => array(
104 => 'पुटम्', // Page

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

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

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

[MediaWiki-commits] [Gerrit] Update Mark Refund function to reflect use of financial_trxns - change (wikimedia...crm)

2016-02-10 Thread Ejegg (Code Review)

Ejegg has submitted this change and it was merged.

Change subject: Update Mark Refund function to reflect use of financial_trxns
..


Update Mark Refund function to reflect use of financial_trxns

There is a long discussion of mismatched refunds in the code comments - which 
is probably
 a better place than this commit message. I am trying to limit the scope of 
this change
to not include dealing with that as that is a long-running issue and this is a 
'since the upgrade' issue.

Bug: T124979

Change-Id: I7b5722d45b575bc1e0b5e2a975b19a0cafd51315
---
M sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 211 insertions(+), 212 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
index c7af4d6..712fad0 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/RefundTest.php
@@ -5,13 +5,13 @@
  * @group WmfCivicrm
  */
 class RefundTest extends BaseWmfDrupalPhpUnitTestCase {
-public static function getInfo() {
-return array(
-'name' => 'Refund',
-'group' => 'Pipeline',
-'description' => 'Test refund handling.',
-);
-}
+
+/**
+ * Id of the contribution created in the setup function.
+ *
+ * @var int
+ */
+protected $original_contribution_id;
 
 public function setUp() {
 parent::setUp();
@@ -32,7 +32,7 @@
 
 $results = civicrm_api3( 'contribution', 'create', array(
 'contact_id' => $this->contact_id,
-'contribution_type' => 'Cash',
+'financial_type_id' => 'Cash',
 'total_amount' => $this->original_amount,
 'contribution_source' => $this->original_currency . ' ' . 
$this->original_amount,
 'receive_date' => wmf_common_date_unix_to_civicrm( $time ),
@@ -44,14 +44,14 @@
 }
 
 public function tearDown() {
-civicrm_api3( 'contribution', 'delete', array(
+civicrm_api3('contribution', 'delete', array(
 'id' => $this->original_contribution_id,
-) );
+));
 
-if ( $this->refund_contribution_id ) {
-civicrm_api3( 'contribution', 'delete', array(
-'id' => $this->refund_contribution_id,
-) );
+if ($this->refund_contribution_id && $this->refund_contribution_id != 
$this->original_contribution_id) {
+  civicrm_api3('contribution', 'delete', array(
+'id' => $this->refund_contribution_id,
+  ));
 }
 
 civicrm_api3( 'contact', 'delete', array(
@@ -62,32 +62,39 @@
 }
 
 /**
- * Covers wmf_civicrm_mark_refund
+ * Check chargeback status exists.
+ */
+public function testStatuses() {
+  $options = $this->callAPISuccess('Contribution', 'getoptions', 
array('field' => 'contribution_status_id'));
+  $this->assertTrue(in_array('Chargeback', $options['values']));
+}
+
+/**
+ * Covers wmf_civicrm_mark_refund.
  */
 public function testMarkRefund() {
-$this->refund_contribution_id = wmf_civicrm_mark_refund( 
$this->original_contribution_id );
+wmf_civicrm_mark_refund( $this->original_contribution_id, 'refund', 
false, '2015-09-09', 'my_special_ref');
 
-$this->assertNotNull( $this->refund_contribution_id,
-"Refund created" );
-
-$results = civicrm_api3( 'contribution', 'get', array(
+$contribution = civicrm_api3( 'contribution', 'getsingle', array(
 'id' => $this->original_contribution_id,
 ) );
-$contribution = array_pop( $results['values'] );
 
 $this->assertEquals( 'Refunded', $contribution['contribution_status'],
 'Refunded contribution has correct status' );
 
-$results = civicrm_api3( 'contribution', 'get', array(
-'id' => $this->refund_contribution_id,
-) );
-$refund_contribution = array_pop( $results['values'] );
+$financialTransactions = civicrm_api3('EntityFinancialTrxn', 'get', 
array(
+'entity_id' => $this->original_contribution_id,
+'entity_table' => 'civicrm_contribution',
+'api.financial_trxn.get' => 1,
+'sequential' => TRUE,
+));
+$this->assertEquals(2, $financialTransactions['count']);
+$transaction1 = 
$financialTransactions['values']['0']['api.financial_trxn.get']['values'][0];
+$transaction2 = 
$financialTransactions['values']['1']['api.financial_trxn.get']['values'][0];
 
-$this->assertEquals( 'Refund', $refund_contribution['financial_type'] 
);
-$this->assertEquals( 'Pending', 
$refund_contribution['contribution_status'] );
-

[MediaWiki-commits] [Gerrit] Cherry-pick rebase fix from Ic4d581b4d0 - change (mediawiki...ContentTranslation)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Cherry-pick rebase fix from Ic4d581b4d0
..


Cherry-pick rebase fix from Ic4d581b4d0

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

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



diff --git a/includes/AbuseFilterCheck.php b/includes/AbuseFilterCheck.php
index 2c35043..7030fda 100644
--- a/includes/AbuseFilterCheck.php
+++ b/includes/AbuseFilterCheck.php
@@ -87,10 +87,10 @@
$rulename = 
\AbuseFilter::$filters[$key]->af_public_comments;
 
if ( isset( $val['warn']['parameters'][0] ) ) {
-   $val['warning_html'] =
+   $val['warn']['messageHtml'] =
wfMessage( 
$val['warn']['parameters'][0] )
->params( $rulename )
-   ->parsed();
+   ->parse();
}
 
$results[$rulename] = $val;

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

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

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

[MediaWiki-commits] [Gerrit] Return to using mobile domain for zeroconfig requests - change (apps...wikipedia)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Return to using mobile domain for zeroconfig requests
..


Return to using mobile domain for zeroconfig requests

Needed for correct server-side behavior.

Change-Id: Ia5c01b62e7076e781a260835a67190e80ccc1586
---
M app/src/main/java/org/wikipedia/Site.java
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
3 files changed, 20 insertions(+), 3 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/Site.java 
b/app/src/main/java/org/wikipedia/Site.java
index 18f6e93..98abee3 100644
--- a/app/src/main/java/org/wikipedia/Site.java
+++ b/app/src/main/java/org/wikipedia/Site.java
@@ -49,6 +49,10 @@
 return domain;
 }
 
+public String getMobileDomain() {
+return urlToMobileSite(domain);
+}
+
 @Override
 public int describeContents() {
 return 0;
@@ -156,6 +160,10 @@
 return url.replaceFirst("\\.m\\.", ".");
 }
 
+private String urlToMobileSite(String url) {
+return url.replaceFirst("\\.", ".m.");
+}
+
 private static String languageToWikiSubdomain(String language) {
 switch (language) {
 case AppLanguageLookUpTable.SIMPLIFIED_CHINESE_LANGUAGE_CODE:
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 4bf9459..83f10a1 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -217,15 +217,20 @@
 }
 
 public Api getAPIForSite(Site site) {
+return getAPIForSite(site, false);
+}
+
+public Api getAPIForSite(Site site, boolean mobile) {
+String domain = mobile ? site.getMobileDomain() : site.getDomain();
 String acceptLanguage = getAcceptLanguage(site);
 Map customHeaders = buildCustomHeaders(acceptLanguage);
 Api api;
 
-String cachedApiKey = site.getDomain() + "-" + acceptLanguage;
+String cachedApiKey = domain + "-" + acceptLanguage;
 if (apis.containsKey(cachedApiKey)) {
 api = apis.get(cachedApiKey);
 } else {
-api = new Api(site.getDomain(), site.getUseSecure(),
+api = new Api(domain, site.getUseSecure(),
 site.getScriptPath("api.php"), customHeaders);
 apis.put(cachedApiKey, api);
 }
@@ -234,6 +239,10 @@
 return api;
 }
 
+public Api getApiForMobileSite(Site site) {
+return getAPIForSite(site, true);
+}
+
 /**
  * Default site for the app
  * You should use PageTitle.getSite() to get the article site
diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java 
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
index 94350d9..b736050 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
@@ -211,7 +211,7 @@
 
 @Override
 public boolean handleMessage(Message msg) {
-WikipediaZeroTask zeroTask = new 
WikipediaZeroTask(app.getAPIForSite(app.getSite()), app.getUserAgent()) {
+WikipediaZeroTask zeroTask = new 
WikipediaZeroTask(app.getApiForMobileSite(app.getSite()), app.getUserAgent()) {
 @Override
 public void onFinish(ZeroMessage message) {
 Log.d("Wikipedia", "Wikipedia Zero message: " + 
message);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5c01b62e7076e781a260835a67190e80ccc1586
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: Sniedzielski 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add mc1006 back into redis/memcached pools after maintenance. - change (operations/puppet)

2016-02-10 Thread Elukey (Code Review)

Elukey has uploaded a new change for review.

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

Change subject: Add mc1006 back into redis/memcached pools after maintenance.
..

Add mc1006 back into redis/memcached pools after maintenance.

Bug: T123711
Change-Id: I0f5849ad61056f9dd5c9c04e814c419254e66092
---
M hieradata/common/mediawiki/redis_servers.yaml
M hieradata/eqiad.yaml
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/269715/1

diff --git a/hieradata/common/mediawiki/redis_servers.yaml 
b/hieradata/common/mediawiki/redis_servers.yaml
index 1f84ec4..5fc910e 100644
--- a/hieradata/common/mediawiki/redis_servers.yaml
+++ b/hieradata/common/mediawiki/redis_servers.yaml
@@ -4,6 +4,7 @@
   - '10.64.0.182:6379:1 "shard03"'
   - '10.64.0.183:6379:1 "shard04"'
   - '10.64.0.184:6379:1 "shard05"'
+  - '10.64.0.185:6379:1 "shard06"'
   - '10.64.32.161:6379:1 "shard07"'
   - '10.64.32.162:6379:1 "shard08"'
   - '10.64.32.163:6379:1 "shard09"'
@@ -18,7 +19,6 @@
   - '10.64.48.96:6379:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
-# - '10.64.0.185:6379:1 "shard06"'
 
 codfw:
   - '10.192.0.34:6379:1 "shard01"'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 682088c..67ee866 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -7,6 +7,7 @@
   - '10.64.0.182:11211:1'
   - '10.64.0.183:11211:1 "shard04"'
   - '10.64.0.184:11211:1 "shard05"'
+  - '10.64.0.185:11211:1 "shard06"'
   - '10.64.32.161:11211:1 "shard07"'
   - '10.64.32.162:11211:1 "shard08"'
   - '10.64.32.163:11211:1 "shard09"'
@@ -21,7 +22,6 @@
   - '10.64.48.96:11211:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
-# - '10.64.0.185:11211:1'
 
 #
 # Ganglia

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

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

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

[MediaWiki-commits] [Gerrit] [bugfix] takesettings is not a function, take settings from... - change (pywikibot/core)

2016-02-10 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: [bugfix] takesettings is not a function, take  settings from 
instance
..

[bugfix] takesettings is not a function, take  settings from instance

Change-Id: I53425c8c8f348f57ed5525eb362d0eab7b023c3a
---
M tests/checkimages_tests.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/17/269717/1

diff --git a/tests/checkimages_tests.py b/tests/checkimages_tests.py
index 978547b..2a173e9 100644
--- a/tests/checkimages_tests.py
+++ b/tests/checkimages_tests.py
@@ -19,7 +19,8 @@
 def test_load(self):
 """Test loading settings."""
 b = checkimages.checkImagesBot(self.get_site())
-rv = b.takesettings()
+b.takesettings()
+rv = b.settingsData
 item1 = rv[0]
 self.assertEqual(item1[0], 1)
 self.assertEqual(item1[1], 'a deprecated template')

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

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

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

[MediaWiki-commits] [Gerrit] Rebuild logstash-gelf for Ubuntu Trusty - change (operations...logstash-gelf)

2016-02-10 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Rebuild logstash-gelf for Ubuntu Trusty
..


Rebuild logstash-gelf for Ubuntu Trusty

This includes minor fixes:
* Archiva now uses HTTPS, correcting the patch 0004
* ignoring .gitreview configuration file

Bug: T109101
Change-Id: I0f7b2f33951802efa5b40c36673f2742a9e97c2d
---
M debian/patches/0004-use-wmf-archiva.patch
A debian/source/options
2 files changed, 6 insertions(+), 4 deletions(-)

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



diff --git a/debian/patches/0004-use-wmf-archiva.patch 
b/debian/patches/0004-use-wmf-archiva.patch
index 7371ca1..f697e7d 100644
--- a/debian/patches/0004-use-wmf-archiva.patch
+++ b/debian/patches/0004-use-wmf-archiva.patch
@@ -31,7 +31,7 @@
 +
 +wikimedia.mirrored
 +Wikimedia Mirrored Repository
-+http://archiva.wikimedia.org/repository/mirrored
++https://archiva.wikimedia.org/repository/mirrored
 +
 +true
 +fail
@@ -44,7 +44,7 @@
 +
 +wikimedia.releases
 +Wikimedia Release Repository
-+http://archiva.wikimedia.org/repository/releases
++https://archiva.wikimedia.org/repository/releases
 +
 +true
 +fail
@@ -57,7 +57,7 @@
 +
 +wikimedia.snaphots
 +Wikimedia Snapshot Repository
-+http://archiva.wikimedia.org/repository/snapshots
++https://archiva.wikimedia.org/repository/snapshots
 +
 +false
 +
@@ -84,7 +84,7 @@
 +
 +wikimedia.mirrored
 +Wikimedia Mirrored Repository
-+http://archiva.wikimedia.org/repository/mirrored/
++https://archiva.wikimedia.org/repository/mirrored/
 +
 +
  
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 000..cf04f17
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+extend-diff-ignore = '^\.gitreview$'
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f7b2f33951802efa5b40c36673f2742a9e97c2d
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/logstash-gelf
Gerrit-Branch: master
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Gage 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] Remove "$that" from SessionManager - change (mediawiki/core)

2016-02-10 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Remove "$that" from SessionManager
..

Remove "$that" from SessionManager

Also "function () use ( &$ref )" that was being done for similar
reasons.

Change-Id: If4ec263a9a9c02c1c6a414b26a0e77ba144437f1
---
M includes/session/SessionBackend.php
M tests/phpunit/includes/session/CookieSessionProviderTest.php
M tests/phpunit/includes/session/SessionManagerTest.php
3 files changed, 25 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/22/269722/1

diff --git a/includes/session/SessionBackend.php 
b/includes/session/SessionBackend.php
index a79c5cb..fe446e3 100644
--- a/includes/session/SessionBackend.php
+++ b/includes/session/SessionBackend.php
@@ -549,13 +549,11 @@
 * @return \ScopedCallback When this goes out of scope, a save will be 
triggered
 */
public function delaySave() {
-   $that = $this;
$this->delaySave++;
-   $ref = &$this->delaySave;
-   return new \ScopedCallback( function () use ( $that, &$ref ) {
-   if ( --$ref <= 0 ) {
-   $ref = 0;
-   $that->save();
+   return new \ScopedCallback( function () {
+   if ( --$this->delaySave <= 0 ) {
+   $this->delaySave = 0;
+   $this->save();
}
} );
}
@@ -692,9 +690,8 @@
private function checkPHPSession() {
if ( !$this->checkPHPSessionRecursionGuard ) {
$this->checkPHPSessionRecursionGuard = true;
-   $ref = &$this->checkPHPSessionRecursionGuard;
-   $reset = new \ScopedCallback( function () use ( &$ref ) 
{
-   $ref = false;
+   $reset = new \ScopedCallback( function () {
+   $this->checkPHPSessionRecursionGuard = false;
} );
 
if ( $this->usePhpSessionHandling && session_id() === 
'' && PHPSessionHandler::isEnabled() &&
diff --git a/tests/phpunit/includes/session/CookieSessionProviderTest.php 
b/tests/phpunit/includes/session/CookieSessionProviderTest.php
index f5c8b05..659826f 100644
--- a/tests/phpunit/includes/session/CookieSessionProviderTest.php
+++ b/tests/phpunit/includes/session/CookieSessionProviderTest.php
@@ -568,8 +568,6 @@
}
 
public function testPersistSessionWithHook() {
-   $that = $this;
-
$provider = new CookieSessionProvider( array(
'priority' => 1,
'sessionName' => 'MySessionName',
@@ -620,14 +618,14 @@
// Logged-in user, no remember
$mock = $this->getMock( __CLASS__, array( 'onUserSetCookies' ) 
);
$mock->expects( $this->once() )->method( 'onUserSetCookies' )
-   ->will( $this->returnCallback( function ( $u, 
&$sessionData, &$cookies ) use ( $that, $user ) {
-   $that->assertSame( $user, $u );
-   $that->assertEquals( array(
+   ->will( $this->returnCallback( function ( $u, 
&$sessionData, &$cookies ) use ( $user ) {
+   $this->assertSame( $user, $u );
+   $this->assertEquals( array(
'wsUserID' => $user->getId(),
'wsUserName' => $user->getName(),
'wsToken' => $user->getToken(),
), $sessionData );
-   $that->assertEquals( array(
+   $this->assertEquals( array(
'UserID' => $user->getId(),
'UserName' => $user->getName(),
'Token' => false,
@@ -663,14 +661,14 @@
// Logged-in user, remember
$mock = $this->getMock( __CLASS__, array( 'onUserSetCookies' ) 
);
$mock->expects( $this->once() )->method( 'onUserSetCookies' )
-   ->will( $this->returnCallback( function ( $u, 
&$sessionData, &$cookies ) use ( $that, $user ) {
-   $that->assertSame( $user, $u );
-   $that->assertEquals( array(
+   ->will( $this->returnCallback( function ( $u, 
&$sessionData, &$cookies ) use ( $user ) {
+   $this->assertSame( $user, $u );
+   $this->assertEquals( array(
'wsUserID' => $user->getId(),

[MediaWiki-commits] [Gerrit] Stop doing $that = $this in includes/jobqueue - change (mediawiki/core)

2016-02-10 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: Stop doing $that = $this in includes/jobqueue
..

Stop doing $that = $this in includes/jobqueue

Closures support $this as of PHP 5.4

Change-Id: Icf4eb9ffeab410c01c68a031ec6704cd83c2681e
---
M includes/jobqueue/JobQueueDB.php
M includes/jobqueue/JobQueueMemory.php
M includes/jobqueue/JobQueueRedis.php
3 files changed, 8 insertions(+), 13 deletions(-)


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

diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index f10866e..51dec65 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -181,11 +181,10 @@
protected function doBatchPush( array $jobs, $flags ) {
$dbw = $this->getMasterDB();
 
-   $that = $this;
$method = __METHOD__;
$dbw->onTransactionIdle(
-   function () use ( $dbw, $that, $jobs, $flags, $method ) 
{
-   $that->doBatchPushInternal( $dbw, $jobs, 
$flags, $method );
+   function () use ( $dbw, $jobs, $flags, $method ) {
+   $this->doBatchPushInternal( $dbw, $jobs, 
$flags, $method );
}
);
}
diff --git a/includes/jobqueue/JobQueueMemory.php 
b/includes/jobqueue/JobQueueMemory.php
index 7dad748..7e9c0c9 100644
--- a/includes/jobqueue/JobQueueMemory.php
+++ b/includes/jobqueue/JobQueueMemory.php
@@ -175,11 +175,10 @@
return new ArrayIterator( array() );
}
 
-   $that = $this;
return new MappedIterator(
$unclaimed,
-   function ( $value ) use ( $that ) {
-   $that->jobFromSpecInternal( $value );
+   function ( $value ) {
+   $this->jobFromSpecInternal( $value );
}
);
}
@@ -195,11 +194,10 @@
return new ArrayIterator( array() );
}
 
-   $that = $this;
return new MappedIterator(
$claimed,
-   function ( $value ) use ( $that ) {
-   $that->jobFromSpecInternal( $value );
+   function ( $value ) {
+   $this->jobFromSpecInternal( $value );
}
);
}
diff --git a/includes/jobqueue/JobQueueRedis.php 
b/includes/jobqueue/JobQueueRedis.php
index eda3e9c..408828d 100644
--- a/includes/jobqueue/JobQueueRedis.php
+++ b/includes/jobqueue/JobQueueRedis.php
@@ -573,12 +573,10 @@
 * @return MappedIterator
 */
protected function getJobIterator( RedisConnRef $conn, array $uids ) {
-   $that = $this;
-
return new MappedIterator(
$uids,
-   function ( $uid ) use ( $that, $conn ) {
-   return $that->getJobFromUidInternal( $uid, 
$conn );
+   function ( $uid ) use ( $conn ) {
+   return $this->getJobFromUidInternal( $uid, 
$conn );
},
array( 'accept' => function ( $job ) {
return is_object( $job );

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

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

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

[MediaWiki-commits] [Gerrit] Add autoload autoload.php to SemanticForms.php and extension... - change (mediawiki...SemanticForms)

2016-02-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Add autoload autoload.php to SemanticForms.php and 
extension.json
..

Add autoload autoload.php to SemanticForms.php and extension.json

This should allow us to load this extension through composer.

Change-Id: Ica3f422a3902128472c2e624ddb78489adda3d1c
---
M SemanticForms.php
M extension.json
2 files changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms 
refs/changes/05/269705/1

diff --git a/SemanticForms.php b/SemanticForms.php
index 382c5bc..f025d83 100644
--- a/SemanticForms.php
+++ b/SemanticForms.php
@@ -60,6 +60,10 @@
}
 }
 
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+   require_once __DIR__ . '/vendor/autoload.php';
+}
+
 if ( defined( 'SF_VERSION' ) ) {
// Do not load Semantic Forms more than once.
return 1;
diff --git a/extension.json b/extension.json
index 411be35..56fdd57 100644
--- a/extension.json
+++ b/extension.json
@@ -1,5 +1,6 @@
 {
"@Note": "When updating this file please also update SemanticForms.php 
with the same changes.",
+   "load_composer_autoloader": true,
"name": "Semantic Forms",
"version": "3.4.3-alpha",
"author": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica3f422a3902128472c2e624ddb78489adda3d1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to wmf/1.27.0-wmf.12 HEAD (3b59d17) - change (mediawiki/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Update VE core submodule to wmf/1.27.0-wmf.12 HEAD (3b59d17)
..


Update VE core submodule to wmf/1.27.0-wmf.12 HEAD (3b59d17)

New changes:
3b59d17 ext.visualEditor.desktopArticleTarget.init: Depend on mediawiki.user too

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

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



diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index c2dfa0b..3b59d17 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit c2dfa0bf331b787159e371ae7115d4513f054817
+Subproject commit 3b59d1765df1877dc4fc6376605b0724d64a4c72

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If55172edd10c496878ed9b92b6ac506e0c73c5c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Enable Math extension on Wikitech" - change (operations/mediawiki-config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Revert "Enable Math extension on Wikitech"
..


Revert "Enable Math extension on Wikitech"

texvc is not available on this server:
```
Failed to parse (Missing texvc executable.
Please see math/README to configure.)
```

Mathoid isn't currently available either for wikitech.

This reverts commit ae88f194d436e1403d9c352869d93f1776267bc6.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb912cc..87ebfc4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13598,6 +13598,7 @@
 
 'wmgUseMath' => array(
'default' => true, // moved from MW core
+   'wikitech' => false,
'loginwiki' => false,
'votewiki' => false, // T61702
 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f6fab78048d18808621ea21edc35b509ba7a8e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Strict comparison for booleans - change (mediawiki...WikidataPageBanner)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Strict comparison for booleans
..


Strict comparison for booleans

Change-Id: Id4d16093ed860942e2dfa561e124482ade0d6381
---
M includes/WikidataPageBanner.functions.php
M includes/WikidataPageBanner.hooks.php
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jdlrobson: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/WikidataPageBanner.functions.php 
b/includes/WikidataPageBanner.functions.php
index d5058aa..19a626a 100644
--- a/includes/WikidataPageBanner.functions.php
+++ b/includes/WikidataPageBanner.functions.php
@@ -295,7 +295,7 @@
$entityLookup = 
Wikibase\Client\WikibaseClient::getDefaultInstance()
->getStore()
->getEntityLookup();
-   if ( $itemId != null ) {
+   if ( $itemId !== null ) {
$item = $entityLookup->getEntity( $itemId );
$statements = 
$item->getStatements()->getByPropertyId(
new 
Wikibase\DataModel\Entity\PropertyId(
diff --git a/includes/WikidataPageBanner.hooks.php 
b/includes/WikidataPageBanner.hooks.php
index 2866dce..31cdc94 100644
--- a/includes/WikidataPageBanner.hooks.php
+++ b/includes/WikidataPageBanner.hooks.php
@@ -149,7 +149,7 @@
 * @param  ParserOutput $pOut
 */
public static function onOutputPageParserOutput( OutputPage $out, 
ParserOutput $pOut ) {
-   if ( $pOut->getExtensionData( 'wpb-banner-options' ) != null ) {
+   if ( $pOut->getExtensionData( 'wpb-banner-options' ) !== null ) 
{
$options = $pOut->getExtensionData( 
'wpb-banner-options' );
 
// if toc parameter set and toc enabled, remove 
original classes and add banner class

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4d16093ed860942e2dfa561e124482ade0d6381
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "Enable Math extension on Wikitech" - change (operations/mediawiki-config)

2016-02-10 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Revert "Enable Math extension on Wikitech"
..

Revert "Enable Math extension on Wikitech"

texvc is not available on this server:
```
Failed to parse (Missing texvc executable.
Please see math/README to configure.)
```

Mathoid isn't currently available either for wikitech.

This reverts commit ae88f194d436e1403d9c352869d93f1776267bc6.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index cb912cc..87ebfc4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13598,6 +13598,7 @@
 
 'wmgUseMath' => array(
'default' => true, // moved from MW core
+   'wikitech' => false,
'loginwiki' => false,
'votewiki' => false, // T61702
 ),

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

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

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

[MediaWiki-commits] [Gerrit] PHPSessionHandler: Implement SessionHandlerInterface - change (mediawiki/core)

2016-02-10 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: PHPSessionHandler: Implement SessionHandlerInterface
..

PHPSessionHandler: Implement SessionHandlerInterface

Now that support for PHP 5.3 has been dropped, we can do this.

Change-Id: If7fa9801194683eea6764e5748157d8a66a616df
---
M includes/session/PHPSessionHandler.php
1 file changed, 4 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/269712/1

diff --git a/includes/session/PHPSessionHandler.php 
b/includes/session/PHPSessionHandler.php
index 795e253..7d7e1cb 100644
--- a/includes/session/PHPSessionHandler.php
+++ b/includes/session/PHPSessionHandler.php
@@ -28,13 +28,10 @@
 
 /**
  * Adapter for PHP's session handling
- * @todo Once we drop support for PHP < 5.4, use SessionHandlerInterface
- *  (should just be a matter of adding "implements SessionHandlerInterface" and
- *  changing the session_set_save_handler() call).
  * @ingroup Session
  * @since 1.27
  */
-class PHPSessionHandler {
+class PHPSessionHandler implements \SessionHandlerInterface {
/** @var PHPSessionHandler */
protected static $instance = null;
 
@@ -132,20 +129,9 @@
// Also set a sane serialization handler
\Wikimedia\PhpSessionSerializer::setSerializeHandler();
 
-   session_set_save_handler(
-   array( self::$instance, 'open' ),
-   array( self::$instance, 'close' ),
-   array( self::$instance, 'read' ),
-   array( self::$instance, 'write' ),
-   array( self::$instance, 'destroy' ),
-   array( self::$instance, 'gc' )
-   );
-
-   // It's necessary to register a shutdown function to call 
session_write_close(),
-   // because by the time the request shutdown function for the 
session module is
-   // called, other needed objects may have already been 
destroyed. Shutdown functions
-   // registered this way are called before object destruction.
-   register_shutdown_function( array( self::$instance, 
'handleShutdown' ) );
+   // Register this as the save handler, and register an 
appropriate
+   // shutdown function.
+   session_set_save_handler( self::$instance, true );
}
 
/**
@@ -368,18 +354,4 @@
$this->store->deleteObjectsExpiringBefore( $before );
return true;
}
-
-   /**
-* Shutdown function.
-*
-* See the comment inside self::install for rationale.
-* @codeCoverageIgnore
-* @private For internal use only
-*/
-   public function handleShutdown() {
-   if ( $this->enable ) {
-   session_write_close();
-   }
-   }
-
 }

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

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

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

[MediaWiki-commits] [Gerrit] Add mc1006 back into redis/memcached pools after maintenance. - change (operations/puppet)

2016-02-10 Thread Elukey (Code Review)

Elukey has submitted this change and it was merged.

Change subject: Add mc1006 back into redis/memcached pools after maintenance.
..


Add mc1006 back into redis/memcached pools after maintenance.

Bug: T123711
Change-Id: I0f5849ad61056f9dd5c9c04e814c419254e66092
---
M hieradata/common/mediawiki/redis_servers.yaml
M hieradata/eqiad.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/common/mediawiki/redis_servers.yaml 
b/hieradata/common/mediawiki/redis_servers.yaml
index 1f84ec4..5fc910e 100644
--- a/hieradata/common/mediawiki/redis_servers.yaml
+++ b/hieradata/common/mediawiki/redis_servers.yaml
@@ -4,6 +4,7 @@
   - '10.64.0.182:6379:1 "shard03"'
   - '10.64.0.183:6379:1 "shard04"'
   - '10.64.0.184:6379:1 "shard05"'
+  - '10.64.0.185:6379:1 "shard06"'
   - '10.64.32.161:6379:1 "shard07"'
   - '10.64.32.162:6379:1 "shard08"'
   - '10.64.32.163:6379:1 "shard09"'
@@ -18,7 +19,6 @@
   - '10.64.48.96:6379:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
-# - '10.64.0.185:6379:1 "shard06"'
 
 codfw:
   - '10.192.0.34:6379:1 "shard01"'
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 682088c..67ee866 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -7,6 +7,7 @@
   - '10.64.0.182:11211:1'
   - '10.64.0.183:11211:1 "shard04"'
   - '10.64.0.184:11211:1 "shard05"'
+  - '10.64.0.185:11211:1 "shard06"'
   - '10.64.32.161:11211:1 "shard07"'
   - '10.64.32.162:11211:1 "shard08"'
   - '10.64.32.163:11211:1 "shard09"'
@@ -21,7 +22,6 @@
   - '10.64.48.96:11211:1 "shard18"'
 
 # Hosts temporary removed from the pool for maintenance
-# - '10.64.0.185:11211:1'
 
 #
 # Ganglia

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f5849ad61056f9dd5c9c04e814c419254e66092
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Clean up Special:CheckUserLog code - change (mediawiki...CheckUser)

2016-02-10 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Clean up Special:CheckUserLog code
..

Clean up Special:CheckUserLog code

Make the code more readable so that the logic is easier to follow.

Also:
- If the form was submitted without the target being specified, show
   all the log entries instead of showing an error
- Remove mw-autocomplete-user class for cuSearch field as this is now
   done in core for user HTMLFormField.
- CheckUserLogPager's constructor now accepts only two arguments
- Remove unused $specialPage member variable from CheckUserLogPager.
- Pass IContextSource to parent constructor to prevent log spam about
   context being null

Change-Id: I56e8800a666bfd9a805bfa0a5e25c6e7722e014e
---
M CheckUserLogPager.php
M specials/SpecialCheckUserLog.php
2 files changed, 98 insertions(+), 64 deletions(-)


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

diff --git a/CheckUserLogPager.php b/CheckUserLogPager.php
index e0a569c..315e73d 100644
--- a/CheckUserLogPager.php
+++ b/CheckUserLogPager.php
@@ -1,14 +1,20 @@
 getDateCond( $y, $m );
-   $this->searchConds = $searchConds ? $searchConds : array();
-   $this->specialPage = $specialPage;
+   /**
+* @param IContextSource $context
+* @param array $opts Should include 'queryConds', 'year', and 'month' 
keys
+*/
+   public function __construct( IContextSource $context, array $conds ) {
+   parent::__construct( $context );
+   $this->searchConds = $conds['queryConds'];
+   // getDateCond() actually *sets* the timestamp offset..
+   $this->getDateCond( $conds['year'], $conds['month'] );
}
 
function formatRow( $row ) {
@@ -66,11 +72,10 @@
}
 
function getQueryInfo() {
-   $this->searchConds[] = 'user_id = cul_user';
return array(
'tables' => array( 'cu_log', 'user' ),
'fields' => $this->selectFields(),
-   'conds'  => $this->searchConds
+   'conds' => array_merge( $this->searchConds, array( 
'user_id = cul_user' ) )
);
}
 
diff --git a/specials/SpecialCheckUserLog.php b/specials/SpecialCheckUserLog.php
index e13551c..c388214 100644
--- a/specials/SpecialCheckUserLog.php
+++ b/specials/SpecialCheckUserLog.php
@@ -1,16 +1,21 @@
 setHeaders();
$this->checkPermissions();
 
$out = $this->getOutput();
$request = $this->getRequest();
-   $this->setHeaders();
 
if ( $this->getUser()->isAllowed( 'checkuser' ) ) {
$subtitleLink = Linker::linkKnown(
@@ -20,63 +25,35 @@
$out->addSubtitle( $subtitleLink );
}
 
-   $type = $request->getVal( 'cuSearchType' );
-   $target = $request->getVal( 'cuSearch' );
-   $target = trim( $target );
-   $year = $request->getIntOrNull( 'year' );
-   $month = $request->getIntOrNull( 'month' );
-   $error = false;
-   $dbr = wfGetDB( DB_SLAVE );
-   $searchConds = false;
-   if ( $type === null ) {
-   $type = 'target';
-   } elseif ( $type == 'initiator' ) {
-   $user = User::newFromName( $target );
-   if ( !$user || !$user->getID() ) {
-   $error = 'checkuser-user-nonexistent';
-   } else {
-   $searchConds = array( 'cul_user' => 
$user->getID() );
-   }
-   } else /* target */ {
-   $type = 'target';
-   // Is it an IP?
-   list( $start, $end ) = IP::parseRange( $target );
-   if ( $start !== false ) {
-   if ( $start == $end ) {
-   $searchConds = array( 'cul_target_hex = 
' . $dbr->addQuotes( $start ) . ' OR ' .
-   '(cul_range_end >= ' . 
$dbr->addQuotes( $start ) . ' AND ' .
-   'cul_range_start <= ' . 
$dbr->addQuotes( $end ) . ')'
-   );
-   } else {
-   $searchConds = array(
-   '(cul_target_hex >= ' . 
$dbr->addQuotes( $start ) . ' AND ' .
-   'cul_target_hex <= ' . 
$dbr->addQuotes( $end ) . ') OR ' .
-   '(cul_range_end >= ' . 
$dbr->addQuotes( $start ) . ' AND ' .
-

[MediaWiki-commits] [Gerrit] Correct HTML code for WMF image - change (operations/mediawiki-config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Correct HTML code for WMF image
..


Correct HTML code for WMF image

Change-Id: Ifaeb434192f2c62b9070efb42e50f7aac3b19616
---
M errorpages/404.html
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Hoo man: Looks good to me, but someone else must approve
  Chad: Looks good to me, approved
  Hashar: Looks good to me, but someone else must approve
  Suriyaa Kudo: Looks good to me, but someone else must approve
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  Aklapper: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/errorpages/404.html b/errorpages/404.html
index 570104b..f8522e1 100644
--- a/errorpages/404.html
+++ b/errorpages/404.html
@@ -14,7 +14,7 @@
 a:hover { text-decoration: underline; }
 em { font-style: normal; color: #777; }
 
-
+
 Not Found
 The requested URL was not found on this server.Perhaps you'd like to 
try our main page instead?
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaeb434192f2c62b9070efb42e50f7aac3b19616
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Suriyaa Kudo 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Suriyaa Kudo 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Stop doing $that = $this in includes/resourceloader - change (mediawiki/core)

2016-02-10 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: Stop doing $that = $this in includes/resourceloader
..

Stop doing $that = $this in includes/resourceloader

Closures support $this as of PHP 5.4

Change-Id: Ib00be459490569036604afff53bd99fe247737df
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/23/269723/1

diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index d7b51b8..51a6225 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -618,11 +618,8 @@
if ( !$modules ) {
return '';
}
-   // Support: PHP 5.3 ("$this" for anonymous functions was added 
in PHP 5.4.0)
-   // http://php.net/functions.anonymous
-   $rl = $this;
-   $hashes = array_map( function ( $module ) use ( $rl, $context ) 
{
-   return $rl->getModule( $module )->getVersionHash( 
$context );
+   $hashes = array_map( function ( $module ) use ( $context ) {
+   return $this->getModule( $module )->getVersionHash( 
$context );
}, $modules );
return self::makeHash( implode( $hashes ) );
}

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

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

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

[MediaWiki-commits] [Gerrit] Stop doing $that = $this in includes/deferred - change (mediawiki/core)

2016-02-10 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: Stop doing $that = $this in includes/deferred
..

Stop doing $that = $this in includes/deferred

Closures support $this as of PHP 5.4

Change-Id: I2632d0c2bdc9e2fec72f1c64c3868dcb442ba871
---
M includes/deferred/LinksUpdate.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/269728/1

diff --git a/includes/deferred/LinksUpdate.php 
b/includes/deferred/LinksUpdate.php
index 3021af1..9cd20fc 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -143,9 +143,8 @@
Hooks::run( 'LinksUpdate', array( &$this ) );
$this->doIncrementalUpdate();
 
-   $that = $this;
-   $this->mDb->onTransactionIdle( function() use ( $that ) {
-   Hooks::run( 'LinksUpdateComplete', array( &$that ) );
+   $this->mDb->onTransactionIdle( function() {
+   Hooks::run( 'LinksUpdateComplete', array( &$this ) );
} );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Add subject to email notification body - change (mediawiki...Echo)

2016-02-10 Thread Sbisson (Code Review)

Sbisson has uploaded a new change for review.

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

Change subject: Add subject to email notification body
..

Add subject to email notification body

Bug: T121831
Change-Id: Ib1a9212202d2c84de8d968d043f65e24b2d94fae
---
M Hooks.php
M i18n/en.json
M i18n/qqq.json
M includes/formatters/EmailUserPresentationModel.php
M maintenance/generateSampleNotifications.php
5 files changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index afdaacf..3e5a542 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1059,6 +1059,7 @@
'type' => 'emailuser',
'extra' => array(
'to-user-id' => $userTo->getId(),
+   'subject' => $subject,
),
'agent' => $userFrom,
) );
diff --git a/i18n/en.json b/i18n/en.json
index e57cf12..13e0fdf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -107,6 +107,7 @@
"notification-body-reverted": "$1",
"notification-emailuser": "[[User:$1|$1]] {{GENDER:$1|sent}} you an 
email.",
"notification-header-emailuser": "$1 {{GENDER:$2|sent}} you an email.",
+   "notification-body-email-user": "$1",
"notification-edit-talk-page-email-subject2": "$1 {{GENDER:$1|left}} 
you a message on {{SITENAME}}",
"notification-edit-talk-page-email-batch-body2": "$1 {{GENDER:$1|left}} 
a message on your talk page.",
"notification-edit-talk-page-email-batch-body-with-section": "$1 
{{GENDER:$1|left}} a message on your talk page in \"$2\".",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ac56eef..07df54d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -128,6 +128,7 @@
"notification-body-reverted": "{{notranslate}}",
"notification-emailuser": "Format for displaying notifications of a 
user has sent an email to another user. Parameters:\n* $1 - the username of the 
person the email, plain text. Can be used for GENDER.",
"notification-header-emailuser": "Flyout-specific format for displaying 
notifications of user has sent an email to another user.\n\nParameters:\n* $1 - 
the formatted username of the person who sent the email.\n* $2 - the username 
for GENDER.",
+   "notification-body-email-user": "{{notranslate}}",
"notification-edit-talk-page-email-subject2": "Email subject. 
Parameters:\n* $1 - a username which can be used for gender support",
"notification-edit-talk-page-email-batch-body2": "First line of the 
email notification for a talk page edit. The following line completes it with 
the description of the message in question, that is its edit 
summary.\n\nParameters:\n* $1 - a username (which also links to the userpage of 
the user in question, in the HTML version)\nSee also:\n* 
{{msg-mw|Notification-edit-talk-page2}}\n* 
{{msg-mw|Notification-edit-talk-page-email-subject2}}\n* 
{{msg-mw|Notification-edit-talk-page-flyout2}}",
"notification-edit-talk-page-email-batch-body-with-section": "Email 
notification for talk page edit with new section or new comment. Parameters:\n* 
$1 - a username\n* $2 - the raw section title text",
diff --git a/includes/formatters/EmailUserPresentationModel.php 
b/includes/formatters/EmailUserPresentationModel.php
index 7c4599a..aef5fab 100644
--- a/includes/formatters/EmailUserPresentationModel.php
+++ b/includes/formatters/EmailUserPresentationModel.php
@@ -13,4 +13,9 @@
public function getSecondaryLinks() {
return array( $this->getAgentLink() );
}
+
+   public function getBodyMessage() {
+   $subject = $this->event->getExtraParam( 'subject' );
+   return $subject ? $this->msg( 'notification-body-email-user' 
)->plaintextParams( $subject ) : false;
+   }
 }
diff --git a/maintenance/generateSampleNotifications.php 
b/maintenance/generateSampleNotifications.php
index 15f4655..155a291 100644
--- a/maintenance/generateSampleNotifications.php
+++ b/maintenance/generateSampleNotifications.php
@@ -201,6 +201,7 @@
'type' => 'emailuser',
'extra' => array(
'to-user-id' => $user->getId(),
+   'subject' => 'Long time no see',
),
'agent' => $agent,
) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1a9212202d2c84de8d968d043f65e24b2d94fae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Sbisson 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Implemented titleicons for hierarchySelect. - change (mediawiki...HierarchyBuilder)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Implemented titleicons for hierarchySelect.
..


Implemented titleicons for hierarchySelect.

Updated argument parsing across all parser functions and forms.

Initial titleicon implementation for hierarchySelect

Change-Id: Ib7b8db48580341dab36720905ea82b221ab4fc62

Finished implementing titleicons for hierarchySelect.

Refactored php wikitext to HTML parsing into a shared HierarchyBuilder utility 
function.

Change-Id: Ia6faaa1fa8e938b63043ee720e5945e1ef811bfb

Php codesniffer fixes.

Change-Id: Id2f774aade4f2414fb98f3094738f3e003eced07
---
M HierarchyBuilder.hooks.php
M HierarchyBuilder.php
M HierarchyBuilder_body.php
M extension.json
M includes/HierarchyFormInput.php
M includes/HierarchySelectFormInput.php
M includes/HierarchyTree.php
M includes/TreeNode.php
M includes/editHierarchy.css
M includes/editHierarchy.js
M includes/renderHierarchy.css
M includes/renderHierarchySelected.js
M includes/selectFromHierarchy.css
M includes/selectFromHierarchy.js
14 files changed, 313 insertions(+), 223 deletions(-)

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



diff --git a/HierarchyBuilder.hooks.php b/HierarchyBuilder.hooks.php
index 221ac3f..950a8dc 100644
--- a/HierarchyBuilder.hooks.php
+++ b/HierarchyBuilder.hooks.php
@@ -1,5 +1,5 @@
 setFunctionHook( 'hierarchyBreadcrumb', 
+   $parser->setFunctionHook( 'hierarchyBreadcrumb',
'HierarchyBuilder::hierarchyBreadcrumb' );
$parser->setFunctionHook( 'hierarchySectionNumber', 
'HierarchyBuilder::hierarchySectionNumber' );
$parser->setFunctionHook( 'hierarchyParent', 
'HierarchyBuilder::hierarchyParent' );
@@ -46,4 +46,4 @@
return true;
}
 
-}
\ No newline at end of file
+}
diff --git a/HierarchyBuilder.php b/HierarchyBuilder.php
index 25e9a6f..2ad7ae1 100644
--- a/HierarchyBuilder.php
+++ b/HierarchyBuilder.php
@@ -29,8 +29,9 @@
$wgExtensionMessagesFiles['HierarchyBuilder'] = __DIR__ . 
'/HierarchyBuilder.i18n.php';
$wgExtensionMessagesFiles['HierarchyBuilderMagic'] = __DIR__ . 
'/HierarchyBuilder.i18n.magic.php';
wfWarn(
-   'Deprecated PHP entry point used for HierarchyBuilder 
extension. Please use wfLoadExtension instead, ' .
-   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   'Deprecated PHP entry point used for HierarchyBuilder 
extension. ' .
+   'Please use wfLoadExtension instead, see ' .
+   'https://www.mediawiki.org/wiki/Extension_registration for more 
details.'
);
return;
 }
@@ -55,7 +56,7 @@
' Semantic Forms 2.5.2 or above.' );
 }
 
-define( 'HB_VERSION', '3.0.1' );
+define( 'HB_VERSION', '3.1.0' );
 
 # credits
 $wgExtensionCredits['parserhook'][] = array (
diff --git a/HierarchyBuilder_body.php b/HierarchyBuilder_body.php
index 3c8489b..4b3aaf4 100644
--- a/HierarchyBuilder_body.php
+++ b/HierarchyBuilder_body.php
@@ -31,7 +31,9 @@
// in the wikitext hierarchy.
const DEPTHPATTERN = '/^(\**)/';
 
-   // constants for child parser function arg names
+   // constants for arg names
+   const PAGENAME = 'pagename';
+   const PROPERTYNAME = 'propertyname';
const SEPARATOR = 'sep';
const TEMPLATE = 'template';
const INTROTEMPLATE = 'introtemplate';
@@ -42,6 +44,14 @@
const DISPLAYMODE = 'displaymode';
const SHOWROOT = 'showroot';
const COLLAPSED = 'collapsed';
+   const PRUNED = 'pruned';
+   const THREESTATE = 'threestate';
+   const HIDEINFO = 'hideinfo';
+   const WIDTH = 'width';
+   const HEIGHT = 'height';
+   const CATEGORY = 'category';
+   const NUMBERED = 'numbered';
+   const SELECTED = 'selected';
 
/**
 * This parser function will give the section number of a page in a 
hierarchy.
@@ -180,7 +190,7 @@
} else {
return 
"{{" . $template . "|[[$child]]}}";
}
-   } ,
+   },
$children
),
"$delimiter\n"
@@ -191,7 +201,7 @@
array_map(
function( $child ) use 
( $link ) {
return $link == 
'none' ? $child : "[[$child]]";
-   } ,
+

[MediaWiki-commits] [Gerrit] Expert::valueCharacteristics is never called statically - change (data-values/value-view)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Expert::valueCharacteristics is never called statically
..


Expert::valueCharacteristics is never called statically

Change-Id: I24fb0bfe2536461f29e0c8ca82511732f5522198
---
M RELEASE-NOTES.md
M src/experts/GlobeCoordinateInput.js
M src/experts/MonolingualText.js
M src/experts/QuantityInput.js
M src/experts/TimeInput.js
M src/jquery.valueview.Expert.js
M tests/src/jquery.valueview.tests.testExpert.js
7 files changed, 8 insertions(+), 30 deletions(-)

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



diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 0721508..59d5e65 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -4,6 +4,8 @@
 
 * Changed `ValueView` to take two `ValueFormatter` instances instead of a
   `ValueFormatterStore`
+* Changed `Expert::valueCharacteristics` definition so that it does not have 
to be
+  statically callable anymore
 
 ## 0.15.9 (2016-02-03)
 
diff --git a/src/experts/GlobeCoordinateInput.js 
b/src/experts/GlobeCoordinateInput.js
index b7b76bf..ef171e0 100644
--- a/src/experts/GlobeCoordinateInput.js
+++ b/src/experts/GlobeCoordinateInput.js
@@ -162,10 +162,6 @@
 * @inheritdoc
 */
valueCharacteristics: function() {
-   if ( !this.precisionRotator ) { // happens when called 
statically
-   return {};
-   }
-
var options = {},
precision = this.precisionRotator.getValue();
 
diff --git a/src/experts/MonolingualText.js b/src/experts/MonolingualText.js
index c8bb828..a1dd803 100644
--- a/src/experts/MonolingualText.js
+++ b/src/experts/MonolingualText.js
@@ -46,11 +46,9 @@
 * @inheritdoc
 */
valueCharacteristics: function() {
-   var options = {};
-   if ( this._languageSelector ) {
-   options.valuelang = 
this._languageSelector.getValue();
-   }
-   return options;
+   return {
+   valuelang: this._languageSelector.getValue()
+   };
},
 
/**
diff --git a/src/experts/QuantityInput.js b/src/experts/QuantityInput.js
index e06f3b4..1e36bec 100644
--- a/src/experts/QuantityInput.js
+++ b/src/experts/QuantityInput.js
@@ -56,7 +56,7 @@
 */
valueCharacteristics: function() {
var options = {
-   unit: this._unitSelector && 
this._unitSelector.getConceptUri() || null
+   unit: this._unitSelector.getConceptUri()
};
 
return options;
diff --git a/src/experts/TimeInput.js b/src/experts/TimeInput.js
index a2e601a..6b5f01d 100644
--- a/src/experts/TimeInput.js
+++ b/src/experts/TimeInput.js
@@ -172,8 +172,8 @@
 */
valueCharacteristics: function() {
var options = {},
-   precision = this.precisionRotator && 
this.precisionRotator.getValue() || null,
-   calendarUri = this.calendarRotator && 
this.calendarRotator.getValue() || null;
+   precision = this.precisionRotator.getValue() || 
null,
+   calendarUri = this.calendarRotator.getValue() 
|| null;
 
if ( precision !== null ) {
options.precision = precision;
diff --git a/src/jquery.valueview.Expert.js b/src/jquery.valueview.Expert.js
index 79f5586..5c32b86 100644
--- a/src/jquery.valueview.Expert.js
+++ b/src/jquery.valueview.Expert.js
@@ -235,13 +235,9 @@
this._options = null;
},
 
-   // TODO: This should actually move out of here together with 
all the advanced input features
-   //  of certain experts (time/coordinate).
/**
 * Returns an object with characteristics specified for the 
value. The object can be used
 * as parser options definition.
-*
-* This method should allow to be called statically, i. e. 
without a useful `this` context.
 *
 * @return {Object}
 */
diff --git a/tests/src/jquery.valueview.tests.testExpert.js 
b/tests/src/jquery.valueview.tests.testExpert.js
index 24873f4..19802f2 100644
--- a/tests/src/jquery.valueview.tests.testExpert.js
+++ b/tests/src/jquery.valueview.tests.testExpert.js
@@ -93,20 +93,6 @@
} );
}
 
-   QUnit.test( 'valueCharacteristics static invocation', function( assert 
) {
-   assert.expect(

[MediaWiki-commits] [Gerrit] use strict can be global in Node.js - change (data-values/value-view)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: use strict can be global in Node.js
..


use strict can be global in Node.js

Change-Id: Ic5a1bb5a65c669883c21983033c12ac86724ec20
---
M Gruntfile.js
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Gruntfile.js b/Gruntfile.js
index ad51cfb..8e2c4eb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,6 +1,7 @@
+'use strict';
 /*jshint node:true */
+
 module.exports = function ( grunt ) {
-   'use strict';
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5a1bb5a65c669883c21983033c12ac86724ec20
Gerrit-PatchSet: 2
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang 
Gerrit-Reviewer: Adrian Lang 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] otrs: Remove the otrs cron file - change (operations/puppet)

2016-02-10 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: otrs: Remove the otrs cron file
..

otrs: Remove the otrs cron file

In otrs 5.0.x the usual cron file does not exist. All of the cronjobs
have been migrated to the OTRS daemon. Remove the crontab file from the
repo. Remove the safeguard around Debian Jessie as well since the old
installation will very soon cease to exist

Change-Id: I6ba018486a1d801bd47bc1409fbd519e57d0f2cf
---
M modules/otrs/manifests/init.pp
1 file changed, 9 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/269703/1

diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index d042a81..7479b9b 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -134,35 +134,15 @@
 source => 'puppet:///modules/otrs/loginlogo_default_wmf.png',
 }
 
-# TODO: Remove the safeguard once we are jessie only
-# NOTE: We couple the move to 4.0.x OTRS with the move to jessie, since 
that
-# should not bite back as after the move the 3.2.x install we have will be
-# decomissioned
-if os_version('debian >= jessie') {
-# TODO: Remove this after the migration to 5.0.x is complete
-file { '/etc/cron.d/otrs':
-ensure => absent,
-}
-
-base::service_unit { 'otrs-daemon':
-ensure  => present,
-upstart => false,
-systemd => true,
-refresh => true,
-service_params => {
-enable => true,
-hasstatus  => true,
-hasrestart => false,
-}
-}
-}
-else {
-file { '/etc/cron.d/otrs':
-ensure => 'file',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-source => 'puppet:///modules/otrs/crontab.otrs',
+base::service_unit { 'otrs-daemon':
+ensure  => present,
+upstart => false,
+systemd => true,
+refresh => true,
+service_params => {
+enable => true,
+hasstatus  => true,
+hasrestart => false,
 }
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ba018486a1d801bd47bc1409fbd519e57d0f2cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] Add missing dependency for ext:Cite - change (integration/config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Add missing dependency for ext:Cite
..


Add missing dependency for ext:Cite

Yes there is a circular dependency between Cite and VE via
ResourceLoader modules.

Change-Id: I557c649c372a0fedf32dcdbc619b7a797d0ab470
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 1a8621c..be24dce 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -41,6 +41,7 @@
 'ApiFeatureUsage': ['Elastica'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
 'Capiunto': ['Scribunto'],
+'Cite': ['VisualEditor'],
 'Citoid': ['Cite', 'VisualEditor'],
 'CirrusSearch': ['MwEmbedSupport', 'TimedMediaHandler', 'PdfHandler',
  'Cite'],

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

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

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

[MediaWiki-commits] [Gerrit] Make SpecialSetLabelDescriptionAliases use ChangeOps. - change (mediawiki...Wikibase)

2016-02-10 Thread Daniel Kinzler (Code Review)

Daniel Kinzler has uploaded a new change for review.

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

Change subject: Make SpecialSetLabelDescriptionAliases use ChangeOps.
..

Make SpecialSetLabelDescriptionAliases use ChangeOps.

The ChangeOps (plural!) class has special logic for batching validation
that ensures consistent checking of constraints that involve multiple
parts of an entity (such as checking the uniqueness of the combination of
label and description). SpecialSetLabelDescriptionAliases was not
using this, causing it to effectively bypass the uniqueness check.

Bug: T121395
Change-Id: I513c00708120feff12588855b884c5cd145aa4d8
---
M repo/includes/specials/SpecialSetLabelDescriptionAliases.php
1 file changed, 39 insertions(+), 15 deletions(-)


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

diff --git a/repo/includes/specials/SpecialSetLabelDescriptionAliases.php 
b/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
index 4c07d5f..4a0fc1a 100644
--- a/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
+++ b/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
@@ -8,6 +8,7 @@
 use SiteStore;
 use Wikibase\ChangeOp\ChangeOp;
 use Wikibase\ChangeOp\ChangeOpException;
+use Wikibase\ChangeOp\ChangeOps;
 use Wikibase\ChangeOp\FingerprintChangeOpFactory;
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Term\Fingerprint;
@@ -344,27 +345,50 @@
 
$changeOps = $this->getChangeOps( $entity->getFingerprint() );
 
-   $summary = false;
-   $success = true;
-
-   foreach ( $changeOps as $module => $changeOp ) {
-   $summary = new Summary( $module );
-
-   try {
-   $this->applyChangeOp( $changeOp, $entity, 
$summary );
-   } catch ( ChangeOpException $ex ) {
-   $this->showErrorHTML( $ex->getMessage() );
-   $success = false;
-   }
+   try {
+   $summary = $this->applyChangeOpList( $changeOps, 
$entity );
+   } catch ( ChangeOpException $ex ) {
+   $this->showErrorHTML( $ex->getMessage() );
+   $summary = false;
}
 
-   if ( !$success ) {
+   if ( !$summary ) {
return false;
-   } elseif ( count( $changeOps ) === 1 ) {
+   } else {
return $summary;
}
+   }
 
-   return $this->getSummaryForLabelDescriptionAliases();
+   /**
+* @param ChangeOp[] $changeOps
+* @param EntityDocument $entity
+*
+* @return bool|Summary
+*/
+   private function applyChangeOpList( array $changeOps, EntityDocument 
$entity ) {
+   if ( empty( $changeOps ) ) {
+   return false;
+   } else if ( count( $changeOps ) === 1 ) {
+   // special case for single change-op, produces a better 
edit summary
+   $keys = array_keys( $changeOps );
+   $module = $keys[0];
+
+   $changeOp = $changeOps[ $module ];
+   $summary = new Summary( $module );
+
+   $this->applyChangeOp( $changeOp, $entity, $summary );
+   } else {
+   // NOTE: it's important to bundle all ChangeOp objects 
into a ChangeOps object,
+   // so validation and modification is properly batched.
+
+   $summary = new Summary(); // dummy
+   $changeOp = new ChangeOps( $changeOps );
+
+   $this->applyChangeOp( $changeOp, $entity, $summary );
+   $summary = 
$this->getSummaryForLabelDescriptionAliases();
+   }
+
+   return $summary;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I513c00708120feff12588855b884c5cd145aa4d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

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

[MediaWiki-commits] [Gerrit] Bump src to 8976ab93 for deploy - change (mediawiki...deploy)

2016-02-10 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review.

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

Change subject: Bump src to 8976ab93 for deploy
..

Bump src to 8976ab93 for deploy

Change-Id: I2bb9bb919f227899e14f083b5e42cd61594d30ec
---
M src
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/src b/src
index 4d44fcc..8976ab9 16
--- a/src
+++ b/src
-Subproject commit 4d44fcc79e90e2d2724460e910ad7ea14358cfb1
+Subproject commit 8976ab935318dbd65c733ba7b888af62ca184f80

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bb9bb919f227899e14f083b5e42cd61594d30ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] WIP recreate VisualEditor Selenium Jenkins job - change (integration/config)

2016-02-10 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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

Change subject: WIP recreate VisualEditor Selenium Jenkins job
..

WIP recreate VisualEditor Selenium Jenkins job

Bug: T94162
Change-Id: I46aa06b7f0d21f2b3ce6f1ae3f1750e1826ad932
---
M jjb/browsertests.yaml
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/32/269732/1

diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index fb8270e..697bca0 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -406,6 +406,9 @@
 repository: mediawiki/extensions/VisualEditor
 
 jobs:
+ - 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
+browser: firefox
+
  - 'browsertests-{name}-language-screenshot-{platform}-{browser}':
 browser: firefox
 mediawiki_credentials_id: LanguageScreenshotBot-at-beta.wmflabs.org

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

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

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

[MediaWiki-commits] [Gerrit] OTRS: update site.pp, mendelevium, remove iodine - change (operations/puppet)

2016-02-10 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: OTRS: update site.pp, mendelevium, remove iodine
..

OTRS: update site.pp, mendelevium, remove iodine

Bug:T105125
Change-Id: I00c9f4de4ae1f04e9c069cc1b180814e91089240
---
M manifests/site.pp
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/269736/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 14a2373..ec3930b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1209,15 +1209,6 @@
 }
 }
 
-# ticket.wikimedia.org
-node 'iodine.wikimedia.org' {
-role otrs
-
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-}
-
 # Phabricator
 node 'iridium.eqiad.wmnet' {
 interface::add_ip6_mapped { 'main':
@@ -1829,7 +1820,7 @@
 role memcached
 }
 
-# OTRS evaluation upgrade
+# OTRS - ticket.wikimedia.org
 node 'mendelevium.eqiad.wmnet' {
 role otrs
 }

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

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

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

[MediaWiki-commits] [Gerrit] resourceloader: Disable localStorage cache on FF, Opera - change (mediawiki/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: resourceloader: Disable localStorage cache on FF, Opera
..


resourceloader: Disable localStorage cache on FF, Opera

Bug T66721 affects a minority of users on a minority of browsers. But for those
people, the effect is sufficiently severe to be considered a deal-breaker. I
regret that it has taken me this long to come around to recognizing that.

Bug: T66721
Change-Id: Iedde8a399c1eec81ed6307748048b3c1bdfe7adc
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 9 insertions(+), 5 deletions(-)

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



diff --git a/resources/src/mediawiki/mediawiki.js 
b/resources/src/mediawiki/mediawiki.js
index 90b93dc..2aada9e 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2034,10 +2034,7 @@
// Whether the store is in use on this 
page.
enabled: null,
 
-   // Modules whose string representation 
exceeds 100 kB (30 kB on FF) are
-   // ineligible for storage due to bug 
T66721. The quota is stricter on
-   // Firefox due to 
.
-   MODULE_SIZE_MAX: ( /Firefox/.test( 
navigator.userAgent ) ? 30 : 100 ) * 1000,
+   MODULE_SIZE_MAX: 100 * 1000,
 
// The contents of the store, mapping 
'[module name]@[version]' keys
// to module implementations.
@@ -2108,8 +2105,15 @@
return;
}
 
-   if ( !mw.config.get( 
'wgResourceLoaderStorageEnabled' ) ) {
+   if (
+   // Disabled because 
localStorage quotas are tight and (in Firefox's case)
+   // shared by multiple 
origins.
+   // See T66721, and 
.
+   /Firefox|Opera/.test( 
navigator.userAgent ) ||
+
// Disabled by 
configuration.
+   !mw.config.get( 
'wgResourceLoaderStorageEnabled' )
+   ) {
// Clear any previous 
store to free up space. (T66721)
mw.loader.store.clear();
mw.loader.store.enabled 
= false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedde8a399c1eec81ed6307748048b3c1bdfe7adc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Edokter 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Test - change (mediawiki...SemanticMediaWiki)

2016-02-10 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Test
..

Test

Change-Id: Ib0e095dd2a26df71a0ba48f12046fd774de32d9f
---
M SemanticMediaWiki.php
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki 
refs/changes/06/269706/1

diff --git a/SemanticMediaWiki.php b/SemanticMediaWiki.php
index b7bbfd1..d3ed551 100644
--- a/SemanticMediaWiki.php
+++ b/SemanticMediaWiki.php
@@ -29,9 +29,14 @@
 if ( version_compare( $GLOBALS['wgVersion'], '1.19c', '<' ) ) {
die( 'Error: This version of Semantic MediaWiki requires 
MediaWiki 1.19 or above; use SMW 1.8.x for MediaWiki 1.18.x or 1.17.x.' );
 }
-
-if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
-   include_once __DIR__ . '/vendor/autoload.php';
+if ( isset( $GLOBALS['wgWikimediaJenkinsCI'] ) && 
$GLOBALS['wgWikimediaJenkinsCI'] == true ) {
+   if ( is_readable( __DIR__ . '/../../vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/../../vendor/autoload.php';
+   }
+} else {
+   if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
+   include_once __DIR__ . '/vendor/autoload.php';
+   }
 }
 
 // Registration of the extension credits, see Special:Version.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0e095dd2a26df71a0ba48f12046fd774de32d9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Paladox 

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

[MediaWiki-commits] [Gerrit] Remove MCC-MNC header enrichment - change (apps...wikipedia)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Remove MCC-MNC header enrichment
..


Remove MCC-MNC header enrichment

Since 2014, we've been logging a sample of IP addresses and MCC-MNC
codes on the server side in order to remediate the drift of operator
exit IP addresses.[0]

Per Adam B. (with Dan Foy's blessing), nobody looks at this anymore, so
let's take it out.

[0] https://lists.wikimedia.org/pipermail/mobile-l/2014-April/006884.html

Change-Id: I16292968666bb61c4112909d218eba754f1fa085
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
D app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java
D app/src/main/java/org/wikipedia/networking/NetworkUtil.java
M app/src/main/java/org/wikipedia/server/mwapi/MwPageEndpointsCache.java
M app/src/main/java/org/wikipedia/server/restbase/RbEndpointsCache.java
5 files changed, 8 insertions(+), 147 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index edf25c6..4bf9459 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -33,7 +33,6 @@
 import org.wikipedia.interlanguage.AcceptLanguageUtil;
 import org.wikipedia.interlanguage.AppLanguageState;
 import org.wikipedia.login.UserInfoStorage;
-import org.wikipedia.networking.MccMncStateHandler;
 import org.wikipedia.onboarding.OnboardingStateMachine;
 import org.wikipedia.onboarding.PrefsOnboardingStateMachine;
 import org.wikipedia.page.PageCache;
@@ -85,7 +84,6 @@
 
 private final RemoteConfig remoteConfig = new RemoteConfig();
 private final UserInfoStorage userInfoStorage = new UserInfoStorage();
-private final MccMncStateHandler mccMncStateHandler = new 
MccMncStateHandler();
 private final Map databaseClients = 
Collections.synchronizedMap(new HashMap());
 private final Map apis = new HashMap<>();
 private AppLanguageState appLanguageState;
@@ -218,27 +216,18 @@
 emptyIfNull(getAppLanguageCode()), 
appLanguageState.getSystemLanguageCode());
 }
 
-public MccMncStateHandler getMccMncStateHandler() {
-return mccMncStateHandler;
-}
 public Api getAPIForSite(Site site) {
 String acceptLanguage = getAcceptLanguage(site);
 Map customHeaders = buildCustomHeaders(acceptLanguage);
+Api api;
 
-// Because the mccMnc enrichment is a one-time thing, we don't need to 
have a complex hash key
-// for the apis HashMap like we do below. It naturally 
gets the correct
-// Accept-Language header from above, when applicable.
-Api api = mccMncStateHandler.makeApiWithMccMncHeaderEnrichment(this, 
site, customHeaders);
-if (api == null) {
-String domainAndApiAndVariantKey = site.getDomain() + "-" + 
site.getDomain()
-+ "-" + acceptLanguage + "-" + isEventLoggingEnabled();
-if (apis.containsKey(domainAndApiAndVariantKey)) {
-api = apis.get(domainAndApiAndVariantKey);
-} else {
-api = new Api(site.getDomain(), site.getUseSecure(),
-site.getScriptPath("api.php"), customHeaders);
-apis.put(domainAndApiAndVariantKey, api);
-}
+String cachedApiKey = site.getDomain() + "-" + acceptLanguage;
+if (apis.containsKey(cachedApiKey)) {
+api = apis.get(cachedApiKey);
+} else {
+api = new Api(site.getDomain(), site.getUseSecure(),
+site.getScriptPath("api.php"), customHeaders);
+apis.put(cachedApiKey, api);
 }
 
 api.setHeaderCheckListener(zeroHandler);
diff --git a/app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java 
b/app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java
deleted file mode 100644
index 08123c0..000
--- a/app/src/main/java/org/wikipedia/networking/MccMncStateHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.wikipedia.networking;
-
-import org.mediawiki.api.json.Api;
-import org.wikipedia.Site;
-import org.wikipedia.WikipediaApp;
-
-import retrofit.RequestInterceptor;
-
-import java.util.Map;
-
-public class MccMncStateHandler {
-private boolean mccMncSent = false;
-
-/**
- * Enriches request to have a header with the MCC-MNC (mobile operator 
code) if
- * cellular data connection is the active one and it hasn't already been 
sent
- * and the user isn't currently opted out of event logging.
- * http://lists.wikimedia.org/pipermail/wikimedia-l/2014-April/071131.html
- *
- * @param app app instance
- * @param site

[MediaWiki-commits] [Gerrit] (WIP) parsoid: move rt/vd roles into role module - change (operations/puppet)

2016-02-10 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: (WIP) parsoid: move rt/vd roles into role module
..

(WIP) parsoid: move rt/vd roles into role module

After having moved the other parsoid roles into the role
module and autoloader layout, also move the rt/vd client/server
role classes over here and rename them to parsoid::foo.

Change-Id: I8e121364056de4da4f4125e03e5902dff8a5371a
---
R modules/role/parsoid/rt_client.pp
R modules/role/parsoid/rt_server.pp
R modules/role/parsoid/vd_client.pp
R modules/role/parsoid/vd_server.pp
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/269707/1

diff --git a/manifests/role/parsoid_rt_client.pp 
b/modules/role/parsoid/rt_client.pp
similarity index 92%
rename from manifests/role/parsoid_rt_client.pp
rename to modules/role/parsoid/rt_client.pp
index eb83fc8..57d218a 100644
--- a/manifests/role/parsoid_rt_client.pp
+++ b/modules/role/parsoid/rt_client.pp
@@ -1,5 +1,5 @@
 # This instantiates testreduce::client
-class role::parsoid_rt_client {
+class role::parsoid::rt_client {
 include ::testreduce
 
 file { 
'/srv/parsoid/src/tests/testreduce/parsoid-rt-client.rttest.localsettings.js':
diff --git a/manifests/role/parsoid_rt_server.pp 
b/modules/role/parsoid/rt_server.pp
similarity index 91%
rename from manifests/role/parsoid_rt_server.pp
rename to modules/role/parsoid/rt_server.pp
index d61d1ad..0ad63dd 100644
--- a/manifests/role/parsoid_rt_server.pp
+++ b/modules/role/parsoid/rt_server.pp
@@ -1,7 +1,7 @@
 # Parsoid RT testing services
 
 # This instantiates testreduce::server
-class role::parsoid_rt_server {
+class role::parsoid::rt_server {
 include ::testreduce
 include ::passwords::testreduce::mysql
 
diff --git a/manifests/role/parsoid_vd_client.pp 
b/modules/role/parsoid/vd_client.pp
similarity index 86%
rename from manifests/role/parsoid_vd_client.pp
rename to modules/role/parsoid/vd_client.pp
index 442..bc7cb3d 100644
--- a/manifests/role/parsoid_vd_client.pp
+++ b/modules/role/parsoid/vd_client.pp
@@ -1,5 +1,5 @@
 # This instantiates testreduce::client for visual diff testing
-class role::parsoid_vd_client {
+class role::parsoid::vd_client {
 include ::testreduce
 include ::visualdiff
 
diff --git a/manifests/role/parsoid_vd_server.pp 
b/modules/role/parsoid/vd_server.pp
similarity index 93%
rename from manifests/role/parsoid_vd_server.pp
rename to modules/role/parsoid/vd_server.pp
index 9651a76..cf823f1 100644
--- a/manifests/role/parsoid_vd_server.pp
+++ b/modules/role/parsoid/vd_server.pp
@@ -1,7 +1,7 @@
 # Testreduce server for aggregating and displaying visualdiff results
 
 # This instantiates testreduce::server
-class role::parsoid_vd_server {
+class role::parsoid::vd_server {
 include ::testreduce
 include ::passwords::testreduce::mysql
 

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

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

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

[MediaWiki-commits] [Gerrit] Take ValueFormatters instead of store - change (data-values/value-view)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Take ValueFormatters instead of store
..


Take ValueFormatters instead of store

The `ValueView` does not need to create `ValueFormatter`s dynamically,
since all informations necessary for constructing them are already available
when creating a `ValueView`. So we now just take two `ValueFormatter`s.

Bug: T125521
Change-Id: I49c83daf988d55fb7b2948df85df5ee9cf81ef71
---
M README.md
M RELEASE-NOTES.md
M src/experts/QuantityInput.js
M src/jquery.valueview.Expert.js
M src/jquery.valueview.valueview.js
M src/resources.php
M tests/src/experts/QuantityInput.tests.js
M tests/src/jquery.valueview.valueview.tests.js
M tests/src/resources.php
9 files changed, 55 insertions(+), 128 deletions(-)

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



diff --git a/README.md b/README.md
index 2e80bcf..7aa2cb8 100644
--- a/README.md
+++ b/README.md
@@ -85,17 +85,17 @@
 ```javascript
 var $subject = $( '' ).appendTo( $( 'body' ).empty() );
 
-// In addition to the Expert store, ValueParser and ValueFormatter stores need 
to be provided. These
-// feature the same mechanisms as the Expert store. For this example, we just 
initialize them with
-// the "string" Parser/Formatter as default Parser/Formatter.
-var parsers = new valueParsers.ValueParserStore( valueParsers.StringParser ),
-   formatters = new valueFormatters.ValueFormatterStore( 
valueFormatters.StringFormatter );
+// In addition to the Expert store, a ValueParser store and two 
ValueFormatters need to be provided. The parser store
+// features the same mechanisms as the Expert store. For this example, we just 
initialize the parser store with
+// the "string" parser as default. The formatters will format a string as it 
is.
+var parsers = new valueParsers.ValueParserStore( valueParsers.StringParser );
 
 $subject.valueview( {
   expertStore: experts,
   parserStore: parsers,
-  formatterStore: formatters,
-  language: 'en', // language code transmitted to Parser and Formatter
+  plaintextFormatter: new valueFormatters.StringFormatter(),
+  htmlFormatter: new valueFormatters.StringFormatter(),
+  language: 'en', // language code transmitted to Parser
   value: new dv.StringValue( 'text' )
 } );
 
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 5fcd31d..0721508 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,8 +1,13 @@
 # ValueView release notes
 
+## 0.16.0 (dev)
+
+* Changed `ValueView` to take two `ValueFormatter` instances instead of a
+  `ValueFormatterStore`
+
 ## 0.15.9 (2016-02-03)
 
-* Correctly detect a changed language code when editing a 
`MonolingualTextValue`
+* Correctly detect a changed language code when editing a 
`MonolingualTextValue`.
 
 ## 0.15.8 (2016-01-27)
 
diff --git a/src/experts/QuantityInput.js b/src/experts/QuantityInput.js
index 78f04c9..e06f3b4 100644
--- a/src/experts/QuantityInput.js
+++ b/src/experts/QuantityInput.js
@@ -54,15 +54,10 @@
/**
 * @inheritdoc
 */
-   valueCharacteristics: function( format ) {
+   valueCharacteristics: function() {
var options = {
unit: this._unitSelector && 
this._unitSelector.getConceptUri() || null
};
-
-   if ( format === 'text/plain' ) {
-   options.applyRounding = false;
-   options.applyUnit = false;
-   }
 
return options;
},
diff --git a/src/jquery.valueview.Expert.js b/src/jquery.valueview.Expert.js
index 851334c..79f5586 100644
--- a/src/jquery.valueview.Expert.js
+++ b/src/jquery.valueview.Expert.js
@@ -243,11 +243,9 @@
 *
 * This method should allow to be called statically, i. e. 
without a useful `this` context.
 *
-* @param {string} [format='text/html'] Typically "text/plain". 
Implementations should
-* fall back to "text/html" when the format is undefined.
 * @return {Object}
 */
-   valueCharacteristics: function( format ) {
+   valueCharacteristics: function() {
return {};
},
 
diff --git a/src/jquery.valueview.valueview.js 
b/src/jquery.valueview.valueview.js
index 580e850..a83e371 100644
--- a/src/jquery.valueview.valueview.js
+++ b/src/jquery.valueview.valueview.js
@@ -42,30 +42,29 @@
  *data types the given store has `Experts` registered for.
  * @param {valueParsers.ValueParserStore} options.parserStore
  *Store providing the parsers values may be parsed with.
- * @param {valueFormatters.ValueFormatterStore} options.formatterStore
- *Store providing the formatters values may be formatted with.
+ * @param

[MediaWiki-commits] [Gerrit] Enable Math extension on Wikitech - change (operations/mediawiki-config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Enable Math extension on Wikitech
..


Enable Math extension on Wikitech

This extension is needed again, for example by the
Analytics Team.

This is a partial revert of Gerrit change 158409.

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 65e91d8..38b1d56 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13596,7 +13596,6 @@
 
 'wmgUseMath' => array(
'default' => true, // moved from MW core
-   'wikitech' => false,
'loginwiki' => false,
'votewiki' => false, // T61702
 ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22b394c94c9385f4adbb6634303cb525b00e548b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Stop doing $that = $this in includes/db - change (mediawiki/core)

2016-02-10 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: Stop doing $that = $this in includes/db
..

Stop doing $that = $this in includes/db

Closures support $this as of PHP 5.4

Also made DatabaseBase::indexName() protected

Change-Id: Iff31e7d9186832a855a953b923ac182f1c66ffa0
---
M includes/db/Database.php
M includes/db/DatabaseMysqlBase.php
2 files changed, 11 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/20/269720/1

diff --git a/includes/db/Database.php b/includes/db/Database.php
index a4d0ad0..564cd2e 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1929,10 +1929,7 @@
 * @param string $index
 * @return string
 */
-   public function indexName( $index ) {
-   // @FIXME: Make this protected once we move away from PHP 5.3
-   // Needs to be public because of usage in closure (in 
DatabaseBase::replaceVars)
-
+   protected function indexName( $index ) {
// Backwards-compatibility hack
$renamed = array(
'ar_usertext_timestamp' => 'usertext_timestamp',
@@ -3100,7 +3097,6 @@
 * @return string The new SQL statement with variables replaced
 */
protected function replaceVars( $ins ) {
-   $that = $this;
$vars = $this->getSchemaVars();
return preg_replace_callback(
'!
@@ -3109,19 +3105,19 @@
`\{\$ (\w+) }`| # 4. 
addIdentifierQuotes
/\*\$ (\w+) \*/ # 5. leave 
unencoded
!x',
-   function ( $m ) use ( $that, $vars ) {
+   function ( $m ) use ( $vars ) {
// Note: Because of 
,
// check for both nonexistent keys *and* the 
empty string.
if ( isset( $m[1] ) && $m[1] !== '' ) {
if ( $m[1] === 'i' ) {
-   return $that->indexName( $m[2] 
);
+   return $this->indexName( $m[2] 
);
} else {
-   return $that->tableName( $m[2] 
);
+   return $this->tableName( $m[2] 
);
}
} elseif ( isset( $m[3] ) && $m[3] !== '' && 
array_key_exists( $m[3], $vars ) ) {
-   return $that->addQuotes( $vars[$m[3]] );
+   return $this->addQuotes( $vars[$m[3]] );
} elseif ( isset( $m[4] ) && $m[4] !== '' && 
array_key_exists( $m[4], $vars ) ) {
-   return $that->addIdentifierQuotes( 
$vars[$m[4]] );
+   return $this->addIdentifierQuotes( 
$vars[$m[4]] );
} elseif ( isset( $m[5] ) && $m[5] !== '' && 
array_key_exists( $m[5], $vars ) ) {
return $vars[$m[5]];
} else {
@@ -3179,10 +3175,9 @@
return null;
}
 
-   $that = $this;
-   $unlocker = new ScopedCallback( function () use ( $that, 
$lockKey, $fname ) {
-   $that->commit( __METHOD__, 'flush' );
-   $that->unlock( $lockKey, $fname );
+   $unlocker = new ScopedCallback( function () use ( $lockKey, 
$fname ) {
+   $this->commit( __METHOD__, 'flush' );
+   $this->unlock( $lockKey, $fname );
} );
 
$this->commit( __METHOD__, 'flush' );
diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 29106ab..c5aafea 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -692,17 +692,16 @@
$this->getLBInfo( 'clusterMasterHost' ) ?: 
$this->getServer()
);
 
-   $that = $this;
return $cache->getWithSetCallback(
$key,
$cache::TTL_INDEFINITE,
-   function () use ( $that, $cache, $key ) {
+   function () use ( $cache, $key ) {
// Get and leave a lock key in place for a 
short period
if ( !$cache->lock( $key, 0, 10 ) ) {
return false; // avoid master 
connection spike slams
}
 
-

[MediaWiki-commits] [Gerrit] Add \n to wikiversions.json - change (operations/mediawiki-config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Add \n to wikiversions.json
..


Add \n to wikiversions.json

MediaWiki coding conventions provides:
"All files should have a newline at the end."

This allows to use command line tools more predictively.

We now ensure the method to write wikiversions.json respects
this convention.

Change-Id: Id9e4f24247d17a2cf0e8ceb63c46df27c3a07ed2
---
M multiversion/MWWikiversions.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Chad: Looks good to me, approved
  Hashar: Looks good to me, but someone else must approve
  20after4: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index 0c90579..5de4849 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -30,7 +30,7 @@
public static function writeWikiVersionsFile( $path, $wikis ) {
// 448 == JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | 
JSON_UNESCAPED_UNICODE,
// but doesn't break on PHP 5.3, which does not have these 
defined.
-   $json = json_encode( $wikis, 448 );
+   $json = json_encode( $wikis, 448 ) . "\n";
if ( !file_put_contents( $path, $json, LOCK_EX ) ) {
print "Unable to write to $path.\n";
exit( 1 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9e4f24247d17a2cf0e8ceb63c46df27c3a07ed2
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make MediaWiki camus run in essential queue - change (operations/puppet)

2016-02-10 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Make MediaWiki camus run in essential queue
..


Make MediaWiki camus run in essential queue

Currently MediaWiki data ingestion for hadoop
is done by camus on default (low priority) queue.
MediaWiki has analytics-search production jobs,
so we should make sure to feed them fast.

Bug: T125967
Change-Id: I50ef795b1f7d144debf6eb1af9ec545aa06553d8
---
M modules/camus/templates/mediawiki.erb
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/camus/templates/mediawiki.erb 
b/modules/camus/templates/mediawiki.erb
index 2bc8fa5..060b03d 100644
--- a/modules/camus/templates/mediawiki.erb
+++ b/modules/camus/templates/mediawiki.erb
@@ -4,8 +4,8 @@
 # Camus properties file for consuming Mediawiki avro binary data into HDFS.
 #
 
-# submit this job in the WMF Analytics Cluster's 'default' queue.
-mapreduce.job.queuename=default
+# submit this job in the WMF Analytics Cluster's 'essential' queue.
+mapreduce.job.queuename=essential
 
 # final top-level data output directory, sub-directory will be dynamically 
created for each topic pulled
 etl.destination.path=hdfs://analytics-hadoop/wmf/data/raw/mediawiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50ef795b1f7d144debf6eb1af9ec545aa06553d8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Joal 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] Stop doing $that = $this in includes/filebackend - change (mediawiki/core)

2016-02-10 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: Stop doing $that = $this in includes/filebackend
..

Stop doing $that = $this in includes/filebackend

Closures support $this as of PHP 5.4

Change-Id: Ib11139ec81336710c22146f9ff714e8afd3aa2cf
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 12 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/269733/1

diff --git a/includes/filebackend/SwiftFileBackend.php 
b/includes/filebackend/SwiftFileBackend.php
index 93d8d07..1f64692 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -278,16 +278,15 @@
'body' => $params['content']
) );
 
-   $that = $this;
$method = __METHOD__;
-   $handler = function ( array $request, Status $status ) use ( 
$that, $method, $params ) {
+   $handler = function ( array $request, Status $status ) use ( 
$method, $params ) {
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = 
$request['response'];
if ( $rcode === 201 ) {
// good
} elseif ( $rcode === 412 ) {
$status->fatal( 'backend-fail-contenttype', 
$params['dst'] );
} else {
-   $that->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
+   $this->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
}
};
 
@@ -343,16 +342,15 @@
'body' => $handle // resource
) );
 
-   $that = $this;
$method = __METHOD__;
-   $handler = function ( array $request, Status $status ) use ( 
$that, $method, $params ) {
+   $handler = function ( array $request, Status $status ) use ( 
$method, $params ) {
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = 
$request['response'];
if ( $rcode === 201 ) {
// good
} elseif ( $rcode === 412 ) {
$status->fatal( 'backend-fail-contenttype', 
$params['dst'] );
} else {
-   $that->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
+   $this->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
}
};
 
@@ -392,16 +390,15 @@
) + $this->sanitizeHdrs( $params ), // extra headers 
merged into object
) );
 
-   $that = $this;
$method = __METHOD__;
-   $handler = function ( array $request, Status $status ) use ( 
$that, $method, $params ) {
+   $handler = function ( array $request, Status $status ) use ( 
$method, $params ) {
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = 
$request['response'];
if ( $rcode === 201 ) {
// good
} elseif ( $rcode === 404 ) {
$status->fatal( 'backend-fail-copy', 
$params['src'], $params['dst'] );
} else {
-   $that->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
+   $this->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
}
};
 
@@ -450,9 +447,8 @@
);
}
 
-   $that = $this;
$method = __METHOD__;
-   $handler = function ( array $request, Status $status ) use ( 
$that, $method, $params ) {
+   $handler = function ( array $request, Status $status ) use ( 
$method, $params ) {
list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = 
$request['response'];
if ( $request['method'] === 'PUT' && $rcode === 201 ) {
// good
@@ -461,7 +457,7 @@
} elseif ( $rcode === 404 ) {
$status->fatal( 'backend-fail-move', 
$params['src'], $params['dst'] );
} else {
-   $that->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
+   $this->onError( $status, $method, $params, 
$rerr, $rcode, $rdesc );
}
};
 
@@ -491,9 +487,8 @@
'headers' => array()
) );
 
-   $that = $this;
$method = __METHOD__;
-   $handler =

[MediaWiki-commits] [Gerrit] Ensure that the schema_repo git submodules are available bef... - change (analytics...source)

2016-02-10 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Ensure that the schema_repo git submodules are available before 
packaging
..


Ensure that the schema_repo git submodules are available before packaging

Added 2 build plugin:
- custom exec plugin to run git submodule, I'm not really sure it'll work
  nicely with the release plugin
- enforce plugin to ensure that schema_repo is available in target/classes

Change-Id: I9dba1b19fd9603080a693a63f6f6b0bd354784b2
---
M refinery-camus/pom.xml
1 file changed, 49 insertions(+), 0 deletions(-)

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



diff --git a/refinery-camus/pom.xml b/refinery-camus/pom.xml
index e0d9870..aad64eb 100644
--- a/refinery-camus/pom.xml
+++ b/refinery-camus/pom.xml
@@ -163,6 +163,55 @@
 ${java.version}
 
 
+
+
+org.codehaus.mojo
+exec-maven-plugin
+
+
+git submodule update
+initialize
+
+git
+
+submodule
+update
+--init
+--recursive
+
+
+
+exec
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-enforcer-plugin
+1.4.1
+
+
+enforce-schema-repo-submodule
+prepare-package
+
+enforce
+
+
+
+
+
+
${project.build.outputDirectory}/schema_repo
+
+
+
+true
+
+
+
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9dba1b19fd9603080a693a63f6f6b0bd354784b2
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Joal 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add debug logging for the case that the API goes read only - change (mediawiki/core)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Add debug logging for the case that the API goes read only
..


Add debug logging for the case that the API goes read only

Useful for tasks like T123867.

Change-Id: I39a65047eac05b9e0268a9184b9fae4c48e66ce9
---
M includes/api/ApiMain.php
1 file changed, 36 insertions(+), 19 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 6ddc28a..814d14e 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1180,26 +1180,43 @@
&& in_array( 'bot', $this->getUser()->getGroups() )
&& wfGetLB()->getServerCount() > 1
) {
-   // Figure out how many servers have passed the lag 
threshold
-   $numLagged = 0;
-   $lagLimit = $this->getConfig()->get( 
'APIMaxLagThreshold' );
-   foreach ( wfGetLB()->getLagTimes() as $lag ) {
-   if ( $lag > $lagLimit ) {
-   ++$numLagged;
-   }
+   $this->checkBotReadOnly();
+   }
+   }
+
+   /**
+* Check whether we are readonly for bots
+*/
+   private function checkBotReadOnly() {
+   // Figure out how many servers have passed the lag threshold
+   $numLagged = 0;
+   $lagLimit = $this->getConfig()->get( 'APIMaxLagThreshold' );
+   $laggedServers = array();
+   $loadBalancer = wfGetLB();
+   foreach ( $loadBalancer->getLagTimes() as $serverIndex => $lag 
) {
+   if ( $lag > $lagLimit ) {
+   ++$numLagged;
+   $laggedServers[] = 
$loadBalancer->getServerName( $serverIndex ) . " ({$lag}s)";
}
-   // If a majority of slaves are too lagged then disallow 
writes
-   $slaveCount = wfGetLB()->getServerCount() - 1;
-   if ( $numLagged >= ceil( $slaveCount / 2 ) ) {
-   $parsed = $this->parseMsg( array( 
'readonlytext' ) );
-   $this->dieUsage(
-   $parsed['info'],
-   $parsed['code'],
-   /* http error */
-   0,
-   array( 'readonlyreason' => "Waiting for 
$numLagged lagged database(s)" )
-   );
-   }
+   }
+
+   // If a majority of slaves are too lagged then disallow writes
+   $slaveCount = wfGetLB()->getServerCount() - 1;
+   if ( $numLagged >= ceil( $slaveCount / 2 ) ) {
+   $laggedServers = join( ', ', $laggedServers );
+   wfDebugLog(
+   'api-readonly',
+   "Api request failed as read only because the 
following DBs are lagged: $laggedServers"
+   );
+
+   $parsed = $this->parseMsg( array( 'readonlytext' ) );
+   $this->dieUsage(
+   $parsed['info'],
+   $parsed['code'],
+   /* http error */
+   0,
+   array( 'readonlyreason' => "Waiting for 
$numLagged lagged database(s)" )
+   );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39a65047eac05b9e0268a9184b9fae4c48e66ce9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] -releng and -devtools changes - change (labs...wikibugs2)

2016-02-10 Thread Greg Grossmeier (Code Review)

Greg Grossmeier has uploaded a new change for review.

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

Change subject: -releng and -devtools changes
..

-releng and -devtools changes

-releng
* Added #scap and #browser-tests-infrastructure
* Removed #Differential (moved to -devtools)

-devtools
* Added #GitHub-Mirrors, #Gerrit-Migration, #Differential, and #Diffusion
** Things related to Phabricator use, basically

Change-Id: I79b7b56b902b4951f205a91a25bd833453bb58f9
---
M channels.yaml
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/37/269737/1

diff --git a/channels.yaml b/channels.yaml
index 38ae41c..e401b9c 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -74,8 +74,12 @@
 - Wikibugs
 - Phabricator.org
 - RT-Migration
+- GitHub-Mirrors
 - Gitblit-Deprecate
+- Gerrit-Migration
 - Project-Creators
+- Differential
+- Diffusion
 
 "#wikimedia-mailman":
 - Wikimedia-Mailing-lists
@@ -99,12 +103,13 @@
 - Staging
 - Deployment-Systems
 - Scap3
+- scap
 - Browser-Tests
 - Gitblit-Deprecate
 - Gerrit-Migration
-- Differential
 - MediaWiki-Releasing
 - MediaWiki-Codesniffer
+- Browser-Tests-infrastructure
 - Testing-Initiative-2015
 
 "#mediawiki-visualeditor":

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79b7b56b902b4951f205a91a25bd833453bb58f9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Greg Grossmeier 

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

[MediaWiki-commits] [Gerrit] Add missing dependency for ext:Cite - change (integration/config)

2016-02-10 Thread JanZerebecki (Code Review)

JanZerebecki has uploaded a new change for review.

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

Change subject: Add missing dependency for ext:Cite
..

Add missing dependency for ext:Cite

Yes there is a circular dependency between Cite and VE via
ResourceLoader modules.

Change-Id: I557c649c372a0fedf32dcdbc619b7a797d0ab470
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/04/269704/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 1a8621c..be24dce 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -41,6 +41,7 @@
 'ApiFeatureUsage': ['Elastica'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
 'Capiunto': ['Scribunto'],
+'Cite': ['VisualEditor'],
 'Citoid': ['Cite', 'VisualEditor'],
 'CirrusSearch': ['MwEmbedSupport', 'TimedMediaHandler', 'PdfHandler',
  'Cite'],

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

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

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

[MediaWiki-commits] [Gerrit] tlsproxy: nginx keepalives param for testing - change (operations/puppet)

2016-02-10 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: tlsproxy: nginx keepalives param for testing
..

tlsproxy: nginx keepalives param for testing

Bug: T107749
Change-Id: Icedfa93c65f8cf279178a028fc9bdcdcebce590c
---
M hieradata/hosts/cp1008.yaml
M modules/tlsproxy/manifests/localssl.pp
M modules/tlsproxy/templates/localssl.erb
3 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/269708/1

diff --git a/hieradata/hosts/cp1008.yaml b/hieradata/hosts/cp1008.yaml
index 0898300..048df4e 100644
--- a/hieradata/hosts/cp1008.yaml
+++ b/hieradata/hosts/cp1008.yaml
@@ -1,3 +1,4 @@
 debdeploy::grains:
   debdeploy-cp:
 value: canary
+tlsproxy::localssl::keepalives_per_worker: 1
diff --git a/modules/tlsproxy/manifests/localssl.pp 
b/modules/tlsproxy/manifests/localssl.pp
index 6480aba..8eddc73 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -40,6 +40,7 @@
 require tlsproxy::instance
 
 $do_spdy = hiera('tlsproxy::localssl::do_spdy', true)
+$keepalives_per_worker = 
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
 
 # Ensure that exactly one definition exists with default_server = true
 # if multiple defines have default_server set to true, this
diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 465522c..8bad26f 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -1,5 +1,11 @@
 # Proxy site configuration file for <%= @name %>
 # This file is managed by Puppet!
+<% if @keepalives_per_worker > 0 -%>
+upstream local_fe {
+server <%= @ipaddress %>:<%= @upstream_port %>;
+keepalive <% @keepalives_per_worker %>; # Note: commonly up to 48 workers!
+}
+<% end -%>
 
 # SSL proxying
 server {
@@ -23,7 +29,13 @@
keepalive_timeout 60;
 
location / {
+<% if @keepalives_per_worker > 0 -%>
+   proxy_pass http://local_fe;
+   proxy_http_version 1.1;
+   proxy_set_header Connection "";
+<% else -%>
proxy_pass http://<%= @ipaddress %>:<%= @upstream_port %>;
+<% end -%>
 
# this should be in sync with Varnish's first_byte_timeout
# and PHP's max_execution_time

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

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

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

[MediaWiki-commits] [Gerrit] Namespaces configuration on ru.wikisource - change (operations/mediawiki-config)

2016-02-10 Thread jenkins-bot (Code Review)

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

Change subject: Namespaces configuration on ru.wikisource
..


Namespaces configuration on ru.wikisource

New namespaces:
* 108: Импортировано (Transwiki)
* 109: Обсуждение импортированного (Transwiki talk)

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 65e91d8..21f6b39 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5661,6 +5661,8 @@
105 => 'Обсуждение_страницы',
106 => 'Индекс',
107 => 'Обсуждение_индекса',
+   108 => 'Импортировано', // T123837 (transwiki)
+   109 => 'Обсуждение_импортированного',
),
'sawikisource' => array(
104 => 'पुटम्', // Page

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63e7046c3aced9b78d92f8a1ca09211e731be062
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 5 >

1 - 100 of 497 matches

Mail list logo