date:20160212

[MediaWiki-commits] [Gerrit] doc: Add HtmlFormatter - change (integration/docroot)

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

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

Change subject: doc: Add HtmlFormatter
..


doc: Add HtmlFormatter

Bug: T125001
Change-Id: I25787b2aec844aa8571ef0ce17b8072772b78a99
---
M org/wikimedia/doc/default.html
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/org/wikimedia/doc/default.html b/org/wikimedia/doc/default.html
index d0f206a..b15112d 100644
--- a/org/wikimedia/doc/default.html
+++ b/org/wikimedia/doc/default.html
@@ -10,6 +10,7 @@
CDB
CLDRPluralRuleParser
IPSet
+   HtmlFormatter
oauthclient-php
OOjs core
OOjs UI

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25787b2aec844aa8571ef0ce17b8072772b78a99
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] [MP3MediaHandler] Register extension - change (translatewiki)

2016-02-12 Thread Raimond Spekking (Code Review)

Raimond Spekking has uploaded a new change for review.

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

Change subject: [MP3MediaHandler] Register extension
..

[MP3MediaHandler] Register extension

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/52/270252/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 682bdc9..fc69e8d 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1466,6 +1466,8 @@
 ignored = moodbar-hide-intro, moodbar-restore-intro, moodbar-response-cc-link, 
moodbar-response-terms-of-use-link
 ignored = moodbar-log-reason, moodbar-delete-intro
 
+MP3 Media Handler
+
 Mpdf
 
 #Ms Calendar // Missing qqq

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfa21c9790c8ccce5ffbde4b8e72a64a69326e17
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] [MP3MediaHandler] Register extension - change (translatewiki)

2016-02-12 Thread Raimond Spekking (Code Review)

Raimond Spekking has submitted this change and it was merged.

Change subject: [MP3MediaHandler] Register extension
..


[MP3MediaHandler] Register extension

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

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 682bdc9..fc69e8d 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1466,6 +1466,8 @@
 ignored = moodbar-hide-intro, moodbar-restore-intro, moodbar-response-cc-link, 
moodbar-response-terms-of-use-link
 ignored = moodbar-log-reason, moodbar-delete-intro
 
+MP3 Media Handler
+
 Mpdf
 
 #Ms Calendar // Missing qqq

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfa21c9790c8ccce5ffbde4b8e72a64a69326e17
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Add ferm rules for eventlogging udp receiver - change (operations/puppet)

2016-02-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Add ferm rules for eventlogging udp receiver
..


Add ferm rules for eventlogging udp receiver

Bug: T113343
Change-Id: Ie398a659af307728a67b44875a0c231007411798
---
M manifests/role/eventlogging.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 2f0b8f2..9ae46d3 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -129,6 +129,12 @@
 count   => true,
 }
 
+ferm::service { 'eventlogging-receive':
+proto  => 'udp',
+notrack => true,
+port   => '8421',
+}
+
 # This forwards the kafka eventlogging-valid-mixed topic to
 # ZMQ port 8600 for backwards compatibility.
 eventlogging::service::forwarder { 'legacy-zmq':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie398a659af307728a67b44875a0c231007411798
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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] Create SkinTemplateOutputPageBeforeExec hook handler - change (mediawiki...Wikibase)

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

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

Change subject: Create SkinTemplateOutputPageBeforeExec hook handler
..


Create SkinTemplateOutputPageBeforeExec hook handler

In order to pull that code out of ClientHooks and
to make it testable.

Merging this depends on the removal of PHP 5.3 support
as this triggers a weird PHP 5.3 bug.

Depends-On: I68c5b5d60952418ff8300c163edfe2275571f41f
Change-Id: Ica79284cf49b2d942b18f4355b4d27936b75c74a
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
A client/includes/Hooks/SkinTemplateOutputPageBeforeExecHandler.php
A 
client/tests/phpunit/includes/Hooks/SkinTemplateOutputPageBeforeExecHandlerTest.php
4 files changed, 312 insertions(+), 63 deletions(-)

Approvals:
  Hoo man: Looks good to me, but someone else must approve
  Daniel Kinzler: Looks good to me, approved
  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/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index dae54c0..bba4e52 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -9,7 +9,6 @@
 use Message;
 use OutputPage;
 use Parser;
-use QuickTemplate;
 use RecentChange;
 use Skin;
 use StubObject;
@@ -22,7 +21,6 @@
 use Wikibase\Client\Hooks\InfoActionHookHandler;
 use Wikibase\Client\RecentChanges\ChangeLineFormatter;
 use Wikibase\Client\RecentChanges\ExternalChangeFactory;
-use Wikibase\Client\RepoItemLinkGenerator;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\Lib\AutoCommentFormatter;
@@ -272,66 +270,6 @@
 
$actionName = Action::getActionName( $skin->getContext() );
$beforePageDisplayHandler->addModules( $out, $actionName );
-
-   return true;
-   }
-
-   /**
-* Displays a list of links to pages on the central wiki at the end of 
the language box.
-*
-* @since 0.1
-*
-* @param Skin $skin
-* @param QuickTemplate $template
-*
-* @return bool
-*/
-   public static function onSkinTemplateOutputPageBeforeExec( Skin &$skin, 
QuickTemplate &$template ) {
-   $title = $skin->getContext()->getTitle();
-   $wikibaseClient = WikibaseClient::getDefaultInstance();
-
-   if ( !self::isWikibaseEnabled( $title->getNamespace() ) ) {
-   // shorten out
-   return true;
-   }
-
-   $repoLinker = $wikibaseClient->newRepoLinker();
-   $entityIdParser = $wikibaseClient->getEntityIdParser();
-
-   $siteGroup = $wikibaseClient->getLangLinkSiteGroup();
-
-   $languageUrls = $template->get( 'language_urls' );
-   $hasLangLinks = $languageUrls !== false && !empty( 
$languageUrls );
-
-   $langLinkGenerator = new RepoItemLinkGenerator(
-   
WikibaseClient::getDefaultInstance()->getNamespaceChecker(),
-   $repoLinker,
-   $entityIdParser,
-   $siteGroup,
-   $wikibaseClient->getSettings()->getSetting( 
'siteGlobalID' )
-   );
-
-   $action = Action::getActionName( $skin->getContext() );
-
-   $noExternalLangLinks = $skin->getOutput()->getProperty( 
'noexternallanglinks' );
-   $prefixedId = $skin->getOutput()->getProperty( 'wikibase_item' 
);
-
-   $editLink = $langLinkGenerator->getLink( $title, $action, 
$hasLangLinks, $noExternalLangLinks, $prefixedId );
-
-   // there will be no link in some situations, like add links 
widget disabled
-   if ( $editLink ) {
-   $template->set( 'wbeditlanglinks', $editLink );
-   }
-
-   // Needed to have "Other languages" section display, so we can 
add "add links".
-   // Only force the section to display if we are going to 
actually add such a link:
-   // Where external langlinks aren't suppressed and where action 
== 'view'.
-   if ( $languageUrls === false && $title->exists()
-   && ( $noExternalLangLinks === null || !in_array( '*', 
$noExternalLangLinks ) )
-   && $action === 'view'
-   ) {
-   $template->set( 'language_urls', array() );
-   }
 
return true;
}
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index ef34602..1da5e51 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -110,7 +110,8 @@
$wgHooks['ParserFirstCallInit'][] = 
'\Wikibase\ClientHooks::onParserFirstCallInit';
$wgHooks['MagicWordwgVariableIDs'][] = 
'\Wikibase\ClientHooks::onMagicWordwgVariableIDs';

[MediaWiki-commits] [Gerrit] Display a message in motd if puppet agent is disabled - change (operations/puppet)

2016-02-12 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Display a message in motd if puppet agent is disabled
..


Display a message in motd if puppet agent is disabled

Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
---
M modules/base/files/puppet/97-last-puppet-run
A modules/base/files/puppet/puppet-enabled
M modules/base/manifests/puppet.pp
3 files changed, 37 insertions(+), 3 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve



diff --git a/modules/base/files/puppet/97-last-puppet-run 
b/modules/base/files/puppet/97-last-puppet-run
index 6a931b5..9bb86a4 100755
--- a/modules/base/files/puppet/97-last-puppet-run
+++ b/modules/base/files/puppet/97-last-puppet-run
@@ -3,7 +3,7 @@
 
 set -e
 
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 LANG=C
 
 TSLASTPUPPETRUN=$(stat -c %Z /var/lib/puppet/state/classes.txt)
@@ -14,8 +14,10 @@
 
 echo -n "The last Puppet run was at $(date -d @$TSLASTPUPPETRUN) "
 
+DISABLEDMSG="$(puppet-enabled || true)"
+
 if [ $DELTAMIN -gt 60 ]; then
-   echo "${BOLD}($DELTAMIN minutes ago)${NORM}."
+   echo "${BOLD}($DELTAMIN minutes ago)${NORM}. $DISABLEDMSG"
 else
-   echo "($DELTAMIN minutes ago)."
+   echo "($DELTAMIN minutes ago). $DISABLEDMSG"
 fi
diff --git a/modules/base/files/puppet/puppet-enabled 
b/modules/base/files/puppet/puppet-enabled
new file mode 100644
index 000..774ca86
--- /dev/null
+++ b/modules/base/files/puppet/puppet-enabled
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Script displaying a message if Puppet agent is disabled.
+
+set -eu
+
+PATH=/bin:/usr/bin
+
+lockfile="/var/lib/puppet/state/agent_disabled.lock"
+
+if test -f $lockfile; then
+reason="$(jq -r '.disabled_message' $lockfile 2>/dev/null)"
+echo "Puppet is disabled. $reason"
+exit 1
+fi
+
+exit 0
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index b4e0872..0458c4e 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -90,6 +90,22 @@
 source => 'puppet:///modules/base/logrotate/puppet',
 }
 
+# Mode 0751 to make sure non-root users can access
+# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
+file { '/var/lib/puppet':
+ensure => directory,
+owner  => 'puppet',
+group  => 'puppet',
+mode   => '0751',
+}
+
+file { '/usr/local/bin/puppet-enabled':
+mode   => '0555',
+owner  => 'root',
+group  => 'root',
+source => 'puppet:///modules/base/puppet/puppet-enabled',
+}
+
 motd::script { 'last-puppet-run':
 ensure   => present,
 priority => 97,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update test for php55 - change (integration/config)

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

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

Change subject: Update test for php55
..


Update test for php55

Change-Id: I13bcbdafd27331e8dd8474e52b4bd8d71ad0f684
---
M tests/test_zuul_scheduler.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 32b7168..2835338 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -124,7 +124,7 @@
 def assertProjectHasPhplint(self, name, definition, pipeline):
 self.assertTrue(
 any([job for job in definition
- if job.endswith('php53lint') or
+ if job.endswith(('php53lint', 'php55lint')) or
  job.startswith('composer-')]),
 'Project %s pipeline %s must have either '
 'phplint or a composer-* job'

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

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

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2016-02-12T10:00:01+0000 - change (mediawiki...Wikidata)

2016-02-12 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

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

Change subject: New Wikidata Build - 2016-02-12T10:00:01+
..

New Wikidata Build - 2016-02-12T10:00:01+

Change-Id: I6be665fb993e8b5468f16ec2b2059f64f57f05d4
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/i18n/su.json
A 
extensions/Wikibase/client/includes/Hooks/SkinTemplateOutputPageBeforeExecHandler.php
A 
extensions/Wikibase/client/tests/phpunit/includes/Hooks/SkinTemplateOutputPageBeforeExecHandlerTest.php
M extensions/Wikibase/docs/ontology.owl
M extensions/Wikibase/lib/i18n/hu.json
M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php
A extensions/Wikibase/lib/tests/phpunit/store/EntityRevisionTest.php
M extensions/Wikibase/purtle/tests/phpunit/BNodeLabelerTest.php
M extensions/Wikibase/purtle/tests/phpunit/RdfWriterTestBase.php
M extensions/Wikibase/purtle/tests/phpunit/TurtleRdfWriterTest.php
M extensions/Wikibase/purtle/tests/phpunit/UnicodeEscaperTest.php
M extensions/Wikibase/repo/i18n/su.json
M 
extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
D extensions/Wikibase/repo/tests/browser
A extensions/Wikibase/repo/tests/browser
M vendor/composer/ClassLoader.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_files.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
23 files changed, 564 insertions(+), 359 deletions(-)


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

diff --git a/composer.lock b/composer.lock
index 2d3b86e..56e2953 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,11 +1,10 @@
 {
 "_readme": [
 "This file locks the dependencies of your project to a known state",
-"Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
+"Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
 "hash": "c8e8090c015b32a8f8771ce88e7e",
-"content-hash": "3279be965e622cfcf4afa7a1795b2a96",
 "packages": [
 {
 "name": "composer/installers",
@@ -998,7 +997,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/;
 },
-"time": "2016-01-30 14:04:29"
+"time": "2016-01-30 14:05:40"
 },
 {
 "name": "wikibase/data-model",
@@ -1482,21 +1481,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-<<< HEAD
-"reference": "c204188248f3f7649ed7a061ace0a403df9d28eb"
+"reference": "89c140be5f4eec33602d373e3d1d764009670daa"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c204188248f3f7649ed7a061ace0a403df9d28eb;,
-"reference": "c204188248f3f7649ed7a061ace0a403df9d28eb",
-===
-"reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ef7910c636664ff5e64ab609f37d0db4145b4db3;,
-"reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3",
->>> New Wikidata build - with fix for broken qunit test
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/89c140be5f4eec33602d373e3d1d764009670daa;,
+"reference": "89c140be5f4eec33602d373e3d1d764009670daa",
 "shasum": ""
 },
 "require": {
@@ -1568,11 +1558,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-<<< HEAD
-"time": "2016-02-10 20:12:05"
-===
-"time": "2016-02-11 13:36:27"
->>> New Wikidata build - with fix for broken qunit test
+"time": "2016-02-12 08:28:18"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.hooks.php 
b/extensions/Wikibase/client/WikibaseClient.hooks.php
index dae54c0..bba4e52 100644
--- a/extensions/Wikibase/client/WikibaseClient.hooks.php
+++ b/extensions/Wikibase/client/WikibaseClient.hooks.php
@@ -9,7 +9,6 @@
 use Message;
 use OutputPage;
 use Parser;
-use QuickTemplate;
 use RecentChange;
 use Skin;
 use StubObject;
@@ -22,7 +21,6 @@
 use Wikibase\Client\Hooks\InfoActionHookHandler;
 use Wikibase\Client\RecentChanges\ChangeLineFormatter;
 use

[MediaWiki-commits] [Gerrit] Add refill-appname as optional - change (translatewiki)

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

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

Change subject: Add refill-appname as optional
..


Add refill-appname as optional

The qqq says that it's optional.

Change-Id: I312632d81a256dbfd192e90d7df5584ca90ca2e9
---
M groups/Intuition/refill.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/groups/Intuition/refill.yaml b/groups/Intuition/refill.yaml
index 4a9ff54..e6b86d8 100644
--- a/groups/Intuition/refill.yaml
+++ b/groups/Intuition/refill.yaml
@@ -18,6 +18,7 @@
 
 TAGS:
   optional:
+- refill-appname
 - refill-wikitext-support-parameter-*
 - refill-wikitext-parameter-*
 - refill-wikitext-template-*

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

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

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

[MediaWiki-commits] [Gerrit] Show basic user stats in the translation dashboard - change (mediawiki...ContentTranslation)

2016-02-12 Thread Santhosh (Code Review)

Santhosh has uploaded a new change for review.

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

Change subject: Show basic user stats in the translation dashboard
..

Show basic user stats in the translation dashboard

Bug: T111776
Change-Id: I4b4edee1d2031417e51a42077c206d889373d29d
---
M api/ApiQueryContentTranslationLanguageTrend.php
A api/ApiQueryTranslatorStats.php
M extension.json
M i18n/api/en.json
M i18n/api/qqq.json
M i18n/en.json
M i18n/qqq.json
M includes/Translation.php
M modules/dashboard/ext.cx.dashboard.js
A modules/widgets/translator/ext.cx.translator.js
A modules/widgets/translator/ext.cx.translator.less
A modules/widgets/translator/images/user-small.png
A modules/widgets/translator/images/user-small.svg
13 files changed, 250 insertions(+), 10 deletions(-)


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

diff --git a/api/ApiQueryContentTranslationLanguageTrend.php 
b/api/ApiQueryContentTranslationLanguageTrend.php
index 96572a3..1fdae20 100644
--- a/api/ApiQueryContentTranslationLanguageTrend.php
+++ b/api/ApiQueryContentTranslationLanguageTrend.php
@@ -33,8 +33,10 @@
$interval = $params['interval'];
 
$data = array(
-   'translations' => Translation::getTrendByStatus( 
$source, $target, 'published', $interval ),
-   'drafts' => Translation::getTrendByStatus( $source, 
$target, 'draft', $interval ),
+   'translations' => Translation::getTrendByStatus(
+   $source, $target, 'published', $interval, null
+   ),
+   'drafts' => Translation::getTrendByStatus( $source, 
$target, 'draft', $interval, null ),
);
 
if ( $target !== null ) {
diff --git a/api/ApiQueryTranslatorStats.php b/api/ApiQueryTranslatorStats.php
new file mode 100644
index 000..e9c3fc6
--- /dev/null
+++ b/api/ApiQueryTranslatorStats.php
@@ -0,0 +1,64 @@
+getResult();
+   $params = $this->extractRequestParams();
+   $user = $this->getUser();
+   if ( isset( $params['translator'] ) ) {
+   $user = \User::newFromName( $params['translator'] );
+   }
+   $translator = new Translator( $user );
+   $translatorId =  $translator->getGlobalUserId();
+   if ( !$translatorId ) {
+   $this->dieUsage( 'Invalid translator name', 
'invalidtranslator' );
+   }
+   $publishedStats = Translation::getTrendByStatus(
+   null, null, 'published', 'month', $translatorId
+   );
+   // TODO: The $publishedStats does not contain data for all 
months,
+   // if there is not translation in that month. 
ApiQueryContentTranslationLanguageTrend
+   // has utility methods to fill it. But it is not important for 
the graph we render
+   // from the output of this data.
+   $result = array(
+   'translator' => $user->getName(),
+   'translatorId' => $translatorId,
+   'publishTrend' => $publishedStats,
+   );
+   $this->getResult()->addValue( null, $this->getModuleName(), 
$result );
+   }
+
+   public function getAllowedParams() {
+   $allowedParams = array(
+   'translator' => array(
+   ApiBase::PARAM_TYPE => 'string',
+   )
+   );
+   return $allowedParams;
+   }
+
+   protected function getExamplesMessages() {
+   return array(
+   
'action=query=cxtranslatorstats=TranslatorName' =>
+   'apihelp-query+cxtranslatorstats-example-1',
+   );
+   }
+}
diff --git a/extension.json b/extension.json
index 8a15cd1..c7804b0 100644
--- a/extension.json
+++ b/extension.json
@@ -47,7 +47,8 @@
"contenttranslationlangtrend": 
"ApiQueryContentTranslationLanguageTrend",
"contenttranslationstats": "ApiQueryContentTranslationStats",
"contenttranslationsuggestions": 
"ApiQueryContentTranslationSuggestions",
-   "cxpublishedtranslations": "ApiQueryPublishedTranslations"
+   "cxpublishedtranslations": "ApiQueryPublishedTranslations",
+   "cxtranslatorstats": "ApiQueryTranslatorStats"
},
"MessagesDirs": {
"ContentTranslation": "i18n",
@@ -70,6 +71,7 @@
"ApiQueryContentTranslationLanguageTrend": 
"api/ApiQueryContentTranslationLanguageTrend.php",
"ApiQueryContentTranslationStats": 
"api/ApiQueryContentTranslationStats.php",
"ApiQueryPublishedTranslations":

[MediaWiki-commits] [Gerrit] Update grunt-jscs to 2.7.0 - change (mediawiki...Scribunto)

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

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

Change subject: Update grunt-jscs to 2.7.0
..


Update grunt-jscs to 2.7.0

Change-Id: I76b632bb08b5f899b753464e6d9a46c595ce9603
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index d23121f..99837ec 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
 "grunt": "0.4.5",
 "grunt-cli": "0.1.13",
 "grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.5.0",
+"grunt-jscs": "2.7.0",
 "grunt-jsonlint": "1.0.7"
   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76b632bb08b5f899b753464e6d9a46c595ce9603
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ricordisamoa 
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 linters and "beautify" - change (mediawiki...CleanChanges)

2016-02-12 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Add linters and "beautify"
..

Add linters and "beautify"

Change-Id: I997557e9f8fa38474cf3e2aa00e5897e43785f43
---
M .gitignore
A .jscsrc
M .jshintrc
M CleanChanges.php
M CleanChanges_body.php
M Filters.php
M Gruntfile.js
M composer.json
M package.json
A phpcs.xml
M resources/cleanchanges.js
M resources/cleanchanges.uls.js
12 files changed, 105 insertions(+), 30 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index e7e3181..16ca8f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 .*.swp
 .idea
 node_modules/
+vendor/
+composer.lock
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+   "preset": "wikimedia"
+}
diff --git a/.jshintrc b/.jshintrc
index 0967ef4..31ce942 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1 +1,20 @@
-{}
+{
+   "bitwise": true,
+   "curly": true,
+   "eqeqeq": true,
+   "forin": false,
+   "freeze": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "onevar": true,
+   "strict": true,
+   "undef": true,
+   "unused": true,
+   "browser": true,
+   "predef": [
+   "mediaWiki",
+   "jQuery",
+   "QUnit"
+   ]
+}
diff --git a/CleanChanges.php b/CleanChanges.php
index 54d3da8..fe520cd 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -4,7 +4,8 @@
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['CleanChanges'] = __DIR__ . '/i18n';
/* wfWarn(
-   'Deprecated PHP entry point used for CleanChanges extension. 
Please use wfLoadExtension instead, ' .
+   'Deprecated PHP entry point used for CleanChanges extension. ' .
+   'Please use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
); */
return;
diff --git a/CleanChanges_body.php b/CleanChanges_body.php
index 0580661..311eb73 100644
--- a/CleanChanges_body.php
+++ b/CleanChanges_body.php
@@ -162,7 +162,9 @@
 
// Make user links
if ( $this->isDeleted( $rc, Revision::DELETED_USER ) ) {
-   $rc->_user = ' ' . 
$this->msg( 'rev-deleted-user' )->escaped() . '';
+   $rc->_user = ' ' .
+   $this->msg( 'rev-deleted-user' )->escaped() .
+   '';
$rc->_userInfo = '';
self::$userinfo += array();
} else {
@@ -284,7 +286,8 @@
$toggleLink = "javascript:toggleVisibilityE('$rci', '$rcm', 
'$rcl', 'block')";
$tl =
Xml::tags( 'span', array( 'id' => $rcm ),
-   Xml::tags( 'a', array( 'href' => $toggleLink ), 
$this->arrow( $this->direction ? 'r' : 'l' ) ) ) .
+   Xml::tags( 'a', array( 'href' => $toggleLink ),
+   $this->arrow( $this->direction ? 'r' : 'l' ) ) 
) .
Xml::tags( 'span', array( 'id' => $rcl, 'style' => 'display: 
none;' ),
Xml::tags( 'a', array( 'href' => $toggleLink ), 
$this->downArrow() ) );
 
@@ -327,7 +330,7 @@
$items[] = $this->makeUserlinks( $userlinks );
$items[] = $block[0]->_watching;
 
-   $lines = Xml::tags( 'div', null, implode( " {$this->dir}", 
$items ) ) . "\n" ;
+   $lines = Xml::tags( 'div', null, implode( " {$this->dir}", 
$items ) ) . "\n";
 
# Sub-entries
$lines .= Xml::tags( 'div',
@@ -348,11 +351,17 @@
 */
protected function arrow( $dir, $alt = '', $title = '' ) {
global $wgExtensionAssetsPath;
-   $encUrl = htmlspecialchars( $wgExtensionAssetsPath . 
'/CleanChanges/images/Arr_' . $dir . '.png' );
-   $encAlt = htmlspecialchars( $alt );
-   $encTitle = htmlspecialchars( $title );
 
-   return "";
+   return Html::element(
+   'img',
+   array(
+   'src' => 
"$wgExtensionAssetsPath/CleanChanges/images/Arr_$dir.png",
+   'width' => 12,
+   'height' => 12,
+   'alt' => $alt,
+   'title' => $title,
+   )
+   );
}
 
/**
@@ -443,7 +452,7 @@
if ( is_int( $size ) ) {
$size = $this->wrapCharacterDifference( $size );
// FIXME: i18n: Hard coded parentheses and spaces.
-

[MediaWiki-commits] [Gerrit] Require extension registration - change (mediawiki...CleanChanges)

2016-02-12 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Require extension registration
..

Require extension registration

Change-Id: Ic75a0a4056478f68dbc3016404697cc4ef148158
---
M CleanChanges.php
1 file changed, 2 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CleanChanges 
refs/changes/49/270249/1

diff --git a/CleanChanges.php b/CleanChanges.php
index 78e26df..54d3da8 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -8,47 +8,6 @@
'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
); */
return;
+} else {
+   die( 'This version of the CleanChanges extension requires MediaWiki 
1.25+' );
 }
-/**
- * Setup for pre-1.25 wikis. Make sure this is kept in sync with extension.json
- */
-
-/**
- * An extension to show a nice compact changes list and few extra filters for
- * Special:RecentChanges.php
- *
- * @file
- * @ingroup Extensions
- *
- * @author Niklas Laxström
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-/* Extension information */
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'Clean Changes',
-   'version' => '2015-09-06',
-   'author' => 'Niklas Laxström',
-   'descriptionmsg' => 'cleanchanges-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:CleanChanges',
-   'license-name' => 'GPL-2.0+',
-);
-
-/* Set up messages and includes */
-$wgMessagesDirs['CleanChanges'] = __DIR__ . '/i18n';
-$wgAutoloadClasses['NCL'] =  __DIR__ . "/CleanChanges_body.php";
-$wgAutoloadClasses['CCFilters'] = __DIR__ . "/Filters.php";
-
-require_once __DIR__ . '/Resources.php';
-
-/* Hook into code */
-$wgHooks['FetchChangesList'][] = 'NCL::hook';
-$wgHooks['MakeGlobalVariablesScript'][] = 'NCL::addScriptVariables';
-$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::user';
-$wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::userForm';
-$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::trailer';
-$wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::trailerForm';
-
-$wgCCUserFilter = true;
-$wgCCTrailerFilter = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic75a0a4056478f68dbc3016404697cc4ef148158
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CleanChanges
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] Use non-deprecated hooks - change (mediawiki...CleanChanges)

2016-02-12 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Use non-deprecated hooks
..

Use non-deprecated hooks

Change-Id: I170da086e7ae0efa7a034998136bd0a54140adf8
---
M CleanChanges.php
M Filters.php
D Resources.php
M extension.json
4 files changed, 36 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CleanChanges 
refs/changes/48/270248/1

diff --git a/CleanChanges.php b/CleanChanges.php
index d607f75..78e26df 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -21,7 +21,6 @@
  * @ingroup Extensions
  *
  * @author Niklas Laxström
- * @copyright Copyright © 2008-2012, Niklas Laxström
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
@@ -29,7 +28,7 @@
 $wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'Clean Changes',
-   'version' => '2014-12-29',
+   'version' => '2015-09-06',
'author' => 'Niklas Laxström',
'descriptionmsg' => 'cleanchanges-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:CleanChanges',
@@ -46,9 +45,9 @@
 /* Hook into code */
 $wgHooks['FetchChangesList'][] = 'NCL::hook';
 $wgHooks['MakeGlobalVariablesScript'][] = 'NCL::addScriptVariables';
-$wgHooks['SpecialRecentChangesQuery'][] = 'CCFilters::user';
+$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::user';
 $wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::userForm';
-$wgHooks['SpecialRecentChangesQuery'][] = 'CCFilters::trailer';
+$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::trailer';
 $wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::trailerForm';
 
 $wgCCUserFilter = true;
diff --git a/Filters.php b/Filters.php
index 13e0858..bd3cdb5 100644
--- a/Filters.php
+++ b/Filters.php
@@ -3,23 +3,27 @@
 class CCFilters {
 
/**
-* @param array $conds
-* @param array $tables
-* @param array $join_conds
-* @param FormOptions $opts
-* @return bool
+* Hook: ChangesListSpecialPageQuery
 */
-   public static function user( &$conds, &$tables, &$join_conds, 
FormOptions $opts ) {
+   public static function user(
+   $name,
+   &$tables,
+   &$fields,
+   &$conds,
+   &$query_options,
+   &$join_conds,
+   FormOptions $opts
+   ) {
global $wgRequest, $wgCCUserFilter;
 
if ( !$wgCCUserFilter ) {
-   return true;
+   return;
}
 
$opts->add( 'users', '' );
$users = $wgRequest->getVal( 'users' );
if ( $users === null ) {
-   return true;
+   return;
}
 
$idfilters = array();
@@ -35,20 +39,16 @@
$conds[] = 'rc_user IN (' . $dbr->makeList( $idfilters 
) . ')';
$opts->setValue( 'users', $users );
}
-
-   return true;
}
 
/**
-* @param $items array
-* @param $opts FormOptions
-* @return bool
+* Hook: SpecialRecentChangesPanel
 */
public static function userForm( &$items, FormOptions $opts ) {
global $wgRequest, $wgCCUserFilter;
 
if ( !$wgCCUserFilter ) {
-   return true;
+   return;
}
 
$opts->consumeValue( 'users' );
@@ -56,38 +56,40 @@
$default = $wgRequest->getVal( 'users', '' );
$items['users'] = Xml::inputLabelSep( wfMessage( 
'cleanchanges-users' )->text(), 'users',
'mw-users', 40, $default  );
-   return true;
+   return;
}
 
/**
-* @param array $conds
-* @param array $tables
-* @param array $join_conds
-* @param FormOptions $opts
-* @return bool
+* Hook: ChangesListSpecialPageQuery
 */
-   public static function trailer( &$conds, &$tables, &$join_conds, 
FormOptions $opts ) {
+   public static function trailer(
+   $name,
+   &$tables,
+   &$fields,
+   &$conds,
+   &$query_options,
+   &$join_conds,
+   FormOptions $opts
+   ) {
global $wgRequest, $wgCCTrailerFilter;
 
if ( !$wgCCTrailerFilter ) {
-   return true;
+   return;
}
 
$opts->add( 'trailer', '' );
$trailer = $wgRequest->getVal( 'trailer' );
-   if ( $trailer === null ) return true;
+   if ( $trailer === null ) {
+   return;
+   }
 
$dbr =

[MediaWiki-commits] [Gerrit] Table overlay: Prevent unnecessary scrolls when editing cells - change (VisualEditor/VisualEditor)

2016-02-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Table overlay: Prevent unnecessary scrolls when editing cells
..

Table overlay: Prevent unnecessary scrolls when editing cells

This makes editing cells which are larger than the viewport
(such as when tables are used for layout) actually possible.

* Don't scroll when changing selection withing a cell
* Don't set selection twice when double clicking to edit

Change-Id: I0ec97024ff8ad9158e8569b9f1b51e158032c955
---
M src/ce/nodes/ve.ce.TableNode.js
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/54/270254/1

diff --git a/src/ce/nodes/ve.ce.TableNode.js b/src/ce/nodes/ve.ce.TableNode.js
index acbce14..473736e 100644
--- a/src/ce/nodes/ve.ce.TableNode.js
+++ b/src/ce/nodes/ve.ce.TableNode.js
@@ -104,10 +104,14 @@
return;
}
if ( this.surface.getModel().getSelection() instanceof 
ve.dm.TableSelection ) {
-   this.setEditing( true );
offset = this.surface.getOffsetFromEventCoords( e.originalEvent 
);
if ( offset !== -1 ) {
+   // Don't change selection in setEditing to avoid 
scrolling to bottom of cell
+   this.setEditing( true, true );
+   // Set selection to where the double click happened
this.surface.getModel().setLinearSelection( new 
ve.Range( offset ) );
+   } else {
+   this.setEditing( true );
}
}
 };
@@ -338,7 +342,8 @@
this.$element.on( 'touchstart.ve-ce-tableNode', 
this.onTableMouseDown.bind( this ) );
}
this.surface.setActiveTableNode( this );
-   this.updateOverlayDebounced( true );
+   // Ignore linear selection changes for the purpose of updating 
the overlay
+   this.updateOverlayDebounced( selection instanceof 
ve.dm.TableSelection );
} else if ( !active && this.active ) {
this.$overlay.addClass( 'oo-ui-element-hidden' );
if ( this.editingFragment ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ec97024ff8ad9158e8569b9f1b51e158032c955
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2016-02-12T10:00:01+0000 - change (mediawiki...Wikidata)

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

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

Change subject: New Wikidata Build - 2016-02-12T10:00:01+
..


New Wikidata Build - 2016-02-12T10:00:01+

Change-Id: I6be665fb993e8b5468f16ec2b2059f64f57f05d4
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.hooks.php
M extensions/Wikibase/client/WikibaseClient.php
M extensions/Wikibase/client/i18n/su.json
A 
extensions/Wikibase/client/includes/Hooks/SkinTemplateOutputPageBeforeExecHandler.php
A 
extensions/Wikibase/client/tests/phpunit/includes/Hooks/SkinTemplateOutputPageBeforeExecHandlerTest.php
M extensions/Wikibase/docs/ontology.owl
M extensions/Wikibase/lib/i18n/hu.json
M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php
A extensions/Wikibase/lib/tests/phpunit/store/EntityRevisionTest.php
M extensions/Wikibase/purtle/tests/phpunit/BNodeLabelerTest.php
M extensions/Wikibase/purtle/tests/phpunit/RdfWriterTestBase.php
M extensions/Wikibase/purtle/tests/phpunit/TurtleRdfWriterTest.php
M extensions/Wikibase/purtle/tests/phpunit/UnicodeEscaperTest.php
M extensions/Wikibase/repo/i18n/su.json
M 
extensions/Wikibase/repo/includes/specials/SpecialSetLabelDescriptionAliases.php
D extensions/Wikibase/repo/tests/browser
A extensions/Wikibase/repo/tests/browser
M vendor/composer/ClassLoader.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_files.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
23 files changed, 564 insertions(+), 359 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 2d3b86e..56e2953 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,11 +1,10 @@
 {
 "_readme": [
 "This file locks the dependencies of your project to a known state",
-"Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
+"Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
 "hash": "c8e8090c015b32a8f8771ce88e7e",
-"content-hash": "3279be965e622cfcf4afa7a1795b2a96",
 "packages": [
 {
 "name": "composer/installers",
@@ -998,7 +997,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/;
 },
-"time": "2016-01-30 14:04:29"
+"time": "2016-01-30 14:05:40"
 },
 {
 "name": "wikibase/data-model",
@@ -1482,21 +1481,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-<<< HEAD
-"reference": "c204188248f3f7649ed7a061ace0a403df9d28eb"
+"reference": "89c140be5f4eec33602d373e3d1d764009670daa"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c204188248f3f7649ed7a061ace0a403df9d28eb;,
-"reference": "c204188248f3f7649ed7a061ace0a403df9d28eb",
-===
-"reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/ef7910c636664ff5e64ab609f37d0db4145b4db3;,
-"reference": "ef7910c636664ff5e64ab609f37d0db4145b4db3",
->>> New Wikidata build - with fix for broken qunit test
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/89c140be5f4eec33602d373e3d1d764009670daa;,
+"reference": "89c140be5f4eec33602d373e3d1d764009670daa",
 "shasum": ""
 },
 "require": {
@@ -1568,11 +1558,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-<<< HEAD
-"time": "2016-02-10 20:12:05"
-===
-"time": "2016-02-11 13:36:27"
->>> New Wikidata build - with fix for broken qunit test
+"time": "2016-02-12 08:28:18"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.hooks.php 
b/extensions/Wikibase/client/WikibaseClient.hooks.php
index dae54c0..bba4e52 100644
--- a/extensions/Wikibase/client/WikibaseClient.hooks.php
+++ b/extensions/Wikibase/client/WikibaseClient.hooks.php
@@ -9,7 +9,6 @@
 use Message;
 use OutputPage;
 use Parser;
-use QuickTemplate;
 use RecentChange;
 use Skin;
 use StubObject;
@@ -22,7 +21,6 @@
 use Wikibase\Client\Hooks\InfoActionHookHandler;
 use Wikibase\Client\RecentChanges\ChangeLineFormatter;
 use Wikibase\Client\RecentChanges\ExternalChangeFactory;
-use Wikibase\Client\RepoItemLinkGenerator;
 use

[MediaWiki-commits] [Gerrit] Don't automatically update openssh-client - change (operations/puppet)

2016-02-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Don't automatically update openssh-client
..


Don't automatically update openssh-client

openssh-server got fixed in ffd2b53748d261f2c2d36bea79393400dcf70179 to
not automatically update to the most recent version, but this isn't
effective in practice: openssh-client has a versioned dependency to be
of the same version as openssh-server, so updating openssh-client makes
apt also update openssh-server.

Change-Id: I54da2ecb3c907c16adef5faad47cde6ea828f365
---
M modules/ssh/manifests/client.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ssh/manifests/client.pp b/modules/ssh/manifests/client.pp
index 1f91c07..d18df39 100644
--- a/modules/ssh/manifests/client.pp
+++ b/modules/ssh/manifests/client.pp
@@ -1,6 +1,6 @@
 class ssh::client {
 package { 'openssh-client':
-ensure => latest,
+ensure => present,
 }
 
 # no exported resources on Labs == no sshknowngen

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

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

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

[MediaWiki-commits] [Gerrit] doc: Add HtmlFormatter - change (integration/docroot)

2016-02-12 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: doc: Add HtmlFormatter
..

doc: Add HtmlFormatter

Bug: T125001
Change-Id: I25787b2aec844aa8571ef0ce17b8072772b78a99
---
M org/wikimedia/doc/default.html
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/docroot 
refs/changes/51/270251/1

diff --git a/org/wikimedia/doc/default.html b/org/wikimedia/doc/default.html
index d0f206a..b15112d 100644
--- a/org/wikimedia/doc/default.html
+++ b/org/wikimedia/doc/default.html
@@ -10,6 +10,7 @@
CDB
CLDRPluralRuleParser
IPSet
+   HtmlFormatter
oauthclient-php
OOjs core
OOjs UI

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25787b2aec844aa8571ef0ce17b8072772b78a99
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Animation on 'Favorite' and 'Discard' actions - change (mediawiki...ContentTranslation)

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

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

Change subject: Animation on 'Favorite' and 'Discard' actions
..


Animation on 'Favorite' and 'Discard' actions

TODO: There is a tooltip appearing 'Lion is added for later' in design
That is not done.

Bug: T125379
Change-Id: I294b33d322bffa9804c858249683fc9b60425b33
---
M modules/dashboard/ext.cx.suggestionlist.js
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.suggestionlist.less
3 files changed, 27 insertions(+), 10 deletions(-)

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



diff --git a/modules/dashboard/ext.cx.suggestionlist.js 
b/modules/dashboard/ext.cx.suggestionlist.js
index f75ecb9..55ebdcc 100644
--- a/modules/dashboard/ext.cx.suggestionlist.js
+++ b/modules/dashboard/ext.cx.suggestionlist.js
@@ -582,9 +582,12 @@
api.postWithToken( 'edit', params ).done( function ( response ) 
{
var favoriteListId;
if ( response.cxsuggestionlist.result === 'success' ) {
-   suggestion.$element.slideUp( 'slow', function 
() {
-   $( this ).remove();
-   } );
+   suggestion.$element.addClass( 'cx-slideup-hide' 
);
+   suggestion.$element.one( 'transitionend 
webkitTransitionEnd oTransitionEnd MSTransitionEnd',
+   function () {
+   $( this ).remove();
+   }
+   );
 
favoriteListId = self.getListId( 
'cx-suggestionlist-favorite' );
suggestion.listId = favoriteListId;
@@ -628,14 +631,17 @@
};
api.postWithToken( 'edit', params ).done( function ( response ) 
{
if ( response.cxsuggestionlist.result === 'success' ) {
-   suggestion.$element.slideUp( 'slow', function 
() {
-   var favoriteListId;
-   $( this ).remove();
-   favoriteListId = self.getListId( 
'cx-suggestionlist-favorite' );
-   if ( !self.lists[ favoriteListId 
].$list.find( '.cx-slitem' ).length ) {
-   self.lists[ favoriteListId 
].$list.hide();
+   suggestion.$element.addClass( 
'cx-slidedown-hide' );
+   suggestion.$element.one( 'transitionend 
webkitTransitionEnd oTransitionEnd MSTransitionEnd',
+   function () {
+   var favoriteListId;
+   $( this ).remove();
+   favoriteListId = 
self.getListId( 'cx-suggestionlist-favorite' );
+   if ( !self.lists[ 
favoriteListId ].$list.find( '.cx-slitem' ).length ) {
+   self.lists[ 
favoriteListId ].$list.hide();
+   }
}
-   } );
+   );
// Do we need to add to general suggestions?
}
// TODO: What happens if this fails?
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index c41d4e7..70c7d91 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -21,6 +21,7 @@
&:last-child {
border: 1px solid #ddd;
}
+   transition: 1s ease;
 }
 
 .cx-translationlist-empty,
diff --git a/modules/dashboard/styles/ext.cx.suggestionlist.less 
b/modules/dashboard/styles/ext.cx.suggestionlist.less
index 922f647..64a1e28 100644
--- a/modules/dashboard/styles/ext.cx.suggestionlist.less
+++ b/modules/dashboard/styles/ext.cx.suggestionlist.less
@@ -155,3 +155,13 @@
border-radius: 1px;
font-size: small;
 }
+
+.cx-slideup-hide {
+   transform: translateY(-200%);
+   opacity: 0;
+}
+
+.cx-slidedown-hide {
+   transform: translateY(200%);
+   opacity: 0;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I294b33d322bffa9804c858249683fc9b60425b33
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer:

[MediaWiki-commits] [Gerrit] Add ferm rules for rsyncd used in eventlogging - change (operations/puppet)

2016-02-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Add ferm rules for rsyncd used in eventlogging
..


Add ferm rules for rsyncd used in eventlogging

Change-Id: I3bfbb7ed363070377e3035830396a60faf71914f
---
M manifests/role/eventlogging.pp
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 50eba97..2f0b8f2 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -324,6 +324,13 @@
 if ( $backup_destinations ) {
 class { 'rsync::server': }
 
+$rsync_clients_ferm = join($backup_destinations, ' ')
+ferm::service { 'eventlogging_rsyncd':
+proto  => 'tcp',
+port   => '873',
+srange => "@resolve((${rsync_clients_ferm}))",
+}
+
 rsync::server::module { 'eventlogging':
 path=> $out_dir,
 read_only   => 'yes',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3bfbb7ed363070377e3035830396a60faf71914f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
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] Introduce a "repoUserValidationMethod" client setting - change (mediawiki...Wikibase)

2016-02-12 Thread Hoo man (Code Review)

Hoo man has uploaded a new change for review.

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

Change subject: Introduce a "repoUserValidationMethod" client setting
..

Introduce a "repoUserValidationMethod" client setting

Used in UpdateRepo to ensure the user on client is the same
as the one on repo with the same name.

Supports two modes:
* centralauth: Make use of CentralAuthUser.
* assumeSame: Assume that if a user with that name exists on
repo, it will be the same.

This way we might be able to remove the binding against CentralAuth,
now that the SULF has been finished.

Also needed in order to be able to write tests for
UpdateRepoHookHandlers without having to work with CentralAuth.

Change-Id: I2f9c0c5743a66b1e62f633ee3c64dad407fef424
---
M client/config/WikibaseClient.default.php
M client/includes/Hooks/UpdateRepoHookHandlers.php
M client/includes/UpdateRepo/UpdateRepo.php
M client/includes/UpdateRepo/UpdateRepoOnMove.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnDeleteTest.php
M client/tests/phpunit/includes/UpdateRepo/UpdateRepoOnMoveTest.php
M docs/options.wiki
M repo/includes/UpdateRepo/UpdateRepoJob.php
8 files changed, 128 insertions(+), 44 deletions(-)


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

diff --git a/client/config/WikibaseClient.default.php 
b/client/config/WikibaseClient.default.php
index 7c68e48..cd9a1e4 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -297,5 +297,9 @@
return $otherProjectsSitesProvider->getOtherProjectsSiteIds( 
$settings->getSetting( 'siteLinkGroups' ) );
};
 
+   $defaults['repoUserValidationMethod'] = function( SettingsArray 
$settings ) {
+   return class_exists( 'CentralAuthUser' ) ? 'centralauth' : 
'assumeSame';
+   };
+
return $defaults;
 } );
diff --git a/client/includes/Hooks/UpdateRepoHookHandlers.php 
b/client/includes/Hooks/UpdateRepoHookHandlers.php
index e5e771a..ce330bb 100644
--- a/client/includes/Hooks/UpdateRepoHookHandlers.php
+++ b/client/includes/Hooks/UpdateRepoHookHandlers.php
@@ -59,6 +59,11 @@
private $propagateChangesToRepo;
 
/**
+* @var string
+*/
+   private $userValidationMethod;
+
+   /**
 * @return UpdateRepoHookHandlers|boolean
 */
private static function newFromGlobalState() {
@@ -83,7 +88,8 @@
$siteLinkLookup,
$settings->getSetting( 'repoDatabase' ),
$settings->getSetting( 'siteGlobalID' ),
-   $settings->getSetting( 'propagateChangesToRepo' )
+   $settings->getSetting( 'propagateChangesToRepo' ),
+   $settings->getSetting( 'repoUserValidationMethod' )
);
}
 
@@ -154,6 +160,7 @@
 * @param string $repoDatabase
 * @param string $siteGlobalID
 * @param bool $propagateChangesToRepo
+* @param string $userValidationMethod
 */
public function __construct(
NamespaceChecker $namespaceChecker,
@@ -161,7 +168,8 @@
SiteLinkLookup $siteLinkLookup,
$repoDatabase,
$siteGlobalID,
-   $propagateChangesToRepo
+   $propagateChangesToRepo,
+   $userValidationMethod
) {
$this->namespaceChecker = $namespaceChecker;
$this->jobQueueGroup = $jobQueueGroup;
@@ -170,6 +178,7 @@
$this->repoDatabase = $repoDatabase;
$this->siteGlobalID = $siteGlobalID;
$this->propagateChangesToRepo = $propagateChangesToRepo;
+   $this->userValidationMethod = $userValidationMethod;
}
 
/**
@@ -209,7 +218,8 @@
$this->siteLinkLookup,
$user,
$this->siteGlobalID,
-   $title
+   $title,
+   $this->userValidationMethod
);
 
if ( !$this->shouldBePushed( $updateRepo ) ) {
@@ -254,7 +264,8 @@
$user,
$this->siteGlobalID,
$oldTitle,
-   $newTitle
+   $newTitle,
+   $this->userValidationMethod
);
 
if ( !$this->shouldBePushed( $updateRepo ) ) {
diff --git a/client/includes/UpdateRepo/UpdateRepo.php 
b/client/includes/UpdateRepo/UpdateRepo.php
index 90e3faf..2c4e30c 100644
--- a/client/includes/UpdateRepo/UpdateRepo.php
+++ b/client/includes/UpdateRepo/UpdateRepo.php
@@ -12,6 +12,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\SiteLink;
 use Wikibase\Lib\Store\SiteLinkLookup;
+use Wikimedia\Assert\Assert;
 
 /**
  * Provides

[MediaWiki-commits] [Gerrit] Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the... - change (operations...openssl)

2016-02-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the 
1.0.2 branch to fix spurious log messages if SSL clients quit during the SSL 
handshake
..

Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the 1.0.2
branch to fix spurious log messages if SSL clients quit during the
SSL handshake

Bug: T126616
Change-Id: I5d98aabf09f178620b28bd47a3416b064e643b42
---
M debian/changelog
A debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch
M debian/patches/series
3 files changed, 108 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/openssl 
refs/changes/57/270257/1

diff --git a/debian/changelog b/debian/changelog
index 961289f..1c3f876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssl (1.0.2f-1~wmf3) jessie-wikimedia; urgency=medium
+
+  * Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the 1.0.2
+branch to fix spurious log messages if SSL clients quit during the
+SSL handshake (Bug: T126616)
+
+ -- Moritz Muehlenhoff   Fri, 12 Feb 2016 11:32:31 
+0100
+
 openssl (1.0.2f-1~wmf2) jessie-wikimedia; urgency=medium
 
   * Correct target distribution
diff --git 
a/debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch 
b/debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch
new file mode 100644
index 000..7dc9f8b
--- /dev/null
+++ 
b/debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch
@@ -0,0 +1,99 @@
+From 64193c8218540499984cd63cda41f3cd491f3f59 Mon Sep 17 00:00:00 2001
+From: Matt Caswell 
+Date: Tue, 2 Feb 2016 10:05:43 +
+Subject: [PATCH] Handle SSL_shutdown while in init more appropriately #2
+
+Previous commit f73c737c7 attempted to "fix" a problem with the way
+SSL_shutdown() behaved whilst in mid-handshake. The original behaviour had
+SSL_shutdown() return immediately having taken no action if called mid-
+handshake with a return value of 1 (meaning everything was shutdown
+successfully). In fact the shutdown has not been successful.
+
+Commit f73c737c7 changed that to send a close_notify anyway and then
+return. This seems to be causing some problems for some applications so
+perhaps a better (much simpler) approach is revert to the previous
+behaviour (no attempt at a shutdown), but return -1 (meaning the shutdown
+was not successful).
+
+This also fixes a bug where SSL_shutdown always returns 0 when shutdown
+*very* early in the handshake (i.e. we are still using SSLv23_method).
+
+Reviewed-by: Viktor Dukhovni 
+---
+ ssl/s3_lib.c  | 15 ---
+ ssl/ssl.h |  1 -
+ ssl/ssl_err.c |  1 -
+ ssl/ssl_lib.c |  7 ++-
+ 4 files changed, 6 insertions(+), 18 deletions(-)
+
+diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
+index f846cb5..6a06625 100644
+--- a/ssl/s3_lib.c
 b/ssl/s3_lib.c
+@@ -4326,21 +4326,6 @@ int ssl3_shutdown(SSL *s)
+ }
+ #endif
+ } else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN)) {
+-if (SSL_in_init(s)) {
+-/*
+- * We can't shutdown properly if we are in the middle of a
+- * handshake. Doing so is problematic because the peer may send a
+- * CCS before it acts on our close_notify. However we should not
+- * continue to process received handshake messages or CCS once our
+- * close_notify has been sent. Therefore any close_notify from
+- * the peer will be unreadable because we have not moved to the 
next
+- * cipher state. Its best just to avoid this can-of-worms. Return
+- * an error if we are wanting to wait for a close_notify from the
+- * peer and we are in init.
+- */
+-SSLerr(SSL_F_SSL3_SHUTDOWN, SSL_R_SHUTDOWN_WHILE_IN_INIT);
+-return -1;
+-}
+ /*
+  * If we are waiting for a close from our peer, we are closed
+  */
+diff --git a/ssl/ssl.h b/ssl/ssl.h
+index ae8c925..04d4007 100644
+--- a/ssl/ssl.h
 b/ssl/ssl.h
+@@ -2713,7 +2713,6 @@ void ERR_load_SSL_strings(void);
+ # define SSL_F_SSL3_SETUP_KEY_BLOCK   157
+ # define SSL_F_SSL3_SETUP_READ_BUFFER 156
+ # define SSL_F_SSL3_SETUP_WRITE_BUFFER291
+-# define SSL_F_SSL3_SHUTDOWN  396
+ # define SSL_F_SSL3_WRITE_BYTES   158
+ # define SSL_F_SSL3_WRITE_PENDING 159
+ # define SSL_F_SSL_ADD_CERT_CHAIN 318
+diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
+index dd3b2af..704088d 100644
+--- a/ssl/ssl_err.c
 b/ssl/ssl_err.c
+@@ -206,7 +206,6 @@ static ERR_STRING_DATA SSL_str_functs[] = {
+ {ERR_FUNC(SSL_F_SSL3_SETUP_KEY_BLOCK),

[MediaWiki-commits] [Gerrit] Expand variable names in scrollIntoView - change (oojs/ui)

2016-02-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Expand variable names in scrollIntoView
..

Expand variable names in scrollIntoView

Because humans.

Change-Id: Ic2fc9a678c1e56e36cfb5058cfa7e1ccdfb9407c
---
M src/Element.js
1 file changed, 31 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/61/270261/1

diff --git a/src/Element.js b/src/Element.js
index 6b770a5..4f86844 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -574,56 +574,56 @@
  * @param {Function} [config.complete] Function to call when scrolling 
completes
  */
 OO.ui.Element.static.scrollIntoView = function ( el, config ) {
-   var rel, anim, callback, sc, $sc, eld, scd, $win;
+   var position, animations, callback, container, $container, 
elementDimensions, containerDimensions, $window;
 
// Configuration initialization
config = config || {};
 
-   anim = {};
+   animations = {};
callback = typeof config.complete === 'function' && config.complete;
-   sc = this.getClosestScrollableContainer( el, config.direction );
-   $sc = $( sc );
-   eld = this.getDimensions( el );
-   scd = this.getDimensions( sc );
-   $win = $( this.getWindow( el ) );
+   container = this.getClosestScrollableContainer( el, config.direction );
+   $container = $( container );
+   elementDimensions = this.getDimensions( el );
+   containerDimensions = this.getDimensions( container );
+   $window = $( this.getWindow( el ) );
 
-   // Compute the distances between the edges of el and the edges of the 
scroll viewport
-   if ( $sc.is( 'html, body' ) ) {
+   // Compute the element's position relative to the container
+   if ( $container.is( 'html, body' ) ) {
// If the scrollable container is the root, this is easy
-   rel = {
-   top: eld.rect.top,
-   bottom: $win.innerHeight() - eld.rect.bottom,
-   left: eld.rect.left,
-   right: $win.innerWidth() - eld.rect.right
+   position = {
+   top: elementDimensions.rect.top,
+   bottom: $window.innerHeight() - 
elementDimensions.rect.bottom,
+   left: elementDimensions.rect.left,
+   right: $window.innerWidth() - 
elementDimensions.rect.right
};
} else {
-   // Otherwise, we have to subtract el's coordinates from sc's 
coordinates
-   rel = {
-   top: eld.rect.top - ( scd.rect.top + scd.borders.top ),
-   bottom: scd.rect.bottom - scd.borders.bottom - 
scd.scrollbar.bottom - eld.rect.bottom,
-   left: eld.rect.left - ( scd.rect.left + 
scd.borders.left ),
-   right: scd.rect.right - scd.borders.right - 
scd.scrollbar.right - eld.rect.right
+   // Otherwise, we have to subtract el's coordinates from 
container's coordinates
+   position = {
+   top: elementDimensions.rect.top - ( 
containerDimensions.rect.top + containerDimensions.borders.top ),
+   bottom: containerDimensions.rect.bottom - 
containerDimensions.borders.bottom - containerDimensions.scrollbar.bottom - 
elementDimensions.rect.bottom,
+   left: elementDimensions.rect.left - ( 
containerDimensions.rect.left + containerDimensions.borders.left ),
+   right: containerDimensions.rect.right - 
containerDimensions.borders.right - containerDimensions.scrollbar.right - 
elementDimensions.rect.right
};
}
 
if ( !config.direction || config.direction === 'y' ) {
-   if ( rel.top < 0 ) {
-   anim.scrollTop = scd.scroll.top + rel.top;
-   } else if ( rel.top > 0 && rel.bottom < 0 ) {
-   anim.scrollTop = scd.scroll.top + Math.min( rel.top, 
-rel.bottom );
+   if ( position.top < 0 ) {
+   animations.scrollTop = containerDimensions.scroll.top + 
position.top;
+   } else if ( position.top > 0 && position.bottom < 0 ) {
+   animations.scrollTop = containerDimensions.scroll.top + 
Math.min( position.top, -position.bottom );
}
}
if ( !config.direction || config.direction === 'x' ) {
-   if ( rel.left < 0 ) {
-   anim.scrollLeft = scd.scroll.left + rel.left;
-   } else if ( rel.left > 0 && rel.right < 0 ) {
-   anim.scrollLeft = scd.scroll.left + Math.min( rel.left, 
-rel.right );
+   if ( position.left < 0 ) {
+   animations.scrollLeft = containerDimensions.scroll.left 
+ position.left;
+   } else

[MediaWiki-commits] [Gerrit] scrollIntoView: Deprecate callback in favour of promise - change (oojs/ui)

2016-02-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: scrollIntoView: Deprecate callback in favour of promise
..

scrollIntoView: Deprecate callback in favour of promise

Change-Id: I7cd4f20ab889e42d760e3f88163f62eacfc3cad4
---
M src/Element.js
1 file changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/62/270262/1

diff --git a/src/Element.js b/src/Element.js
index 4f86844..0244690 100644
--- a/src/Element.js
+++ b/src/Element.js
@@ -568,13 +568,16 @@
  * @static
  * @param {HTMLElement} el Element to scroll into view
  * @param {Object} [config] Configuration options
- * @param {string} [config.duration] jQuery animation duration value
+ * @param {string} [config.duration='fast'] jQuery animation duration value
  * @param {string} [config.direction] Scroll in only one direction, e.g. 'x' 
or 'y', omit
  *  to scroll in both directions
- * @param {Function} [config.complete] Function to call when scrolling 
completes
+ * @param {Function} [config.complete] Function to call when scrolling 
completes.
+ *  Deprecated since 0.15.3, use return promise instead.
+ * @return {jQuery.Promise} Promise which resolves when the scroll is complete
  */
 OO.ui.Element.static.scrollIntoView = function ( el, config ) {
-   var position, animations, callback, container, $container, 
elementDimensions, containerDimensions, $window;
+   var position, animations, callback, container, $container, 
elementDimensions, containerDimensions, $window,
+   deferred = $.Deferred();
 
// Configuration initialization
config = config || {};
@@ -622,17 +625,20 @@
}
if ( !$.isEmptyObject( animations ) ) {
$container.stop( true ).animate( animations, config.duration || 
'fast' );
-   if ( callback ) {
-   $container.queue( function ( next ) {
+   $container.queue( function ( next ) {
+   if ( callback ) {
callback();
-   next();
-   } );
-   }
+   }
+   deferred.resolve();
+   next();
+   } );
} else {
if ( callback ) {
callback();
+   deferred.resolve();
}
}
+   return deferred.promise();
 };
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] Structured language overlay filtering fix - change (mediawiki...MobileFrontend)

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

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

Change subject: Structured language overlay filtering fix
..


Structured language overlay filtering fix

Correctly display the filtered variants. Don't hide variants when
hiding the parent.

Bug: T123384
Change-Id: If383095cedbf71b4107d337d1fbdbd09c06d0799
---
M resources/mobile.languages.structured/LanguageOverlay.hogan
M resources/mobile.languages.structured/LanguageOverlay.js
M tests/qunit/mobile.languages.structured/test_LanguageOverlay.js
3 files changed, 22 insertions(+), 15 deletions(-)

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



diff --git a/resources/mobile.languages.structured/LanguageOverlay.hogan 
b/resources/mobile.languages.structured/LanguageOverlay.hogan
index 25a06cd..7a0a25a 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.hogan
+++ b/resources/mobile.languages.structured/LanguageOverlay.hogan
@@ -9,8 +9,8 @@
{{preferredLanguagesHeader}}

{{#preferredLanguages}}
-   
-   
+   
+   

{{lang}}

@@ -30,10 +30,10 @@
{{allLanguagesHeader}}{{allLanguagesCount}}

{{#allLanguages}}
-   
+   
{{#hasVariants}}{{variantsHeader}}{{/hasVariants}}
{{#lang}}{{! this test is important because 
variants may exist, but not the parent language }}
-   
+   

{{lang}}

@@ -48,8 +48,8 @@
{{#hasVariants}}

{{#variants}}
-   
-   
+   
+   

{{lang}}
{{variant}}
diff --git a/resources/mobile.languages.structured/LanguageOverlay.js 
b/resources/mobile.languages.structured/LanguageOverlay.js
index 915ab59..df86106 100644
--- a/resources/mobile.languages.structured/LanguageOverlay.js
+++ b/resources/mobile.languages.structured/LanguageOverlay.js
@@ -49,7 +49,7 @@
// cache
this.$searchInput = this.$( 'input.search' );
this.$siteLinksList = this.$( '.site-link-list' );
-   this.$languageItems = this.$siteLinksList.find( 'li' );
+   this.$languageItems = this.$siteLinksList.find( 'a' );
this.$subheaders = this.$( 'h3' );
 
if ( this.options.languageSwitcherSchema ) {
diff --git a/tests/qunit/mobile.languages.structured/test_LanguageOverlay.js 
b/tests/qunit/mobile.languages.structured/test_LanguageOverlay.js
index aba0ae6..34d84b8 100644
--- a/tests/qunit/mobile.languages.structured/test_LanguageOverlay.js
+++ b/tests/qunit/mobile.languages.structured/test_LanguageOverlay.js
@@ -81,7 +81,7 @@
 
QUnit.test( 'test language overlay', 3, function ( assert ) {
assert.equal(
-   this.languageOverlay.$( 
'.site-link-list.preferred-languages li' ).length,
+   this.languageOverlay.$( 
'.site-link-list.preferred-languages a' ).length,
3,
'There are 3 preferred languages.'
);
@@ -93,32 +93,39 @@
);
 
assert.equal(
-   this.languageOverlay.$( '.site-link-list.all-languages 
.variants li' ).length,
+   this.languageOverlay.$( '.site-link-list.all-languages 
.variants a' ).length,
1,
'One language is a variant.'
);
} );
 
-   QUnit.test( 'test language overlay search', 3, function ( assert ) {
+   QUnit.test( 'test language overlay search', 4, function ( assert ) {
this.languageOverlay.filterLanguages( 'zh' );
assert.equal(
-   this.languageOverlay.$( '.site-link-list 
li:not(.hidden)' ).length,
+   this.languageOverlay.$( '.site-link-list 
a:not(.hidden)' ).length,
3,
-   'Three languages match "zh". And only those languages 
are visible.'
+

[MediaWiki-commits] [Gerrit] BSApiTasksBase: Added support for logging - change (mediawiki...BlueSpiceFoundation)

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

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

Change subject: BSApiTasksBase: Added support for logging
..


BSApiTasksBase: Added support for logging

There are a lot of use cases where the actions that are performed by the
API should be logged to Special:Log. This base method makes it easier to
implement such a behavior.

PatchSet 2:
* Added support for 'comment'
* Fixed CC

Change-Id: I122e4ebbeddfeace15511faf23114c7da2171338
---
M includes/api/BSApiTasksBase.php
1 file changed, 91 insertions(+), 0 deletions(-)

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



diff --git a/includes/api/BSApiTasksBase.php b/includes/api/BSApiTasksBase.php
index 5645d61..3523871 100644
--- a/includes/api/BSApiTasksBase.php
+++ b/includes/api/BSApiTasksBase.php
@@ -33,6 +33,13 @@
 abstract class BSApiTasksBase extends BSApiBase {
 
/**
+* This is the default log the API writes to. It needs to be registered
+* in $wgLogTypes
+* @var string
+*/
+   protected $sTaskLogType = null;
+
+   /**
 * Methods that can be called by task param
 * @var array
 */
@@ -95,6 +102,90 @@
}
 
/**
+* Creates a log entry for Special:Log, based on $this->sTaskLogType or
+* $aOptions['type']. See 
https://www.mediawiki.org/wiki/Manual:Logging_to_Special:Log
+* @param string $sAction
+* @param array $aParams for the log entry
+* @param array $aOptions 
+* 'performer' of type User
+* 'target' of type Title
+* 'timestamp' of type string
+* 'relations of type array
+* 'deleted' of type int
+* 'type' of type string; to allow overriding of class default
+* @param bool $bDoPublish
+* @return int Id of the newly created log entry or -1 on error
+*/
+   protected function logTaskAction( $sAction, $aParams, $aOptions = 
array(), $bDoPublish = false ) {
+   $aOptions += array(
+   'performer' => null,
+   'target' => null,
+   'timestamp' => null,
+   'relations' => null,
+   'comment' => null,
+   'deleted' =>  null,
+   'publish' => null,
+   'type' => null //To allow overriding of class default
+   );
+
+   $oTarget = $aOptions['target'];
+   if ( $oTarget === null ) {
+   $oTarget = $this->makeDefaultLogTarget();
+   }
+
+   $oPerformer = $aOptions['performer'];
+   if ( $oPerformer === null ) {
+   $oPerformer = $this->getUser();
+   }
+
+   $sType = $this->sTaskLogType;
+   if ( $aOptions['type'] !== null ) {
+   $sType = $aOptions['type'];
+   }
+
+   if ( $sType === null ) { //Not set on class, not set as call 
option
+   return -1;
+   }
+
+   $oLogger = new ManualLogEntry( $sType, $sAction );
+   $oLogger->setPerformer( $oPerformer );
+   $oLogger->setTarget( $oTarget );
+   $oLogger->setParameters( $aParams );
+
+   if ( $aOptions['timestamp'] !== null ) {
+   $oLogger->setTimestamp( $aOptions['timestamp'] );
+   }
+
+   if ( $aOptions['relations'] !== null ) {
+   $oLogger->setRelations( $aOptions['relations'] );
+   }
+
+   if ( $aOptions['comment'] !== null ) {
+   $oLogger->setComment( $aOptions['comment'] );
+   }
+
+   if ( $aOptions['deleted'] !== null ) {
+   $oLogger->setDeleted( $aOptions['deleted'] );
+   }
+
+   $iLogEntryId = $oLogger->insert();
+
+   if ( $bDoPublish ) {
+   $oLogger->publish();
+   }
+
+   return $iLogEntryId;
+   }
+
+   /**
+*
+* @return Title
+*/
+   protected function makeDefaultLogTarget() {
+   return $this->getTitle();
+   }
+
+   /**
 * Returns an array of allowed parameters
 * @return array
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I122e4ebbeddfeace15511faf23114c7da2171338
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth

[MediaWiki-commits] [Gerrit] Also fade out image container when image loads - change (mediawiki...MobileFrontend)

2016-02-12 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

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

Change subject: Also fade out image container when image loads
..

Also fade out image container when image loads

This was noted during the review of 103614e but not addressed before it
was merged.

Bug: T126592
Bug: T124770
Change-Id: I7f55acc3e933468c2f28872652607030b62ff22b
---
M resources/skins.minerva.base.styles/images.less
1 file changed, 18 insertions(+), 16 deletions(-)


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

diff --git a/resources/skins.minerva.base.styles/images.less 
b/resources/skins.minerva.base.styles/images.less
index 6feadd2..1e7cb3a 100644
--- a/resources/skins.minerva.base.styles/images.less
+++ b/resources/skins.minerva.base.styles/images.less
@@ -1,4 +1,5 @@
 @import "minerva.variables.less";
+@import "minerva.mixins.less";
 
 @animationDuration: 0.3s;
 
@@ -30,30 +31,31 @@
// When the image has loaded transition background color and image 
opacity
// for a fade-in effect
&.loaded {
+   .animation(fadeOutContainer @animationDuration ease-in);
background-color: transparent;
border: none;
 
img {
-   -webkit-animation: loaded @animationDuration ease-in;
-   animation: loaded @animationDuration ease-in;
+   .animation(fadeInImage @animationDuration ease-in);
opacity: 1;
}
}
 }
 
-@-webkit-keyframes loaded {
-   from {
-   opacity: 0
-   }
-   to {
-   opacity: 1
-   }
+@-webkit-keyframes fadeInImage {
+   from { opacity: 0 }
+   to { opacity: 1 }
 }
-@keyframes loaded {
-   from {
-   opacity: 0
-   }
-   to {
-   opacity: 1
-   }
+@keyframes fadeInImage {
+   from { opacity: 0 }
+   to { opacity: 1 }
+}
+
+@-webkit-keyframes fadeOutContainer {
+   from { background-color: @colorGray14 }
+   to { background-color: transparent }
+}
+@keyframes fadeOutContainer {
+   from { background-color: @colorGray14 }
+   to { background-color: transparent }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f55acc3e933468c2f28872652607030b62ff22b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx 

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

[MediaWiki-commits] [Gerrit] Enable tinyrgb profile swapping for multimedia role - change (mediawiki/vagrant)

2016-02-12 Thread Gilles (Code Review)

Gilles has uploaded a new change for review.

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

Change subject: Enable tinyrgb profile swapping for multimedia role
..

Enable tinyrgb profile swapping for multimedia role

Bug: T126727
Change-Id: I237446142d754b33869d07861f1e390f709da588
---
M puppet/modules/role/manifests/multimedia.pp
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/65/270265/1

diff --git a/puppet/modules/role/manifests/multimedia.pp 
b/puppet/modules/role/manifests/multimedia.pp
index 2b6e453..0ea50d5 100644
--- a/puppet/modules/role/manifests/multimedia.pp
+++ b/puppet/modules/role/manifests/multimedia.pp
@@ -26,11 +26,12 @@
 require => Package['imagemagick'],
 values  => {
 # These are copied over from the Commons production configuration
-wgMaxImageArea   => 75e6,
-wgTiffMaxMetaSize=> 1048576,
-wgMaxAnimatedGifArea => 75e6,
-wgSharpenParameter   => '0x0.8',
-wgUseImageMagick => true,
+wgMaxImageArea   => 75e6,
+wgTiffMaxMetaSize=> 1048576,
+wgMaxAnimatedGifArea => 75e6,
+wgSharpenParameter   => '0x0.8',
+wgUseImageMagick => true,
+wgUseTinyRGBForJPGThumbnails => true,
 }
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Use new scrollIntoView method, now in surface - change (mediawiki...MobileFrontend)

2016-02-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: Use new scrollIntoView method, now in surface
..

Use new scrollIntoView method, now in surface

Change-Id: Ie5a9aa2ecb8aaae7c222dc5a34f75af324ef3c1b
Depends-On: I1416385253f6b5521cee9219a356a81d6238f234
---
M resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
1 file changed, 12 insertions(+), 11 deletions(-)


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

diff --git 
a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js 
b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
index ee05acc..42941a6 100644
--- a/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
+++ b/resources/mobile.editor.ve/ve.init.mw.MobileFrontendArticleTarget.js
@@ -101,20 +101,16 @@
 };
 
 /*
- * FIXME: @inheritdoc once this file is in the right repo
+ * Handle surface scroll events
  */
-ve.init.mw.MobileFrontendArticleTarget.prototype.scrollTo = function () {
-   // Parent method
-   ve.init.mw.MobileFrontendArticleTarget.super.prototype.scrollTo.apply( 
this, arguments );
+ve.init.mw.MobileFrontendArticleTarget.prototype.onSurfaceScroll = function () 
{
+   var nativeSelection, range;
 
-   var range, nativeSelection,
-   surface = this.getSurface();
-
-   if ( ve.init.platform.constructor.static.isIos() && surface ) {
+   if ( ve.init.platform.constructor.static.isIos() ) {
// iOS has another bug (!) where if you change the scroll 
offset of a
// contentEditable with a cursor visible it disappears, so 
remove and
// reapply the selection in that case.
-   nativeSelection = surface.getView().nativeSelection;
+   nativeSelection = this.getSurface().getView().nativeSelection;
if ( nativeSelection.rangeCount && 
document.activeElement.contentEditable === 'true' ) {
range = nativeSelection.getRangeAt(0);
nativeSelection.removeAllRanges();
@@ -127,6 +123,7 @@
  * FIXME: @inheritdoc once this file is in the right repo
  */
 ve.init.mw.MobileFrontendArticleTarget.prototype.createSurface = function ( 
dmDoc, config ) {
+   var surface;
if ( this.overlay.isNewPage ) {
config = ve.extendObject( {
placeholder: mw.msg( 
'mobile-frontend-editor-placeholder-new-page', mw.user )
@@ -134,7 +131,11 @@
}
 
// Parent method
-   return 
ve.init.mw.MobileFrontendArticleTarget.super.prototype.createSurface.call( 
this, dmDoc, config );
+   surface = 
ve.init.mw.MobileFrontendArticleTarget.super.prototype.createSurface.call( 
this, dmDoc, config );
+
+   surface.connect( this, { scroll: 'onSurfaceScroll' } );
+
+   return surface;
 };
 
 /*
@@ -169,7 +170,7 @@
surface = this.getSurface();
surface.setToolbarHeight( toolbarHeight );
this.$overlay.css( 'padding-top', toolbarHeight );
-   this.scrollCursorIntoView( surface );
+   this.getSurface().scrollCursorIntoView();
 };
 
 /*

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5a9aa2ecb8aaae7c222dc5a34f75af324ef3c1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Move scrollIntoView down into the surface - change (VisualEditor/VisualEditor)

2016-02-12 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

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

Change subject: [BREAKING CHANGE] Move scrollIntoView down into the surface
..

[BREAKING CHANGE] Move scrollIntoView down into the surface

We already tell the surface about toolbar height, we just need
to tell it the $scrollContainer and it can do the calculations
itself, instead of having the target reach in the surface.

Change-Id: I1416385253f6b5521cee9219a356a81d6238f234
---
M src/init/ve.init.Target.js
M src/ui/ve.ui.Surface.js
2 files changed, 58 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/66/270266/1

diff --git a/src/init/ve.init.Target.js b/src/init/ve.init.Target.js
index 09b54f7..9c6ab8b 100644
--- a/src/init/ve.init.Target.js
+++ b/src/init/ve.init.Target.js
@@ -296,6 +296,7 @@
  */
 ve.init.Target.prototype.getSurfaceConfig = function ( config ) {
return ve.extendObject( {
+   $scrollContainer: this.$scrollContainer,
includeCommands: this.constructor.static.includeCommands,
excludeCommands: OO.simpleArrayUnion(
this.constructor.static.excludeCommands,
@@ -317,8 +318,7 @@
var surface = this.createSurface( dmDoc, config );
this.surfaces.push( surface );
surface.getView().connect( this, {
-   focus: this.onSurfaceViewFocus.bind( this, surface ),
-   keyup: this.onSurfaceViewKeyUp.bind( this, surface )
+   focus: this.onSurfaceViewFocus.bind( this, surface )
} );
return surface;
 };
@@ -339,68 +339,6 @@
  */
 ve.init.Target.prototype.onSurfaceViewFocus = function ( surface ) {
this.setSurface( surface );
-};
-
-/**
- * Handle key up events from a surface's view
- *
- * @param {ve.ui.Surface} surface Surface firing the event
- */
-ve.init.Target.prototype.onSurfaceViewKeyUp = function ( surface ) {
-   this.scrollCursorIntoView( surface );
-};
-
-/**
- * Check if the toolbar is overlapping the surface
- *
- * @return {boolean} Toolbar is overlapping the surface
- */
-ve.init.Target.prototype.isToolbarOverSurface = function () {
-   return this.getToolbar().isFloating();
-};
-
-/**
- * Scroll the cursor into view.
- *
- * @param {ve.ui.Surface} surface Surface to scroll
- */
-ve.init.Target.prototype.scrollCursorIntoView = function ( surface ) {
-   var nativeRange, clientRect, cursorTop, scrollTo, toolbarBottom;
-
-   if ( !this.isToolbarOverSurface() ) {
-   return;
-   }
-
-   nativeRange = surface.getView().getNativeRange();
-   if ( !nativeRange ) {
-   return;
-   }
-
-   if ( OO.ui.contains( surface.getView().$pasteTarget[ 0 ], 
nativeRange.startContainer, true ) ) {
-   return;
-   }
-
-   clientRect = RangeFix.getBoundingClientRect( nativeRange );
-   if ( !clientRect ) {
-   return;
-   }
-
-   cursorTop = clientRect.top - 5;
-   toolbarBottom = this.getSurface().toolbarHeight;
-
-   if ( cursorTop < toolbarBottom ) {
-   scrollTo = this.$scrollContainer.scrollTop() + cursorTop - 
toolbarBottom;
-   this.scrollTo( scrollTo );
-   }
-};
-
-/**
- * Scroll the scroll container to a specific offset
- *
- * @param {number} offset Scroll offset
- */
-ve.init.Target.prototype.scrollTo = function ( offset ) {
-   this.$scrollContainer.scrollTop( offset );
 };
 
 /**
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 2c576ad..b92ab98 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -14,6 +14,7 @@
  * @constructor
  * @param {HTMLDocument|Array|ve.dm.LinearData|ve.dm.Document} dataOrDoc 
Document data to edit
  * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$scrollContainer] The scroll container of the surface
  * @cfg {string[]|null} [includeCommands] List of commands to include, null 
for all registered commands
  * @cfg {string[]} [excludeCommands] List of commands to exclude
  * @cfg {Object} [importRules] Import rules
@@ -29,6 +30,7 @@
ve.ui.Surface.super.call( this, config );
 
// Properties
+   this.$scrollContainer = config.$scrollContainer || $( 
this.getElementWindow() );
this.inDialog = config.inDialog || '';
this.globalOverlay = new ve.ui.Overlay( { classes: [ 
've-ui-overlay-global' ] } );
this.localOverlay = new ve.ui.Overlay( { classes: [ 
've-ui-overlay-local' ] } );
@@ -69,6 +71,7 @@
} );
 
// Events
+   this.getView().connect( this, { keyup: 'scrollCursorIntoView' } );
this.getModel().getDocument().connect( this, { transact: 
'onDocumentTransact' } );
 
// Initialization
@@ -91,6 +94,12 @@
  * When a surface is destroyed.
  *
  * @event destroy
+ */
+
+/**
+ * The surface was scrolled programmatically
+ *
+ * @event

[MediaWiki-commits] [Gerrit] [IMPR] use wikistats lib to update languages_by_size - change (pywikibot/core)

2016-02-12 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: [IMPR] use wikistats lib to update languages_by_size
..

[IMPR] use wikistats lib to update languages_by_size

Change-Id: Iad218316ccd439c38106a1def29c2284c68356f1
---
M scripts/maintenance/wikimedia_sites.py
1 file changed, 9 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/69/270269/1

diff --git a/scripts/maintenance/wikimedia_sites.py 
b/scripts/maintenance/wikimedia_sites.py
index 8f0fcc6..fa096ba 100755
--- a/scripts/maintenance/wikimedia_sites.py
+++ b/scripts/maintenance/wikimedia_sites.py
@@ -2,8 +2,8 @@
 # -*- coding: utf-8  -*-
 """Script that updates the language lists in Wikimedia family files."""
 #
-# (C) xqt, 2009-2014
-# (C) Pywikibot team, 2008-2014
+# (C) xqt, 2009-2016
+# (C) Pywikibot team, 2008-2016
 #
 # Distributed under the terms of the MIT license.
 #
@@ -16,10 +16,9 @@
 import re
 import sys
 
-from xml.etree import cElementTree
-
 import pywikibot
 
+from pywikibot.data import wikistats
 from pywikibot.family import Family
 
 if sys.version_info[0] > 2:
@@ -51,16 +50,12 @@
 original = Family.load(family).languages_by_size
 obsolete = Family.load(family).obsolete
 
-feed = urlopen(URL % familiesDict[family])
-tree = cElementTree.parse(feed)
-
 new = []
-for field in tree.findall('row/field'):
-if field.get('name') == 'prefix':
-code = field.text
-if not (code in obsolete or code in exceptions):
-new.append(code)
-continue
+ws = wikistats.WikiStats()
+table = ws.languages_by_size(family)
+for code in table:
+if not (code in obsolete or code in exceptions):
+new.append(code)
 
 # put the missing languages to the right place
 missing = original != new and set(original) - set(new)
@@ -104,7 +99,7 @@
 
 if __name__ == '__main__':
 fam = []
-for arg in pywikibot.handleArgs():
+for arg in pywikibot.handle_args():
 if arg in familiesDict.keys() and arg not in fam:
 fam.append(arg)
 update_family(fam)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad218316ccd439c38106a1def29c2284c68356f1
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] updated url parsing for node4 - change (mediawiki...graphoid)

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

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

Change subject: updated url parsing for node4
..


updated url parsing for node4

Change-Id: I76230ad7508290e89d0b5eae9bda451e1a52789f
---
M lib/vega2.js
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/lib/vega2.js b/lib/vega2.js
index 8e02032..5c1a42f 100644
--- a/lib/vega2.js
+++ b/lib/vega2.js
@@ -42,7 +42,7 @@
 // Workaround: urllib does not support relative URLs, add a temp 
protocol
 url = 'temp:' + url;
 }
-var urlParts = urllib.parse(url);
+var urlParts = urllib.parse(url, true);
 if (isRelativeUrl) {
 delete urlParts.protocol;
 } else if (urlParts.protocol && 
urlParts.protocol[urlParts.protocol.length - 1] === ':') {
@@ -53,6 +53,7 @@
 delete urlParts.path;
 delete urlParts.href;
 delete urlParts.port;
+delete urlParts.search;
 if (!urlParts.host || urlParts.host === '') {
 urlParts.host = opt.domain;
 // for some protocols, default host name is resolved differently

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76230ad7508290e89d0b5eae9bda451e1a52789f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: Yurik 
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: Update loginlogo - change (operations/puppet)

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

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: otrs: Update loginlogo
..

otrs: Update loginlogo

Use a better version of OTRS login logo. Amend the filename as well to
remove the default word for it.

Bug: T125911
Change-Id: I4390594711c24bd7814db1ef87a516eae9d6ccc1
---
D modules/otrs/files/loginlogo_default_wmf.png
A modules/otrs/files/loginlogo_wmf.png
M modules/otrs/manifests/init.pp
3 files changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/otrs/files/loginlogo_default_wmf.png 
b/modules/otrs/files/loginlogo_default_wmf.png
deleted file mode 100644
index 658d68c..000
--- a/modules/otrs/files/loginlogo_default_wmf.png
+++ /dev/null
Binary files differ
diff --git a/modules/otrs/files/loginlogo_wmf.png 
b/modules/otrs/files/loginlogo_wmf.png
new file mode 100644
index 000..31d2d0f
--- /dev/null
+++ b/modules/otrs/files/loginlogo_wmf.png
Binary files differ
diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index d042a81..13b7d41 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -131,7 +131,7 @@
 owner  => 'otrs',
 group  => 'www-data',
 mode   => '0664',
-source => 'puppet:///modules/otrs/loginlogo_default_wmf.png',
+source => 'puppet:///modules/otrs/loginlogo_wmf.png',
 }
 
 # TODO: Remove the safeguard once we are jessie only

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4390594711c24bd7814db1ef87a516eae9d6ccc1
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: Replace logo_bg_wmf.png with transparent one - change (operations/puppet)

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

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: otrs: Replace logo_bg_wmf.png with transparent one
..

otrs: Replace logo_bg_wmf.png with transparent one

Get a better version of the wikimedia OTRS background logo

Bug: T125912
Change-Id: Ic349d52a249c21182d242f8519ecc7c69e1be66b
---
M modules/otrs/files/logo_bg_wmf.png
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/73/270273/1

diff --git a/modules/otrs/files/logo_bg_wmf.png 
b/modules/otrs/files/logo_bg_wmf.png
index ab28351..d4058f2 100644
--- a/modules/otrs/files/logo_bg_wmf.png
+++ b/modules/otrs/files/logo_bg_wmf.png
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic349d52a249c21182d242f8519ecc7c69e1be66b
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] ApiTasksBase: needToken by default + bs.api.tasks - change (mediawiki...BlueSpiceFoundation)

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

Robert Vogel has uploaded a new change for review.

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

Change subject: ApiTasksBase: needToken by default + bs.api.tasks
..

ApiTasksBase: needToken by default + bs.api.tasks

To enhance security we've decided to enable 'needToken' on task APIs by
default. To ease development there is now a new method 'bs.api.tasks.exec'
that handles most details of the call. Including standard error handling.

Change-Id: I7547b713dd229bc997d66c1992399ef2f3cdf08c
---
M i18n/api/en.json
M i18n/api/qqq.json
M includes/api/BSApiTasksBase.php
M resources/Resources.php
A resources/bluespice/bluespice.api.js
5 files changed, 129 insertions(+), 2 deletions(-)


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

diff --git a/i18n/api/en.json b/i18n/api/en.json
index a6014c5..9a5dbb9 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -22,6 +22,8 @@
"apihelp-bs-task-param-taskdata": "JSON string encoded object with 
arbitrary data for the task",
"apihelp-bs-task-param-format": "The format of the result",
"bs-wikipage-tasks-error-contentmodel" : "The task could not be 
perfomed with the content model of the provided page.",
+   "apihelp-bs-task-param-format": "The format of the result",
+   "apihelp-bs-task-param-token": "The token required to access the API 
module"
"bs-wikipage-tasks-error-page-not-valid" : "The provided page is not 
valid.",
"bs-wikipage-tasks-setcategories-edit-summary": "Changed categories.",
"bs-wikipage-tasks-error-page-edit-not-allowed": "You are not allowed 
to edit page '$1'.",
diff --git a/i18n/api/qqq.json b/i18n/api/qqq.json
index 7de7e4d..2a454d1 100644
--- a/i18n/api/qqq.json
+++ b/i18n/api/qqq.json
@@ -21,7 +21,9 @@
"apihelp-bs-task-param-task": "Describes the task parameter 
of the API module",
"apihelp-bs-task-param-taskdata": "Describes the taskData 
parameter of the API module",
"apihelp-bs-task-param-format": "Describes the format 
parameter of the API module\n\n{{msg-mw|Bs-store-param-format}}",
+   "apihelp-bs-task-param-format": "Describes the format 
parameter of the API module\n\n{{msg-mw|Bs-store-param-format}}",
"bs-wikipage-tasks-error-contentmodel" : "An error message in case that 
the task was not supported by the content model of the provided page",
+   "apihelp-bs-task-param-token": "Describes the token 
parameter of the API module"
"bs-wikipage-tasks-error-page-not-valid" : "An error message in case 
that the provided page was not valid",
"bs-wikipage-tasks-setcategories-edit-summary": "The summary of an edit 
made by the bs-wikipage-tasks API setCategories task",
"bs-wikipage-tasks-error-page-edit-not-allowed": "An error message that 
occurs if a user is not allowed to edit page with name '$1'.\n\nParameters:\n* 
$1 - a page title",
diff --git a/includes/api/BSApiTasksBase.php b/includes/api/BSApiTasksBase.php
index 3523871..e9f83ee 100644
--- a/includes/api/BSApiTasksBase.php
+++ b/includes/api/BSApiTasksBase.php
@@ -80,7 +80,10 @@
$oResult->message = wfMessage( 'bs-readonly', 
$wgReadOnly )->plain();
}
else {
-   $oResult = $this->$sMethod( 
$this->getParameter('taskData'), $aParams );
+   $oTaskData = $this->getParameter('taskData');
+   Hooks::run( 'BSApiTasksBaseBeforeExecuteTask', 
array( $this, $sTask, &$oTaskData , &$aParams ) );
+   $oResult = $this->$sMethod( $oTaskData , 
$aParams );
+   Hooks::run( 'BSApiTasksBaseAfterExecuteTask', 
array( $this, $sTask, &$oResult, $oTaskData , $aParams ) );
}
}
 
@@ -206,6 +209,11 @@
ApiBase::PARAM_DFLT => 'json',
ApiBase::PARAM_TYPE => array( 'json', 'jsonfm' 
),
10 /*ApiBase::PARAM_HELP_MSG*/ => 
'apihelp-bs-task-param-format',
+   ),
+   'token' => array(
+   ApiBase::PARAM_TYPE => 'string',
+   ApiBase::PARAM_REQUIRED => true,
+   10 /*ApiBase::PARAM_HELP_MSG*/ => 
'apihelp-bs-task-param-token',
)
);
}
@@ -276,4 +284,12 @@
protected function getRequiredTaskPermissions() {
return array();
}
+
+   /**
+* General protection
+* @return boolean
+*/
+   public function needsToken() {
+   return true;
+   }
 }
diff --git a/resources/Resources.php b/resources/Resources.php
index ba2df32..69c58a5 100644
--- a/resources/Resources.php
+++

[MediaWiki-commits] [Gerrit] Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the... - change (operations...openssl)

2016-02-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the 
1.0.2 branch to fix spurious log messages if SSL clients quit during the SSL 
handshake
..


Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the 1.0.2
branch to fix spurious log messages if SSL clients quit during the
SSL handshake

Bug: T126616
Change-Id: I5d98aabf09f178620b28bd47a3416b064e643b42
---
M debian/changelog
A debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch
M debian/patches/series
3 files changed, 108 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 961289f..1c3f876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssl (1.0.2f-1~wmf3) jessie-wikimedia; urgency=medium
+
+  * Cherrypick 64193c8218540499984cd63cda41f3cd491f3f59 from the 1.0.2
+branch to fix spurious log messages if SSL clients quit during the
+SSL handshake (Bug: T126616)
+
+ -- Moritz Muehlenhoff   Fri, 12 Feb 2016 11:32:31 
+0100
+
 openssl (1.0.2f-1~wmf2) jessie-wikimedia; urgency=medium
 
   * Correct target distribution
diff --git 
a/debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch 
b/debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch
new file mode 100644
index 000..7dc9f8b
--- /dev/null
+++ 
b/debian/patches/handle-ssl-shutdown-while-in-init-more-appropriately-v2.patch
@@ -0,0 +1,99 @@
+From 64193c8218540499984cd63cda41f3cd491f3f59 Mon Sep 17 00:00:00 2001
+From: Matt Caswell 
+Date: Tue, 2 Feb 2016 10:05:43 +
+Subject: [PATCH] Handle SSL_shutdown while in init more appropriately #2
+
+Previous commit f73c737c7 attempted to "fix" a problem with the way
+SSL_shutdown() behaved whilst in mid-handshake. The original behaviour had
+SSL_shutdown() return immediately having taken no action if called mid-
+handshake with a return value of 1 (meaning everything was shutdown
+successfully). In fact the shutdown has not been successful.
+
+Commit f73c737c7 changed that to send a close_notify anyway and then
+return. This seems to be causing some problems for some applications so
+perhaps a better (much simpler) approach is revert to the previous
+behaviour (no attempt at a shutdown), but return -1 (meaning the shutdown
+was not successful).
+
+This also fixes a bug where SSL_shutdown always returns 0 when shutdown
+*very* early in the handshake (i.e. we are still using SSLv23_method).
+
+Reviewed-by: Viktor Dukhovni 
+---
+ ssl/s3_lib.c  | 15 ---
+ ssl/ssl.h |  1 -
+ ssl/ssl_err.c |  1 -
+ ssl/ssl_lib.c |  7 ++-
+ 4 files changed, 6 insertions(+), 18 deletions(-)
+
+diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
+index f846cb5..6a06625 100644
+--- a/ssl/s3_lib.c
 b/ssl/s3_lib.c
+@@ -4326,21 +4326,6 @@ int ssl3_shutdown(SSL *s)
+ }
+ #endif
+ } else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN)) {
+-if (SSL_in_init(s)) {
+-/*
+- * We can't shutdown properly if we are in the middle of a
+- * handshake. Doing so is problematic because the peer may send a
+- * CCS before it acts on our close_notify. However we should not
+- * continue to process received handshake messages or CCS once our
+- * close_notify has been sent. Therefore any close_notify from
+- * the peer will be unreadable because we have not moved to the 
next
+- * cipher state. Its best just to avoid this can-of-worms. Return
+- * an error if we are wanting to wait for a close_notify from the
+- * peer and we are in init.
+- */
+-SSLerr(SSL_F_SSL3_SHUTDOWN, SSL_R_SHUTDOWN_WHILE_IN_INIT);
+-return -1;
+-}
+ /*
+  * If we are waiting for a close from our peer, we are closed
+  */
+diff --git a/ssl/ssl.h b/ssl/ssl.h
+index ae8c925..04d4007 100644
+--- a/ssl/ssl.h
 b/ssl/ssl.h
+@@ -2713,7 +2713,6 @@ void ERR_load_SSL_strings(void);
+ # define SSL_F_SSL3_SETUP_KEY_BLOCK   157
+ # define SSL_F_SSL3_SETUP_READ_BUFFER 156
+ # define SSL_F_SSL3_SETUP_WRITE_BUFFER291
+-# define SSL_F_SSL3_SHUTDOWN  396
+ # define SSL_F_SSL3_WRITE_BYTES   158
+ # define SSL_F_SSL3_WRITE_PENDING 159
+ # define SSL_F_SSL_ADD_CERT_CHAIN 318
+diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
+index dd3b2af..704088d 100644
+--- a/ssl/ssl_err.c
 b/ssl/ssl_err.c
+@@ -206,7 +206,6 @@ static ERR_STRING_DATA SSL_str_functs[] = {
+ {ERR_FUNC(SSL_F_SSL3_SETUP_KEY_BLOCK), "ssl3_setup_key_block"},
+

[MediaWiki-commits] [Gerrit] Fix: Call to undefined function CirrusSearch\Search\getScore() - change (mediawiki...CirrusSearch)

2016-02-12 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Fix: Call to undefined function CirrusSearch\Search\getScore()
..

Fix: Call to undefined function CirrusSearch\Search\getScore()

Change-Id: I5aaed5125c7299ae795dd1ad99b59dd5ef287906
---
M includes/Search/Result.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/58/270258/1

diff --git a/includes/Search/Result.php b/includes/Search/Result.php
index 8cf6e20..4908f5b 100644
--- a/includes/Search/Result.php
+++ b/includes/Search/Result.php
@@ -94,7 +94,7 @@
if ( isset( $highlights[ 'category' ] ) ) {
$this->categorySnippet = $this->escapeHighlightedText( 
$highlights[ 'category' ][ 0 ] );
}
-   $this->score = $result-getScore();
+   $this->score = $result->getScore();
$this->explanation = $result->getExplanation();
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5aaed5125c7299ae795dd1ad99b59dd5ef287906
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
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] Completion suggester: add support for the offset param - change (mediawiki...CirrusSearch)

2016-02-12 Thread DCausse (Code Review)

DCausse has uploaded a new change for review.

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

Change subject: Completion suggester: add support for the offset param
..

Completion suggester: add support for the offset param

The hack is to fetch offset+limit.
Added a hard limit to prevent scrolling to far.

Change-Id: Ia6f5abeb3b623736fcc07df498ddc1cf2691e445
---
M CirrusSearch.php
M includes/CirrusSearch.php
M includes/CompletionSuggester.php
3 files changed, 51 insertions(+), 9 deletions(-)


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

diff --git a/CirrusSearch.php b/CirrusSearch.php
index e289e78..319ab04 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -765,6 +765,13 @@
 $wgCirrusSearchUseCompletionSuggester = false;
 
 /**
+ * Maximum number of results to ask from the elasticsearch completion
+ * api, note that this value will be multiplied by fetch_limit_factor
+ * set in Completion profiles (default to 2)
+ */
+$wgCirrusSearchCompletionSuggesterHardLimit = 50;
+
+/**
  * Try to recycle the completion suggester, if the wiki is small
  * it's certainly better to not re-create the index from scratch
  * since index creation is costly. Recycling the index will prevent
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index ae7d50c..0003250 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -394,7 +394,8 @@
// offset is omitted, searchSuggestion does not support
// scrolling results
$suggester = new CompletionSuggester( $this->connection, 
$this->limit,
-   $config, $this->namespaces, null, 
$this->indexBaseName );
+   $this->offset, $config, $this->namespaces, null,
+   $this->indexBaseName );
 
$response = $suggester->suggest( $search, $variants );
if ( $response->isOK() ) {
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index d256dac..8828da7 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -106,6 +106,11 @@
private $limit;
 
/**
+* @var integer offset
+*/
+   private $offset;
+
+   /**
 * @var string index base name to use
 */
private $indexBaseName;
@@ -136,7 +141,7 @@
 * @param string|boolean $index Base name for index to search from, 
defaults to wfWikiId()
 * @throws \ConfigException
 */
-   public function __construct( Connection $conn, $limit, SearchConfig 
$config = null, array $namespaces = null,
+   public function __construct( Connection $conn, $limit, $offset = 0, 
SearchConfig $config = null, array $namespaces = null,
User $user = null, $index = false ) {
 
if ( is_null( $config ) ) {
@@ -148,6 +153,7 @@
parent::__construct( $conn, $user, $config->get( 
'CirrusSearchSlowSearch' ) );
$this->config = $config;
$this->limit = $limit;
+   $this->offset = $offset;
$this->indexBaseName = $index ?: $config->getWikiId();
$this->searchContext = new SearchContext( $this->config, 
$namespaces );
}
@@ -189,8 +195,7 @@
try {
$result = $index->request( "_suggest", 
Request::POST, $suggest, $queryOptions );
if( $result->isOk() ) {
-   $result = 
$searcher->postProcessSuggest( $result,
-   $profiles, $this->limit 
);
+   $result = 
$searcher->postProcessSuggest( $result, $profiles );
return $searcher->success( 
$result );
}
return $result;
@@ -293,7 +298,7 @@
'text' => $query,
'completion' => array(
'field' => $field,
-   'size' => $this->limit * 
$config['fetch_limit_factor']
+   'size' => ($this->limit + $this->offset) * 
$config['fetch_limit_factor']
)
);
if ( isset( $config['fuzzy'] ) ) {
@@ -383,11 +388,12 @@
 * @param int $limit Maximum suggestions to return, -1 for unlimited
 * @return SearchSuggestionSet a set of Suggestions
 */
-   protected function postProcessSuggest( \Elastica\Response $response, 
$profiles, $limit = -1 ) {
+   protected function postProcessSuggest( \Elastica\Response $response, 
$profiles ) {
$this->logContext['elasticTookMs'] = intval(

[MediaWiki-commits] [Gerrit] Update languages_by_size from core - change (pywikibot/compat)

2016-02-12 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: Update languages_by_size from core
..

Update languages_by_size from core

Change-Id: I469fe784520511d40298cdb74449602756d40b7d
---
M families/wikipedia_family.py
M families/wikiquote_family.py
M families/wikisource_family.py
M families/wiktionary_family.py
4 files changed, 21 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat 
refs/changes/72/270272/1

diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index aee512a..1624a46 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -21,30 +21,30 @@
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'fa', 'no', 'sh', 'ar', 'fi',
 'hu', 'id', 'ro', 'cs', 'ko', 'sr', 'ms', 'tr', 'eu', 'eo', 'min',
 'da', 'kk', 'bg', 'sk', 'hy', 'he', 'lt', 'hr', 'sl', 'et', 'uz',
-'gl', 'nn', 'la', 'zh-min-nan', 'vo', 'ce', 'simple', 'el', 'be',
+'gl', 'zh-min-nan', 'nn', 'la', 'vo', 'ce', 'simple', 'el', 'be',
 'ka', 'az', 'ur', 'hi', 'th', 'oc', 'mk', 'ta', 'mg', 'new', 'cy',
 'tt', 'bs', 'lv', 'te', 'tl', 'pms', 'be-tarask', 'br', 'ky', 'ht',
-'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'is',
-'pnb', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 
'an',
+'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'pnb',
+'is', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 'an',
 'yo', 'ne', 'io', 'gu', 'scn', 'bpy', 'nds', 'ku', 'pa', 'als',
 'kn', 'qu', 'ia', 'su', 'bar', 'ckb', 'mn', 'arz', 'bat-smg', 
'nap',
 'bug', 'wa', 'gd', 'yi', 'am', 'map-bms', 'mzn', 'fo', 'si', 'nah',
-'li', 'sah', 'vec', 'hsb', 'or', 'os', 'mrj', 'sa', 'roa-tara',
-'mhr', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif', 'eml',
-'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue', 'bo',
-'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 'sd', 
'gv',
-'km', 'crh', 'kv', 'szl', 'wuu', 'frr', 'zea', 'zh-classical', 
'as',
-'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad', 'rm',
-'ie', 'mt', 'fur', 'pcd', 'gn', 'lij', 'dsb', 'dv', 'cbk-zam',
+'li', 'vec', 'sah', 'hsb', 'or', 'os', 'mrj', 'sa', 'mhr',
+'roa-tara', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif',
+'eml', 'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue',
+'bo', 'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 
'sd',
+'gv', 'km', 'crh', 'szl', 'kv', 'wuu', 'frr', 'zea', 
'zh-classical',
+'as', 'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad',
+'ie', 'rm', 'mt', 'fur', 'pcd', 'gn', 'dsb', 'lij', 'dv', 
'cbk-zam',
 'myv', 'nso', 'ksh', 'ext', 'ang', 'gag', 'mwl', 'lez', 'ace', 
'ug',
 'kab', 'pi', 'pag', 'nv', 'sn', 'frp', 'av', 'ln', 'pfl', 'haw',
-'xal', 'krc', 'gom', 'kaa', 'mai', 'rw', 'pdc', 'to', 'bxr', 'kl',
+'xal', 'krc', 'gom', 'mai', 'kaa', 'rw', 'pdc', 'to', 'bxr', 'kl',
 'nov', 'arc', 'kbd', 'bjn', 'lo', 'ha', 'tet', 'pap', 'tpi', 'tyv',
-'na', 'lbe', 'jbo', 'roa-rup', 'mdf', 'ty', 'kg', 'za', 'ig', 'wo',
+'na', 'lbe', 'jbo', 'roa-rup', 'ty', 'mdf', 'kg', 'za', 'ig', 'wo',
 'srn', 'ki', 'ab', 'ltg', 'zu', 'lg', 'om', 'rmy', 'chy', 'cu',
 'tw', 'tn', 'chr', 'rn', 'bi', 'pih', 'xh', 'tum', 'got', 'sm',
 'ss', 'pnt', 'ch', 'bm', 'iu', 'ee', 'st', 'ts', 'ks', 'fj', 'ak',
-'sg', 'ik', 've', 'ff', 'ti', 'ny', 'dz', 'cr',
+'sg', 'ik', 've', 'ff', 'ny', 'ti', 'dz', 'cr',
 ]
 
 self.langs = dict([(lang, '%s.wikipedia.org' % lang)
diff --git a/families/wikiquote_family.py b/families/wikiquote_family.py
index 543f076..9d48df4 100644
--- a/families/wikiquote_family.py
+++ b/families/wikiquote_family.py
@@ -21,8 +21,8 @@
 'bs', 'uk', 'tr', 'lt', 'bg', 'he', 'ca', 'sl', 'eo', 'el', 'nn',
 'id', 'zh', 'hr', 'hy', 'th', 'hu', 'li', 'nl', 'su', 'ko', 'ja',
 'sv', 'ur', 'te', 'ar', 'fi', 'cy', 'az', 'la', 'no', 'gl', 'ml',
-'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'sa', 'da', 'is',
-'vi', 'be', 'hi', 'sq', 'gu', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
+'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'da', 'sa', 'is',
+'gu', 'vi', 'be', 'hi', 'sq', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
 'am', 'wo', 'ky',
 ]
 
diff --git a/families/wikisource_family.py b/families/wikisource_family.py
index 498b62a..cfd5390 100644
--- a/families/wikisource_family.py
+++ b/families/wikisource_family.py
@@ -18,9 +18,9 @@

[MediaWiki-commits] [Gerrit] Fix multiple definition of /var/lib/puppet - change (operations/puppet)

2016-02-12 Thread Ema (Code Review)

Ema has uploaded a new change for review.

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

Change subject: Fix multiple definition of /var/lib/puppet
..

Fix multiple definition of /var/lib/puppet

We introduced a definition of File[/var/lib/puppet] in
https://gerrit.wikimedia.org/r/#/c/268684/.

However, File[/var/lib/puppet] was already defined in puppetmaster::ssl.

This patch introduces a new class called base::puppet::common which is
then included by base::puppet as well as puppetmaster::ssl to fix the
issue.

Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
---
M modules/base/manifests/puppet.pp
M modules/puppetmaster/manifests/ssl.pp
2 files changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/270263/1

diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 0458c4e..cf0b4b9 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -90,14 +90,7 @@
 source => 'puppet:///modules/base/logrotate/puppet',
 }
 
-# Mode 0751 to make sure non-root users can access
-# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
-file { '/var/lib/puppet':
-ensure => directory,
-owner  => 'puppet',
-group  => 'puppet',
-mode   => '0751',
-}
+include base::puppet::common
 
 file { '/usr/local/bin/puppet-enabled':
 mode   => '0555',
@@ -112,3 +105,14 @@
 source   => 'puppet:///modules/base/puppet/97-last-puppet-run',
 }
 }
+
+class base::puppet::common {
+# Mode 0751 to make sure non-root users can access
+# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
+file { '/var/lib/puppet':
+ensure => directory,
+owner  => 'puppet',
+group  => 'puppet',
+mode   => '0751',
+}
+}
diff --git a/modules/puppetmaster/manifests/ssl.pp 
b/modules/puppetmaster/manifests/ssl.pp
index ea9086f..de2ee88 100644
--- a/modules/puppetmaster/manifests/ssl.pp
+++ b/modules/puppetmaster/manifests/ssl.pp
@@ -14,6 +14,8 @@
 $before = undef
 }
 
+include base::puppet::common
+
 # Move the puppetmaster's SSL files to a separate directory from the client
 file {
 [ '/var/lib/puppet/server',
@@ -25,7 +27,6 @@
 mode=> '0771',
 before  => $before;
 [
-'/var/lib/puppet',
 "${ssldir}/ca",
 "${ssldir}/certificate_requests",
 "${ssldir}/certs",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
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] swiftrepl: name-based filter for objects - change (operations/software)

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

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swiftrepl: name-based filter for objects
..


swiftrepl: name-based filter for objects

this can be used for example to limit the scope of replication, e.g. to
particular thumbnails only

Bug: T125791
Change-Id: I88f97f282d9197e78340e05a2849500e311b09e6
---
M swiftrepl/swiftrepl.py
1 file changed, 37 insertions(+), 12 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  Mark Bergsma: Looks good to me, but someone else must approve



diff --git a/swiftrepl/swiftrepl.py b/swiftrepl/swiftrepl.py
index 7a180dc..10b8a29 100644
--- a/swiftrepl/swiftrepl.py
+++ b/swiftrepl/swiftrepl.py
@@ -285,10 +285,10 @@
 else:
 print "Created container", name
 
-def sync_container(srccontainer, srcconnpool, dstconnpool):
+def sync_container(srccontainer, srcconnpool, dstconnpool, filename_regexp):
 
 last = ''
-hits, processed, gets = 0, 0, 0
+hits, processed, gets, skipped = 0, 0, 0, 0
 
 dstconn = dstconnpool.get()
 try:
@@ -315,8 +315,11 @@
 break
 
 for srcobj in srcobjects:
-processed += 1
 objname = srcobj.name.encode("ascii", errors="ignore")
+if filename_regexp is not None and not 
filename_regexp.match(objname):
+skipped += 1
+continue
+processed += 1
 last = srcobj.name.encode("utf-8")
 msg = "%s\t%s\t%s\t%s\t%s" % (srccontainer.name, srcobj.etag, 
srcobj.size, objname, srcobj.last_modified)
 try:
@@ -347,11 +350,14 @@
 replicate_object(srcobj, dstobj, srcconnpool, dstconnpool)
 
 pct = lambda x, y: y != 0 and int(float(x) / y * 100) or 0
-print ("STATS: %s processed: %d/%d (%d%%), hit rate: %d%%" %
+print ("STATS: %s processed: %d/%d (%d%%), hit rate: %d%%, skipped 
%d/%d (%d%%)" %
(srccontainer.name,
 processed, srccontainer.object_count,
 pct(processed, srccontainer.object_count),
-pct(hits, processed)))
+pct(hits, processed),
+skipped, srccontainer.object_count,
+pct(skipped, srccontainer.object_count),
+))
 
 if len(srcobjects) < NOBJECT:
 break
@@ -408,7 +414,7 @@
 srcconnpool.put(srccontainer.conn)
 srccontainer.conn = None
 
-def sync_deletes(srccontainer, srcconnpool, dstconnpool):
+def sync_deletes(srccontainer, srcconnpool, dstconnpool, filename_regexp):
 
 dstconn = dstconnpool.get()
 try:
@@ -424,7 +430,7 @@
 srclimit = int(srclimit * 1.2)
 
 last = ''
-deletes, processed = 0, 0
+deletes, processed, skipped = 0, 0, 0
 while True:
 
 dstobjects = get_container_objects(dstcontainer, limit=dstlimit, 
marker=last, connpool=dstconnpool)
@@ -440,6 +446,9 @@
 diff = dstset - srcset
 
 for dstname in diff:
+if filename_regexp is not None and not 
filename_regexp.match(dstname):
+skipped += 1
+continue
 # do a HEAD to make sure it's gone
 srccontainer.conn = srcconnpool.get()
 try:
@@ -463,11 +472,14 @@
 processed += len(dstobjects)
 
 pct = lambda x, y: y != 0 and int(float(x) / y * 100) or 0
-print ("STATS: %s processed: %d/%d (%d%%), deleted: %d" %
+print ("STATS: %s processed: %d/%d (%d%%), deleted: %d, skipped %d/%d 
(%d%%)" %
(srccontainer.name,
 processed, dstcontainer.object_count,
 pct(processed, dstcontainer.object_count),
-deletes))
+deletes,
+skipped, dstcontainer.object_count,
+pct(skipped, dstcontainer.object_count),
+))
 
 if len(dstobjects) < dstlimit:
 break
@@ -482,9 +494,11 @@
 break
 
 if options.sync_deletes:
-sync_deletes(container, kwargs['srcconnpool'], 
kwargs['dstconnpool'])
+sync_deletes(container, kwargs['srcconnpool'],
+kwargs['dstconnpool'], kwargs['filename_regexp'])
 else:
-sync_container(container, kwargs['srcconnpool'], 
kwargs['dstconnpool'])
+sync_container(container, kwargs['srcconnpool'],
+kwargs['dstconnpool'], kwargs['filename_regexp'])
 
 if not options.once:  # once
 containers.append(container)
@@ -521,6 +535,7 @@
 parser.add_argument('--sync-deletes', '-d', dest='sync_deletes', 
action='store_true', default=False)
 parser.add_argument('--container-set', dest='container_set', metavar='SET')
 parser.add_argument('--container-regexp', dest='container_regexp', 
metavar='REGEXP')
+parser.add_argument('--filename-regexp',

[MediaWiki-commits] [Gerrit] Update languages_by_size - change (pywikibot/core)

2016-02-12 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: Update languages_by_size
..

Update languages_by_size

Change-Id: I4faa53dfa261dc8656d7f92d2e40c21dd39b7a86
---
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wiktionary_family.py
4 files changed, 22 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/68/270268/1

diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index b8a1801..6d8eb43 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -55,30 +55,30 @@
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'fa', 'no', 'sh', 'ar', 'fi',
 'hu', 'id', 'ro', 'cs', 'ko', 'sr', 'ms', 'tr', 'eu', 'eo', 'min',
 'da', 'kk', 'bg', 'sk', 'hy', 'he', 'lt', 'hr', 'sl', 'et', 'uz',
-'gl', 'nn', 'la', 'zh-min-nan', 'vo', 'ce', 'simple', 'el', 'be',
+'gl', 'zh-min-nan', 'nn', 'la', 'vo', 'ce', 'simple', 'el', 'be',
 'ka', 'az', 'ur', 'hi', 'th', 'oc', 'mk', 'ta', 'mg', 'new', 'cy',
 'tt', 'bs', 'lv', 'te', 'tl', 'pms', 'be-tarask', 'br', 'ky', 'ht',
-'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'is',
-'pnb', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 
'an',
+'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'pnb',
+'is', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 'an',
 'yo', 'ne', 'io', 'gu', 'scn', 'bpy', 'nds', 'ku', 'pa', 'als',
 'kn', 'qu', 'ia', 'su', 'bar', 'ckb', 'mn', 'arz', 'bat-smg', 
'nap',
 'bug', 'wa', 'gd', 'yi', 'am', 'map-bms', 'mzn', 'fo', 'si', 'nah',
-'li', 'sah', 'vec', 'hsb', 'or', 'os', 'mrj', 'sa', 'roa-tara',
-'mhr', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif', 'eml',
-'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue', 'bo',
-'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 'sd', 
'gv',
-'km', 'crh', 'kv', 'szl', 'wuu', 'frr', 'zea', 'zh-classical', 
'as',
-'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad', 'rm',
-'ie', 'mt', 'fur', 'pcd', 'gn', 'lij', 'dsb', 'dv', 'cbk-zam',
+'li', 'vec', 'sah', 'hsb', 'or', 'os', 'mrj', 'sa', 'mhr',
+'roa-tara', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif',
+'eml', 'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue',
+'bo', 'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 
'sd',
+'gv', 'km', 'crh', 'szl', 'kv', 'wuu', 'frr', 'zea', 
'zh-classical',
+'as', 'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad',
+'ie', 'rm', 'mt', 'fur', 'pcd', 'gn', 'dsb', 'lij', 'dv', 
'cbk-zam',
 'myv', 'nso', 'ksh', 'ext', 'ang', 'gag', 'mwl', 'lez', 'ace', 
'ug',
 'kab', 'pi', 'pag', 'nv', 'sn', 'frp', 'av', 'ln', 'pfl', 'haw',
-'xal', 'krc', 'gom', 'kaa', 'mai', 'rw', 'pdc', 'to', 'bxr', 'kl',
+'xal', 'krc', 'gom', 'mai', 'kaa', 'rw', 'pdc', 'to', 'bxr', 'kl',
 'nov', 'arc', 'kbd', 'bjn', 'lo', 'ha', 'tet', 'pap', 'tpi', 'tyv',
-'na', 'lbe', 'jbo', 'roa-rup', 'mdf', 'ty', 'kg', 'za', 'ig', 'wo',
+'na', 'lbe', 'jbo', 'roa-rup', 'ty', 'mdf', 'kg', 'za', 'ig', 'wo',
 'srn', 'ki', 'ab', 'ltg', 'zu', 'lg', 'om', 'rmy', 'chy', 'cu',
 'tw', 'tn', 'chr', 'rn', 'bi', 'pih', 'xh', 'tum', 'got', 'sm',
 'ss', 'pnt', 'ch', 'bm', 'iu', 'ee', 'st', 'ts', 'ks', 'fj', 'ak',
-'sg', 'ik', 've', 'ff', 'ti', 'ny', 'dz', 'cr',
+'sg', 'ik', 've', 'ff', 'ny', 'ti', 'dz', 'cr',
 ]
 
 # Sites we want to edit but not count as real languages
diff --git a/pywikibot/families/wikiquote_family.py 
b/pywikibot/families/wikiquote_family.py
index 019ed3e..fc50f85 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -70,8 +70,8 @@
 'bs', 'uk', 'tr', 'lt', 'bg', 'he', 'ca', 'sl', 'eo', 'el', 'nn',
 'id', 'zh', 'hr', 'hy', 'th', 'hu', 'li', 'nl', 'su', 'ko', 'ja',
 'sv', 'ur', 'te', 'ar', 'fi', 'cy', 'az', 'la', 'no', 'gl', 'ml',
-'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'sa', 'da', 'is',
-'vi', 'be', 'hi', 'sq', 'gu', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
+'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'da', 'sa', 'is',
+'gu', 'vi', 'be', 'hi', 'sq', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
 'am', 'wo', 'ky',
 ]
 
diff --git a/pywikibot/families/wikisource_family.py 
b/pywikibot/families/wikisource_family.py
index 6a24705..1faefe9

[MediaWiki-commits] [Gerrit] Format CSS with csscomb - change (mediawiki...CleanChanges)

2016-02-12 Thread Nikerabbit (Code Review)

Nikerabbit has uploaded a new change for review.

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

Change subject: Format CSS with csscomb
..

Format CSS with csscomb

Config is the default config slightly adapted for MediaWiki conventions.

Change-Id: I120479a677bda101fc3e4bc60474eae9a9dc2cd7
---
A .csscomb.json
M resources/cleanchanges.uls.css
2 files changed, 341 insertions(+), 7 deletions(-)


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

diff --git a/.csscomb.json b/.csscomb.json
new file mode 100644
index 000..ed995c0
--- /dev/null
+++ b/.csscomb.json
@@ -0,0 +1,328 @@
+{
+   "exclude": [
+   ".git/**",
+   "node_modules/**",
+   "vendor/**"
+   ],
+   "always-semicolon": true,
+   "block-indent": "\t",
+   "color-case": "lower",
+   "color-shorthand": true,
+   "element-case": "lower",
+   "eof-newline": true,
+   "leading-zero": true,
+   "quotes": "single",
+   "remove-empty-rulesets": true,
+   "space-after-colon": " ",
+   "space-after-combinator": " ",
+   "space-after-opening-brace": "\n",
+   "space-after-selector-delimiter": "\n",
+   "space-before-closing-brace": "\n",
+   "space-before-colon": "",
+   "space-before-combinator": " ",
+   "space-before-opening-brace": " ",
+   "space-before-selector-delimiter": "",
+   "strip-spaces": true,
+   "unitless-zero": true,
+   "vendor-prefix-align": false,
+   "sort-order": [
+   [
+   "font",
+   "font-family",
+   "font-size",
+   "font-weight",
+   "font-style",
+   "font-variant",
+   "font-size-adjust",
+   "font-stretch",
+   "font-effect",
+   "font-emphasize",
+   "font-emphasize-position",
+   "font-emphasize-style",
+   "font-smooth",
+   "line-height"
+   ],
+   [
+   "position",
+   "z-index",
+   "top",
+   "right",
+   "bottom",
+   "left"
+   ],
+   [
+   "display",
+   "visibility",
+   "float",
+   "clear",
+   "overflow",
+   "overflow-x",
+   "overflow-y",
+   "-ms-overflow-x",
+   "-ms-overflow-y",
+   "clip",
+   "zoom",
+   "flex-direction",
+   "flex-order",
+   "flex-pack",
+   "flex-align"
+   ],
+   [
+   "-webkit-box-sizing",
+   "-moz-box-sizing",
+   "box-sizing",
+   "width",
+   "min-width",
+   "max-width",
+   "height",
+   "min-height",
+   "max-height",
+   "margin",
+   "margin-top",
+   "margin-right",
+   "margin-bottom",
+   "margin-left",
+   "padding",
+   "padding-top",
+   "padding-right",
+   "padding-bottom",
+   "padding-left"
+   ],
+   [
+   "table-layout",
+   "empty-cells",
+   "caption-side",
+   "border-spacing",
+   "border-collapse",
+   "list-style",
+   "list-style-position",
+   "list-style-type",
+   "list-style-image"
+   ],
+   [
+   "content",
+   "quotes",
+   "counter-reset",
+   "counter-increment",
+   "resize",
+   "cursor",
+   "-webkit-user-select",
+   "-moz-user-select",
+   "-ms-user-select",
+   "user-select",
+   "nav-index",
+   "nav-up",
+   "nav-right",
+   "nav-down",
+   "nav-left",
+   "-webkit-transition",
+   "-moz-transition",
+   "-ms-transition",
+   "-o-transition",
+

[MediaWiki-commits] [Gerrit] updated url parsing for node4 - change (mediawiki...graphoid)

2016-02-12 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: updated url parsing for node4
..

updated url parsing for node4

Change-Id: I76230ad7508290e89d0b5eae9bda451e1a52789f
---
M lib/vega2.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/graphoid 
refs/changes/70/270270/1

diff --git a/lib/vega2.js b/lib/vega2.js
index 8e02032..5c1a42f 100644
--- a/lib/vega2.js
+++ b/lib/vega2.js
@@ -42,7 +42,7 @@
 // Workaround: urllib does not support relative URLs, add a temp 
protocol
 url = 'temp:' + url;
 }
-var urlParts = urllib.parse(url);
+var urlParts = urllib.parse(url, true);
 if (isRelativeUrl) {
 delete urlParts.protocol;
 } else if (urlParts.protocol && 
urlParts.protocol[urlParts.protocol.length - 1] === ':') {
@@ -53,6 +53,7 @@
 delete urlParts.path;
 delete urlParts.href;
 delete urlParts.port;
+delete urlParts.search;
 if (!urlParts.host || urlParts.host === '') {
 urlParts.host = opt.domain;
 // for some protocols, default host name is resolved differently

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76230ad7508290e89d0b5eae9bda451e1a52789f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Enable tinyrgb profile swapping for multimedia role - change (mediawiki/vagrant)

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

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

Change subject: Enable tinyrgb profile swapping for multimedia role
..


Enable tinyrgb profile swapping for multimedia role

Bug: T126727
Change-Id: I237446142d754b33869d07861f1e390f709da588
---
M puppet/modules/role/manifests/multimedia.pp
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/puppet/modules/role/manifests/multimedia.pp 
b/puppet/modules/role/manifests/multimedia.pp
index 2b6e453..0ea50d5 100644
--- a/puppet/modules/role/manifests/multimedia.pp
+++ b/puppet/modules/role/manifests/multimedia.pp
@@ -26,11 +26,12 @@
 require => Package['imagemagick'],
 values  => {
 # These are copied over from the Commons production configuration
-wgMaxImageArea   => 75e6,
-wgTiffMaxMetaSize=> 1048576,
-wgMaxAnimatedGifArea => 75e6,
-wgSharpenParameter   => '0x0.8',
-wgUseImageMagick => true,
+wgMaxImageArea   => 75e6,
+wgTiffMaxMetaSize=> 1048576,
+wgMaxAnimatedGifArea => 75e6,
+wgSharpenParameter   => '0x0.8',
+wgUseImageMagick => true,
+wgUseTinyRGBForJPGThumbnails => true,
 }
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I237446142d754b33869d07861f1e390f709da588
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix multiple definition of /var/lib/puppet - change (operations/puppet)

2016-02-12 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Fix multiple definition of /var/lib/puppet
..


Fix multiple definition of /var/lib/puppet

We introduced a definition of File[/var/lib/puppet] in
https://gerrit.wikimedia.org/r/#/c/268684/.

However, File[/var/lib/puppet] was already defined in puppetmaster::ssl.

This patch introduces a new class called base::puppet::common which is
then included by base::puppet as well as puppetmaster::ssl to fix the
issue.

Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
---
M modules/base/manifests/puppet.pp
A modules/base/manifests/puppet/common.pp
M modules/puppetmaster/manifests/ssl.pp
3 files changed, 13 insertions(+), 9 deletions(-)

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



diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 0458c4e..3639da5 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -90,14 +90,7 @@
 source => 'puppet:///modules/base/logrotate/puppet',
 }
 
-# Mode 0751 to make sure non-root users can access
-# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
-file { '/var/lib/puppet':
-ensure => directory,
-owner  => 'puppet',
-group  => 'puppet',
-mode   => '0751',
-}
+include ::base::puppet::common
 
 file { '/usr/local/bin/puppet-enabled':
 mode   => '0555',
diff --git a/modules/base/manifests/puppet/common.pp 
b/modules/base/manifests/puppet/common.pp
new file mode 100644
index 000..c8ea912
--- /dev/null
+++ b/modules/base/manifests/puppet/common.pp
@@ -0,0 +1,10 @@
+class base::puppet::common {
+# Mode 0751 to make sure non-root users can access
+# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
+file { '/var/lib/puppet':
+ensure => directory,
+owner  => 'puppet',
+group  => 'puppet',
+mode   => '0751',
+}
+}
diff --git a/modules/puppetmaster/manifests/ssl.pp 
b/modules/puppetmaster/manifests/ssl.pp
index ea9086f..a8bfff0 100644
--- a/modules/puppetmaster/manifests/ssl.pp
+++ b/modules/puppetmaster/manifests/ssl.pp
@@ -14,6 +14,8 @@
 $before = undef
 }
 
+include ::base::puppet::common
+
 # Move the puppetmaster's SSL files to a separate directory from the client
 file {
 [ '/var/lib/puppet/server',
@@ -25,7 +27,6 @@
 mode=> '0771',
 before  => $before;
 [
-'/var/lib/puppet',
 "${ssldir}/ca",
 "${ssldir}/certificate_requests",
 "${ssldir}/certs",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Ema 
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] Remove unnecessary DB begin/commit calls - change (mediawiki...Patroller)

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

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

Change subject: Remove unnecessary DB begin/commit calls
..


Remove unnecessary DB begin/commit calls

Change-Id: I988da908937b96d37262942e63f8f09eeceea9ff
---
M SpecialPatroller.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/SpecialPatroller.php b/SpecialPatroller.php
index fd34666..c08b039 100644
--- a/SpecialPatroller.php
+++ b/SpecialPatroller.php
@@ -308,7 +308,6 @@
global $wgUser;
if ( !$wgUser->isBlocked( false ) ) { # Check block against 
master
$dbw = wfGetDB( DB_MASTER );
-   $dbw->begin( __METHOD__ );
$title = $edit->getTitle();
# Prepare the comment
$comment = wfMessage( 'patrol-reverting', $comment 
)->inContentLanguage()->text();
@@ -328,7 +327,6 @@
$article = new Article( $title );
$article->doEdit( $old->getText(), $comment, 
EDIT_UPDATE & EDIT_MINOR & EDIT_SUPPRESS_RC );
}
-   $dbw->commit( __METHOD__ );
# Mark the edit patrolled so it doesn't bother us again
RecentChange::markPatrolled( $edit->mAttribs['rc_id'] );
return true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I988da908937b96d37262942e63f8f09eeceea9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Patroller
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
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] Fix case of Html class - change (mediawiki...WikibaseQualityConstraints)

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

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

Change subject: Fix case of Html class
..


Fix case of Html class

Gives fatal when using $wgAutoloadAttemptLowercase = false

Change-Id: I2f2e6d9e714b9e1e6f03f3ccd569aaa4369c7d1b
---
M specials/SpecialConstraintReport.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/specials/SpecialConstraintReport.php 
b/specials/SpecialConstraintReport.php
index 64cbd0c..4670717 100644
--- a/specials/SpecialConstraintReport.php
+++ b/specials/SpecialConstraintReport.php
@@ -497,7 +497,7 @@
$indicator
);
 
-   $tooltip = HTML::rawElement(
+   $tooltip = Html::rawElement(
'div',
array (
'class' => 'wbqc-tooltip'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2f2e6d9e714b9e1e6f03f3ccd569aaa4369c7d1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fresh translation after deletion should have correct author ... - change (mediawiki...ContentTranslation)

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

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

Change subject: Fresh translation after deletion should have correct author and 
dates
..


Fresh translation after deletion should have correct author and dates

The started-by and started-date fields for this translation were not
updated in these cases.

Bug: T125959
Change-Id: I91658e6720e1dddf94ac5caa7da406d091a2ee48
---
M includes/Translation.php
1 file changed, 15 insertions(+), 5 deletions(-)

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



diff --git a/includes/Translation.php b/includes/Translation.php
index 66db0cc..a8d8a74 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -42,14 +42,11 @@
$this->translation['id'] = (int)$dbw->insertId();
}
 
-   public function update() {
+   public function update( array $options ) {
$dbw = Database::getConnection( DB_MASTER );
 
$values = array(
-   'translation_source_title' => 
$this->translation['sourceTitle'],
'translation_target_title' => 
$this->translation['targetTitle'],
-   'translation_source_language' => 
$this->translation['sourceLanguage'],
-   'translation_target_language' => 
$this->translation['targetLanguage'],
'translation_source_revision_id' => 
$this->translation['sourceRevisionId'],
'translation_source_url' => 
$this->translation['sourceURL'],
'translation_status' => $this->translation['status'],
@@ -63,6 +60,11 @@
$values['translation_target_revision_id'] = 
$this->translation['targetRevisionId'];
}
 
+   if ( isset( $options['freshTranslation'] ) && 
$options['freshTranslation'] === true ) {
+   $values['translation_start_timestamp'] = 
$dbw->timestamp();
+   $values['translation_started_by'] = 
$this->translation['startedTranslator'];
+   }
+
$dbw->update(
'cx_translations',
$values,
@@ -72,6 +74,8 @@
}
 
public function save() {
+   $freshTranslation = false;
+
$existingTranslation = Translation::find(
$this->translation['sourceLanguage'],
$this->translation['targetLanguage'],
@@ -81,8 +85,14 @@
if ( $existingTranslation === null ) {
$this->create();
} else {
+   $options = array();
+   if ( $existingTranslation->translation['status'] === 
'deleted' ) {
+   // Existing translation is deleted, so this is 
a fresh start of same
+   // language pair and source title.
+   $options['freshTranslation'] = true;
+   }
$this->translation['id'] = 
$existingTranslation->getTranslationId();
-   $this->update();
+   $this->update( $options );
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91658e6720e1dddf94ac5caa7da406d091a2ee48
Gerrit-PatchSet: 3
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] [FundraisingEmailUnsubscribe] Switch extension-jslint to jsh... - change (integration/config)

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

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

Change subject: [FundraisingEmailUnsubscribe] Switch extension-jslint to jshint 
and jsonlint
..


[FundraisingEmailUnsubscribe] Switch extension-jslint to jshint and jsonlint

jslint test is deprecated and we should be migrating to npm but for now on
this repo lets do jshint an jsonlint.

Change-Id: If4deb867da650182d0ecc46079ec56468370c697
---
M jjb/mediawiki-extensions.yaml
M zuul/layout.yaml
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index adcf639..d888992 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -713,7 +713,6 @@
   - mwext-FormelApplet
   - mwext-Foxway
   - mwext-FundraisingChart
-  - mwext-FundraisingEmailUnsubscribe
   - mwext-Genderize
   - mwext-GlobalNotice
   - mwext-GlobalUserGroups
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bad3600..9973c71 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4545,7 +4545,8 @@
 
   - name: mediawiki/extensions/FundraisingEmailUnsubscribe
 template:
-  - name: extension-jslint
+  - name: jshint
+  - name: jsonlint
   - name: extension-unittests-generic
 
   - name: mediawiki/extensions/Genderize

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4deb867da650182d0ecc46079ec56468370c697
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
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] New BSApiWikiPageTasks - change (mediawiki...BlueSpiceFoundation)

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

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

Change subject: New BSApiWikiPageTasks
..


New BSApiWikiPageTasks

Provides common tasks that can pe performed on a WikiPage

ATM only "setCategories" is available

PatchSet 3: Implemented comments by MGlaser

Change-Id: I847788c88fe5443457ae897a479598e4e1b05756
---
M BlueSpiceFoundation.php
M i18n/api/en.json
M i18n/api/qqq.json
M includes/AutoLoader.php
A includes/api/BSApiWikiPageTasks.php
5 files changed, 140 insertions(+), 3 deletions(-)

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



diff --git a/BlueSpiceFoundation.php b/BlueSpiceFoundation.php
index e3c708b..e8d0200 100644
--- a/BlueSpiceFoundation.php
+++ b/BlueSpiceFoundation.php
@@ -69,6 +69,7 @@
 $wgAPIModules['bs-filebackend-store'] = 'BSApiFileBackendStore';
 $wgAPIModules['bs-user-store'] = 'BSApiUserStore';
 $wgAPIModules['bs-group-store'] = 'BSApiGroupStore';
+$wgAPIModules['bs-wikipage-tasks'] = 'BSApiWikiPageTasks';
 
 //I18N MW1.23+
 $wgMessagesDirs['BlueSpice'] = __DIR__ . '/i18n/core';
diff --git a/i18n/api/en.json b/i18n/api/en.json
index 456697e..a6014c5 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -7,6 +7,7 @@
"apihelp-bs-filebackend-store-description": "Lists all files from the 
file backend. Allows sorting, filtering and pagination. Implements ExtJS Store 
parameters.",
"apihelp-bs-user-store-description": "Lists all users from the 
database. Allows sorting, filtering and pagination. Implements ExtJS Store 
parameters.",
"apihelp-bs-group-store-description": "Lists all groups except 
$wgImplicitGroups. Allows sorting, filtering and pagination. Implements ExtJS 
Store parameters.",
+   "apihelp-bs-wikipage-tasks-description": "Provides common operations 
for WikiPages",
"apihelp-bs-store-param-sort": "JSON string with sorting info; 
deserializes to array of objects that hold field name and 
direction for each sorting option",
"apihelp-bs-store-param-group": "JSON string with grouping info; 
deserializes to array of objects that hold field name and 
direction for each grouping option",
"apihelp-bs-store-param-filter": "JSON string with filter info; 
deserializes to array of objects that hold field name, filter 
type, and filter value for each filtering option",
@@ -19,5 +20,11 @@
"apihelp-bs-store-param-format": "The format of the output (only JSON 
or formatted JSON)",
"apihelp-bs-task-param-task": "The task that should be executed",
"apihelp-bs-task-param-taskdata": "JSON string encoded object with 
arbitrary data for the task",
-   "apihelp-bs-task-param-format": "The format of the result"
-}
\ No newline at end of file
+   "apihelp-bs-task-param-format": "The format of the result",
+   "bs-wikipage-tasks-error-contentmodel" : "The task could not be 
perfomed with the content model of the provided page.",
+   "bs-wikipage-tasks-error-page-not-valid" : "The provided page is not 
valid.",
+   "bs-wikipage-tasks-setcategories-edit-summary": "Changed categories.",
+   "bs-wikipage-tasks-error-page-edit-not-allowed": "You are not allowed 
to edit page '$1'.",
+   "bs-wikipage-tasks-error-categories-not-valid": "Invalid 
{{PLURAL:$2|category|categories}}: $1",
+   "bs-wikipage-tasks-setcategories-success": "Categories have 
successfully been set."
+}
diff --git a/i18n/api/qqq.json b/i18n/api/qqq.json
index de68a3c..7de7e4d 100644
--- a/i18n/api/qqq.json
+++ b/i18n/api/qqq.json
@@ -7,6 +7,7 @@
"apihelp-bs-filebackend-store-description": "Describes the API endpoint 
that lists uploaded files",
"apihelp-bs-user-store-description": "Describes the API endpoint that 
lists users",
"apihelp-bs-group-store-description": "Describes the API endpoint that 
lists groups",
+   "apihelp-bs-wikipage-tasks-description": "Describes the API endpoint 
that allows manipulation of wikipages",
"apihelp-bs-store-param-sort": "Describes the sort parameter 
of the API module",
"apihelp-bs-store-param-group": "Describes the group 
parameter of the API module",
"apihelp-bs-store-param-filter": "Describes the filter 
parameter of the API module",
@@ -19,5 +20,11 @@
"apihelp-bs-store-param-format": "Describes the format 
parameter of the API module",
"apihelp-bs-task-param-task": "Describes the task parameter 
of the API module",
"apihelp-bs-task-param-taskdata": "Describes the taskData 
parameter of the API module",
-   "apihelp-bs-task-param-format": "Describes the format 
parameter of the API module\n\n{{msg-mw|Bs-store-param-format}}"
+   "apihelp-bs-task-param-format": "Describes the format 
parameter of the API module\n\n{{msg-mw|Bs-store-param-format}}",
+   "bs-wikipage-tasks-error-contentmodel" : "An error message in case that 
the task was not supported by the content model of the provided page",

[MediaWiki-commits] [Gerrit] Make $wgLocalStylePath the same as $wgStylePath - change (operations/mediawiki-config)

2016-02-12 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: Make $wgLocalStylePath the same as $wgStylePath
..

Make $wgLocalStylePath the same as $wgStylePath

The other /static urls SHOULD be relative, whereas this one MUST be relative.
Added a comment to document this fact.

We honour this SHOULD (since we don't use bits.wikimedia.org anymore),
however these variables still varied for no particular reason (/static vs 
/w/static).

Remove this unimportant difference to make maintenance easier (and improve 
caching).

Change-Id: I1d5af9dde8834202372dbf39480df6adc33a3878
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 6919cd3..12d7a17 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -227,12 +227,15 @@
 $wgScript = "{$wgScriptPath}/index.php";
 $wgRedirectScript = "{$wgScriptPath}/redirect.php";
 $wgLoadScript = "{$wgScriptPath}/load.php";
-$wgLocalStylePath = "{$wgScriptPath}/static/$wmgVersionNumber/skins";
 
-// Don't include a hostname in these urls (T106966, T112646)
+// Don't include a hostname in these urls
+// - Goes wrong otherwise on mobile web (T106966, T112646)
+// - Improves performance by leveraging HTTP/2
+// - $wgLocalStylePath MUST be relative
 $wgResourceBasePath = "/static/{$wmgVersionNumber}";
 $wgExtensionAssetsPath = "{$wgResourceBasePath}/extensions";
 $wgStylePath = "{$wgResourceBasePath}/skins";
+$wgLocalStylePath = $wgStylePath;
 
 // Deprecated
 $wgStyleSheetPath = $wgStylePath;

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

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

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

[MediaWiki-commits] [Gerrit] Update AutoLoaderTest and ran maintenance/generateLocalAutol... - change (mediawiki/core)

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

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

Change subject: Update AutoLoaderTest and ran 
maintenance/generateLocalAutoload.php
..


Update AutoLoaderTest and ran maintenance/generateLocalAutoload.php

AutoLoaderTest didn't know about traits.

generateLocalAutoload found a  missing Trait from the autoloader and
a class map ordering issue.

Change-Id: I34bf2698ad838b6a977c9bf39f6e416330ff0e5d
---
M autoload.php
M tests/phpunit/structure/AutoLoaderTest.php
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index ab6c5e0..83ca3b3 100644
--- a/autoload.php
+++ b/autoload.php
@@ -54,6 +54,7 @@
'ApiManageTags' => __DIR__ . '/includes/api/ApiManageTags.php',
'ApiMergeHistory' => __DIR__ . '/includes/api/ApiMergeHistory.php',
'ApiMessage' => __DIR__ . '/includes/api/ApiMessage.php',
+   'ApiMessageTrait' => __DIR__ . '/includes/api/ApiMessage.php',
'ApiModuleManager' => __DIR__ . '/includes/api/ApiModuleManager.php',
'ApiMove' => __DIR__ . '/includes/api/ApiMove.php',
'ApiOpenSearch' => __DIR__ . '/includes/api/ApiOpenSearch.php',
@@ -563,7 +564,6 @@
'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
'IPTC' => __DIR__ . '/includes/media/IPTC.php',
'IRCColourfulRCFeedFormatter' => __DIR__ . 
'/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
-   'LinkTarget' => __DIR__ . '/includes/LinkTarget.php',
'IcuCollation' => __DIR__ . '/includes/Collation.php',
'IdentityCollation' => __DIR__ . '/includes/Collation.php',
'ImageBuilder' => __DIR__ . '/maintenance/rebuildImages.php',
@@ -698,6 +698,7 @@
'LinkFilter' => __DIR__ . '/includes/LinkFilter.php',
'LinkHolderArray' => __DIR__ . '/includes/parser/LinkHolderArray.php',
'LinkSearchPage' => __DIR__ . 
'/includes/specials/SpecialLinkSearch.php',
+   'LinkTarget' => __DIR__ . '/includes/LinkTarget.php',
'Linker' => __DIR__ . '/includes/Linker.php',
'LinksDeletionUpdate' => __DIR__ . 
'/includes/deferred/LinksDeletionUpdate.php',
'LinksUpdate' => __DIR__ . '/includes/deferred/LinksUpdate.php',
diff --git a/tests/phpunit/structure/AutoLoaderTest.php 
b/tests/phpunit/structure/AutoLoaderTest.php
index 8674329..e5b7a93 100644
--- a/tests/phpunit/structure/AutoLoaderTest.php
+++ b/tests/phpunit/structure/AutoLoaderTest.php
@@ -71,7 +71,7 @@
$matches = array();
preg_match_all( '/
^ [\t ]* (?:
-   (?:final\s+)? (?:abstract\s+)? 
(?:class|interface) \s+
+   (?:final\s+)? (?:abstract\s+)? 
(?:class|interface|trait) \s+
(?P [a-zA-Z0-9_]+)
|
class_alias \s* \( \s*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I34bf2698ad838b6a977c9bf39f6e416330ff0e5d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update languages_by_size - change (pywikibot/core)

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

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

Change subject: Update languages_by_size
..


Update languages_by_size

Change-Id: I4faa53dfa261dc8656d7f92d2e40c21dd39b7a86
---
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/families/wikisource_family.py
M pywikibot/families/wiktionary_family.py
4 files changed, 21 insertions(+), 21 deletions(-)

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



diff --git a/pywikibot/families/wikipedia_family.py 
b/pywikibot/families/wikipedia_family.py
index b8a1801..6d8eb43 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -55,30 +55,30 @@
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'fa', 'no', 'sh', 'ar', 'fi',
 'hu', 'id', 'ro', 'cs', 'ko', 'sr', 'ms', 'tr', 'eu', 'eo', 'min',
 'da', 'kk', 'bg', 'sk', 'hy', 'he', 'lt', 'hr', 'sl', 'et', 'uz',
-'gl', 'nn', 'la', 'zh-min-nan', 'vo', 'ce', 'simple', 'el', 'be',
+'gl', 'zh-min-nan', 'nn', 'la', 'vo', 'ce', 'simple', 'el', 'be',
 'ka', 'az', 'ur', 'hi', 'th', 'oc', 'mk', 'ta', 'mg', 'new', 'cy',
 'tt', 'bs', 'lv', 'te', 'tl', 'pms', 'be-tarask', 'br', 'ky', 'ht',
-'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'is',
-'pnb', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 
'an',
+'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'pnb',
+'is', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 'an',
 'yo', 'ne', 'io', 'gu', 'scn', 'bpy', 'nds', 'ku', 'pa', 'als',
 'kn', 'qu', 'ia', 'su', 'bar', 'ckb', 'mn', 'arz', 'bat-smg', 
'nap',
 'bug', 'wa', 'gd', 'yi', 'am', 'map-bms', 'mzn', 'fo', 'si', 'nah',
-'li', 'sah', 'vec', 'hsb', 'or', 'os', 'mrj', 'sa', 'roa-tara',
-'mhr', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif', 'eml',
-'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue', 'bo',
-'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 'sd', 
'gv',
-'km', 'crh', 'kv', 'szl', 'wuu', 'frr', 'zea', 'zh-classical', 
'as',
-'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad', 'rm',
-'ie', 'mt', 'fur', 'pcd', 'gn', 'lij', 'dsb', 'dv', 'cbk-zam',
+'li', 'vec', 'sah', 'hsb', 'or', 'os', 'mrj', 'sa', 'mhr',
+'roa-tara', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif',
+'eml', 'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue',
+'bo', 'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 
'sd',
+'gv', 'km', 'crh', 'szl', 'kv', 'wuu', 'frr', 'zea', 
'zh-classical',
+'as', 'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad',
+'ie', 'rm', 'mt', 'fur', 'pcd', 'gn', 'dsb', 'lij', 'dv', 
'cbk-zam',
 'myv', 'nso', 'ksh', 'ext', 'ang', 'gag', 'mwl', 'lez', 'ace', 
'ug',
 'kab', 'pi', 'pag', 'nv', 'sn', 'frp', 'av', 'ln', 'pfl', 'haw',
-'xal', 'krc', 'gom', 'kaa', 'mai', 'rw', 'pdc', 'to', 'bxr', 'kl',
+'xal', 'krc', 'gom', 'mai', 'kaa', 'rw', 'pdc', 'to', 'bxr', 'kl',
 'nov', 'arc', 'kbd', 'bjn', 'lo', 'ha', 'tet', 'pap', 'tpi', 'tyv',
-'na', 'lbe', 'jbo', 'roa-rup', 'mdf', 'ty', 'kg', 'za', 'ig', 'wo',
+'na', 'lbe', 'jbo', 'roa-rup', 'ty', 'mdf', 'kg', 'za', 'ig', 'wo',
 'srn', 'ki', 'ab', 'ltg', 'zu', 'lg', 'om', 'rmy', 'chy', 'cu',
 'tw', 'tn', 'chr', 'rn', 'bi', 'pih', 'xh', 'tum', 'got', 'sm',
 'ss', 'pnt', 'ch', 'bm', 'iu', 'ee', 'st', 'ts', 'ks', 'fj', 'ak',
-'sg', 'ik', 've', 'ff', 'ti', 'ny', 'dz', 'cr',
+'sg', 'ik', 've', 'ff', 'ny', 'ti', 'dz', 'cr',
 ]
 
 # Sites we want to edit but not count as real languages
diff --git a/pywikibot/families/wikiquote_family.py 
b/pywikibot/families/wikiquote_family.py
index 019ed3e..fc50f85 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -70,8 +70,8 @@
 'bs', 'uk', 'tr', 'lt', 'bg', 'he', 'ca', 'sl', 'eo', 'el', 'nn',
 'id', 'zh', 'hr', 'hy', 'th', 'hu', 'li', 'nl', 'su', 'ko', 'ja',
 'sv', 'ur', 'te', 'ar', 'fi', 'cy', 'az', 'la', 'no', 'gl', 'ml',
-'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'sa', 'da', 'is',
-'vi', 'be', 'hi', 'sq', 'gu', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
+'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'da', 'sa', 'is',
+'gu', 'vi', 'be', 'hi', 'sq', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
 'am', 'wo', 'ky',
 ]
 
diff --git a/pywikibot/families/wikisource_family.py 
b/pywikibot/families/wikisource_family.py
index 6a24705..4a01b54 100644
---

[MediaWiki-commits] [Gerrit] Update languages_by_size from core - change (pywikibot/compat)

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

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

Change subject: Update languages_by_size from core
..


Update languages_by_size from core

Change-Id: I469fe784520511d40298cdb74449602756d40b7d
---
M families/wikipedia_family.py
M families/wikiquote_family.py
M families/wikisource_family.py
M families/wiktionary_family.py
4 files changed, 21 insertions(+), 21 deletions(-)

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



diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py
index aee512a..1624a46 100644
--- a/families/wikipedia_family.py
+++ b/families/wikipedia_family.py
@@ -21,30 +21,30 @@
 'vi', 'ja', 'pt', 'zh', 'uk', 'ca', 'fa', 'no', 'sh', 'ar', 'fi',
 'hu', 'id', 'ro', 'cs', 'ko', 'sr', 'ms', 'tr', 'eu', 'eo', 'min',
 'da', 'kk', 'bg', 'sk', 'hy', 'he', 'lt', 'hr', 'sl', 'et', 'uz',
-'gl', 'nn', 'la', 'zh-min-nan', 'vo', 'ce', 'simple', 'el', 'be',
+'gl', 'zh-min-nan', 'nn', 'la', 'vo', 'ce', 'simple', 'el', 'be',
 'ka', 'az', 'ur', 'hi', 'th', 'oc', 'mk', 'ta', 'mg', 'new', 'cy',
 'tt', 'bs', 'lv', 'te', 'tl', 'pms', 'be-tarask', 'br', 'ky', 'ht',
-'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'is',
-'pnb', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 
'an',
+'sq', 'jv', 'ast', 'lb', 'mr', 'zh-yue', 'ml', 'bn', 'tg', 'pnb',
+'is', 'af', 'ga', 'sco', 'ba', 'cv', 'fy', 'lmo', 'my', 'sw', 'an',
 'yo', 'ne', 'io', 'gu', 'scn', 'bpy', 'nds', 'ku', 'pa', 'als',
 'kn', 'qu', 'ia', 'su', 'bar', 'ckb', 'mn', 'arz', 'bat-smg', 
'nap',
 'bug', 'wa', 'gd', 'yi', 'am', 'map-bms', 'mzn', 'fo', 'si', 'nah',
-'li', 'sah', 'vec', 'hsb', 'or', 'os', 'mrj', 'sa', 'roa-tara',
-'mhr', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif', 'eml',
-'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue', 'bo',
-'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 'sd', 
'gv',
-'km', 'crh', 'kv', 'szl', 'wuu', 'frr', 'zea', 'zh-classical', 
'as',
-'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad', 'rm',
-'ie', 'mt', 'fur', 'pcd', 'gn', 'lij', 'dsb', 'dv', 'cbk-zam',
+'li', 'vec', 'sah', 'hsb', 'or', 'os', 'mrj', 'sa', 'mhr',
+'roa-tara', 'pam', 'azb', 'ilo', 'se', 'mi', 'ps', 'bcl', 'hif',
+'eml', 'gan', 'hak', 'diq', 'bh', 'glk', 'vls', 'nds-nl', 'rue',
+'bo', 'xmf', 'fiu-vro', 'co', 'sc', 'tk', 'vep', 'lrc', 'csb', 
'sd',
+'gv', 'km', 'crh', 'szl', 'kv', 'wuu', 'frr', 'zea', 
'zh-classical',
+'as', 'so', 'stq', 'udm', 'ay', 'kw', 'cdo', 'nrm', 'koi', 'lad',
+'ie', 'rm', 'mt', 'fur', 'pcd', 'gn', 'dsb', 'lij', 'dv', 
'cbk-zam',
 'myv', 'nso', 'ksh', 'ext', 'ang', 'gag', 'mwl', 'lez', 'ace', 
'ug',
 'kab', 'pi', 'pag', 'nv', 'sn', 'frp', 'av', 'ln', 'pfl', 'haw',
-'xal', 'krc', 'gom', 'kaa', 'mai', 'rw', 'pdc', 'to', 'bxr', 'kl',
+'xal', 'krc', 'gom', 'mai', 'kaa', 'rw', 'pdc', 'to', 'bxr', 'kl',
 'nov', 'arc', 'kbd', 'bjn', 'lo', 'ha', 'tet', 'pap', 'tpi', 'tyv',
-'na', 'lbe', 'jbo', 'roa-rup', 'mdf', 'ty', 'kg', 'za', 'ig', 'wo',
+'na', 'lbe', 'jbo', 'roa-rup', 'ty', 'mdf', 'kg', 'za', 'ig', 'wo',
 'srn', 'ki', 'ab', 'ltg', 'zu', 'lg', 'om', 'rmy', 'chy', 'cu',
 'tw', 'tn', 'chr', 'rn', 'bi', 'pih', 'xh', 'tum', 'got', 'sm',
 'ss', 'pnt', 'ch', 'bm', 'iu', 'ee', 'st', 'ts', 'ks', 'fj', 'ak',
-'sg', 'ik', 've', 'ff', 'ti', 'ny', 'dz', 'cr',
+'sg', 'ik', 've', 'ff', 'ny', 'ti', 'dz', 'cr',
 ]
 
 self.langs = dict([(lang, '%s.wikipedia.org' % lang)
diff --git a/families/wikiquote_family.py b/families/wikiquote_family.py
index 543f076..9d48df4 100644
--- a/families/wikiquote_family.py
+++ b/families/wikiquote_family.py
@@ -21,8 +21,8 @@
 'bs', 'uk', 'tr', 'lt', 'bg', 'he', 'ca', 'sl', 'eo', 'el', 'nn',
 'id', 'zh', 'hr', 'hy', 'th', 'hu', 'li', 'nl', 'su', 'ko', 'ja',
 'sv', 'ur', 'te', 'ar', 'fi', 'cy', 'az', 'la', 'no', 'gl', 'ml',
-'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'sa', 'da', 'is',
-'vi', 'be', 'hi', 'sq', 'gu', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
+'et', 'ku', 'kn', 'sr', 'eu', 'ro', 'ta', 'ka', 'da', 'sa', 'is',
+'gu', 'vi', 'be', 'hi', 'sq', 'mr', 'br', 'uz', 'af', 'zh-min-nan',
 'am', 'wo', 'ky',
 ]
 
diff --git a/families/wikisource_family.py b/families/wikisource_family.py
index 498b62a..cfd5390 100644
--- a/families/wikisource_family.py
+++ b/families/wikisource_family.py
@@ -18,9 +18,9 @@
 self.languages_by_size = [
 'en', 'de', 'ru',

[MediaWiki-commits] [Gerrit] Fix GetClaimsStatementFilter not failing correctly with inva... - change (mediawiki...Wikibase)

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

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

Change subject: Fix GetClaimsStatementFilter not failing correctly with invalid 
rank
..


Fix GetClaimsStatementFilter not failing correctly with invalid rank

Luckily this is not critical in production, because the API takes care
that no invalid rank can make it that far. See GetClaims::getAllowedParams.

But when looking at the two classes I'm touching in this patch, there is
no safety. Both filters (by rank and by property) had bugs and failed with
type errors and "undefined variable" errors.

The StatementRankSerializer did not had any safety.

This also increases code coverage (which was the reason why I started
working on this).

Change-Id: I750c5c569cd336ff67f64744d23ab1666ce790b6
---
M repo/includes/StatementRankSerializer.php
M repo/includes/api/GetClaimsStatementFilter.php
M repo/tests/phpunit/includes/StatementRankSerializerTest.php
A repo/tests/phpunit/includes/api/GetClaimsStatementFilterTest.php
4 files changed, 188 insertions(+), 38 deletions(-)

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



diff --git a/repo/includes/StatementRankSerializer.php 
b/repo/includes/StatementRankSerializer.php
index f8ed719..d8da6c4 100644
--- a/repo/includes/StatementRankSerializer.php
+++ b/repo/includes/StatementRankSerializer.php
@@ -3,6 +3,8 @@
 namespace Wikibase;
 
 use Deserializers\Deserializer;
+use Deserializers\Exceptions\DeserializationException;
+use Serializers\Exceptions\SerializationException;
 use Serializers\Serializer;
 use Wikibase\DataModel\Statement\Statement;
 
@@ -15,6 +17,7 @@
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  * @author Daniel Kinzler
  * @author Addshore
+ * @author Thiemo Mättig
  */
 class StatementRankSerializer implements Serializer, Deserializer {
 
@@ -41,21 +44,32 @@
 *
 * @param string $serializedRank
 *
-* @return integer
+* @throws DeserializationException
+* @return int
 */
public function deserialize( $serializedRank ) {
$ranks = array_flip( self::$rankMap );
+
+   if ( !array_key_exists( $serializedRank, $ranks ) ) {
+   throw new DeserializationException( 'Invalid rank 
serialization' );
+   }
+
return $ranks[$serializedRank];
}
 
/**
 * Serializes the rank.
 *
-* @param integer $rank
+* @param int $rank
 *
+* @throws SerializationException
 * @return string
 */
public function serialize( $rank ) {
+   if ( !array_key_exists( $rank, self::$rankMap ) ) {
+   throw new SerializationException( 'Invalid rank' );
+   }
+
return self::$rankMap[$rank];
}
 
diff --git a/repo/includes/api/GetClaimsStatementFilter.php 
b/repo/includes/api/GetClaimsStatementFilter.php
index 3f16596..37ac88e 100644
--- a/repo/includes/api/GetClaimsStatementFilter.php
+++ b/repo/includes/api/GetClaimsStatementFilter.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Repo\Api;
 
+use Deserializers\Exceptions\DeserializationException;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
@@ -13,6 +14,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  * @author Addshore
+ * @author Thiemo Mättig
  */
 class GetClaimsStatementFilter implements StatementFilter {
 
@@ -29,11 +31,20 @@
private $idParser;
 
/**
-* @var array
+* @var string[]
 */
private $requestParams;
 
-   public function __construct( EntityIdParser $idParser, ApiErrorReporter 
$errorReporter, array $requestParams ) {
+   /**
+* @param EntityIdParser $idParser
+* @param ApiErrorReporter $errorReporter
+* @param string[] $requestParams
+*/
+   public function __construct(
+   EntityIdParser $idParser,
+   ApiErrorReporter $errorReporter,
+   array $requestParams
+   ) {
$this->idParser = $idParser;
$this->errorReporter = $errorReporter;
$this->requestParams = $requestParams;
@@ -42,22 +53,27 @@
/**
 * @param Statement $statement
 *
-* @return boolean
+* @return bool
 */
public function statementMatches( Statement $statement ) {
return $this->rankMatchesFilter( $statement->getRank() )
&& $this->propertyMatchesFilter( 
$statement->getPropertyId() );
}
 
+   /**
+* @param int $rank
+*
+* @return bool
+*/
private function rankMatchesFilter( $rank ) {
-   if ( $rank === null ) {
-   return true;
-

[MediaWiki-commits] [Gerrit] Search for scripts in maintenance folder too. - change (pywikibot/core)

2016-02-12 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

Change subject: Search for scripts in maintenance folder too.
..

Search for scripts in maintenance folder too.

- with I3143241f64e scripts can be found in an archive folder but mainenance
  scripts must be startet with preleading "maintenance/"
- join paths in the right way; otherwise we could have mixed separators
  on windows os.

Change-Id: I02ed7a5e533eaa33c32cbd77a2c2bdcba567413c
---
M pwb.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/79/270279/1

diff --git a/pwb.py b/pwb.py
index a630c5f..e2ed051 100755
--- a/pwb.py
+++ b/pwb.py
@@ -211,7 +211,11 @@
 file_package = 'scripts'
 if not os.path.exists(testpath):
 testpath = os.path.join(
-os.path.split(__file__)[0], 'scripts/archive', filename)
+os.path.split(__file__)[0], 'scripts', 'maintenance', 
filename)
+file_package = 'scripts.maintenance'
+if not os.path.exists(testpath):
+testpath = os.path.join(
+os.path.split(__file__)[0], 'scripts', 'archive', filename)
 file_package = 'scripts.archive'
 
 if os.path.exists(testpath):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02ed7a5e533eaa33c32cbd77a2c2bdcba567413c
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] Remove unused imports from repo - change (mediawiki...Wikibase)

2016-02-12 Thread WMDE

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

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

Change subject: Remove unused imports from repo
..

Remove unused imports from repo

Seems two of these were a mistake in Ib27173a.

Change-Id: I0cd50098c8e13e8a8765a689be34cbf44f733f60
---
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
3 files changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/repo/includes/api/SetDescription.php 
b/repo/includes/api/SetDescription.php
index c64f33c..eb954fb 100644
--- a/repo/includes/api/SetDescription.php
+++ b/repo/includes/api/SetDescription.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Repo\Api;
 
 use ApiMain;
-use InvalidArgumentException;
 use Wikibase\ChangeOp\ChangeOpDescription;
 use Wikibase\ChangeOp\FingerprintChangeOpFactory;
 use Wikibase\DataModel\Entity\EntityDocument;
diff --git a/repo/includes/api/SetLabel.php b/repo/includes/api/SetLabel.php
index 6ac651d..447bf6d 100644
--- a/repo/includes/api/SetLabel.php
+++ b/repo/includes/api/SetLabel.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Repo\Api;
 
 use ApiMain;
-use InvalidArgumentException;
 use Wikibase\ChangeOp\ChangeOpLabel;
 use Wikibase\ChangeOp\FingerprintChangeOpFactory;
 use Wikibase\DataModel\Entity\EntityDocument;
diff --git 
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
 
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
index 299cb0a..018d7d0 100644
--- 
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
+++ 
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
@@ -14,7 +14,6 @@
 use Wikibase\DataModel\Term\Fingerprint;
 use Wikibase\EditEntityFactory;
 use Wikibase\LabelDescriptionDuplicateDetector;
-use Wikibase\Lib\ContentLanguages;
 use Wikibase\Lib\StaticContentLanguages;
 use Wikibase\Repo\Specials\SpecialSetLabelDescriptionAliases;
 use Wikibase\Repo\Validators\TermValidatorFactory;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cd50098c8e13e8a8765a689be34cbf44f733f60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
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] move most of esams to standard layout - change (operations/dns)

2016-02-12 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: move most of esams to standard layout
..

move most of esams to standard layout

functional no-op, but moves various esams.wikimedia.org hostnames
out of its ORIGIN block and up to where the other DCs define such
things, and moves non-subdomain esams servers up to the main
alphabetical list.

Change-Id: I0bbdfbb8cf6f3b0ba31490c68169a755dd655d3b
---
M templates/wikimedia.org
1 file changed, 27 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/85/270285/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 56647ee..5242b97 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -119,6 +119,8 @@
 1H  IN  2620:0:861:1:208:80:154:11
 dickson 1H  IN A208.80.155.68
 1H  IN  2620:0:861:202:208:80:155:68
+eeden   1H  IN A91.198.174.121
+1H  IN  2620:0:862:1:91:198:174:121
 einsteinium 1H  IN A208.80.155.119
 fermium 1H  IN A208.80.154.74 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 1H  IN  2620:0:861:3:208:80:154:74
@@ -148,13 +150,19 @@
 lvs1004 1H  IN A208.80.154.137
 lvs1005 1H  IN A208.80.154.138
 lvs1006 1H  IN A208.80.154.139
+maerlant1H  IN A91.198.174.122
+1H  IN  2620:0:862:1:91:198:174:122
 magnesium   1H  IN A208.80.154.5
 ms1001  1H  IN A208.80.154.16
 1H  IN  2620:0:861:1:208:80:154:16
+multatuli   1H  IN A91.198.174.114
+1H  IN  2620:0:862:1:91:198:174:114
 mx1001  1H  IN A208.80.154.76 ; VM on the ganeti01.svc.eqiad.wmnet 
cluster
 1H  IN  2620:0:861:3:208:80:154:76
 mx2001  1H  IN A208.80.153.45 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 1H  IN  2620:0:860:2:208:80:153:45
+nescio  1H  IN A91.198.174.106
+1H  IN  2620:0:862:1:91:198:174:106
 neon1H  IN A208.80.154.14
 1H  IN  2620:0:861:1:208:80:154:14
 netmon1001  1H  IN A208.80.154.159
@@ -199,6 +207,9 @@
 
 ;;; codfw
 ntp.codfw   1H  IN CNAME acamar
+
+;;; esams
+ntp.esams   1H  IN CNAME maerlant
 
 ; Round Robin LVS Service records
 
@@ -263,6 +274,21 @@
 misc-web-lb.codfw   600 IN DYNA geoip!misc-addrs/codfw
 donate-lb.codfw 600 IN DYNA geoip!text-addrs/codfw
 geoiplookup-lb.codfw600 IN DYNA geoip!geoiplookup-addrs/codfw
+
+;;; esams
+text-lb.esams   600 IN DYNA geoip!text-addrs/esams
+upload-lb.esams 600 IN DYNA geoip!upload-addrs/esams
+mobile-lb.esams 600 IN DYNA geoip!mobile-addrs/esams
+; XXX temporary, should be DYNA geoip!maps-addrs/esams
+maps-lb.esams   1H  IN A91.198.174.209
+  1H  IN  2620:0:862:ed1a::2:d
+misc-web-lb.esams   600 IN DYNA geoip!misc-addrs/esams
+geoiplookup-lb.esams600 IN DYNA geoip!geoiplookup-addrs/esams
+donate-lb.esams 600 IN DYNA geoip!text-addrs/esams
+  1H  IN MX 10mx1001.wikimedia.org.
+  1H  IN MX 50mx2001.wikimedia.org.
+dns-rec-lb.esams1H  IN A91.198.174.216
+  1H  IN  2620:0:862:ed1a::3:fe
 
 ; Mobile
 
@@ -745,28 +771,13 @@
 ns2 1H  IN A198.73.209.16
 
 ; esams cluster
-
-$ORIGIN {{ zonename }}.
-
-; Servers
-
-eeden1H  IN A   91.198.174.121
- 1H  IN 2620:0:862:1:91:198:174:121
-maerlant 1H  IN A   91.198.174.122
- 1H  IN 2620:0:862:1:91:198:174:122
-multatuli1H  IN A   91.198.174.114
- 1H  IN 2620:0:862:1:91:198:174:114
-nescio   1H  IN A   91.198.174.106
- 1H  IN 2620:0:862:1:91:198:174:106
-
 $ORIGIN esams.{{ zonename }}.
 
 ; Service aliases
-
+; FIXME: all 3 of these are suspect, we don't do these per-subdomain 
elsewhere..
 puppet  1H  IN CNAMEpalladium.eqiad.wmnet.
 recursor0   1H  IN A91.198.174.216  ; esams LVS (dns-rec-lb)
 recursor1   1H  IN A208.80.154.239  ; eqiad LVS (dns-rec-lb)
-ntp 1H  IN CNAMEmaerlant.wikimedia.org.
 
 ; Servers
 ; FIXME: these stay under .esams.wikimedia.org until they get reprovisioned
@@ -776,20 +787,4 @@
 1H  IN  2620:0:862:1:91:198:174:113
 
 ; Management
-
 scs-oe11-esams  1H  IN A10.21.0.102
-
-; Round robin record
-text-lb   600 IN DYNA geoip!text-addrs/esams
-upload-lb 600 IN DYNA geoip!upload-addrs/esams
-mobile-lb 600 IN DYNA geoip!mobile-addrs/esams
-; XXX temporary, should be DYNA geoip!maps-addrs/esams
-maps-lb   1H  IN A91.198.174.209
-  1H  IN  2620:0:862:ed1a::2:d
-misc-web-lb   600 IN DYNA

[MediaWiki-commits] [Gerrit] set rDNS for civi service IPs to civicrm.wm.o to match cert ... - change (operations/dns)

2016-02-12 Thread Jgreen (Code Review)

Jgreen has submitted this change and it was merged.

Change subject: set rDNS for civi service IPs to civicrm.wm.o to match cert for 
SMTP/TLS
..


set rDNS for civi service IPs to civicrm.wm.o to match cert for SMTP/TLS

Change-Id: Ia4677f42b59cbcc37547d28c3560b4da3121082a
---
M templates/152.80.208.in-addr.arpa
M templates/155.80.208.in-addr.arpa
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index ca23db5..3831f50 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -20,7 +20,7 @@
 229 1H IN PTR   frack-payments-nat-codfw.wikimedia.org.
 230 1H IN PTR   frack-default-nat-codfw.wikimedia.org.
 231 1H IN PTR   rigel.wikimedia.org.
-232 1H IN PTR   civicrm-codfw.wikimedia.org.
+232 1H IN PTR   civicrm.wikimedia.org.
 233 1H IN PTR   payments-listener-codfw.wikimedia.org.
 234 1H IN PTR   fundraising-codfw.wikimedia.org.
 
diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index d114cc8..3059b53 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -25,7 +25,7 @@
 7   1H IN PTR   frack-payments-nat-eqiad.wikimedia.org.
 9   1H IN PTR   tellurium.wikimedia.org.
 10  1H IN PTR   frdata-eqiad.wikimedia.org.
-11  1H IN PTR   barium.wikimedia.org.
+11  1H IN PTR   civicrm.wikimedia.org.
 12  1H IN PTR   payments-listener-eqiad.wikimedia.org.
 13  1H IN PTR   frdev-eqiad.wikimedia.org.
 14  1H IN PTR   fundraising-eqiad.wikimedia.org.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4677f42b59cbcc37547d28c3560b4da3121082a
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jgreen 
Gerrit-Reviewer: Jgreen 
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: Replace logo_bg_wmf.png with transparent one - change (operations/puppet)

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

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: otrs: Replace logo_bg_wmf.png with transparent one
..


otrs: Replace logo_bg_wmf.png with transparent one

Get a better version of the wikimedia OTRS background logo

Bug: T125912
Change-Id: Ic349d52a249c21182d242f8519ecc7c69e1be66b
---
M modules/otrs/files/logo_bg_wmf.png
1 file changed, 0 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
index ab28351..d4058f2 100644
--- a/modules/otrs/files/logo_bg_wmf.png
+++ b/modules/otrs/files/logo_bg_wmf.png
Binary files differ

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic349d52a249c21182d242f8519ecc7c69e1be66b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
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 DOMTestTrait to replace deprecated assertTag() - change (mediawiki/core)

2016-02-12 Thread Ricordisamoa (Code Review)

Ricordisamoa has uploaded a new change for review.

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

Change subject: Add DOMTestTrait to replace deprecated assertTag()
..

Add DOMTestTrait to replace deprecated assertTag()

Bug: T69122
Change-Id: Ie83f6ed9c4f8dc68e146a9985f11ae78507fba87
---
A tests/phpunit/DOMTestTrait.php
1 file changed, 76 insertions(+), 0 deletions(-)


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

diff --git a/tests/phpunit/DOMTestTrait.php b/tests/phpunit/DOMTestTrait.php
new file mode 100644
index 000..347d010
--- /dev/null
+++ b/tests/phpunit/DOMTestTrait.php
@@ -0,0 +1,76 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Trait for DOM testing.
+ *
+ * @since 1.27
+ */
+trait DOMTestTrait {
+
+   private static function assertTagSimple( array $matcher, $actual, 
$message = '', $isHtml = true ) {
+   $this->assertEmpty( array_diff(
+   array_keys( $matcher ),
+   array( 'tag', 'attributes', 'content' )
+   ) );
+   $doc = new DOMDocument();
+   if ( $isHtml ) {
+   $doc->loadHTML( $actual );
+   } else {
+   $doc->loadXML( $actual );
+   }
+   $found = false;
+   $elements = $doc->getElementsByTagName( $matcher['tag'] );
+   foreach ( $elements as $node ) {
+   $valid = true;
+   if ( isset( $matcher['attributes'] ) ) {
+   foreach ( $matcher['attributes'] as $name => 
$value ) {
+   if ( $name === 'class' ) {
+   $expected = preg_split( 
'/\s+/', $value, null, PREG_SPLIT_NO_EMPTY );
+   $got = preg_split( '/\s+/', 
$node->getAttribute( $name ), null, PREG_SPLIT_NO_EMPTY );
+   // make sure each class given 
is in the actual node
+   if ( array_diff( $expected, 
$got ) ) {
+   $valid = false;
+   break;
+   }
+   } elseif ( $node->getAttribute( $name ) 
!== $value ) {
+   $valid = false;
+   break;
+   }
+   }
+   }
+   if ( isset( $matcher['content'] ) ) {
+   if ( $matcher['content'] === '' ) {
+   if ( $node->nodeValue !== '' ) {
+   $valid = false;
+   }
+   } elseif ( strstr( $node->nodeValue, 
$matcher['content'] ) === false ) {
+   $valid = false;
+   }
+   }
+   if ( $valid ) {
+   $found = true;
+   break;
+   }
+   }
+   $this->assertTrue( $found, $message );
+   }
+
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie83f6ed9c4f8dc68e146a9985f11ae78507fba87
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] set rDNS for civi service IPs to civicrm.wm.o to match cert ... - change (operations/dns)

2016-02-12 Thread Jgreen (Code Review)

Jgreen has uploaded a new change for review.

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

Change subject: set rDNS for civi service IPs to civicrm.wm.o to match cert for 
SMTP/TLS
..

set rDNS for civi service IPs to civicrm.wm.o to match cert for SMTP/TLS

Change-Id: Ia4677f42b59cbcc37547d28c3560b4da3121082a
---
M templates/152.80.208.in-addr.arpa
M templates/155.80.208.in-addr.arpa
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/77/270277/1

diff --git a/templates/152.80.208.in-addr.arpa 
b/templates/152.80.208.in-addr.arpa
index ca23db5..3831f50 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -20,7 +20,7 @@
 229 1H IN PTR   frack-payments-nat-codfw.wikimedia.org.
 230 1H IN PTR   frack-default-nat-codfw.wikimedia.org.
 231 1H IN PTR   rigel.wikimedia.org.
-232 1H IN PTR   civicrm-codfw.wikimedia.org.
+232 1H IN PTR   civicrm.wikimedia.org.
 233 1H IN PTR   payments-listener-codfw.wikimedia.org.
 234 1H IN PTR   fundraising-codfw.wikimedia.org.
 
diff --git a/templates/155.80.208.in-addr.arpa 
b/templates/155.80.208.in-addr.arpa
index d114cc8..3059b53 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -25,7 +25,7 @@
 7   1H IN PTR   frack-payments-nat-eqiad.wikimedia.org.
 9   1H IN PTR   tellurium.wikimedia.org.
 10  1H IN PTR   frdata-eqiad.wikimedia.org.
-11  1H IN PTR   barium.wikimedia.org.
+11  1H IN PTR   civicrm.wikimedia.org.
 12  1H IN PTR   payments-listener-eqiad.wikimedia.org.
 13  1H IN PTR   frdev-eqiad.wikimedia.org.
 14  1H IN PTR   fundraising-eqiad.wikimedia.org.

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

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

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

[MediaWiki-commits] [Gerrit] BSApiExtJSStoreBase/StringHelper: String filter - change (mediawiki...BlueSpiceFoundation)

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

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

Change subject: BSApiExtJSStoreBase/StringHelper: String filter
..


BSApiExtJSStoreBase/StringHelper: String filter

Encapsulated string filter logic to make it availabl to other code.
This also makes it easier to override 'filterString' in subclasses of
BSApiExtJSStoreBase.

* PatchSet 2: Applied CC

Change-Id: Idbe074824895868f198f98d460d90c1e06f6ea6a
---
M includes/api/BSApiExtJSStoreBase.php
M includes/utility/StringHelper.class.php
2 files changed, 46 insertions(+), 19 deletions(-)

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



diff --git a/includes/api/BSApiExtJSStoreBase.php 
b/includes/api/BSApiExtJSStoreBase.php
index 46b5fe2..f60c68d 100644
--- a/includes/api/BSApiExtJSStoreBase.php
+++ b/includes/api/BSApiExtJSStoreBase.php
@@ -347,25 +347,7 @@
$sFieldValue = $aDataSet->{$oFilter->field};
$sFilterValue = $oFilter->value;
 
-   //TODO: Add string functions to BsStringHelper
-   //HINT: http://stackoverflow.com/a/10473026 + Case insensitive
-   switch( $oFilter->comparison ) {
-   case 'sw':
-   return $sFilterValue === '' ||
-   strripos($sFieldValue, $sFilterValue, 
-strlen($sFieldValue)) !== false;
-   case 'ew':
-   return $sFilterValue === '' ||
-   (($temp = strlen($sFieldValue) - 
strlen($sFilterValue)) >= 0
-   && stripos($sFieldValue, $sFilterValue, 
$temp) !== false);
-   case 'ct':
-   return stripos($sFieldValue, $sFilterValue) !== 
false;
-   case 'nct':
-   return stripos($sFieldValue, $sFilterValue) === 
false;
-   case 'eq':
-   return $sFieldValue === $sFilterValue;
-   case 'neq':
-   return $sFieldValue !== $sFilterValue;
-   }
+   return BsStringHelper::filter( $oFilter->comparison, 
$sFieldValue, $sFilterValue );
}
 
/**
diff --git a/includes/utility/StringHelper.class.php 
b/includes/utility/StringHelper.class.php
index 332a1af..2b964d8 100644
--- a/includes/utility/StringHelper.class.php
+++ b/includes/utility/StringHelper.class.php
@@ -124,4 +124,49 @@
}
return false;
}
+
+   const FILTER_STARTSWITH = 'sw';
+   const FILTER_ENDSWITH = 'ew';
+   const FILTER_CONTAINS = 'ct';
+   const FILTER_CONTAINSNOT = 'nct';
+   const FILTER_EQUALS = 'eq';
+   const FILTER_EQUALSNOT = 'neq';
+
+   /**
+* HINT: http://stackoverflow.com/a/10473026
+* @param string $sOp ExtJS filter conformant operator
+* 'sw' --> 'Starts with' 
+* 'ew' --> 'Ends with' 
+* 'ct' --> 'Contains' 
+* 'nct' --> 'Contains not' 
+* 'eq' --> 'Equals' 
+* 'neq' --> 'Not equals' 
+* @param string $sHaystack
+* @param string $sNeedle
+* @return bool
+*/
+   public static function filter( $sOp, $sHaystack, $sNeedle, 
$bCaseSensitive = false ) {
+   if( !$bCaseSensitive ) {
+   $sHaystack = mb_strtolower( $sHaystack );
+   $sNeedle = mb_strtolower( $sNeedle );
+   }
+   switch( $sOp ) {
+   case self::FILTER_STARTSWITH:
+   return $sNeedle === '' ||
+   strrpos( $sHaystack, $sNeedle, - 
strlen( $sHaystack ) ) !== false;
+   case self::FILTER_ENDSWITH:
+   return $sNeedle === '' ||
+   ( ( $temp = strlen( $sHaystack ) - 
strlen( $sNeedle ) ) >= 0
+   && strpos( $sHaystack, $sNeedle, $temp 
) !== false);
+   case self::FILTER_CONTAINS:
+   return strpos( $sHaystack, $sNeedle ) !== false;
+   case self::FILTER_CONTAINSNOT:
+   return strpos( $sHaystack, $sNeedle ) === false;
+   case self::FILTER_EQUALS:
+   return $sHaystack === $sNeedle;
+   case self::FILTER_EQUALSNOT:
+   return $sHaystack !== $sNeedle;
+   }
+   }
+
 }
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbe074824895868f198f98d460d90c1e06f6ea6a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation

[MediaWiki-commits] [Gerrit] Remove unused imports from suggest(er) classes - change (mediawiki...CirrusSearch)

2016-02-12 Thread WMDE

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

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

Change subject: Remove unused imports from suggest(er) classes
..

Remove unused imports from suggest(er) classes

Change-Id: Ib6aef00cc0f26c4b6a5fc8015b7370022bba84c6
---
M includes/Api/Suggest.php
M includes/CompletionSuggester.php
2 files changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/includes/Api/Suggest.php b/includes/Api/Suggest.php
index 85908cf..48001c4 100644
--- a/includes/Api/Suggest.php
+++ b/includes/Api/Suggest.php
@@ -3,7 +3,6 @@
 
 use SearchSuggestion;
 use CirrusSearch;
-use RequestContext;
 
 /**
  * Use ElasticSearch suggestion API
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index 8cfbd21..b16a0a0 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -9,7 +9,6 @@
 use CirrusSearch\Search\SearchContext;
 use ConfigFactory;
 use MediaWiki\Logger\LoggerFactory;
-use RequestContext;
 use SearchSuggestion;
 use SearchSuggestionSet;
 use Status;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6aef00cc0f26c4b6a5fc8015b7370022bba84c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
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] swiftrepl: minimal README with instructions - change (operations/software)

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

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swiftrepl: minimal README with instructions
..

swiftrepl: minimal README with instructions

Change-Id: I22b9644c38967b36ce2f5c5e0d63b04bef63daa6
---
A swiftrepl/README.md
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/96/270296/1

diff --git a/swiftrepl/README.md b/swiftrepl/README.md
new file mode 100644
index 000..2b84aa9
--- /dev/null
+++ b/swiftrepl/README.md
@@ -0,0 +1,23 @@
+swiftrepl
+=
+
+swiftrepl performs one-way synchronization between two different swift
+clusters. It is possible to restrict what will be synchronized by container
+name and file name.
+
+testing
+---
+One easy way to test swiftrepl at a very high level is to spawn two local swift
+clusters using SAIO and two vagrant virtual machines:
+
+  git clone https://github.com/swiftstack/vagrant-swift-all-in-one.git 
vagrant-saio1
+  git clone https://github.com/swiftstack/vagrant-swift-all-in-one.git 
vagrant-saio2
+
+  (cd vagrant-saio1 && vagrant up)
+  (cd vagrant-saio2 && export IP=192.168.8.81 && vagrant up)
+
+If you are on Linux you might want to also `export SOURCE_ROOT=/tmp` since
+vboxfs mounted at `/vagrant` doesn't like symlinks. A sample configuration file
+`swiftrepl.conf.saio` is provided that can be used out of the box. The two
+swift clusters can be inspected for example with `python-swiftclient` and
+setting `ST_USER` `ST_KEY` `ST_AUTH` as indicated in the sample configuration.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22b9644c38967b36ce2f5c5e0d63b04bef63daa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] swiftrepl: example configuration file - change (operations/software)

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

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swiftrepl: example configuration file
..

swiftrepl: example configuration file

Change-Id: I4fe3607603627d56e414354f5bb7f4b4ddfda07e
---
A swiftrepl/swiftrepl.conf.saio
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/97/270297/1

diff --git a/swiftrepl/swiftrepl.conf.saio b/swiftrepl/swiftrepl.conf.saio
new file mode 100644
index 000..2c32c45
--- /dev/null
+++ b/swiftrepl/swiftrepl.conf.saio
@@ -0,0 +1,13 @@
+# see also README.md
+[src]
+username=test:tester
+api_key=testing
+auth_url=http://192.168.8.80:8080/auth/v1.0
+
+[dst]
+username=test:tester
+api_key=testing
+auth_url=http://192.168.8.81:8080/auth/v1.0
+
+[container_sets]
+all=^.*$

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fe3607603627d56e414354f5bb7f4b4ddfda07e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] swiftrepl: example configuration file - change (operations/software)

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

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swiftrepl: example configuration file
..


swiftrepl: example configuration file

Change-Id: I4fe3607603627d56e414354f5bb7f4b4ddfda07e
---
A swiftrepl/swiftrepl.conf.saio
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/swiftrepl/swiftrepl.conf.saio b/swiftrepl/swiftrepl.conf.saio
new file mode 100644
index 000..2c32c45
--- /dev/null
+++ b/swiftrepl/swiftrepl.conf.saio
@@ -0,0 +1,13 @@
+# see also README.md
+[src]
+username=test:tester
+api_key=testing
+auth_url=http://192.168.8.80:8080/auth/v1.0
+
+[dst]
+username=test:tester
+api_key=testing
+auth_url=http://192.168.8.81:8080/auth/v1.0
+
+[container_sets]
+all=^.*$

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4fe3607603627d56e414354f5bb7f4b4ddfda07e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Add PHP linting with mediawiki-codesniffer - change (mediawiki...GWToolset)

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

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

Change subject: Add PHP linting with mediawiki-codesniffer
..


Add PHP linting with mediawiki-codesniffer

* Add MediaWiki CodeSniffer to composer.json
* Disable PHPCS rules currently failing rules in phpcs.xml
* Fix CodeSniffer errors automatically using phpcs diff report [1]

[1] The following errors were automatically fixed:
- MediaWiki.Usage.DirUsage.FunctionFound
- MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect
- MediaWiki.WhiteSpace.SpaceyParenthesis.SpaceBeforeOpeningParenthesis
- PSR2.ControlStructures.ElseIfDeclaration.NotAllowed
- PSR2.Methods.MethodDeclaration.AbstractAfterVisibility
- PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter
- PSR2.Namespaces.UseDeclaration.MultipleDeclarations
- PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse
- PSR2.Namespaces.UseDeclaration.SpaceAfterUse
- Squiz.WhiteSpace.LanguageConstructSpacing.Incorrect
- Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
- Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLine)

Bug: T125554
Change-Id: I90b9fabbe2630ecb9d62d185a5c0b30147d378fe
---
M GWToolset.hooks.php
M GWToolset.i18n.php
M GWToolset.php
M composer.json
M includes/Adapters/Php/MappingPhpAdapter.php
M includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
M includes/Adapters/Php/MetadataPhpAdapter.php
M includes/Forms/MetadataDetectForm.php
M includes/Forms/MetadataMappingForm.php
M includes/Forms/PreviewForm.php
M includes/GWTException.php
M includes/Handlers/Forms/FormHandler.php
M includes/Handlers/Forms/MetadataDetectHandler.php
M includes/Handlers/Forms/MetadataMappingHandler.php
M includes/Handlers/UploadHandler.php
M includes/Handlers/Xml/XmlDetectHandler.php
M includes/Handlers/Xml/XmlHandler.php
M includes/Handlers/Xml/XmlMappingHandler.php
M includes/Helpers/FileChecks.php
M includes/Helpers/GWTFileBackend.php
M includes/Helpers/WikiChecks.php
M includes/Jobs/GWTFileBackendCleanupJob.php
M includes/Jobs/UploadMediafileJob.php
M includes/Jobs/UploadMetadataJob.php
M includes/Models/Mapping.php
M includes/Models/MediawikiTemplate.php
M includes/Models/Metadata.php
M includes/Models/ModelInterface.php
M includes/Php/File.php
M includes/Specials/SpecialGWToolset.php
M includes/Utils.php
M maintenance/cleanupGWTFileBackend.php
A phpcs.xml
33 files changed, 280 insertions(+), 240 deletions(-)

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



diff --git a/GWToolset.hooks.php b/GWToolset.hooks.php
index 19e43f3..79fb169 100644
--- a/GWToolset.hooks.php
+++ b/GWToolset.hooks.php
@@ -17,4 +17,4 @@
return true;
}
 
-}
\ No newline at end of file
+}
diff --git a/GWToolset.i18n.php b/GWToolset.i18n.php
index f600888..b33d226 100644
--- a/GWToolset.i18n.php
+++ b/GWToolset.i18n.php
@@ -15,7 +15,7 @@
function wfJsonI18nShimee273fa76ab14105( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
+   $fileName = __DIR__ . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents( 
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
diff --git a/GWToolset.php b/GWToolset.php
index 478aef0..cfbacf0 100644
--- a/GWToolset.php
+++ b/GWToolset.php
@@ -8,6 +8,7 @@
  */
 
 namespace GWToolset;
+
 use GWToolset\Constants;
 
 if ( !defined( 'MEDIAWIKI' ) ) {
diff --git a/composer.json b/composer.json
index 1c63f9e..083767b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,12 @@
 {
"require-dev": {
-   "jakub-onderka/php-parallel-lint": "0.9.2"
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.5.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor"
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
]
}
 }
diff --git a/includes/Adapters/Php/MappingPhpAdapter.php 
b/includes/Adapters/Php/MappingPhpAdapter.php
index f020d66..87bced5 100644
--- a/includes/Adapters/Php/MappingPhpAdapter.php
+++ b/includes/Adapters/Php/MappingPhpAdapter.php
@@ -8,10 +8,11 @@
  */
 
 namespace GWToolset\Adapters\Php;
-use GWToolset\Adapters\DataAdapterInterface,
-   GWToolset\GWTException,
-   Title,
-   WikiPage;
+
+use GWToolset\Adapters\DataAdapterInterface;
+use GWToolset\GWTException;
+use Title;
+use WikiPage;
 
 class MappingPhpAdapter implements DataAdapterInterface {
 
diff --git a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php 
b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
index

[MediaWiki-commits] [Gerrit] otrs: Update loginlogo - change (operations/puppet)

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

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: otrs: Update loginlogo
..


otrs: Update loginlogo

Use a better version of OTRS login logo. Amend the filename as well to
remove the default word for it.

Bug: T125911
Change-Id: I4390594711c24bd7814db1ef87a516eae9d6ccc1
---
D modules/otrs/files/loginlogo_default_wmf.png
A modules/otrs/files/loginlogo_wmf.png
M modules/otrs/manifests/init.pp
3 files changed, 1 insertion(+), 1 deletion(-)

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
deleted file mode 100644
index 658d68c..000
--- a/modules/otrs/files/loginlogo_default_wmf.png
+++ /dev/null
Binary files differ
diff --git a/modules/otrs/files/loginlogo_wmf.png 
b/modules/otrs/files/loginlogo_wmf.png
new file mode 100644
index 000..31d2d0f
--- /dev/null
+++ b/modules/otrs/files/loginlogo_wmf.png
Binary files differ
diff --git a/modules/otrs/manifests/init.pp b/modules/otrs/manifests/init.pp
index 7479b9b..fa13c4f 100644
--- a/modules/otrs/manifests/init.pp
+++ b/modules/otrs/manifests/init.pp
@@ -131,7 +131,7 @@
 owner  => 'otrs',
 group  => 'www-data',
 mode   => '0664',
-source => 'puppet:///modules/otrs/loginlogo_default_wmf.png',
+source => 'puppet:///modules/otrs/loginlogo_wmf.png',
 }
 
 base::service_unit { 'otrs-daemon':

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

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

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

[MediaWiki-commits] [Gerrit] Require extension registration - change (mediawiki...CleanChanges)

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

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

Change subject: Require extension registration
..


Require extension registration

Change-Id: Ic75a0a4056478f68dbc3016404697cc4ef148158
---
M CleanChanges.php
1 file changed, 2 insertions(+), 43 deletions(-)

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



diff --git a/CleanChanges.php b/CleanChanges.php
index f447aab..54d3da8 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -8,47 +8,6 @@
'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
); */
return;
+} else {
+   die( 'This version of the CleanChanges extension requires MediaWiki 
1.25+' );
 }
-/**
- * Setup for pre-1.25 wikis. Make sure this is kept in sync with extension.json
- */
-
-/**
- * An extension to show a nice compact changes list and few extra filters for
- * Special:RecentChanges.php
- *
- * @file
- * @ingroup Extensions
- *
- * @author Niklas Laxström
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
- */
-
-/* Extension information */
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'Clean Changes',
-   'version' => '2016-02-12',
-   'author' => 'Niklas Laxström',
-   'descriptionmsg' => 'cleanchanges-desc',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:CleanChanges',
-   'license-name' => 'GPL-2.0+',
-);
-
-/* Set up messages and includes */
-$wgMessagesDirs['CleanChanges'] = __DIR__ . '/i18n';
-$wgAutoloadClasses['NCL'] =  __DIR__ . "/CleanChanges_body.php";
-$wgAutoloadClasses['CCFilters'] = __DIR__ . "/Filters.php";
-
-require_once __DIR__ . '/Resources.php';
-
-/* Hook into code */
-$wgHooks['FetchChangesList'][] = 'NCL::hook';
-$wgHooks['MakeGlobalVariablesScript'][] = 'NCL::addScriptVariables';
-$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::user';
-$wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::userForm';
-$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::trailer';
-$wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::trailerForm';
-
-$wgCCUserFilter = true;
-$wgCCTrailerFilter = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic75a0a4056478f68dbc3016404697cc4ef148158
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CleanChanges
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
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] Use non-deprecated hooks - change (mediawiki...CleanChanges)

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

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

Change subject: Use non-deprecated hooks
..


Use non-deprecated hooks

Change-Id: I170da086e7ae0efa7a034998136bd0a54140adf8
---
M CleanChanges.php
M Filters.php
D Resources.php
M extension.json
4 files changed, 36 insertions(+), 53 deletions(-)

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



diff --git a/CleanChanges.php b/CleanChanges.php
index d607f75..f447aab 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -21,7 +21,6 @@
  * @ingroup Extensions
  *
  * @author Niklas Laxström
- * @copyright Copyright © 2008-2012, Niklas Laxström
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
@@ -29,7 +28,7 @@
 $wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'Clean Changes',
-   'version' => '2014-12-29',
+   'version' => '2016-02-12',
'author' => 'Niklas Laxström',
'descriptionmsg' => 'cleanchanges-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:CleanChanges',
@@ -46,9 +45,9 @@
 /* Hook into code */
 $wgHooks['FetchChangesList'][] = 'NCL::hook';
 $wgHooks['MakeGlobalVariablesScript'][] = 'NCL::addScriptVariables';
-$wgHooks['SpecialRecentChangesQuery'][] = 'CCFilters::user';
+$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::user';
 $wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::userForm';
-$wgHooks['SpecialRecentChangesQuery'][] = 'CCFilters::trailer';
+$wgHooks['ChangesListSpecialPageQuery'][] = 'CCFilters::trailer';
 $wgHooks['SpecialRecentChangesPanel'][] = 'CCFilters::trailerForm';
 
 $wgCCUserFilter = true;
diff --git a/Filters.php b/Filters.php
index 13e0858..bd3cdb5 100644
--- a/Filters.php
+++ b/Filters.php
@@ -3,23 +3,27 @@
 class CCFilters {
 
/**
-* @param array $conds
-* @param array $tables
-* @param array $join_conds
-* @param FormOptions $opts
-* @return bool
+* Hook: ChangesListSpecialPageQuery
 */
-   public static function user( &$conds, &$tables, &$join_conds, 
FormOptions $opts ) {
+   public static function user(
+   $name,
+   &$tables,
+   &$fields,
+   &$conds,
+   &$query_options,
+   &$join_conds,
+   FormOptions $opts
+   ) {
global $wgRequest, $wgCCUserFilter;
 
if ( !$wgCCUserFilter ) {
-   return true;
+   return;
}
 
$opts->add( 'users', '' );
$users = $wgRequest->getVal( 'users' );
if ( $users === null ) {
-   return true;
+   return;
}
 
$idfilters = array();
@@ -35,20 +39,16 @@
$conds[] = 'rc_user IN (' . $dbr->makeList( $idfilters 
) . ')';
$opts->setValue( 'users', $users );
}
-
-   return true;
}
 
/**
-* @param $items array
-* @param $opts FormOptions
-* @return bool
+* Hook: SpecialRecentChangesPanel
 */
public static function userForm( &$items, FormOptions $opts ) {
global $wgRequest, $wgCCUserFilter;
 
if ( !$wgCCUserFilter ) {
-   return true;
+   return;
}
 
$opts->consumeValue( 'users' );
@@ -56,38 +56,40 @@
$default = $wgRequest->getVal( 'users', '' );
$items['users'] = Xml::inputLabelSep( wfMessage( 
'cleanchanges-users' )->text(), 'users',
'mw-users', 40, $default  );
-   return true;
+   return;
}
 
/**
-* @param array $conds
-* @param array $tables
-* @param array $join_conds
-* @param FormOptions $opts
-* @return bool
+* Hook: ChangesListSpecialPageQuery
 */
-   public static function trailer( &$conds, &$tables, &$join_conds, 
FormOptions $opts ) {
+   public static function trailer(
+   $name,
+   &$tables,
+   &$fields,
+   &$conds,
+   &$query_options,
+   &$join_conds,
+   FormOptions $opts
+   ) {
global $wgRequest, $wgCCTrailerFilter;
 
if ( !$wgCCTrailerFilter ) {
-   return true;
+   return;
}
 
$opts->add( 'trailer', '' );
$trailer = $wgRequest->getVal( 'trailer' );
-   if ( $trailer === null ) return true;
+   if ( $trailer === null ) {
+   return;
+   }
 
$dbr = wfGetDB( DB_SLAVE );
$conds[] = 'rc_title ' .

[MediaWiki-commits] [Gerrit] Fix: Call to undefined function CirrusSearch\Search\getScore() - change (mediawiki...CirrusSearch)

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

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

Change subject: Fix: Call to undefined function CirrusSearch\Search\getScore()
..


Fix: Call to undefined function CirrusSearch\Search\getScore()

Change-Id: I5aaed5125c7299ae795dd1ad99b59dd5ef287906
---
M includes/Search/Result.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Aude: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Search/Result.php b/includes/Search/Result.php
index 8cf6e20..4908f5b 100644
--- a/includes/Search/Result.php
+++ b/includes/Search/Result.php
@@ -94,7 +94,7 @@
if ( isset( $highlights[ 'category' ] ) ) {
$this->categorySnippet = $this->escapeHighlightedText( 
$highlights[ 'category' ][ 0 ] );
}
-   $this->score = $result-getScore();
+   $this->score = $result->getScore();
$this->explanation = $result->getExplanation();
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5aaed5125c7299ae795dd1ad99b59dd5ef287906
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
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 ferm rules for maps/cassandra - change (operations/puppet)

2016-02-12 Thread Muehlenhoff (Code Review)

Muehlenhoff has uploaded a new change for review.

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

Change subject: Add ferm rules for maps/cassandra
..

Add ferm rules for maps/cassandra

The other bits of maps* are TDB in a second commit.

Change-Id: I73b958d392ae74d829ea00230346253577845942
---
M manifests/role/maps.pp
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/270280/1

diff --git a/manifests/role/maps.pp b/manifests/role/maps.pp
index 0e5088c..8543e12 100644
--- a/manifests/role/maps.pp
+++ b/manifests/role/maps.pp
@@ -39,6 +39,31 @@
 file { '/var/log/postgresql/postgresql-9.4-main.log':
 group => 'maps-admins',
 }
+
+$cassandra_hosts = hiera('cassandra::seeds')
+$cassandra_hosts_ferm = join($cassandra_hosts, ' ')
+
+# Cassandra intra-node messaging
+ferm::service { 'maps-cassandra-intra-node':
+proto  => 'tcp',
+port   => '7000',
+srange => "(${cassandra_hosts_ferm})",
+}
+
+# Cassandra JMX/RMI
+ferm::service { 'maps-cassandra-jmx-rmi':
+proto  => 'tcp',
+# hardcoded limit of 4 instances per host
+port   => '7199',
+srange => "(${cassandra_hosts_ferm})",
+}
+
+# Cassandra CQL query interface
+ferm::service { 'cassandra-cql':
+proto  => 'tcp',
+port   => '9042',
+srange => "(${cassandra_hosts_ferm})",
+}
 }
 
 # Sets up a maps server master

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73b958d392ae74d829ea00230346253577845942
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] Remove unused imports from repo - change (mediawiki...Wikibase)

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

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

Change subject: Remove unused imports from repo
..


Remove unused imports from repo

Seems two of these were a mistake in Ib27173a.

Change-Id: I0cd50098c8e13e8a8765a689be34cbf44f733f60
---
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
M repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
3 files changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/repo/includes/api/SetDescription.php 
b/repo/includes/api/SetDescription.php
index c64f33c..eb954fb 100644
--- a/repo/includes/api/SetDescription.php
+++ b/repo/includes/api/SetDescription.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Repo\Api;
 
 use ApiMain;
-use InvalidArgumentException;
 use Wikibase\ChangeOp\ChangeOpDescription;
 use Wikibase\ChangeOp\FingerprintChangeOpFactory;
 use Wikibase\DataModel\Entity\EntityDocument;
diff --git a/repo/includes/api/SetLabel.php b/repo/includes/api/SetLabel.php
index 6ac651d..447bf6d 100644
--- a/repo/includes/api/SetLabel.php
+++ b/repo/includes/api/SetLabel.php
@@ -3,7 +3,6 @@
 namespace Wikibase\Repo\Api;
 
 use ApiMain;
-use InvalidArgumentException;
 use Wikibase\ChangeOp\ChangeOpLabel;
 use Wikibase\ChangeOp\FingerprintChangeOpFactory;
 use Wikibase\DataModel\Entity\EntityDocument;
diff --git 
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
 
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
index 299cb0a..018d7d0 100644
--- 
a/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
+++ 
b/repo/tests/phpunit/includes/specials/SpecialSetLabelDescriptionAliasesTest.php
@@ -14,7 +14,6 @@
 use Wikibase\DataModel\Term\Fingerprint;
 use Wikibase\EditEntityFactory;
 use Wikibase\LabelDescriptionDuplicateDetector;
-use Wikibase\Lib\ContentLanguages;
 use Wikibase\Lib\StaticContentLanguages;
 use Wikibase\Repo\Specials\SpecialSetLabelDescriptionAliases;
 use Wikibase\Repo\Validators\TermValidatorFactory;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cd50098c8e13e8a8765a689be34cbf44f733f60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Bene 
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 shell users for frack pentest - change (operations/puppet)

2016-02-12 Thread Cmjohnson (Code Review)

Cmjohnson has submitted this change and it was merged.

Change subject: admin: add shell users for frack pentest
..


admin: add shell users for frack pentest

Creates 2 shell users as requestd on T126012.

Does _not_ add them to any groups yet, that will be
separate. When trying to add them in the same change
jenkins will always vote -1 for "Users assigned that
do not exist" and it also keeps the actual access requests
smaller.

Bug:T126012
Change-Id: I5825ad3447a1191c9d0cb91d78430743b7a4211d
---
M modules/admin/data/data.yaml
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index c3a990d..786dc07 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1815,4 +1815,19 @@
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDSxkE+b4Jc+3FoCgYqZvQJZ8a0Hk2UhC2Qb1zi1CiThsE8oBPf6n1Mki58o/mHBrtfgAPutCFFylkLwuPDE5tDojENvNx3roMxEmpQhDTs3iKTfXF98IVdsrI8gmrpCQoy+fny3K/O89rmAza2WTK2ogB2rDBLRAC0hYz6pzuA38+4ybmYbqVn/SQSDyMsX0366xBsn3r6pEwyttZsLhO/5HDG1O5cUkrxwXr5XACIGGHZyG2ev2uLtZj/6py5skxvp2xLs1/m7qP1Sykvz8QungW7KfyzNCVKb07RxKlsUQEnAqnQY2fnB3VjKSe4FNUafQHkmFJ1MLr0zH31uMOF
 pche...@petrs-mbp.corp.wikimedia.org
 uid: 12460
+  akumar:
+  ensure: present
+  gid: 500
+  name: akumar
+  realname: Anupam Kumar
+  ssh_keys: [ssh-rsa 
B3NzaC1yc2EBJQAAAQEAsPYgcsmSWzUX0W1DQTz+XiMTkxI3lPHBmTz+C5q9yfhSBD7N5EZnuf9ULAJM3aH1Hat2BNqhvI3IWcNAhI1TNcGLOR7ZrgPEN5b1SnZsctfaNW3nf2ZpxZU+6Am7rDQQu467UjXx2wi/UwqAY/+O/cE3pPr6Yh+3DOiuDcEcLuAP9QMDjbS2nnf1yqJlNl8Go9nmxK5FXXN465y5GxxrFi0bOgTwkelca928VDIsqQdhBUKJqbyYv7MYZgm6AfxsPDHpgvySNp/sPBtEzZHaBcs8ig0jqoKKo451aA5atYihkctZ37b6njkVstcupL6Bv/P+504HMQxLSD6M5YjHew==
 anupam.kumar]
+  uid: 14121
+mnoushad:
+  ensure: present
+  gid: 500
+  name: mnoushad
+  realname: Muhammed Noushad
+  ssh_keys: [ssh-rsa 
B3NzaC1yc2EBJQAAAQEA1DvHq/H0WOvfcpwXTcc9cGipyJXymQRoguOgxlfSsQDlk7X9IUMii34M4CNVqNzU3e68itJzb2GKlnMKRYeRgsJWluWxi6ZDgD1unoa4cs3dg5mvrWmrp3bpRvGGfois+dOuH4di9/bM/+hwhRS/MGt9pRNQLPEXf/0nsTPD/JSfMIEuETbCvpY0r8+Cek1I7rVxg9qzWTFdidK5QQbqI5I5aqcrJpqgzJ5iBbivO6bVDFx6qA/okRPHDYpoUA9/YE2GdlY7P5hwmrERNX7xMbv/3DETInS6uOFMksdUSlUhhMVR8H0xsDgrLIIDYNk8bjAcQ4T7TWCxVxHiN/u/6Q==
 muhammed.noushad]
+  uid: 14122
+
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5825ad3447a1191c9d0cb91d78430743b7a4211d
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Cmjohnson 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Jgreen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] change civicrm.wm.o from a cname to an A record - change (operations/dns)

2016-02-12 Thread Jgreen (Code Review)

Jgreen has submitted this change and it was merged.

Change subject: change civicrm.wm.o from a cname to an A record
..


change civicrm.wm.o from a cname to an A record

Change-Id: I474d5af9ee1214f7cdb43f0e70a68d95d77817fc
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index e17e5dd..116fa88 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -621,7 +621,7 @@
 bugzilla 600 IN DYNA geoip!misc-addrs
 bug-attachment   1H  IN DYNA geoip!text-addrs
 careers  600 IN DYNA geoip!text-addrs
-civicrm  1H  IN CNAMEbarium
+civicrm  1H  IN A208.80.155.11
 civicrm.frdev1H  IN CNAMEfrdev-eqiad
 civicrm-gr.frdev 1H  IN CNAMEfrdev-eqiad
 civicrm2-gr.frdev 1H IN CNAMEfrdev-eqiad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I474d5af9ee1214f7cdb43f0e70a68d95d77817fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jgreen 
Gerrit-Reviewer: Jgreen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update graphoid to 581abaa - change (mediawiki...deploy)

2016-02-12 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Update graphoid to 581abaa
..

Update graphoid to 581abaa

List of changes:
3cc0d80 Added wikidatasparql: support, new config
581abaa updated url parsing for node4
xxx Update node module dependencies

Change-Id: Icfd8d00cab4313361257877725222f84568b4195
---
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/js/release/debuggability.js
M node_modules/bluebird/js/release/errors.js
M node_modules/bluebird/js/release/promise.js
M node_modules/bluebird/js/release/timers.js
M node_modules/bluebird/js/release/util.js
M node_modules/bluebird/package.json
R node_modules/body-parser/node_modules/http-errors/LICENSE
A node_modules/body-parser/node_modules/http-errors/index.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits_browser.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/test.js
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
A node_modules/body-parser/node_modules/http-errors/package.json
A node_modules/body-parser/node_modules/qs/.eslintrc
M node_modules/body-parser/node_modules/qs/.travis.yml
M node_modules/body-parser/node_modules/qs/bower.json
M node_modules/body-parser/node_modules/qs/component.json
M node_modules/body-parser/node_modules/qs/dist/qs.js
M node_modules/body-parser/node_modules/qs/lib/index.js
M node_modules/body-parser/node_modules/qs/lib/parse.js
M node_modules/body-parser/node_modules/qs/lib/stringify.js
M node_modules/body-parser/node_modules/qs/lib/utils.js
M node_modules/body-parser/node_modules/qs/package.json
A node_modules/body-parser/node_modules/qs/test/index.js
M node_modules/body-parser/node_modules/qs/test/parse.js
M node_modules/body-parser/node_modules/qs/test/stringify.js
M node_modules/body-parser/node_modules/qs/test/utils.js
M node_modules/body-parser/package.json
M node_modules/bunyan/AUTHORS
M node_modules/bunyan/Makefile
M node_modules/bunyan/bin/bunyan
M node_modules/bunyan/lib/bunyan.js
A node_modules/bunyan/node_modules/moment/LICENSE
A node_modules/bunyan/node_modules/moment/ender.js
A node_modules/bunyan/node_modules/moment/locale/af.js
A node_modules/bunyan/node_modules/moment/locale/ar-ma.js
A node_modules/bunyan/node_modules/moment/locale/ar-sa.js
A node_modules/bunyan/node_modules/moment/locale/ar-tn.js
A node_modules/bunyan/node_modules/moment/locale/ar.js
A node_modules/bunyan/node_modules/moment/locale/az.js
A node_modules/bunyan/node_modules/moment/locale/be.js
A node_modules/bunyan/node_modules/moment/locale/bg.js
A node_modules/bunyan/node_modules/moment/locale/bn.js
A node_modules/bunyan/node_modules/moment/locale/bo.js
A node_modules/bunyan/node_modules/moment/locale/br.js
A node_modules/bunyan/node_modules/moment/locale/bs.js
A node_modules/bunyan/node_modules/moment/locale/ca.js
A node_modules/bunyan/node_modules/moment/locale/cs.js
A node_modules/bunyan/node_modules/moment/locale/cv.js
A node_modules/bunyan/node_modules/moment/locale/cy.js
A node_modules/bunyan/node_modules/moment/locale/da.js
A node_modules/bunyan/node_modules/moment/locale/de-at.js
A node_modules/bunyan/node_modules/moment/locale/de.js
A node_modules/bunyan/node_modules/moment/locale/dv.js
A node_modules/bunyan/node_modules/moment/locale/el.js
A node_modules/bunyan/node_modules/moment/locale/en-au.js
A node_modules/bunyan/node_modules/moment/locale/en-ca.js
A node_modules/bunyan/node_modules/moment/locale/en-gb.js
A node_modules/bunyan/node_modules/moment/locale/en-ie.js
A node_modules/bunyan/node_modules/moment/locale/en-nz.js
A node_modules/bunyan/node_modules/moment/locale/eo.js
A node_modules/bunyan/node_modules/moment/locale/es.js
A node_modules/bunyan/node_modules/moment/locale/et.js
A node_modules/bunyan/node_modules/moment/locale/eu.js
A node_modules/bunyan/node_modules/moment/locale/fa.js
A node_modules/bunyan/node_modules/moment/locale/fi.js
A node_modules/bunyan/node_modules/moment/locale/fo.js
A node_modules/bunyan/node_modules/moment/locale/fr-ca.js
A node_modules/bunyan/node_modules/moment/locale/fr-ch.js
A node_modules/bunyan/node_modules/moment/locale/fr.js
A node_modules/bunyan/node_modules/moment/locale/fy.js

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

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

Alexandros Kosiaris has submitted this change and it was merged.

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
---
D modules/otrs/files/crontab.otrs
M modules/otrs/manifests/init.pp
2 files changed, 9 insertions(+), 60 deletions(-)

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



diff --git a/modules/otrs/files/crontab.otrs b/modules/otrs/files/crontab.otrs
deleted file mode 100644
index 11bfa9b..000
--- a/modules/otrs/files/crontab.otrs
+++ /dev/null
@@ -1,31 +0,0 @@
-# installed by puppet, see puppet/files/otrs/crontab.otrs
-
-MAILTO="r...@wikimedia.org"
-
-# delete expired cache every Sunday AM
-20 0 * * 0   otrs /opt/otrs/bin/otrs.DeleteCache.pl --expired > /dev/null 2>&1
-30 0 * * 0   otrs /opt/otrs/bin/otrs.LoaderCache.pl -o delete > /dev/null 2>&1
-
-# start generic agent (db) every 10 min
-*/10 * * * * otrs /opt/otrs/bin/otrs.GenericAgent.pl -c db > /dev/null 2>&1
-
-# start generic agent (non-db) every 20 min
-*/20 * * * * otrs /opt/otrs/bin/otrs.GenericAgent.pl > /dev/null 2>&1
-
-# check for pending jobs every 120 min
-45 */2 * * * otrs /opt/otrs/bin/otrs.PendingJobs.pl > /dev/null 2>&1
-
-# check daily the spool directory of OTRS
-10 0 * * *   otrs /opt/otrs/bin/otrs.cleanup > /dev/null 2>&1
-
-# rebuild ticket index for OTRS daily
-01 01 * * *  otrs /opt/otrs/bin/otrs.RebuildTicketIndex.pl > /dev/null 2>&1
-
-# delete old/idle session ids every 2 hours
-55 */2 * * * otrs /opt/otrs/bin/otrs.DeleteSessionIDs.pl --expired > 
/dev/null 2>&1
-
-# unlock old locked tickets hourly
-35 * * * *   otrs /opt/otrs/bin/otrs.UnlockTickets.pl --timeout > /dev/null 
2>&1
-
-# NOTE: This is here for completeness. It is NOT to be used under systemd 
otherwise it WILL cause problems
-# */5 * * * *  otrs /opt/otrs/bin/otrs.Scheduler.pl -w 1 > /dev/null 2>&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: merged
Gerrit-Change-Id: I6ba018486a1d801bd47bc1409fbd519e57d0f2cf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] misc-web: reduce TTLs from 1H to 600 - change (operations/dns)

2016-02-12 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: misc-web: reduce TTLs from 1H to 600
..


misc-web: reduce TTLs from 1H to 600

Change-Id: I58d8c54103a4b6396d15d5f4a703e0c53d98cb09
---
M templates/wikidata.org
M templates/wikimedia.org
M templates/wmfusercontent.org
3 files changed, 61 insertions(+), 61 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, but someone else must approve
  BBlack: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/wikidata.org b/templates/wikidata.org
index 12f22e3..44b1235 100644
--- a/templates/wikidata.org
+++ b/templates/wikidata.org
@@ -30,7 +30,7 @@
 ; Servers (alphabetic order)
 
 ; Service aliases
-query   1H  IN DYNA geoip!misc-addrs
+query   600 IN DYNA geoip!misc-addrs
 
 ; Wikis (alphabetic order)
 
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 34f9409..e17e5dd 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -419,7 +419,7 @@
 
 ; Service aliases (alphabetical order)
 
-annual  1H  IN DYNA geoip!misc-addrs
+annual  600 IN DYNA geoip!misc-addrs
 
 apt 1H  IN CNAMEcarbon
 
@@ -434,13 +434,13 @@
 
 cache   600 IN DYNA geoip!text-addrs
 
-config-master   1H  IN DYNA geoip!misc-addrs
+config-master   600 IN DYNA geoip!misc-addrs
 
 dash.frdev  1H  IN CNAMEfrdev-eqiad
 
-dbtree  1H  IN DYNA geoip!misc-addrs
+dbtree  600 IN DYNA geoip!misc-addrs
 dev 600 IN DYNA geoip!text-addrs
-doc 1H  IN DYNA geoip!misc-addrs
+doc 600 IN DYNA geoip!misc-addrs
 docs600 IN DYNA geoip!text-addrs
 eventdonations  1H  IN CNAME
contrib-wi-10109-10472-20140728-1682402186.us-east-1.elb.amazonaws.com.
 ldap-corp.eqiad 1H  IN CNAMEdubnium.wikimedia.org.
@@ -457,31 +457,31 @@
 
 gerrit  1H  IN A208.80.154.81
 1H  IN  2620:0:861:3:208:80:154:81
-git 1H  IN DYNA geoip!misc-addrs
-gdash   1H  IN DYNA geoip!misc-addrs
-graphite1H  IN DYNA geoip!misc-addrs
-grafana 1H  IN DYNA geoip!misc-addrs
-grafana-admin   1H  IN DYNA geoip!misc-addrs
-parsoid-tests   1H  IN DYNA geoip!misc-addrs
-performance 1H  IN DYNA geoip!misc-addrs
-horizon 1H  IN DYNA geoip!misc-addrs
+git 600 IN DYNA geoip!misc-addrs
+gdash   600 IN DYNA geoip!misc-addrs
+graphite600 IN DYNA geoip!misc-addrs
+grafana 600 IN DYNA geoip!misc-addrs
+grafana-admin   600 IN DYNA geoip!misc-addrs
+parsoid-tests   600 IN DYNA geoip!misc-addrs
+performance 600 IN DYNA geoip!misc-addrs
+horizon 600 IN DYNA geoip!misc-addrs
 
 icinga  1H  IN CNAMEneon
 
-integration 1H  IN DYNA geoip!misc-addrs
+integration 600 IN DYNA geoip!misc-addrs
 irc 1H  IN CNAMEargon
 
 ldap-eqiad  1H  IN CNAMEseaborgium
 ldap-codfw  1H  IN CNAMEserpens
 
-phabricator 1H  IN DYNA geoip!misc-addrs
+phabricator 600 IN DYNA geoip!misc-addrs
 1H  IN MX   10 mx1001.wikimedia.org.
 1H  IN MX   50 mx2001.wikimedia.org.
 
 login   600 IN DYNA geoip!text-addrs
 
 librenms1H  IN CNAMEnetmon1001
-servermon   1H  IN DYNA geoip!misc-addrs
+servermon   600 IN DYNA geoip!misc-addrs
 
 payments5M  IN A208.80.155.5   ; eqiad
 payments-eqiad  1H  IN A208.80.155.5   ; eqiad
@@ -491,13 +491,13 @@
 payments-listener   1H  IN CNAMEpayments-listener-eqiad
 payments-listener.frdev 1H  IN CNAMEfrdev-eqiad
 
-people  1H  IN DYNA geoip!misc-addrs
+people  600 IN DYNA geoip!misc-addrs
 
-piwik   1H  IN DYNA geoip!misc-addrs ; T103577
+piwik   600 IN DYNA geoip!misc-addrs ; T103577
 
 ; policy.wikimedia.org goes to wordpress cluster T110203
 policy  5M  IN A192.0.66.2
-releases1H  IN DYNA geoip!misc-addrs
+releases600 IN DYNA geoip!misc-addrs
 
 reports.frdev   1H  IN CNAMEfrdev-eqiad
 
@@ -617,8 +617,8 @@
 
 ; Other websites (NO wikis!)
 blog 1H  IN CNAMEwikimediablog.wordpress.com.
-bugs 1H  IN DYNA geoip!misc-addrs
-bugzilla 1H  IN DYNA geoip!misc-addrs
+bugs 600 IN DYNA geoip!misc-addrs
+bugzilla 600 IN DYNA geoip!misc-addrs
 bug-attachment   1H  IN DYNA geoip!text-addrs
 careers  600 IN DYNA geoip!text-addrs
 civicrm  1H  IN CNAMEbarium
@@ -628,13 +628,13 @@
 coffee   600 IN DYNA geoip!text-addrs
 cs   600 IN DYNA geoip!text-addrs
 cz   600 IN DYNA geoip!text-addrs
-datasets 1H  IN DYNA geoip!misc-addrs
+datasets

[MediaWiki-commits] [Gerrit] All DYNA standardized to TTL=600 - change (operations/dns)

2016-02-12 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: All DYNA standardized to TTL=600
..

All DYNA standardized to TTL=600

Change-Id: I804e5af1eca283a06b3f380cf3915f9d6a74555c
---
M templates/wikimedia.org
M templates/wikipedia.org
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/81/270281/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index e17e5dd..56647ee 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -426,7 +426,7 @@
 archiva 1H  IN CNAMEtitanium
 
 benefactorevents 1H IN CNAMEtrilogytools1.azurewebsites.net.
-benefactors 1H  IN DYNA geoip!text-addrs
+benefactors 600 IN DYNA geoip!text-addrs
 1H  IN MX   10 mx1001.wikimedia.org.
 1H  IN MX   50 mx2001.wikimedia.org.
 1H  IN TXT  "v=spf1 include:wikimedia.org 
include:jangomail.com ?all"
@@ -619,7 +619,7 @@
 blog 1H  IN CNAMEwikimediablog.wordpress.com.
 bugs 600 IN DYNA geoip!misc-addrs
 bugzilla 600 IN DYNA geoip!misc-addrs
-bug-attachment   1H  IN DYNA geoip!text-addrs
+bug-attachment   600 IN DYNA geoip!text-addrs
 careers  600 IN DYNA geoip!text-addrs
 civicrm  1H  IN CNAMEbarium
 civicrm.frdev1H  IN CNAMEfrdev-eqiad
@@ -630,7 +630,7 @@
 cz   600 IN DYNA geoip!text-addrs
 datasets 600 IN DYNA geoip!misc-addrs
 download 600 IN DYNA geoip!text-addrs
-etherpad 5M  IN DYNA geoip!misc-addrs
+etherpad 600 IN DYNA geoip!misc-addrs
 fundraising  1H  IN CNAMEfundraising-eqiad
 ganglia  1H  IN CNAMEuranium
 hue  600 IN DYNA geoip!misc-addrs
@@ -652,7 +652,7 @@
 metrics  600 IN DYNA geoip!misc-addrs
 noc  600 IN DYNA geoip!misc-addrs
 nyc  600 IN DYNA geoip!text-addrs
-old-bugzilla 1H  IN DYNA geoip!text-addrs
+old-bugzilla 600 IN DYNA geoip!text-addrs
 planet   600 IN DYNA geoip!misc-addrs
 ar.planet600 IN DYNA geoip!misc-addrs
 ca.planet600 IN DYNA geoip!misc-addrs
@@ -684,13 +684,13 @@
 scholarships 600 IN DYNA geoip!misc-addrs
 transparency 600 IN DYNA geoip!misc-addrs
 search   600 IN DYNA geoip!text-addrs
-shop 1H  IN DYNA geoip!text-addrs
+shop 600 IN DYNA geoip!text-addrs
 smokeping600 IN DYNA geoip!misc-addrs
 store1H  IN CNAMEc.ssl.shopify.com.
 static-bugzilla  600 IN DYNA geoip!misc-addrs
 stats600 IN DYNA geoip!misc-addrs
 status   1H  IN CNAMEstatus.watchmouse.com.
-techblog 1H  IN DYNA geoip!text-addrs
+techblog 600 IN DYNA geoip!text-addrs
 ticket   600 IN DYNA geoip!misc-addrs
 tor-eqiad-1  1H  IN CNAMEradium
 ubuntu   1H  IN CNAMEcarbon
diff --git a/templates/wikipedia.org b/templates/wikipedia.org
index 9038d68..656355a 100644
--- a/templates/wikipedia.org
+++ b/templates/wikipedia.org
@@ -62,7 +62,7 @@
 ; Other websites
 
 15  600 IN DYNA geoip!misc-addrs
-bugzilla1H  IN DYNA geoip!text-addrs
+bugzilla600 IN DYNA geoip!text-addrs
 careers 600 IN DYNA geoip!text-addrs
 donate  600 IN DYNA geoip!text-addrs
 download600 IN DYNA geoip!text-addrs

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

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

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

[MediaWiki-commits] [Gerrit] getCustomList: modified namespace argument - change (mediawiki...BlueSpiceExtensions)

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

Dvogel hallowelt has uploaded a new change for review.

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

Change subject: getCustomList: modified namespace argument
..

getCustomList: modified namespace argument

*ns="all" is now including ns="6" (images)
*excludens is working now

Previously smartlist did not show ns="6", even if it was set
explizit.

Change-Id: Ib28aaeb60c40cb02ffa70cb45980937751dd258a
---
M SmartList/SmartList.class.php
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/86/270286/1

diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 2f56c3d..2dbd7ab 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -721,8 +721,18 @@
break;
}
 
+   $aNamespaceIds = array();
try {
$aNamespaceIds = 
BsNamespaceHelper::getNamespaceIdsFromAmbiguousCSVString( $aArgs['namespaces'] 
);
+
+   if ( isset( $aArgs['excludens'] ) ) {
+   $aExcludedId = array();
+   $aNamespaceDiffId = array();
+   $aExcludedId = 
BsNamespaceHelper::getNamespaceIdsFromAmbiguousCSVString( $aArgs['excludens'] );
+   $aNamespaceDiffId= array_diff( 
$aNamespaceIds, $aExcludedId );
+   $aNamespaceIds = $aNamespaceDiffId;
+   }
+
$aConditions[] = 'rc_namespace IN (' . implode( 
',', $aNamespaceIds ) . ')';
} catch ( BsInvalidNamespaceException $ex ) {
$sInvalidNamespaces = implode( ', ', 
$ex->getListOfInvalidNamespaces() );
@@ -769,7 +779,7 @@
}
 
$aConditions[] = 'rc_title = page_title AND 
rc_namespace = page_namespace'; //prevent display of deleted articles
-   $aConditions[] = 'NOT (rc_type = 3)'; //prevent moves 
and deletes from being displayed
+   $aConditions[] = 'NOT ( rc_type = 3 AND NOT ( 
rc_namespace = 6 ) )'; //include files
 
$aFields = array( 'rc_title as title', 'rc_namespace as 
namespace' );
if ( isset( $aArgs['meta'] ) && $aArgs['meta'] == true 
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib28aaeb60c40cb02ffa70cb45980937751dd258a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Dvogel hallowelt 

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

[MediaWiki-commits] [Gerrit] Add linters and "beautify" - change (mediawiki...CleanChanges)

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

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

Change subject: Add linters and "beautify"
..


Add linters and "beautify"

Change-Id: I997557e9f8fa38474cf3e2aa00e5897e43785f43
---
M .gitignore
A .jscsrc
M .jshintrc
M CleanChanges.php
M CleanChanges_body.php
M Filters.php
M Gruntfile.js
M composer.json
M package.json
A phpcs.xml
M resources/cleanchanges.js
M resources/cleanchanges.uls.js
12 files changed, 105 insertions(+), 30 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index e7e3181..16ca8f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 .*.swp
 .idea
 node_modules/
+vendor/
+composer.lock
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+   "preset": "wikimedia"
+}
diff --git a/.jshintrc b/.jshintrc
index 0967ef4..31ce942 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1 +1,20 @@
-{}
+{
+   "bitwise": true,
+   "curly": true,
+   "eqeqeq": true,
+   "forin": false,
+   "freeze": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "onevar": true,
+   "strict": true,
+   "undef": true,
+   "unused": true,
+   "browser": true,
+   "predef": [
+   "mediaWiki",
+   "jQuery",
+   "QUnit"
+   ]
+}
diff --git a/CleanChanges.php b/CleanChanges.php
index 54d3da8..fe520cd 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -4,7 +4,8 @@
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['CleanChanges'] = __DIR__ . '/i18n';
/* wfWarn(
-   'Deprecated PHP entry point used for CleanChanges extension. 
Please use wfLoadExtension instead, ' .
+   'Deprecated PHP entry point used for CleanChanges extension. ' .
+   'Please use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
); */
return;
diff --git a/CleanChanges_body.php b/CleanChanges_body.php
index 0580661..311eb73 100644
--- a/CleanChanges_body.php
+++ b/CleanChanges_body.php
@@ -162,7 +162,9 @@
 
// Make user links
if ( $this->isDeleted( $rc, Revision::DELETED_USER ) ) {
-   $rc->_user = ' ' . 
$this->msg( 'rev-deleted-user' )->escaped() . '';
+   $rc->_user = ' ' .
+   $this->msg( 'rev-deleted-user' )->escaped() .
+   '';
$rc->_userInfo = '';
self::$userinfo += array();
} else {
@@ -284,7 +286,8 @@
$toggleLink = "javascript:toggleVisibilityE('$rci', '$rcm', 
'$rcl', 'block')";
$tl =
Xml::tags( 'span', array( 'id' => $rcm ),
-   Xml::tags( 'a', array( 'href' => $toggleLink ), 
$this->arrow( $this->direction ? 'r' : 'l' ) ) ) .
+   Xml::tags( 'a', array( 'href' => $toggleLink ),
+   $this->arrow( $this->direction ? 'r' : 'l' ) ) 
) .
Xml::tags( 'span', array( 'id' => $rcl, 'style' => 'display: 
none;' ),
Xml::tags( 'a', array( 'href' => $toggleLink ), 
$this->downArrow() ) );
 
@@ -327,7 +330,7 @@
$items[] = $this->makeUserlinks( $userlinks );
$items[] = $block[0]->_watching;
 
-   $lines = Xml::tags( 'div', null, implode( " {$this->dir}", 
$items ) ) . "\n" ;
+   $lines = Xml::tags( 'div', null, implode( " {$this->dir}", 
$items ) ) . "\n";
 
# Sub-entries
$lines .= Xml::tags( 'div',
@@ -348,11 +351,17 @@
 */
protected function arrow( $dir, $alt = '', $title = '' ) {
global $wgExtensionAssetsPath;
-   $encUrl = htmlspecialchars( $wgExtensionAssetsPath . 
'/CleanChanges/images/Arr_' . $dir . '.png' );
-   $encAlt = htmlspecialchars( $alt );
-   $encTitle = htmlspecialchars( $title );
 
-   return "";
+   return Html::element(
+   'img',
+   array(
+   'src' => 
"$wgExtensionAssetsPath/CleanChanges/images/Arr_$dir.png",
+   'width' => 12,
+   'height' => 12,
+   'alt' => $alt,
+   'title' => $title,
+   )
+   );
}
 
/**
@@ -443,7 +452,7 @@
if ( is_int( $size ) ) {
$size = $this->wrapCharacterDifference( $size );
// FIXME: i18n: Hard coded parentheses and spaces.
-   return $this->msg( 'cleanchanges-rcinfo-3'

[MediaWiki-commits] [Gerrit] Reducing db1072 weight a bit - change (operations/mediawiki-config)

2016-02-12 Thread Jcrespo (Code Review)

Jcrespo has uploaded a new change for review.

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

Change subject: Reducing db1072 weight a bit
..

Reducing db1072 weight a bit

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 892b54d..6470ebb 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -95,7 +95,7 @@
'db1057' => 200, # 2.8TB  96GB
'db1065' => 100, # 2.8TB 160GB, api
'db1066' => 100, # 2.8TB 160GB, api
-   'db1072' => 500, # 2.8TB 160GB
+   'db1072' => 450, # 2.8TB 160GB
'db1073' => 500, # 2.8TB 160GB
),
's2' => array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6a04296f4251cf231a192d3d0124db9d5658149
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] wfDebugLog texvc returns/file output check - change (mediawiki...Math)

2016-02-12 Thread Hashar (Code Review)

Hashar has uploaded a new change for review.

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

Change subject: wfDebugLog texvc returns/file output check
..

wfDebugLog texvc returns/file output check

Merely to debug T126422

Bug: T126422
Change-Id: I41471b2d9bf2641294a0cf181662c0a783649473
---
M MathTexvc.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/MathTexvc.php b/MathTexvc.php
index 514a512..03ca8d7 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -277,8 +277,10 @@
} elseif ( !preg_match( "/^[a-f0-9]{32}$/", $this->getHash() ) 
) {
return $this->getError( 'math_unknown_error' );
} elseif ( !file_exists( "$tmpDir/{$this->getHash()}.png" ) ) {
+   wfDebugLog( __CLASS__, " HASHAR file does not exist 
$tmpDir/{$this->getHash()}.png wfTempDir(): " . wfTempDir() );
return $this->getError( 'math_image_error' );
} elseif ( filesize( "$tmpDir/{$this->getHash()}.png" ) == 0 ) {
+   wfDebugLog( __CLASS__, " HASHAR empty file 
$tmpDir/{$this->getHash()}.png" );
return $this->getError( 'math_image_error' );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41471b2d9bf2641294a0cf181662c0a783649473
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Add missing api error messages - change (mediawiki...Wikibase)

2016-02-12 Thread Bene (Code Review)

Bene has uploaded a new change for review.

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

Change subject: Add missing api error messages
..

Add missing api error messages

This adds missing api error messages to the api modules and the json
files.

Also fixed a typo in the messages file.

Change-Id: I0b15385faf4062ffef2dc1037bc6033401babe20
---
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/api/EditEntity.php
M repo/includes/api/SetAliases.php
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
6 files changed, 21 insertions(+), 5 deletions(-)


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

diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index e630e69..5f783e8 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -309,7 +309,7 @@
"wikibase-api-invalid-list": "Invalid list",
"wikibase-api-invalid-property-id": "Invalid property id",
"wikibase-api-invalid-entity-id": "Invalid entity id",
-   "wikibase-api-no-common-iten": "There is no common item",
+   "wikibase-api-no-common-item": "There is no common item",
"wikibase-api-no-data": "No data to operate on",
"wikibase-api-no-external-page": "The external client site '$1' did not 
provide page information for page '$2'.",
"wikibase-api-nosuchrevid": "Revision with id not found",
@@ -321,6 +321,7 @@
"wikibase-api-no-such-site": "Could not find such a site",
"wikibase-api-no-such-sitelink": "Could not find a sitelink to '$1' 
when trying to edit badges.",
"wikibase-api-no-such-statement": "Could not find such a statement",
+   "wikibase-api-not-supported": "The requested feature is not supported 
by the given entity.",
"wikibase-api-not-statement": "Not a statement",
"wikibase-api-not-item": "Not an item",
"wikibase-api-not-recognized-siteid": "The supplied site identifier was 
not recognized",
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index 4bb0da2..f2cb76d 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -340,7 +340,7 @@
"wikibase-api-invalid-list": "!!DO NOT TRANSLATE!! Invalid list or data 
has been provided. This can occour when a list conflicts with itself (the list 
contains something to modify, but also to remove this item)",
"wikibase-api-invalid-property-id": "!!DO NOT TRANSLATE!! Invalid 
propertyid has been supplied",
"wikibase-api-invalid-entity-id": "!!DO NOT TRANSLATE!! Invalid 
entityid has been supplied",
-   "wikibase-api-no-common-iten": "!!DO NOT TRANSLATE!! There is no common 
item between to passed parameters when there should be",
+   "wikibase-api-no-common-item": "!!DO NOT TRANSLATE!! There is no common 
item between to passed parameters when there should be",
"wikibase-api-no-data": "!!DO NOT TRANSLATE!! This is an error message 
for a situation where the \"data\" argument to the API is lacking content. 
Usually this should never be shown to the user, unless there are some 
exceptional error condition. This message should probably not exist in the 
final version.",
"wikibase-api-no-external-page": "This is an error message where the 
external client did reply, but either because of a faulty reply or because the 
page title could not be unwound, it was not possible to identify an external 
page.\n* $1 - the site id\n* $2 - the page id",
"wikibase-api-nosuchrevid": "!!DO NOT TRANSLATE!! Page or entity with 
this revision id could not be found in the database",
@@ -352,6 +352,7 @@
"wikibase-api-no-such-site": "!!DO NOT TRANSLATE!! Could not find such 
a site, this could be to the user entering the wrong data",
"wikibase-api-no-such-sitelink": "Could not find such a sitelink, this 
could be to the user entering the wrong data\n* $1 - the site id",
"wikibase-api-no-such-statement": "!!DO NOT TRANSLATE!! Could not find 
such a statement, this could be to the user entering the wrong data",
+   "wikibase-api-not-supported": "!!DO NOT TRANSLATE!! The given entity 
does not support the operation provided by the requested api module.",
"wikibase-api-not-statement": "!!DO NOT TRANSLATE!! The passed 
parameter is Not a statement when a statement is expected",
"wikibase-api-not-item": "!!DO NOT TRANSLATE!! The passed parameter is 
Not an item when an item is expected (the passed parameter may infact be a 
property)",
"wikibase-api-not-recognized-siteid": "!!DO NOT TRANSLATE!! The 
supplied site identifier was not recognized",
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 48e9966..7d68fff 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -22,7 +22,9 @@
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Statement\Statement;
+use

[MediaWiki-commits] [Gerrit] UploadWizardUploadInterface: Remove some broken dead code - change (mediawiki...UploadWizard)

2016-02-12 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: UploadWizardUploadInterface: Remove some broken dead code
..

UploadWizardUploadInterface: Remove some broken dead code

* mw.UploadWizardUploadInterface.prototype.resetFileInput.
  This function does nothing. You can't modify the 'value'
  of a . Removed functions and all calls.

* mw.UploadWizardUploadInterface.prototype.hideFileInput.
  Simply unused. Also remove a misleading comment about it.

* A check for `!this.$fileInputCtrl.first().value`. This is
  always undefined, because first() returns a jQuery object.

Change-Id: I21538e013878eb2b9cba024005b1f420f8cd3ce2
---
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
3 files changed, 1 insertion(+), 23 deletions(-)


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

diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index fc97084..64376a2 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -278,7 +278,6 @@
 
if ( tooManyFiles ) {

wizard.steps.file.showTooManyFilesWarning( totalFiles );
-   upload.resetFileInput();
return;
}
 
diff --git a/resources/mw.UploadWizardUpload.js 
b/resources/mw.UploadWizardUpload.js
index 2f71d62..8e151e2 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -99,13 +99,6 @@
};
 
/**
-* Reset file input.
-*/
-   mw.UploadWizardUpload.prototype.resetFileInput = function () {
-   this.ui.resetFileInput();
-   };
-
-   /**
 * start
 *
 * @return {jQuery.Promise}
diff --git a/resources/mw.UploadWizardUploadInterface.js 
b/resources/mw.UploadWizardUploadInterface.js
index a77979e..a494232 100644
--- a/resources/mw.UploadWizardUploadInterface.js
+++ b/resources/mw.UploadWizardUploadInterface.js
@@ -271,13 +271,6 @@
};
 
/**
-* Reset file input to have no value.
-*/
-   mw.UploadWizardUploadInterface.prototype.resetFileInput = function () {
-   this.$fileInputCtrl.get( 0 ).value = '';
-   };
-
-   /**
 * Get a list of the files from this file input, defaulting to the 
value from the input form
 *
 * @return {Array} of File objects
@@ -285,7 +278,7 @@
mw.UploadWizardUploadInterface.prototype.getFiles = function () {
var files = [];
if ( mw.fileApi.isAvailable() ) {
-   if ( this.providedFile && 
!this.$fileInputCtrl.first().value ) {  // default to the fileinput if it's 
defined.
+   if ( this.providedFile ) {
files[ 0 ] = this.providedFile;
} else {
$.each( this.$fileInputCtrl.get( 0 ).files, 
function ( i, file ) {
@@ -531,7 +524,6 @@
$win.off( 'resize', onResize );
};
}
-   // Show file input (possibly hidden by .hideFileInput())
this.$fileInputCtrl.show();
update();
};
@@ -541,12 +533,6 @@
this.stopTracking();
this.stopTracking = null;
}
-   };
-
-   mw.UploadWizardUploadInterface.prototype.hideFileInput = function () {
-   this.cancelPositionTracking();
-   // Hide file input so it does not interfere with other 
interface elements
-   this.$fileInputCtrl.hide();
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21538e013878eb2b9cba024005b1f420f8cd3ce2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Add a comment about $( '' ).prop( 'disabl... - change (mediawiki...UploadWizard)

2016-02-12 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: Add a comment about $( '' ).prop( 'disabled' 
)
..

Add a comment about $( '' ).prop( 'disabled' )

This was a massive WTF moment and I was going to delete this code
as obviously broken until I blamed it and it turns out that Brion
says it works. (Probably, unless the attr->prop change broke it.)

Change-Id: I63b1b0ea8f2fcdc2f51b021f246d1eaa6ea49c0c
---
M resources/mw.UploadWizardUploadInterface.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/mw.UploadWizardUploadInterface.js 
b/resources/mw.UploadWizardUploadInterface.js
index c11f1b0..a77979e 100644
--- a/resources/mw.UploadWizardUploadInterface.js
+++ b/resources/mw.UploadWizardUploadInterface.js
@@ -91,6 +91,7 @@
.append( this.filenameCtrl )
.get( 0 );
 
+   // While this looks extremely unlikely to be right, it actually 
is. Blame Apple. T34328#364508
if ( $( '' ).prop( 'disabled' ) ) {
$( '#mwe-upwiz-stepdiv-file' ).replaceWith(
$( '' )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63b1b0ea8f2fcdc2f51b021f246d1eaa6ea49c0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] UploadWizardUploadInterface: Hide the "Show thumbnail" butto... - change (mediawiki...UploadWizard)

2016-02-12 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: UploadWizardUploadInterface: Hide the "Show thumbnail" button 
only after showing thumbnail
..

UploadWizardUploadInterface: Hide the "Show thumbnail" button only after 
showing thumbnail

Previously: the button disappeared after the file was stashed, even if
the thumbnail wasn't being displayed (if many large files were added
at once and UploadWizardUpload#disablePreview was called earlier).
It went disabled when clicked.

Now: the button disappears when it is clicked and the thumbnail
appears, and never otherwise.

Bug: T126728
Change-Id: Iac80b00b3dea1e48dd45fa5f80b1d803142fb7cb
---
M resources/mw.UploadWizardUploadInterface.js
1 file changed, 6 insertions(+), 5 deletions(-)


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

diff --git a/resources/mw.UploadWizardUploadInterface.js 
b/resources/mw.UploadWizardUploadInterface.js
index a494232..43cf415 100644
--- a/resources/mw.UploadWizardUploadInterface.js
+++ b/resources/mw.UploadWizardUploadInterface.js
@@ -220,10 +220,6 @@
mw.UploadWizardUploadInterface.prototype.showStashed = function () {
this.$fileInputCtrl.detach();
 
-   if ( this.$showThumbCtrl ) {
-   this.$showThumbCtrl.detach();
-   }
-
this.showIndicator( 'stashed' );
this.setStatus( 'mwe-upwiz-stashed-upload' );
this.setAdditionalStatus( null );
@@ -371,12 +367,17 @@
 * Display thumbnail preview.
 */
mw.UploadWizardUploadInterface.prototype.showThumbnail = function () {
-   var $preview = $( this.div ).find( '.mwe-upwiz-file-preview' );
+   var
+   $preview = $( this.div ).find( 
'.mwe-upwiz-file-preview' ),
+   $showThumbCtrl = this.$showThumbCtrl;
this.upload.getThumbnail(
mw.UploadWizard.config.thumbnailWidth,
mw.UploadWizard.config.thumbnailMaxHeight
).done( function ( thumb ) {
mw.UploadWizard.placeThumbnail( $preview, thumb );
+   if ( $showThumbCtrl ) {
+   $showThumbCtrl.remove();
+   }
} );
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac80b00b3dea1e48dd45fa5f80b1d803142fb7cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] [WIP] Move "Add files" functionality from UWUploadInterface ... - change (mediawiki...UploadWizard)

2016-02-12 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: [WIP] Move "Add files" functionality from UWUploadInterface to 
UploadWizard
..

[WIP] Move "Add files" functionality from UWUploadInterface to UploadWizard

This simplifies things greatly.

* All rejoice, for UploadWizardUploadInterface#moveFileInputToCover is
  now gone. No more slow positioning on every new upload or "polling"
  for resizes. An  is still overlaid, but using a
  pure CSS solution, possible now that we only have a single one.

* The control flow is also simpler. There is less jumping all over the
  place using events now.

* Retained the code paths that try to handle browsers without File API
  support, but I haven't tested them since I don't know any browsers
  that we still support that lack it. (We dropped IE 8 recently.)
  Perhaps some thinning of the herds is in order.

TODO A few doc comments need updating, I'll review the diff later.

Bug: T126712
Change-Id: I9638d958ed5ebbbc4346ed03a1e9bbbf46147749
---
M resources/mw.FlickrChecker.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardUpload.js
M resources/mw.UploadWizardUploadInterface.js
M resources/ui/steps/uw.ui.Upload.js
M resources/uploadWizard.css
6 files changed, 100 insertions(+), 237 deletions(-)


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

diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index 5abcbb7..16319b4 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -670,7 +670,7 @@
method: 'flickr.photos.getSizes',
photo_id: photoId
} ).done( function ( data ) {
-   var nameParts, newUpload;
+   var nameParts;
 
if (
typeof data.sizes !== 'undefined' &&
@@ -691,10 +691,8 @@
upload.name = nameParts.join( 
'.' ) + '.' + upload.originalFormat;
}
upload.url = largestSize.source;
-   // Need to call the newUpload here, 
otherwise some code would have to be written to detect the completion of the 
API call.
-   newUpload = checker.wizard.newUpload();
-
-   newUpload.fill( upload );
+   // Need to call the addUpload here, 
otherwise some code would have to be written to detect the completion of the 
API call.
+   checker.wizard.addUpload( upload );
} else {
mw.errorDialog( mw.message( 
'mwe-upwiz-error-no-image-retrieved', 'Flickr' ).escaped() );
checker.wizard.flickrInterfaceReset();
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index 64376a2..7f79413 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -70,6 +70,56 @@
this.showDeed = false;
this.removeMatchingUploads( function () { return true; 
} );
this.hasLoadedBefore = true;
+   this.$fileInputCtrl = this.setupFileInputCtrl();
+   },
+
+   setupFileInputCtrl: function () {
+   var
+   $fileInputCtrl,
+   wizard = this;
+
+   $fileInputCtrl = $( '' );
+   if ( mw.UploadWizard.config.enableFormData && 
mw.fileApi.isFormDataAvailable() &&
+   mw.UploadWizard.config.enableMultiFileSelect && 
mw.UploadWizard.config.enableMultipleFiles ) {
+   // Multiple uploads requires the FormData 
transport
+   $fileInputCtrl.attr( 'multiple', '1' );
+   }
+
+   // #mwe-upwiz-add-file is a ButtonWidget constructed 
somewhere else, so this is hacky.
+   // But it's less bad than how this was done before.
+   $( '#mwe-upwiz-add-file' ).append( $fileInputCtrl );
+
+   $fileInputCtrl.on( 'change', function () {
+   var
+   totalSize,
+   files = mw.fileApi.isAvailable() && 
$fileInputCtrl[ 0 ].files,
+   totalFiles = ( files ? files.length : 1 
) + wizard.uploads.length,
+   tooManyFiles = totalFiles > 
wizard.config.maxUploads;
+
+

[MediaWiki-commits] [Gerrit] UploadWizardUpload: Stop processing after encountering a dup... - change (mediawiki...UploadWizard)

2016-02-12 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review.

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

Change subject: UploadWizardUpload: Stop processing after encountering a 
duplicate
..

UploadWizardUpload: Stop processing after encountering a duplicate

Like for every other kinds of errors.

Bug: T126729
Change-Id: I651becfc7f7c6a7ef6bd5a875db7e6f4cf8d54d6
---
M resources/mw.UploadWizardUpload.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/mw.UploadWizardUpload.js 
b/resources/mw.UploadWizardUpload.js
index 8e151e2..9317d94 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -426,6 +426,7 @@
 
if ( duplicate ) {
this.fileNameErr( 'dup', basename );
+   return;
}
 
this.setTitle( basename );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I651becfc7f7c6a7ef6bd5a875db7e6f4cf8d54d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] change civicrm.wm.o from a cname to an A record - change (operations/dns)

2016-02-12 Thread Jgreen (Code Review)

Jgreen has uploaded a new change for review.

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

Change subject: change civicrm.wm.o from a cname to an A record
..

change civicrm.wm.o from a cname to an A record

Change-Id: I474d5af9ee1214f7cdb43f0e70a68d95d77817fc
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/98/270298/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index e17e5dd..116fa88 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -621,7 +621,7 @@
 bugzilla 600 IN DYNA geoip!misc-addrs
 bug-attachment   1H  IN DYNA geoip!text-addrs
 careers  600 IN DYNA geoip!text-addrs
-civicrm  1H  IN CNAMEbarium
+civicrm  1H  IN A208.80.155.11
 civicrm.frdev1H  IN CNAMEfrdev-eqiad
 civicrm-gr.frdev 1H  IN CNAMEfrdev-eqiad
 civicrm2-gr.frdev 1H IN CNAMEfrdev-eqiad

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

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

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

[MediaWiki-commits] [Gerrit] Format CSS with csscomb - change (mediawiki...CleanChanges)

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

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

Change subject: Format CSS with csscomb
..


Format CSS with csscomb

Config is the default config slightly adapted for MediaWiki conventions.

Change-Id: I120479a677bda101fc3e4bc60474eae9a9dc2cd7
---
A .csscomb.json
M resources/cleanchanges.uls.css
2 files changed, 341 insertions(+), 7 deletions(-)

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



diff --git a/.csscomb.json b/.csscomb.json
new file mode 100644
index 000..ed995c0
--- /dev/null
+++ b/.csscomb.json
@@ -0,0 +1,328 @@
+{
+   "exclude": [
+   ".git/**",
+   "node_modules/**",
+   "vendor/**"
+   ],
+   "always-semicolon": true,
+   "block-indent": "\t",
+   "color-case": "lower",
+   "color-shorthand": true,
+   "element-case": "lower",
+   "eof-newline": true,
+   "leading-zero": true,
+   "quotes": "single",
+   "remove-empty-rulesets": true,
+   "space-after-colon": " ",
+   "space-after-combinator": " ",
+   "space-after-opening-brace": "\n",
+   "space-after-selector-delimiter": "\n",
+   "space-before-closing-brace": "\n",
+   "space-before-colon": "",
+   "space-before-combinator": " ",
+   "space-before-opening-brace": " ",
+   "space-before-selector-delimiter": "",
+   "strip-spaces": true,
+   "unitless-zero": true,
+   "vendor-prefix-align": false,
+   "sort-order": [
+   [
+   "font",
+   "font-family",
+   "font-size",
+   "font-weight",
+   "font-style",
+   "font-variant",
+   "font-size-adjust",
+   "font-stretch",
+   "font-effect",
+   "font-emphasize",
+   "font-emphasize-position",
+   "font-emphasize-style",
+   "font-smooth",
+   "line-height"
+   ],
+   [
+   "position",
+   "z-index",
+   "top",
+   "right",
+   "bottom",
+   "left"
+   ],
+   [
+   "display",
+   "visibility",
+   "float",
+   "clear",
+   "overflow",
+   "overflow-x",
+   "overflow-y",
+   "-ms-overflow-x",
+   "-ms-overflow-y",
+   "clip",
+   "zoom",
+   "flex-direction",
+   "flex-order",
+   "flex-pack",
+   "flex-align"
+   ],
+   [
+   "-webkit-box-sizing",
+   "-moz-box-sizing",
+   "box-sizing",
+   "width",
+   "min-width",
+   "max-width",
+   "height",
+   "min-height",
+   "max-height",
+   "margin",
+   "margin-top",
+   "margin-right",
+   "margin-bottom",
+   "margin-left",
+   "padding",
+   "padding-top",
+   "padding-right",
+   "padding-bottom",
+   "padding-left"
+   ],
+   [
+   "table-layout",
+   "empty-cells",
+   "caption-side",
+   "border-spacing",
+   "border-collapse",
+   "list-style",
+   "list-style-position",
+   "list-style-type",
+   "list-style-image"
+   ],
+   [
+   "content",
+   "quotes",
+   "counter-reset",
+   "counter-increment",
+   "resize",
+   "cursor",
+   "-webkit-user-select",
+   "-moz-user-select",
+   "-ms-user-select",
+   "user-select",
+   "nav-index",
+   "nav-up",
+   "nav-right",
+   "nav-down",
+   "nav-left",
+   "-webkit-transition",
+   "-moz-transition",
+   "-ms-transition",
+   "-o-transition",
+   "transition",
+

[MediaWiki-commits] [Gerrit] Attack of the sort-it-all for Resources.php - change (mediawiki...Translate)

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

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

Change subject: Attack of the sort-it-all for Resources.php
..


Attack of the sort-it-all for Resources.php

Change-Id: Ie36f757a40dc4e109b8695546745bf22f045bff0
---
M Resources.php
1 file changed, 121 insertions(+), 121 deletions(-)

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



diff --git a/Resources.php b/Resources.php
index 9a868a3..aeb01cf 100644
--- a/Resources.php
+++ b/Resources.php
@@ -22,9 +22,9 @@
 $wgResourceModules['ext.translate.base'] = array(
'scripts' => 'resources/js/ext.translate.base.js',
'dependencies' => array(
-   'mediawiki.util',
-   'mediawiki.api',
'ext.translate.hooks',
+   'mediawiki.api',
+   'mediawiki.util',
),
'messages' => array(
'translate-js-support-unsaved-warning',
@@ -38,78 +38,78 @@
 
 $wgResourceModules['ext.translate.editor'] = array(
'scripts' => array(
-   'resources/js/ext.translate.editor.js',
'resources/js/ext.translate.editor.helpers.js',
+   'resources/js/ext.translate.editor.js',
'resources/js/ext.translate.editor.shortcuts.js',
-   'resources/js/ext.translate.proofread.js',
'resources/js/ext.translate.pagemode.js',
+   'resources/js/ext.translate.proofread.js',
),
'styles' => array(
'resources/css/ext.translate.editor.css',
-   'resources/css/ext.translate.proofread.css',
'resources/css/ext.translate.pagemode.css',
+   'resources/css/ext.translate.proofread.css',
),
'dependencies' => array(
'ext.translate.base',
-   'ext.translate.storage',
-   'ext.translate.hooks',
'ext.translate.dropdownmenu',
+   'ext.translate.hooks',
+   'ext.translate.storage',
'ext.uls.buttons',
-   'mediawiki.util',
+   'jquery.autosize',
+   'jquery.makeCollapsible',
+   'jquery.textSelection',
+   'jquery.textchange',
+   'jquery.tipsy',
'mediawiki.Uri',
'mediawiki.api',
'mediawiki.api.parse',
-   'mediawiki.user',
'mediawiki.jqueryMsg',
-   'jquery.makeCollapsible',
-   'jquery.tipsy',
-   'jquery.textchange',
-   'jquery.autosize',
-   'jquery.textSelection',
+   'mediawiki.user',
+   'mediawiki.util',
),
'messages' => array(
-   'tux-status-translated',
-   'tux-status-saving',
-   'tux-status-unsaved',
-   'tux-editor-placeholder',
-   'tux-editor-paste-original-button-label',
-   'tux-editor-discard-changes-button-label',
-   'tux-editor-save-button-label',
-   'tux-editor-skip-button-label',
-   'tux-editor-cancel-button-label',
-   'tux-editor-confirm-button-label',
-   'tux-editor-shortcut-info',
-   'tux-editor-edit-desc',
+   'translate-edit-askpermission',
+   'translate-edit-nopermission',
'tux-editor-add-desc',
-   'tux-editor-message-desc-more',
-   'tux-editor-message-desc-less',
-   'tux-editor-suggestions-title',
-   'tux-editor-in-other-languages',
-   'tux-editor-need-more-help',
'tux-editor-ask-help',
-   'tux-editor-tm-match',
-   'tux-warnings-more',
-   'tux-warnings-hide',
-   'tux-editor-save-failed',
-   'tux-editor-n-uses',
+   'tux-editor-cancel-button-label',
+   'tux-editor-close-tooltip',
+   'tux-editor-collapse-tooltip',
+   'tux-editor-confirm-button-label',
+   'tux-editor-discard-changes-button-label',
+   'tux-editor-doc-editor-cancel',
'tux-editor-doc-editor-placeholder',
'tux-editor-doc-editor-save',
-   'tux-editor-doc-editor-cancel',
-   'translate-edit-nopermission',
-   'translate-edit-askpermission',
+   'tux-editor-edit-desc',
+   'tux-editor-expand-tooltip',
+   'tux-editor-in-other-languages',
+   'tux-editor-loading',
+   'tux-editor-message-desc-less',
+   'tux-editor-message-desc-more',
+   'tux-editor-message-tools-delete',
+   'tux-editor-message-tools-history',
+   'tux-editor-message-tools-translations',
+   'tux-editor-n-uses',
+

[MediaWiki-commits] [Gerrit] Remove unused entityPrefixes setting - change (mediawiki...Wikibase)

2016-02-12 Thread Bene (Code Review)

Bene has uploaded a new change for review.

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

Change subject: Remove unused entityPrefixes setting
..

Remove unused entityPrefixes setting

This setting is now unused and not needed anymore.

Change-Id: I1b750b577177d6a6236f1de3d76cafc5ad432800
---
M docs/options.wiki
M lib/config/WikibaseLib.default.php
2 files changed, 0 insertions(+), 14 deletions(-)


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

diff --git a/docs/options.wiki b/docs/options.wiki
index b189136..add51b8 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -19,15 +19,6 @@
 :* NOTE: The default may change in order to use the repo's database name 
automatically.
 ;sharedCacheDuration: The default duration of entries in the shared object 
cache, in seconds. Default is 3600 seconds = 1 hour.
 ;sharedCacheType: The type of cache to use for the shared object cache. 
Defaults to $wgMainCacheType. Use CACHE_XXX constants.
-;entityPrefixes: ID prefixes to use for the different entity types, as an 
associative array mapping prefixes to entity type constants. Default:
-
-  array(
-  'q' => Wikibase\DataModel\Entity\Item::ENTITY_TYPE,
-  'p' => Wikibase\DataModel\Entity\Property::ENTITY_TYPE,
-  'y' => Wikibase\DataModel\Entity\Query::ENTITY_TYPE,
-  );
-
-:'''Warning:''' do not change this if you already have Wikibase entities in 
your database, since they may become unreadable!
 ;useChangesTable: Whether to record changes in the database, so they can be 
pushed to clients. Boolean, defaults to true. May be set to false 
in situations where there are no clients to notify, to preserve space. 
'''Note''' that if this is true, the pruneChanges.php script 
should be run periodically to remove old changes from the database table.
 ;changeHandlers: Array mapping change type IDs to handler classes. May be used 
by extensions to register additional change classes.
 ;disabledDataTypes: Array listing of disabled data types on a wiki. This 
setting is intended to be used a new Wikibase install without items yet, or to 
control deployment of new data types. This setting should be set the same in 
the client and repo settings.
diff --git a/lib/config/WikibaseLib.default.php 
b/lib/config/WikibaseLib.default.php
index b0369d0..95342d1 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -19,11 +19,6 @@
// whether changes get recorded to wb_changes
'useChangesTable' => true,
 
-   'entityPrefixes' => array(
-   'q' => 'item',
-   'p' => 'property',
-   ),
-
'siteLinkGroups' => array(
'wikipedia',
),

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

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

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

[MediaWiki-commits] [Gerrit] Reducing db1072 weight a bit - change (operations/mediawiki-config)

2016-02-12 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged.

Change subject: Reducing db1072 weight a bit
..


Reducing db1072 weight a bit

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 892b54d..6470ebb 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -95,7 +95,7 @@
'db1057' => 200, # 2.8TB  96GB
'db1065' => 100, # 2.8TB 160GB, api
'db1066' => 100, # 2.8TB 160GB, api
-   'db1072' => 500, # 2.8TB 160GB
+   'db1072' => 450, # 2.8TB 160GB
'db1073' => 500, # 2.8TB 160GB
),
's2' => array(

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

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

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

[MediaWiki-commits] [Gerrit] Remove unused entityPrefixes setting - change (mediawiki...Wikibase)

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

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

Change subject: Remove unused entityPrefixes setting
..


Remove unused entityPrefixes setting

This setting is now unused and not needed anymore.

Change-Id: I1b750b577177d6a6236f1de3d76cafc5ad432800
---
M docs/options.wiki
M lib/config/WikibaseLib.default.php
2 files changed, 0 insertions(+), 14 deletions(-)

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



diff --git a/docs/options.wiki b/docs/options.wiki
index b189136..add51b8 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -19,15 +19,6 @@
 :* NOTE: The default may change in order to use the repo's database name 
automatically.
 ;sharedCacheDuration: The default duration of entries in the shared object 
cache, in seconds. Default is 3600 seconds = 1 hour.
 ;sharedCacheType: The type of cache to use for the shared object cache. 
Defaults to $wgMainCacheType. Use CACHE_XXX constants.
-;entityPrefixes: ID prefixes to use for the different entity types, as an 
associative array mapping prefixes to entity type constants. Default:
-
-  array(
-  'q' => Wikibase\DataModel\Entity\Item::ENTITY_TYPE,
-  'p' => Wikibase\DataModel\Entity\Property::ENTITY_TYPE,
-  'y' => Wikibase\DataModel\Entity\Query::ENTITY_TYPE,
-  );
-
-:'''Warning:''' do not change this if you already have Wikibase entities in 
your database, since they may become unreadable!
 ;useChangesTable: Whether to record changes in the database, so they can be 
pushed to clients. Boolean, defaults to true. May be set to false 
in situations where there are no clients to notify, to preserve space. 
'''Note''' that if this is true, the pruneChanges.php script 
should be run periodically to remove old changes from the database table.
 ;changeHandlers: Array mapping change type IDs to handler classes. May be used 
by extensions to register additional change classes.
 ;disabledDataTypes: Array listing of disabled data types on a wiki. This 
setting is intended to be used a new Wikibase install without items yet, or to 
control deployment of new data types. This setting should be set the same in 
the client and repo settings.
diff --git a/lib/config/WikibaseLib.default.php 
b/lib/config/WikibaseLib.default.php
index b0369d0..95342d1 100644
--- a/lib/config/WikibaseLib.default.php
+++ b/lib/config/WikibaseLib.default.php
@@ -19,11 +19,6 @@
// whether changes get recorded to wb_changes
'useChangesTable' => true,
 
-   'entityPrefixes' => array(
-   'q' => 'item',
-   'p' => 'property',
-   ),
-
'siteLinkGroups' => array(
'wikipedia',
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b750b577177d6a6236f1de3d76cafc5ad432800
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

___
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-12 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

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

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: I5e517d7add5e3659fe797801bf9e129e258c610a
---
M scripts/casechecker.py
1 file changed, 17 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/90/270290/1

diff --git a/scripts/casechecker.py b/scripts/casechecker.py
index 06ee014..23adaa4 100755
--- a/scripts/casechecker.py
+++ b/scripts/casechecker.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8  -*-
 """Bot to find all pages on the wiki with mixed latin and cyrilic alphabets."""
 #
-# (C) Pywikibot team, 2006-2015
+# (C) Pywikibot team, 2006-2016
 #
 # Distributed under the terms of the MIT license.
 #
@@ -145,13 +145,12 @@
 def __init__(self):
 
 for arg in pywikibot.handle_args():
-if arg.startswith('-from'):
-if arg.startswith('-from:'):
-self.apfrom = arg[6:]
-else:
-self.apfrom = pywikibot.input(u'Which page to start from: 
')
-elif arg.startswith('-reqsize:'):
-self.aplimit = int(arg[9:])
+arg, sep, value = arg.partition(':')
+if arg == '-from':
+self.apfrom = value or pywikibot.input(
+'Which page to start from: ')
+elif arg == '-reqsize':
+self.aplimit = int(value)
 elif arg == '-links':
 self.links = True
 elif arg == '-linksonly':
@@ -163,16 +162,16 @@
 self.filterredir = 'all'
 elif arg == '-redironly':
 self.filterredir = 'redirects'
-elif arg.startswith('-limit:'):
-self.stopAfter = int(arg[7:])
-elif arg == '-autonomous' or arg == '-a':
+elif == '-limit':
+self.stopAfter = int(value)
+elif arg in ('-autonomous', '-a'):
 self.autonomous = True
-elif arg.startswith('-ns:'):
-self.namespaces.append(int(arg[4:]))
-elif arg.startswith('-wikilog:'):
-self.wikilogfile = arg[9:]
-elif arg.startswith('-failedlog:'):
-self.failedTitles = arg[11:]
+elif arg == '-ns:':
+self.namespaces.append(int(value))
+elif arg == '-wikilog':
+self.wikilogfile = value
+elif arg == '-failedlog':
+self.failedTitles = value
 elif arg == '-failed':
 self.doFailed = True
 else:
@@ -261,7 +260,7 @@
 
 # TODO: handle "continue"
 if self.site.code in self.whitelists:
-wlpage = self.whitelists[self.site.code]
+wlpage = pywikibot.Page(self.site, self.whitelists[self.site.code])
 pywikibot.output(u'Loading whitelist from %s' % wlpage)
 wlparams = {
 'action': 'query',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e517d7add5e3659fe797801bf9e129e258c610a
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] swiftrepl: minimal README with instructions - change (operations/software)

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

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swiftrepl: minimal README with instructions
..


swiftrepl: minimal README with instructions

Change-Id: I22b9644c38967b36ce2f5c5e0d63b04bef63daa6
---
A swiftrepl/README.md
1 file changed, 23 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/swiftrepl/README.md b/swiftrepl/README.md
new file mode 100644
index 000..2b84aa9
--- /dev/null
+++ b/swiftrepl/README.md
@@ -0,0 +1,23 @@
+swiftrepl
+=
+
+swiftrepl performs one-way synchronization between two different swift
+clusters. It is possible to restrict what will be synchronized by container
+name and file name.
+
+testing
+---
+One easy way to test swiftrepl at a very high level is to spawn two local swift
+clusters using SAIO and two vagrant virtual machines:
+
+  git clone https://github.com/swiftstack/vagrant-swift-all-in-one.git 
vagrant-saio1
+  git clone https://github.com/swiftstack/vagrant-swift-all-in-one.git 
vagrant-saio2
+
+  (cd vagrant-saio1 && vagrant up)
+  (cd vagrant-saio2 && export IP=192.168.8.81 && vagrant up)
+
+If you are on Linux you might want to also `export SOURCE_ROOT=/tmp` since
+vboxfs mounted at `/vagrant` doesn't like symlinks. A sample configuration file
+`swiftrepl.conf.saio` is provided that can be used out of the box. The two
+swift clusters can be inspected for example with `python-swiftclient` and
+setting `ST_USER` `ST_KEY` `ST_AUTH` as indicated in the sample configuration.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22b9644c38967b36ce2f5c5e0d63b04bef63daa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Save button in proofreading could be more context sensitive - change (mediawiki...Translate)

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

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

Change subject: Save button in proofreading could be more context sensitive
..


Save button in proofreading could be more context sensitive

Bug: T50100
Change-Id: Ie7c3899181513d031d4761d0d46491d00a658df9
---
M i18n/core/en.json
M i18n/core/qqq.json
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.proofread.js
4 files changed, 63 insertions(+), 9 deletions(-)

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



diff --git a/i18n/core/en.json b/i18n/core/en.json
index 255267f..ea9d23e 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -312,6 +312,7 @@
"tux-editor-skip-button-label": "Skip to next",
"tux-editor-cancel-button-label": "Cancel",
"tux-editor-confirm-button-label": "Confirm translation",
+   "tux-editor-proofread-button-label": "Mark as reviewed",
"tux-editor-shortcut-info": "Press \"$1\" to save or \"$2\" to skip to 
next message or \"$3\" for other shortcuts.",
"tux-editor-edit-desc": "Edit documentation",
"tux-editor-add-desc": "Add documentation",
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index 88eb394..06baeae 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -343,6 +343,7 @@
"tux-editor-skip-button-label": "Label for skip button",
"tux-editor-cancel-button-label": "Label for cancel button.\nPressing 
the button hides the message editor without saving and marks the message 
internally as \"hard\".\n{{Identical|Cancel}}",
"tux-editor-confirm-button-label": "Label for confirm button",
+   "tux-editor-proofread-button-label": "Label for review button",
"tux-editor-shortcut-info": "A help text for the keyboard shortcuts. 
Parameters:\n* $1 - shortcut key for save button\n* $2 - shortcut key for skip 
button\n* $3 - \"ALT\"",
"tux-editor-edit-desc": "Text for the link to edit message 
documentation.\n{{Identical|Edit description}}",
"tux-editor-add-desc": "Text for the link to add message documentation 
when it doesn't exist",
diff --git a/resources/js/ext.translate.editor.js 
b/resources/js/ext.translate.editor.js
index 25506c2..6e285c6 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -600,7 +600,8 @@
mw.translate.dirty = true;
}
 
-   $saveButton.text( mw.msg( 
'tux-editor-save-button-label' ) );
+   translateEditor.makeSaveButtonJustSave( 
$saveButton );
+
// When there is content in the editor enable 
the button.
// But do not enable when some saving is not 
finished yet.
if ( $.trim( current ) && 
!translateEditor.saving ) {
@@ -655,8 +656,10 @@
// and go back to 
hiding.

$discardChangesButton.addClass( 'hide' );
 
-   // There's nothing new 
to save
+   // There's nothing new 
to save...
$saveButton.prop( 
'disabled', true );
+   // ...unless there is 
other action
+   
translateEditor.makeSaveButtonContextSensitive( $saveButton );
 

translateEditor.markUnunsaved();
} );
@@ -684,13 +687,7 @@
e.stopPropagation();
} );
 
-   // When the user opens an outdated translation, 
the main button should be enabled
-   // and display a "confirm translation" label.
-   if ( this.$messageItem.hasClass( 'fuzzy' ) ) {
-   $saveButton
-   .prop( 'disabled', false )
-   .text( mw.msg( 
'tux-editor-confirm-button-label' ) );
-   }
+   this.makeSaveButtonContextSensitive( 
$saveButton, this.$messageItem );
} else {
$editingButtonBlock = $( [] );
 
@@ -777,6 +774,53 @@
},
 
/**
+* Modifies the save button to provide suitable default action 
for *unchanged*
+* message. It will revert back to normal save button if the 
text is changed.
+*
+* @param {jQuery} $button The save

1 2 3 4 >

1 - 100 of 344 matches

Mail list logo