[MediaWiki-commits] [Gerrit] Extract roundtrip tests from MwTimeIsoFormatterTest - change (mediawiki...Wikibase)

[WMDE]

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

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

Change subject: Extract roundtrip tests from MwTimeIsoFormatterTest
..

Extract roundtrip tests from MwTimeIsoFormatterTest

This is critical for I0f6e06d. What I did: I copied the old
MwTimeIsoFormatterTest and removed everything that's not marked as
"roundtrip".

Change-Id: Idef4e5d9dbaded8872a561f9dd2f65786f8846f9
---
A repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php
1 file changed, 129 insertions(+), 0 deletions(-)


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

diff --git 
a/repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php 
b/repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php
new file mode 100644
index 000..97040b7
--- /dev/null
+++ b/repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php
@@ -0,0 +1,129 @@
+http://www.wikidata.org/entity/Q1985727';
+
+   $tests = array(
+   // Positive dates
+   array(
+   '+2013-08-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '16 August 2013',
+   ),
+   array(
+   '+0002013-07-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '16 July 2013',
+   ),
+   array(
+   '+001-01-14T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '14 January 1',
+   ),
+   array(
+   '+001-01-01T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '1 January 1',
+   ),
+
+   // Negative dates
+   array(
+   '-2013-08-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '16 August 2013 BCE',
+   ),
+   array(
+   '-0002013-07-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '16 July 2013 BCE',
+   ),
+   array(
+   '-001-01-14T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '14 January 1 BCE',
+   ),
+   array(
+   '-001-01-01T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '1 January 1 BCE',
+   ),
+
+   // Some languages default to genitive month names
+   array(
+   '+2013-08-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   // Nominative is "Augustus", genitive is 
"Augusti".
+   '16 Augusti 2013',
+   'la'
+   ),
+
+   // Preserve punctuation as given in MessagesXx.php but 
skip suffixes and words
+   array(
+   '+2013-08-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '16 Avgust, 2013',
+   'kaa'
+   ),
+   array(
+   '+2013-08-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '16 agosto 2013',
+   'pt'
+   ),
+   array(
+   '+2013-08-16T00:00:00Z', 
TimeValue::PRECISION_DAY,
+   '16 8月 2013',
+   'yue'
+   ),
+   );
+
+   $argLists = array();
+
+   foreach ( $tests as $args ) {
+   $timestamp = $args[0];
+   $precision = $args[1];
+   $formatted = $args[2];
+   $languageCode = isset( $args[3] ) ? $args[3] : 'en';
+
+   $argLists[] = array(
+   new TimeValue( $timestamp, 0, 0, 0, $precision, 
$gregorian ),
+   $formatted,
+   $languageCode
+   );
+   }
+
+   return $argLists;
+   }
+
+   /**
+* @dataProvider formatProvider
+*/
+   public function testFormatterParserRoundtrip( TimeValue $timeValue, 
$formatted, $languageCode ) {
+   $formatterOptions = new FormatterOptions( array(
+   ValueFormatter::OPT_LANG => $languageCode,
+   ) );
+   $formatter = new MwTimeIsoFormatter( 

[MediaWiki-commits] [Gerrit] Bump version to 0.3.1 and update dependencies' versions - change (mediawiki...citoid)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Bump version to 0.3.1 and update dependencies' versions
..

Bump version to 0.3.1 and update dependencies' versions

Change-Id: I2964c9b2d9b00d4072362e6a3ac746bb4a73e259
---
M package.json
1 file changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid 
refs/changes/18/238118/1

diff --git a/package.json b/package.json
index 1e12310..8642adf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "citoid",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Converts search terms such as URL or DOI into citations.",
   "homepage": "https://www.mediawiki.org/wiki/Citoid;,
   "scripts": {
@@ -10,22 +10,22 @@
   },
   "dependencies": {
 "bluebird": "2.8.2",
-"body-parser": "1.13.2",
-"bunyan": "1.4.0",
+"body-parser": "1.13.3",
+"bunyan": "1.5.1",
 "cassandra-uuid": "0.0.2",
-"cheerio": "0.18.0",
-"compression": "1.5.1",
+"cheerio": "0.19.0",
+"compression": "1.5.2",
 "content-type": "1.0.1",
-"express": "4.13.1",
+"express": "4.13.3",
 "html-metadata": "1.2.1",
 "iconv-lite": "0.4.11",
-"ip": "0.3.3",
-"js-yaml": "3.3.1",
+"ip": "1.0.1",
+"js-yaml": "3.4.2",
 "preq": "0.4.4",
 "request": "^2.58.0",
-"service-runner": "0.2.1",
+"service-runner": "0.2.5",
 "tough-cookie": "2.0.0",
-"striptags": "2.0.2"
+"striptags": "2.0.3"
   },
   "devDependencies": {
 "extend": "3.0.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2964c9b2d9b00d4072362e6a3ac746bb4a73e259
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] Browser tests: fix buttons locators for anonymous edit - change (mediawiki...Flow)

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: Browser tests: fix buttons locators for anonymous edit
..

Browser tests: fix buttons locators for anonymous edit

Change-Id: Iab11f753fb63cf0ac6fed1a12ffbb1fff12ada03
---
M tests/browser/features/support/components/board_description.rb
M tests/browser/features/support/pages/abstract_flow_page.rb
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/tests/browser/features/support/components/board_description.rb 
b/tests/browser/features/support/components/board_description.rb
index 5f9cc77..a456533 100644
--- a/tests/browser/features/support/components/board_description.rb
+++ b/tests/browser/features/support/components/board_description.rb
@@ -16,7 +16,7 @@
 visualeditor_or_textarea editor_widget_element
   end
 
-  link(:save, text: "Save description")
+  link(:save, text: /Save description.*/)
 
   # If page has an archive template from a flow conversion
   # find the link
diff --git a/tests/browser/features/support/pages/abstract_flow_page.rb 
b/tests/browser/features/support/pages/abstract_flow_page.rb
index 667bb99..28c615b 100644
--- a/tests/browser/features/support/pages/abstract_flow_page.rb
+++ b/tests/browser/features/support/pages/abstract_flow_page.rb
@@ -243,7 +243,7 @@
   end
 
   link(:new_topic_save) do
-new_topic_widget_element.link_element(text: 'Add topic')
+new_topic_widget_element.link_element(text: /Add topic.*/)
   end
 
   # Replying
@@ -267,7 +267,7 @@
 first_reply_widget_element.link_element(text: 'Cancel')
   end
   link(:new_reply_save) do
-first_reply_widget_element.link_element(text: 'Reply')
+first_reply_widget_element.link_element(text: /Reply.*/)
   end
 
   button(:keep_editing, text: "Keep editing")

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

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

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

[MediaWiki-commits] [Gerrit] Bump version to 0.3.1 and update dependencies' versions - change (mediawiki...citoid)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Bump version to 0.3.1 and update dependencies' versions
..


Bump version to 0.3.1 and update dependencies' versions

Change-Id: I2964c9b2d9b00d4072362e6a3ac746bb4a73e259
---
M package.json
1 file changed, 10 insertions(+), 10 deletions(-)

Approvals:
  Mobrovac: Looks good to me, approved



diff --git a/package.json b/package.json
index 1e12310..8642adf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "citoid",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Converts search terms such as URL or DOI into citations.",
   "homepage": "https://www.mediawiki.org/wiki/Citoid;,
   "scripts": {
@@ -10,22 +10,22 @@
   },
   "dependencies": {
 "bluebird": "2.8.2",
-"body-parser": "1.13.2",
-"bunyan": "1.4.0",
+"body-parser": "1.13.3",
+"bunyan": "1.5.1",
 "cassandra-uuid": "0.0.2",
-"cheerio": "0.18.0",
-"compression": "1.5.1",
+"cheerio": "0.19.0",
+"compression": "1.5.2",
 "content-type": "1.0.1",
-"express": "4.13.1",
+"express": "4.13.3",
 "html-metadata": "1.2.1",
 "iconv-lite": "0.4.11",
-"ip": "0.3.3",
-"js-yaml": "3.3.1",
+"ip": "1.0.1",
+"js-yaml": "3.4.2",
 "preq": "0.4.4",
 "request": "^2.58.0",
-"service-runner": "0.2.1",
+"service-runner": "0.2.5",
 "tough-cookie": "2.0.0",
-"striptags": "2.0.2"
+"striptags": "2.0.3"
   },
   "devDependencies": {
 "extend": "3.0.0",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2964c9b2d9b00d4072362e6a3ac746bb4a73e259
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Mvolz 
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 old copy of RestrictedEntityLookup - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Remove old copy of RestrictedEntityLookup
..

Remove old copy of RestrictedEntityLookup

Task T108286

Change-Id: I80fd5f5eb091d1d2c08564d953714342a174525f
---
M client/includes/DataAccess/PropertyParserFunction/Runner.php
D client/includes/DataAccess/RestrictedEntityLookup.php
M client/includes/Hooks/ParserLimitHookHandlers.php
M client/includes/WikibaseClient.php
M 
client/tests/phpunit/includes/DataAccess/PropertyParserFunction/LanguageAwareRendererTest.php
M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php
M client/tests/phpunit/includes/DataAccess/RestrictedEntityLookupTest.php
M client/tests/phpunit/includes/Hooks/ParserLimitHookHandlersTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
9 files changed, 10 insertions(+), 127 deletions(-)


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

diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php 
b/client/includes/DataAccess/PropertyParserFunction/Runner.php
index 99cb620..721483e 100644
--- a/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -4,7 +4,7 @@
 
 use Parser;
 use PPFrame;
-use Wikibase\Client\DataAccess\RestrictedEntityLookup;
+use Wikibase\DataModel\Services\Lookup\RestrictedEntityLookup;
 use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\EntityId;
diff --git a/client/includes/DataAccess/RestrictedEntityLookup.php 
b/client/includes/DataAccess/RestrictedEntityLookup.php
deleted file mode 100644
index 6084811..000
--- a/client/includes/DataAccess/RestrictedEntityLookup.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- */
-class RestrictedEntityLookup implements EntityLookup {
-
-   /**
-* @var EntityLookup
-*/
-   private $entityLookup;
-
-   /**
-* @var int
-*/
-   private $entityAccessLimit;
-
-   /**
-* @var bool[] Entity id serialization => bool
-*/
-   private $entitiesAccessed = array();
-
-   /**
-* @var int
-*/
-   private $entityAccessCount = 0;
-
-   /**
-* @param EntityLookup $entityLookup
-* @param int $entityAccessLimit
-*/
-   public function __construct( EntityLookup $entityLookup, 
$entityAccessLimit ) {
-   Assert::parameterType( 'integer', $entityAccessLimit, 
'$entityAccessLimit' );
-
-   $this->entityLookup = $entityLookup;
-   $this->entityAccessLimit = $entityAccessLimit;
-   }
-
-   /**
-* @see EntityLookup::getEntity
-*
-* @param EntityId $entityId
-*
-* @throws StorageException|EntityAccessLimitException
-* @return EntityDocument|null
-*/
-   public function getEntity( EntityId $entityId ) {
-   $entityIdSerialization = $entityId->getSerialization();
-
-   if ( !array_key_exists( $entityIdSerialization, 
$this->entitiesAccessed ) ) {
-   $this->entityAccessCount++;
-   $this->entitiesAccessed[$entityIdSerialization] = true;
-   }
-
-   if ( $this->entityAccessCount > $this->entityAccessLimit ) {
-   throw new EntityAccessLimitException(
-   'To many entities loaded, must not load more 
than ' . $this->entityAccessLimit . ' entities.'
-   );
-   }
-
-   return $this->entityLookup->getEntity( $entityId );
-   }
-
-   /**
-* @see EntityLookup::hasEntity
-*
-* @since 0.4
-*
-* @param EntityId $entityId
-*
-* @throws StorageException
-* @return bool
-*/
-   public function hasEntity( EntityId $entityId ) {
-   return $this->entityLookup->hasEntity( $entityId );
-   }
-
-   /**
-* Returns the number of entities already loaded via this object.
-*
-* @return int
-*/
-   public function getEntityAccessCount() {
-   return $this->entityAccessCount;
-   }
-
-   /**
-* Whether an entity has been accessed before via this 
RestrictedEntityLookup.
-*
-* @param EntityId $entityId
-*
-* @return bool
-*/
-   public function entityHasBeenAccessed( EntityId $entityId ) {
-   $entityIdSerialization = $entityId->getSerialization();
-
-   return array_key_exists( $entityIdSerialization, 
$this->entitiesAccessed );
-   }
-
-}
diff --git a/client/includes/Hooks/ParserLimitHookHandlers.php 
b/client/includes/Hooks/ParserLimitHookHandlers.php
index c5140a5..06a2357 

[MediaWiki-commits] [Gerrit] Update code and separated repos scheme - change (analytics/ua-parser)

[Joal (Code Review)]

Joal has uploaded a new change for review.

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

Change subject: Update code and separated repos scheme
..

Update code and separated repos scheme

Remove existing code.
Add up-to-date uap-core and uap-java submodules.

Bug: T106134
Change-Id: I9bb009856deb3ea8a6d05bba2b74244dd9f0d023
---
A .gitmodules
D CONTRIBUTING.md
D LICENSE.txt
D MANIFEST.in
D README.markdown
D composer.json
D cpp/CMakeLists.txt
D cpp/LICENSE
D cpp/Makefile
D cpp/README.md
D cpp/UaParser.cpp
D cpp/UaParser.h
D cpp/UaParserTest.cpp
D cpp/main.cpp
D cpp/ua_parser.cpp
D cpp/ua_parser.h
D cpp/ua_parser_test.cpp
D csharp/.gitignore
D csharp/.nuget/NuGet.Config
D csharp/.nuget/NuGet.exe
D csharp/.nuget/NuGet.targets
D csharp/LICENSE
D csharp/PublicKey.snk
D csharp/README.md
D csharp/UAParser.ConsoleApp/Program.cs
D csharp/UAParser.ConsoleApp/Properties/AssemblyInfo.cs
D csharp/UAParser.ConsoleApp/UAParser.ConsoleApp.csproj
D csharp/UAParser.ConsoleApp/app.config
D csharp/UAParser.Tests/DeviceYamlTestCase.cs
D csharp/UAParser.Tests/InternalExtensions.cs
D csharp/UAParser.Tests/ParserTests.cs
D csharp/UAParser.Tests/Properties/AssemblyInfo.cs
D csharp/UAParser.Tests/TestResourceTests.cs
D csharp/UAParser.Tests/UAParser.Tests.csproj
D csharp/UAParser.Tests/YamlParsing.cs
D csharp/UAParser.Tests/YamlTestCase.cs
D csharp/UAParser.Tests/packages.config
D csharp/UAParser.sln
D csharp/UAParser/.gitignore
D csharp/UAParser/Properties/AssemblyInfo.cs
D csharp/UAParser/UAParser.cs
D csharp/UAParser/UAParser.csproj
D csharp/UAParser/UAParser.nuspec
D csharp/build.bat
D csharp/build.proj
D csharp/tools/nunit/nunit-console-runner.dll
D csharp/tools/nunit/nunit-console-x86.exe
D csharp/tools/nunit/nunit-console-x86.exe.config
D csharp/tools/nunit/nunit-console.exe
D csharp/tools/nunit/nunit-console.exe.config
D csharp/tools/nunit/nunit.core.dll
D csharp/tools/nunit/nunit.core.interfaces.dll
D csharp/tools/nunit/nunit.util.dll
D d/LICENSE
D d/README.markdown
D d/UaParser.d
D d/example.d
D go/example/example.go
D go/uaparser/LICENSE.md
D go/uaparser/README.md
D go/uaparser/device.go
D go/uaparser/device_test.go
D go/uaparser/os.go
D go/uaparser/os_test.go
D go/uaparser/parser.go
D go/uaparser/user_agent.go
D go/uaparser/user_agent_test.go
D haskell/.ghci
D haskell/CONTRIBUTORS.md
D haskell/LICENSE
D haskell/Setup.hs
D haskell/regexes.yaml
D haskell/src/Web/UAParser.hs
D haskell/test/.ghci
D haskell/test/src/TestSuite.hs
D haskell/ua-parser.cabal
D java/.gitignore
D java/LICENSE
D java/README.md
D java/pom.xml
D java/src/main/java/ua_parser/CachingParser.java
D java/src/main/java/ua_parser/Client.java
D java/src/main/java/ua_parser/Constants.java
D java/src/main/java/ua_parser/Device.java
D java/src/main/java/ua_parser/DeviceParser.java
D java/src/main/java/ua_parser/OS.java
D java/src/main/java/ua_parser/OSParser.java
D java/src/main/java/ua_parser/Parser.java
D java/src/main/java/ua_parser/UserAgent.java
D java/src/main/java/ua_parser/UserAgentParser.java
D java/src/test/java/ua_parser/CachingParserTest.java
D java/src/test/java/ua_parser/DataTest.java
D java/src/test/java/ua_parser/DeviceTest.java
D java/src/test/java/ua_parser/OSTest.java
D java/src/test/java/ua_parser/ParserTest.java
D java/src/test/java/ua_parser/UserAgentTest.java
D js/LICENSE
D js/index.js
D js/lib/device.js
D js/lib/helpers.js
D js/lib/os.js
D js/lib/results.js
D js/lib/ua.js
D js/test/device.js
D js/test/helpers.js
D js/test/old-api.js
D js/test/os.js
D js/test/parse.js
D js/test/ua.js
D js/test/with_fixtures.js
D package.json
D perl/Changes
D perl/MANIFEST
D perl/MANIFEST.SKIP
D perl/META.json
D perl/META.yml
D perl/Makefile.PL
D perl/README.pod
D perl/lib/HTTP/UA/Parser.pm
D perl/lib/HTTP/UA/Parser/regexes.yaml
D perl/lib/Yaml/Tiny.pm
D perl/script/ua_parser
D perl/t/HTTP-UA-Parser.t
D perl/t/additional_os_tests.t
D perl/t/device.t
D perl/t/firefox_user_agent_strings.t
D perl/t/os.t
D perl/t/pgts_browser_list.t
D perl/t/test_device.t
D perl/t/test_user_agent_parser.t
D perl/t/test_user_agent_parser_os.t
D perl/t/ua.t
D perl/t/utils.pl
D php/CHANGELOG
D php/LICENSE
D php/README.md
D php/bin/uaparser.php
D php/phpunit.xml.dist
D php/resources/.gitignore
D php/resources/ca-bundle.crt
D php/src/UAParser/AbstractParser.php
D php/src/UAParser/Command/ConvertCommand.php
D php/src/UAParser/Command/FetchCommand.php
D php/src/UAParser/Command/LogfileCommand.php
D php/src/UAParser/Command/ParserCommand.php
D php/src/UAParser/Command/UpdateCommand.php
D php/src/UAParser/DeviceParser.php
D php/src/UAParser/Exception/DomainException.php
D php/src/UAParser/Exception/FetcherException.php
D php/src/UAParser/Exception/FileNotFoundException.php
D php/src/UAParser/Exception/InvalidArgumentException.php
D php/src/UAParser/Exception/ReaderException.php
D php/src/UAParser/OperatingSystemParser.php
D php/src/UAParser/Parser.php
D php/src/UAParser/Result/AbstractClient.php
D 

[MediaWiki-commits] [Gerrit] Stats: Optimize the query behind contenttranslationlangtrend... - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Stats: Optimize the query behind contenttranslationlangtrend API
..

Stats: Optimize the query behind contenttranslationlangtrend API

Query simplified by avoiding subquery, single method of both
published and draft stats.

Bug: T111943
Change-Id: I1503d7bf0f677955c7e740cd0290e02f398a4edc
---
M api/ApiQueryContentTranslationLanguageTrend.php
M includes/Translation.php
2 files changed, 36 insertions(+), 114 deletions(-)


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

diff --git a/api/ApiQueryContentTranslationLanguageTrend.php 
b/api/ApiQueryContentTranslationLanguageTrend.php
index a790c47..2ade9f4 100644
--- a/api/ApiQueryContentTranslationLanguageTrend.php
+++ b/api/ApiQueryContentTranslationLanguageTrend.php
@@ -33,8 +33,8 @@
$interval = $params['interval'];
 
$data = array(
-   'translations' => Translation::getPublishTrend( 
$source, $target, $interval ),
-   'drafts' => Translation::getDraftTrend( $source, 
$target, $interval ),
+   'translations' => Translation::getTrendByStatus( 
$source, $target, 'published', $interval ),
+   'drafts' => Translation::getTrendByStatus( $source, 
$target, 'draft', $interval ),
);
 
if ( $target !== null ) {
diff --git a/includes/Translation.php b/includes/Translation.php
index 3a7ba17..95f6699 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -211,86 +211,6 @@
}
 
/**
-* Get time-wise cumulative number of drafts for given
-* language pairs, with given interval.
-* @param string $source Source language code
-* @param string $target Target language code
-* @param string $interval 'weekly' or 'monthly' trend
-* @return array
-*/
-   public static function getDraftTrend( $source, $target, $interval ) {
-   $dbr = Database::getConnection( DB_SLAVE );
-
-   $draftCondition = $dbr->makeList(
-   array(
-   'translation_status' => 'draft',
-   'translation_target_url IS NULL'
-   ),
-   LIST_AND
-   );
-
-   $conditions = array();
-   $conditions[] = $draftCondition;
-   if ( $source !== null ) {
-   $conditions['translation_source_language'] = $source;
-   }
-   if ( $target !== null ) {
-   $conditions['translation_target_language'] = $target;
-   }
-
-   $options = null;
-   if ( $interval === 'week' ) {
-$options = array(
-   'GROUP BY' => array(
-   
'YEARWEEK(translation_last_updated_timestamp)',
-   ),
-   );
-   } elseif ( $interval === 'month' ) {
-$options = array(
-   'GROUP BY' => array(
-   
'YEAR(translation_last_updated_timestamp), 
MONTH(translation_last_updated_timestamp)',
-   ),
-   );
-   }
-
-   $subQuery = $dbr->selectSQLText(
-   'cx_translations',
-   'count(*)',
-   $dbr->makeList( array(
-   'translation_last_updated_timestamp <= 
MAX(translations.translation_last_updated_timestamp)',
-   $dbr->makeList( $conditions, LIST_AND ),
-   ),
-   LIST_AND )
-   );
-
-   $rows = $dbr->select(
-   array( 'translations' => 'cx_translations' ),
-   array(
-   
"translations.translation_last_updated_timestamp AS date",
-   '(' . $subQuery . ') translatons_count',
-   ),
-   $dbr->makeList( $conditions, LIST_AND ),
-   __METHOD__,
-   $options
-   );
-
-   $prev = 0;
-   $result = array();
-   foreach ( $rows as $row ) {
-   $count = (int)$row->translatons_count;
-   $time = self::getResultTime( $row->date, $interval );
-   $result[$time] = array(
-   'count' => $count,
-   'delta' => $count - $prev,
-   );
-
-   $prev = $count;
-   }
-
-  

[MediaWiki-commits] [Gerrit] MWSaveDialog: Checkbox vertical alignment tweak - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: MWSaveDialog: Checkbox vertical alignment tweak
..

MWSaveDialog: Checkbox vertical alignment tweak

Change-Id: I3741d2d5c9bc5b5500440c053766582cfd298841
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
index 3d1f158..0fdce81 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
@@ -35,7 +35,7 @@
 
 .ve-ui-mwSaveDialog-checkboxes {
margin-right: 3.25em; /* Hack to prevent overlap on edit summary count 
*/
-   padding: 0.2em 0.75em 0 0.75em;
+   padding: 0.25em 0.75em 0 0.75em;
 }
 
 .ve-ui-mwSaveDialog-checkboxes .oo-ui-fieldLayout {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3741d2d5c9bc5b5500440c053766582cfd298841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/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] Dialog: Use a 'done' button on edit param page instead of 'b... - change (mediawiki...TemplateData)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Dialog: Use a 'done' button on edit param page instead of 'back'
..

Dialog: Use a 'done' button on edit param page instead of 'back'

'Back' suggests that changes in the form won't be saved.

Change-Id: I0df0887caa6317393a3a891dd292aa4dc54cc32b
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.ui.tdDialog.js
4 files changed, 11 insertions(+), 2 deletions(-)


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

diff --git a/extension.json b/extension.json
index f150e2b..0a96b6c 100644
--- a/extension.json
+++ b/extension.json
@@ -103,6 +103,7 @@
"templatedata-modal-button-cancel",
"templatedata-modal-button-changelang",
"templatedata-modal-button-delparam",
+   "templatedata-modal-button-done",
"templatedata-modal-button-importParams",
"templatedata-modal-button-restoreparam",
"templatedata-modal-button-saveparam",
diff --git a/i18n/en.json b/i18n/en.json
index a42b2f4..0bc182a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -51,6 +51,7 @@
"templatedata-modal-button-cancel": "Cancel",
"templatedata-modal-button-changelang": "Change language",
"templatedata-modal-button-delparam": "Remove parameter information",
+   "templatedata-modal-button-done": "Done",
"templatedata-modal-button-importParams": "Import parameters",
"templatedata-modal-button-restoreparam": "Restore parameter",
"templatedata-modal-button-saveparam": "Save",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e64c5c0..23c6504 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -59,6 +59,7 @@
"templatedata-modal-button-cancel": "Label of the cancel 
button.\n{{Identical|Cancel}}",
"templatedata-modal-button-changelang": "Label for the button to change 
language in the edit dialog.\n{{Identical|Change language}}",
"templatedata-modal-button-delparam": "Button to remove a parameter.",
+   "templatedata-modal-button-done": "Label of the done button.",
"templatedata-modal-button-importParams": "Label of the import button",
"templatedata-modal-button-restoreparam": "Label for the button to 
restore a previously deleted parameter in the edit dialog.",
"templatedata-modal-button-saveparam": "Label for the button to save 
parameter details in the templatedata edit dialog.\n{{Identical|Save}}",
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 62fdacc..d751cb7 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -36,6 +36,12 @@
modes: 'list'
},
{
+   action: 'done',
+   label: mw.msg( 'templatedata-modal-button-done' ),
+   flags: [ 'primary', 'progressive' ],
+   modes: 'edit'
+   },
+   {
action: 'add',
label: mw.msg( 'templatedata-modal-button-addparam' ),
flags: [ 'constructive' ],
@@ -56,7 +62,7 @@
action: 'back',
label: mw.msg( 'templatedata-modal-button-back' ),
flags: 'safe',
-   modes: [ 'edit', 'language', 'add' ]
+   modes: [ 'language', 'add' ]
}
 ];
 
@@ -904,7 +910,7 @@
  * @return {OO.ui.Process} Action process
  */
 mw.TemplateData.Dialog.prototype.getActionProcess = function ( action ) {
-   if ( action === 'back' ) {
+   if ( action === 'back' || action === 'done' ) {
return new OO.ui.Process( function () {
this.switchPanels( 'listParams' );
}, this );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0df0887caa6317393a3a891dd292aa4dc54cc32b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
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] Stats: Misc cleanup on getDeletionTrend method - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Stats: Misc cleanup on getDeletionTrend method
..

Stats: Misc cleanup on getDeletionTrend method

Change-Id: I0cbf399c57a4a44b573d09dd0287d5b9aed11543
---
M includes/Translation.php
1 file changed, 5 insertions(+), 7 deletions(-)


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

diff --git a/includes/Translation.php b/includes/Translation.php
index 2384225..84100b1 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -221,16 +221,16 @@
'ct_tag' => 'contenttranslation',
'ar_rev_id = ct_rev_id'
);
-   $groupBy = null;
 
+   $options = null;
if ( $interval === 'week' ) {
-   $groupBy = array(
+   $options = array(
'GROUP BY' => array(
'YEARWEEK(ar_timestamp)',
),
);
} elseif ( $interval === 'month' ) {
-   $groupBy = array(
+   $options = array(
'GROUP BY' => array(
'YEAR(ar_timestamp), 
MONTH(ar_timestamp)',
),
@@ -242,10 +242,9 @@
array( 'ar_timestamp', 'count(ar_page_id) as count' ),
$conditions,
__METHOD__,
-   $groupBy
+   $options
);
 
-   $prev = 0;
$count = 0;
$result = array();
foreach ( $rows as $row ) {
@@ -253,9 +252,8 @@
$time = self::getResultTime( $row->ar_timestamp, 
$interval );
$result[$time] = array(
'count' => $count,
-   'delta' => $count - $prev,
+   'delta' => (int)$row->count,
);
-   $prev = $count;
}
 
return $result;

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

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

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

[MediaWiki-commits] [Gerrit] Remove (broken) Wikidata-specific SkinCopyrightFooter hook h... - change (operations/mediawiki-config)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Remove (broken) Wikidata-specific SkinCopyrightFooter hook 
handler
..

Remove (broken) Wikidata-specific SkinCopyrightFooter hook handler

This causes the footer copyright in Wikidata's main namespace to be:



We already have a hook handler for the copyright message in the
WikimediaMessages extension and that works.

Bug: T112520
Change-Id: If121aef742510c8009ca241576342035fcc4206d
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7a21407..02d9c91 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2955,17 +2955,6 @@
return true;
 };
 
-// T46617
-if ( in_array( $wgDBname, array( 'wikidatawiki', 'testwikidatawiki' ) ) ) {
-   $wgHooks['SkinCopyrightFooter'][] = function( $title, $type, &$msg, 
&$link, &$forContent ) {
-   if ( $title->getNamespace() === NS_MAIN ) {
-   $msg = 'Creative Commons Public Domain 1.0';
-   $link = '//creativecommons.org/publicdomain/zero/1.0/';
-   }
-   return true;
-   };
-}
-
 $wgExemptFromUserRobotsControl = array_merge( $wgContentNamespaces, 
$wmgExemptFromUserRobotsControlExtra );
 
 // additional "language names", adding to Names.php data

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

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

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

[MediaWiki-commits] [Gerrit] Load the module mediawiki.page.watch.ajax only when required - change (mediawiki/core)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Load the module mediawiki.page.watch.ajax only when required
..

Load the module mediawiki.page.watch.ajax only when required

Load the module mediawiki.page.watch.ajax only when there is
a watch button on the page.

This change uses the same check as buildContentNavigationUrls() in 
SkinTemplate.php.

Bug: T112523
Change-Id: I78895ffea1290f8c1d90630851d0d3d443800d66
---
M includes/skins/Skin.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/238131/1

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 53af3e7..eae6cf1 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -204,6 +204,7 @@
if ( $wgEnableAPI ) {
if ( $wgEnableWriteAPI && $wgAjaxWatch && 
$user->isLoggedIn()
&& $user->isAllowed( 'writeapi' )
+   && $this->getRelevantTitle()->canExist()
) {
$modules['watch'][] = 
'mediawiki.page.watch.ajax';
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78895ffea1290f8c1d90630851d0d3d443800d66
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] Add pywikibot/wikibase - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Add pywikibot/wikibase
..


Add pywikibot/wikibase

wikibase parts of pywikibot is becoming a dependency
and it needs proper code review and tests.

Change-Id: I72dacd7aa751b1cf9d076a3b8e81f3fb44cfcc1b
---
M jjb/pywikibot.yaml
M zuul/layout.yaml
2 files changed, 26 insertions(+), 0 deletions(-)

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



diff --git a/jjb/pywikibot.yaml b/jjb/pywikibot.yaml
index f37d721..448d987 100644
--- a/jjb/pywikibot.yaml
+++ b/jjb/pywikibot.yaml
@@ -57,3 +57,14 @@
  tox -e venv -- python setup.py nosetests --tests tests --verbosity=2 
-a '"family=wpbeta,code=en"'
 triggers:
 - timed: "@midnight"
+
+- project:
+name: pywikibot-wikibase
+toxenv:
+ - flake8-py3
+ - nose
+ - nose34
+
+jobs:
+ - '{name}-tox-{toxenv}'
+ - '{name}-tox-{toxenv}-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3a93325..c872137 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -7764,6 +7764,21 @@
   - pywikibot-i18n-pep8
   - pywikibot-i18n-pyflakes
 
+  - name: pywikibot/wikibase
+check:
+  - noop
+test:
+  - 'tox-flake8'
+  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
+  - 'pywikibot-wikibase-tox-nose'
+  - 'pywikibot-wikibase-tox-nose34-trusty'
+  - 'tox-doc-trusty'
+gate-and-submit:
+  - 'tox-flake8'
+  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
+  - 'pywikibot-wikibase-tox-nose34-trusty'
+  - 'tox-doc-trusty'
+
   - name: qrpedia
 check-voter:
   - phplint

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72dacd7aa751b1cf9d076a3b8e81f3fb44cfcc1b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] cassandra: add auxiliary (non-seed) codfw test hosts - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: add auxiliary (non-seed) codfw test hosts
..

cassandra: add auxiliary (non-seed) codfw test hosts

not all nodes need (or want) to be seeds, yet they are part of the cluster and
should be allowed by firewall rules

Bug: T108613
Change-Id: I762dbc9c744bc1fecb9629e8837ad826c724efed
---
M hieradata/regex.yaml
M manifests/role/cassandra.pp
M modules/cassandra/manifests/init.pp
3 files changed, 12 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index b667d0a..15c1acf 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -32,6 +32,10 @@
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  cassandra::non_seeds:
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   restbase::seeds:
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
@@ -46,6 +50,10 @@
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  cassandra::non_seeds:
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   restbase::seeds:
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 4acd598..5808bf6 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -29,7 +29,9 @@
 contact_group => 'admins,team-services',
 }
 
-$cassandra_hosts = hiera('cassandra::seeds')
+$cassandra_seeds = hiera('cassandra::seeds')
+$cassandra_non_seeds = hiera('cassandra::non_seeds')
+$cassandra_hosts = concat($cassandra_seeds, $cassandra_non_seeds)
 $cassandra_hosts_ferm = join($cassandra_hosts, ' ')
 
 # Cassandra intra-node messaging
diff --git a/modules/cassandra/manifests/init.pp 
b/modules/cassandra/manifests/init.pp
index 91fb7bd..a9ed683 100644
--- a/modules/cassandra/manifests/init.pp
+++ b/modules/cassandra/manifests/init.pp
@@ -192,6 +192,7 @@
 class cassandra(
 $cluster_name = 'Test Cluster',
 $seeds= [$::ipaddress],
+$non_seeds= [],
 $num_tokens   = 256,
 $authenticator= true,
 $authorizor   = true,

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

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

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

[MediaWiki-commits] [Gerrit] Move lib/TimeFormatterParserRoundtripTest to repo - change (mediawiki...Wikibase)

[WMDE]

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

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

Change subject: Move lib/TimeFormatterParserRoundtripTest to repo
..

Move lib/TimeFormatterParserRoundtripTest to repo

Lib can not use a repo class, but repo can use lib classes.

Change-Id: Iae7aa0e08d1ef7a464e355c592868b18e8c8626a
---
R repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/tests/phpunit/TimeFormatterParserRoundtripTest.php 
b/repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php
similarity index 100%
rename from lib/tests/phpunit/TimeFormatterParserRoundtripTest.php
rename to 
repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae7aa0e08d1ef7a464e355c592868b18e8c8626a
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] Disable JavaScript buttons while loading for JavaScript clie... - change (mediawiki/core)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: Disable JavaScript buttons while loading for JavaScript clients 
via CSS
..

Disable JavaScript buttons while loading for JavaScript clients via CSS

The deactivated buttons get reactivated when the JavaScript function is loaded.

This prevents a fallback to the non-JavaScript version when clicking the button 
while loading.

Bug: T112495
Change-Id: I1540529adf83198479916b0e29f772e3e0dee055
---
M resources/src/mediawiki.legacy/shared.css
M resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js
M resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
3 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/238121/1

diff --git a/resources/src/mediawiki.legacy/shared.css 
b/resources/src/mediawiki.legacy/shared.css
index f55d2a8..225c82c 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -187,6 +187,14 @@
text-align: right;
 }
 
+/* Disable patrol link while loading for JavaScript clients. */
+.client-js .patrollink a,
+/* Disable watch/unwatch links while loading for JavaScript clients. */
+.client-js #ca-unwatch.icon a,
+.client-js #ca-watch.icon a {
+   pointer-events: none;
+}
+
 /**
  * Forms
  */
diff --git a/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js 
b/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js
index f9b0d35..aaec8dc 100644
--- a/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js
+++ b/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js
@@ -61,5 +61,8 @@
 
e.preventDefault();
} );
+
+   // Reactivate while loading disabled buttons
+   $patrolLinks.css( 'pointer-events', 'initial' );
} );
 }( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js 
b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
index a3197da..65e4bb5 100644
--- a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -176,6 +176,9 @@
} );
} );
} );
+
+   // Reactivate while loading disabled buttons
+   $links.css( 'pointer-events', 'initial' );
} );
 
 }( mediaWiki, jQuery ) );

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

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

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

[MediaWiki-commits] [Gerrit] Move lib/parsers to repo/Parsers - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Move lib/parsers to repo/Parsers
..


Move lib/parsers to repo/Parsers

All the parser classes are only used in repo. There is
no reason to keep them in lib.

Change-Id: I9184485af0f8a3ed0defabfe3776805a39ad2499
---
R repo/includes/Parsers/EntityIdValueParser.php
R repo/includes/Parsers/MWTimeIsoParser.php
R repo/includes/Parsers/MediaWikiNumberUnlocalizer.php
R repo/includes/Parsers/MonolingualTextParser.php
R repo/includes/Parsers/TimeParserFactory.php
R repo/includes/Parsers/WikibaseStringValueLocalizer.php
R repo/includes/Parsers/YearMonthTimeParser.php
R repo/includes/Parsers/YearTimeParser.php
R repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
R repo/tests/phpunit/includes/Parsers/MediaWikiNumberUnlocalizerTest.php
R repo/tests/phpunit/includes/Parsers/MonolingualTextParserTest.php
R repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
R repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
R repo/tests/phpunit/includes/Parsers/WikibaseStringValueNormalizerTest.php
R repo/tests/phpunit/includes/Parsers/YearMonthTimeParserTest.php
R repo/tests/phpunit/includes/Parsers/YearTimeParserTest.php
16 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/includes/parsers/EntityIdValueParser.php 
b/repo/includes/Parsers/EntityIdValueParser.php
similarity index 100%
rename from lib/includes/parsers/EntityIdValueParser.php
rename to repo/includes/Parsers/EntityIdValueParser.php
diff --git a/lib/includes/parsers/MWTimeIsoParser.php 
b/repo/includes/Parsers/MWTimeIsoParser.php
similarity index 100%
rename from lib/includes/parsers/MWTimeIsoParser.php
rename to repo/includes/Parsers/MWTimeIsoParser.php
diff --git a/lib/includes/parsers/MediaWikiNumberUnlocalizer.php 
b/repo/includes/Parsers/MediaWikiNumberUnlocalizer.php
similarity index 100%
rename from lib/includes/parsers/MediaWikiNumberUnlocalizer.php
rename to repo/includes/Parsers/MediaWikiNumberUnlocalizer.php
diff --git a/lib/includes/parsers/MonolingualTextParser.php 
b/repo/includes/Parsers/MonolingualTextParser.php
similarity index 100%
rename from lib/includes/parsers/MonolingualTextParser.php
rename to repo/includes/Parsers/MonolingualTextParser.php
diff --git a/lib/includes/parsers/TimeParserFactory.php 
b/repo/includes/Parsers/TimeParserFactory.php
similarity index 100%
rename from lib/includes/parsers/TimeParserFactory.php
rename to repo/includes/Parsers/TimeParserFactory.php
diff --git a/lib/includes/parsers/WikibaseStringValueLocalizer.php 
b/repo/includes/Parsers/WikibaseStringValueLocalizer.php
similarity index 100%
rename from lib/includes/parsers/WikibaseStringValueLocalizer.php
rename to repo/includes/Parsers/WikibaseStringValueLocalizer.php
diff --git a/lib/includes/parsers/YearMonthTimeParser.php 
b/repo/includes/Parsers/YearMonthTimeParser.php
similarity index 100%
rename from lib/includes/parsers/YearMonthTimeParser.php
rename to repo/includes/Parsers/YearMonthTimeParser.php
diff --git a/lib/includes/parsers/YearTimeParser.php 
b/repo/includes/Parsers/YearTimeParser.php
similarity index 100%
rename from lib/includes/parsers/YearTimeParser.php
rename to repo/includes/Parsers/YearTimeParser.php
diff --git a/lib/tests/phpunit/parsers/EntityIdValueParserTest.php 
b/repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
similarity index 100%
rename from lib/tests/phpunit/parsers/EntityIdValueParserTest.php
rename to repo/tests/phpunit/includes/Parsers/EntityIdValueParserTest.php
diff --git a/lib/tests/phpunit/parsers/MediaWikiNumberUnlocalizerTest.php 
b/repo/tests/phpunit/includes/Parsers/MediaWikiNumberUnlocalizerTest.php
similarity index 100%
rename from lib/tests/phpunit/parsers/MediaWikiNumberUnlocalizerTest.php
rename to repo/tests/phpunit/includes/Parsers/MediaWikiNumberUnlocalizerTest.php
diff --git a/lib/tests/phpunit/parsers/MonolingualTextParserTest.php 
b/repo/tests/phpunit/includes/Parsers/MonolingualTextParserTest.php
similarity index 100%
rename from lib/tests/phpunit/parsers/MonolingualTextParserTest.php
rename to repo/tests/phpunit/includes/Parsers/MonolingualTextParserTest.php
diff --git a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php 
b/repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
similarity index 100%
rename from lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
rename to repo/tests/phpunit/includes/Parsers/MwTimeIsoParserTest.php
diff --git a/lib/tests/phpunit/parsers/TimeParserFactoryTest.php 
b/repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
similarity index 100%
rename from lib/tests/phpunit/parsers/TimeParserFactoryTest.php
rename to repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
diff --git a/lib/tests/phpunit/parsers/WikibaseStringValueNormalizerTest.php 

[MediaWiki-commits] [Gerrit] Remove old copy of RedirectResolvingEntityLookup and always ... - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Remove old copy of RedirectResolvingEntityLookup and always use 
the new one
..

Remove old copy of RedirectResolvingEntityLookup and always use the new one

Change-Id: I70613bb3e5e31c016adff67131050a22f11c481a
---
M client/includes/store/sql/DirectSqlStore.php
D lib/includes/store/RedirectResolvingEntityLookup.php
D lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php
M repo/includes/Dumpers/JsonDumpGenerator.php
M repo/includes/Dumpers/RdfDumpGenerator.php
M repo/includes/store/sql/SqlStore.php
M repo/tests/phpunit/includes/EntityModificationTestHelper.php
7 files changed, 5 insertions(+), 212 deletions(-)


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

diff --git a/client/includes/store/sql/DirectSqlStore.php 
b/client/includes/store/sql/DirectSqlStore.php
index 0f78842..aad489e 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -19,11 +19,11 @@
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Lookup\RedirectResolvingEntityLookup;
 use Wikibase\Lib\Store\CachingEntityRevisionLookup;
 use Wikibase\Lib\Store\CachingSiteLinkLookup;
 use Wikibase\Lib\Store\EntityContentDataCodec;
 use Wikibase\Lib\Store\EntityRevisionLookup;
-use Wikibase\Lib\Store\RedirectResolvingEntityLookup;
 use Wikibase\Lib\Store\RevisionBasedEntityLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
 use Wikibase\Lib\Store\SiteLinkTable;
diff --git a/lib/includes/store/RedirectResolvingEntityLookup.php 
b/lib/includes/store/RedirectResolvingEntityLookup.php
deleted file mode 100644
index e7da7d3..000
--- a/lib/includes/store/RedirectResolvingEntityLookup.php
+++ /dev/null
@@ -1,69 +0,0 @@
-lookup = new EntityRedirectResolvingDecorator( $lookup );
-   }
-
-   /**
-* @see EntityLookup::getEntity
-*
-* If the given entity ID points to a redirect, that redirect is 
resolved and the
-* target entity returned.
-*
-* Callers can detect the presence of a redirect by comparing the ID of 
the returned
-* Entity with the request ID.
-*
-* @param EntityId $entityId
-*
-* @throws StorageException
-* @return EntityDocument|null
-*/
-   public function getEntity( EntityId $entityId ) {
-   return $this->lookup->getEntity( $entityId );
-   }
-
-   /**
-* @see EntityLookup::hasEntity
-*
-* If the given entity ID points to a redirect, that redirect is 
resolved and the
-* existence of the target entity is checked.
-*
-* @param EntityId $entityId
-*
-* @throws StorageException
-* @return bool
-*/
-   public function hasEntity( EntityId $entityId ) {
-   return $this->lookup->hasEntity( $entityId );
-   }
-
-}
diff --git a/lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php 
b/lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php
deleted file mode 100644
index fde07c3..000
--- a/lib/tests/phpunit/store/RedirectResolvingEntityLookupTest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-getEntity( $id ) !== null;
-   }
-
-   /**
-* @param EntityId $id
-*
-* @return null|Item
-* @throws UnresolvedRedirectException
-*/
-   public function getEntity( EntityId $id ) {
-   if ( $id->getSerialization() == 'Q11' ) {
-   throw new UnresolvedRedirectException( new ItemId( 
'Q10' ) );
-   }
-
-   if ( $id->getSerialization() == 'Q12' ) {
-   throw new UnresolvedRedirectException( new ItemId( 
'Q11' ) );
-   }
-
-   if ( $id->getSerialization() == 'Q21' ) {
-   throw new UnresolvedRedirectException( new ItemId( 
'Q20' ) );
-   }
-
-   if ( $id->getSerialization() == 'Q10' ) {
-   return new Item( $id );
-   }
-
-   return null;
-   }
-
-   /**
-* @return EntityLookup
-*/
-   public function getLookupDouble() {
-   $mock = $this->getMock( 
'Wikibase\DataModel\Services\Lookup\EntityLookup' );
-
-   $mock->expects( $this->any() )
-   ->method( 'getEntity' )
-   ->will( $this->returnCallback( array( $this, 
'getEntity' ) ) );
-
-   $mock->expects( $this->any() )
-   ->method( 'hasEntity' )
-   ->will( $this->returnCallback( array( $this, 
'hasEntity' ) ) );
-
-   return $mock;
-   }
-
-   public function 

[MediaWiki-commits] [Gerrit] cassandra: enable DC internode encryption for test cluster - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: enable DC internode encryption for test cluster
..


cassandra: enable DC internode encryption for test cluster

This will also install private material to be used for encryption via secret()

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

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index b667d0a..2ea5032 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -39,6 +39,8 @@
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test
+  cassandra::tls_cluster_name: services-test
+  cassandra::internode_encryption: dc
 
 cassandra_test_codfw:
   __regex: !ruby/regexp /^restbase-test200[1-3]\.codfw\.wmnet$/
@@ -53,6 +55,8 @@
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test
+  cassandra::tls_cluster_name: services-test
+  cassandra::internode_encryption: dc
 
 swift_be_codfw:
   __regex: !ruby/regexp /^ms-be20.*\.codfw\.wmnet$/

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

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

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

[MediaWiki-commits] [Gerrit] Suggestions: Make the whole suggestion item clickable - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Suggestions: Make the whole suggestion item clickable
..


Suggestions: Make the whole suggestion item clickable

Bug: T106405
Change-Id: I63bd26febe92b529e57b6987b6b6d2262b447dfb
---
M modules/dashboard/ext.cx.suggestionlist.js
M modules/dashboard/styles/ext.cx.lists.common.less
M modules/dashboard/styles/ext.cx.translationlist.less
3 files changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Nikerabbit: 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 df69afb..c046a25 100644
--- a/modules/dashboard/ext.cx.suggestionlist.js
+++ b/modules/dashboard/ext.cx.suggestionlist.js
@@ -194,6 +194,11 @@
target: '_blank',
title: mw.msg( 
'cx-suggestionlist-view-source-page' )
} )
+   .click( function ( e ) {
+   // Do not propagate to the parent suggestion 
item. Prevent opening
+   // source selector.
+   e.stopPropagation();
+   } )
.addClass( 'cx-slitem__languages__language 
cx-slitem__languages__language--source' )
.text( $.uls.data.getAutonym( suggestion.sourceLanguage 
) );
 
@@ -286,14 +291,14 @@
 * Event handlers
 */
CXSuggestionList.prototype.listen = function () {
-   this.$container.on( 'click', '.cx-suggestionlist 
.cx-slitem__translation-link', function () {
+   this.$container.on( 'click', '.cx-suggestionlist .cx-slitem', 
function () {
var cxSelector, suggestion;
 
cxSelector = $( this ).data( 'cxsourceselector' );
if ( cxSelector ) {
cxSelector.prefill();
} else {
-   suggestion = $( this ).data( 'suggestion' );
+   suggestion = $( this ).find( 
'.cx-slitem__translation-link' ).data( 'suggestion' );
$( this ).cxSourceSelector( {
sourceLanguage: 
suggestion.sourceLanguage,
targetLanguage: 
suggestion.targetLanguage,
diff --git a/modules/dashboard/styles/ext.cx.lists.common.less 
b/modules/dashboard/styles/ext.cx.lists.common.less
index cc83072..4790d29 100644
--- a/modules/dashboard/styles/ext.cx.lists.common.less
+++ b/modules/dashboard/styles/ext.cx.lists.common.less
@@ -4,7 +4,7 @@
padding: 12px;
background-color: #fff;
border-top: 1px solid #ddd;
-
+   cursor: pointer;
&:hover {
background-color: #eff3fb;
}
diff --git a/modules/dashboard/styles/ext.cx.translationlist.less 
b/modules/dashboard/styles/ext.cx.translationlist.less
index 1ea142c..7523b23 100644
--- a/modules/dashboard/styles/ext.cx.translationlist.less
+++ b/modules/dashboard/styles/ext.cx.translationlist.less
@@ -3,8 +3,6 @@
 @import "mediawiki.mixins";
 
 .cx-tlitem {
-   cursor: pointer;
-
&.cx-translation-deleted {
opacity: 0.5;
}

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

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

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

[MediaWiki-commits] [Gerrit] Remove (broken) Wikidata-specific SkinCopyrightFooter hook h... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Remove (broken) Wikidata-specific SkinCopyrightFooter hook 
handler
..


Remove (broken) Wikidata-specific SkinCopyrightFooter hook handler

This causes the footer copyright in Wikidata's main namespace to be:



We already have a hook handler for the copyright message in the
WikimediaMessages extension and that works.

Bug: T112520
Change-Id: If121aef742510c8009ca241576342035fcc4206d
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 11 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 7a21407..02d9c91 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2955,17 +2955,6 @@
return true;
 };
 
-// T46617
-if ( in_array( $wgDBname, array( 'wikidatawiki', 'testwikidatawiki' ) ) ) {
-   $wgHooks['SkinCopyrightFooter'][] = function( $title, $type, &$msg, 
&$link, &$forContent ) {
-   if ( $title->getNamespace() === NS_MAIN ) {
-   $msg = 'Creative Commons Public Domain 1.0';
-   $link = '//creativecommons.org/publicdomain/zero/1.0/';
-   }
-   return true;
-   };
-}
-
 $wgExemptFromUserRobotsControl = array_merge( $wgContentNamespaces, 
$wmgExemptFromUserRobotsControlExtra );
 
 // additional "language names", adding to Names.php data

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If121aef742510c8009ca241576342035fcc4206d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Depool es1002, es1005, es1008 for decommission - change (operations/mediawiki-config)

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: Depool es1002, es1005, es1008 for decommission
..


Depool es1002, es1005, es1008 for decommission

Slowly depooling the old ES servers for future decommision.

Change-Id: If2b2fad64fe3a01a41f3572b668146229cb93d21
References: T105843
---
M wmf-config/db-eqiad.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Jcrespo: Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index da10b3e..bd03d13 100755
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -15,7 +15,7 @@
 
 $wmgOldExtTemplate = array(
 #  '10.64.0.25'   => 1, # es1001
-   '10.64.16.40'  => 1, # es1002
+#  '10.64.16.40'  => 1, # es1002
'10.64.16.41'  => 1, # es1003
'10.64.16.42'  => 1, # es1004
'10.64.0.7'=> 1, # es1012
@@ -480,8 +480,8 @@
# es2
'cluster24' => array(
'10.64.0.6'=> 1, # es1011, master
-#  '10.64.16.154' => 3, # es1006 (down for maint)
-   '10.64.16.153' => 3, # es1005
+#  '10.64.16.154' => 3, # es1006
+#  '10.64.16.153' => 3, # es1005
'10.64.32.17'  => 3, # es1007
'10.64.16.186' => 3, # es1013
'10.64.32.184' => 3, # es1015
@@ -489,8 +489,8 @@
# es3
'cluster25' => array(
'10.64.16.187' => 1, # es1014, master
-#  '10.64.32.19'  => 1, # es1009 (down for maint)
-   '10.64.32.18'  => 3, # es1008
+#  '10.64.32.19'  => 1, # es1009
+#  '10.64.32.18'  => 3, # es1008
'10.64.32.20'  => 3, # es1010
'10.64.48.114' => 3, # es1017
'10.64.48.116' => 3, # es1019

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2b2fad64fe3a01a41f3572b668146229cb93d21
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] Don't load oojs-ui.styles on every page - change (mediawiki...Echo)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Don't load oojs-ui.styles on every page
..

Don't load oojs-ui.styles on every page

We don't really need it to render the no-JS version
of the notification badges (the only rule we were missing
was background-repeat: no-repeat;) and it significantly
increased the amount of render-blocking CSS.

This means we do need to call setupOOUI() ourselves
in order for our get_class( OOUI\Theme::singleton() ) hack
to keep working.

Bug: T112401
Change-Id: I148f8ac19dfe62cc84abe03e1a2ff00683d515c1
---
M Hooks.php
M modules/echo.mixins.less
M modules/nojs/mw.echo.badge.less
3 files changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index 75a3eb5..3d26498 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -591,10 +591,8 @@
// Load the styles for the Notifications badge
$out->addModuleStyles( array(
'ext.echo.nojs',
-   'oojs-ui.styles',
'oojs-ui.styles.icons-alerts'
) );
-   $out->enableOOUI();
}
 
return true;
@@ -653,6 +651,7 @@
 
// HACK: inverted icons only work in the "MediaWiki" OOUI theme
// Avoid flashes in skins that don't use it (T111821)
+   $sk->getOutput()->setupOOUI( strtolower( $sk->getSkinName() ), 
$sk->getOutput()->getLanguage()->getDir() );
$oouiImageClass = get_class( OOUI\Theme::singleton() ) === 
'OOUI\\MediaWikiTheme'
? 'oo-ui-image-invert'
: '';
diff --git a/modules/echo.mixins.less b/modules/echo.mixins.less
index 1f0f257..bef7264 100644
--- a/modules/echo.mixins.less
+++ b/modules/echo.mixins.less
@@ -8,6 +8,5 @@
color: white;
cursor: pointer;
text-decoration: none;
-   background-color: #d2d2d2;
margin-top: -0.2em;
 }
diff --git a/modules/nojs/mw.echo.badge.less b/modules/nojs/mw.echo.badge.less
index f074d52..242f5b1 100644
--- a/modules/nojs/mw.echo.badge.less
+++ b/modules/nojs/mw.echo.badge.less
@@ -20,6 +20,7 @@
background-position: ~"calc(100% - @{badge-padding}) 
center";
}
background-size: @badge-icon-size;
+   background-repeat: no-repeat;
 
&:hover,
&:active,

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

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

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

[MediaWiki-commits] [Gerrit] Remove old copy of EntityRedirectResolvingDecorator - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Remove old copy of EntityRedirectResolvingDecorator
..

Remove old copy of EntityRedirectResolvingDecorator

Change-Id: I0f37318bd36159ca7013b41418b38e96245b2301
---
D lib/includes/store/EntityRedirectResolvingDecorator.php
D lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
2 files changed, 0 insertions(+), 240 deletions(-)


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

diff --git a/lib/includes/store/EntityRedirectResolvingDecorator.php 
b/lib/includes/store/EntityRedirectResolvingDecorator.php
deleted file mode 100644
index 986d88f..000
--- a/lib/includes/store/EntityRedirectResolvingDecorator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-targetObject = $targetObject;
-   $this->maxResolutionDepth = $maxResolutionDepth;
-   }
-
-   /**
-* Method invocation handler which delegates calls to the target object 
supplied to
-* the constructor. This adds a kind of "retry" logic to any method 
that has an
-* EntityId as its first parameter and throws an 
UnresolvedRedirectException when a
-* redirect is encountered.
-*
-* This essentially adds transparent redirect resolution to the 
respective methods of the
-* target object.
-*/
-   public function __call( $name, $arguments ) {
-   $retries = $this->maxResolutionDepth;
-
-   do {
-   try {
-   $method = array( $this->targetObject, $name );
-   return call_user_func_array( $method, 
$arguments );
-   } catch ( UnresolvedRedirectException $ex ) {
-   // If the first argument was an EntityId, 
replace it and retry.
-   // Otherwise, give up.
-   if ( !isset( $arguments[0] ) || !( 
$arguments[0] instanceof EntityId ) ) {
-   break;
-   }
-
-   $arguments[0] = $ex->getRedirectTargetId();
-   }
-   } while ( $retries-- );
-
-   throw $ex;
-   }
-
-}
diff --git a/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php 
b/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
deleted file mode 100644
index 1de7c0f..000
--- a/lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-setExpectedException( 'InvalidArgumentException' );
-
-   new EntityRedirectResolvingDecorator( $target, $levels );
-   }
-
-   public function getEntityRevision( EntityId $id ) {
-   if ( $id->getSerialization() === 'Q1' ) {
-   throw new UnresolvedRedirectException( new ItemId( 'Q5' 
) );
-   }
-
-   if ( $id->getSerialization() === 'Q5' ) {
-   throw new UnresolvedRedirectException( new ItemId( 
'Q10' ) );
-   }
-
-   return new EntityRevision( new Item( $id ), 777 );
-   }
-
-   private function getEntityRevisionLookup() {
-   $lookup = $this->getMock( 
'Wikibase\Lib\Store\EntityRevisionLookup' );
-
-   $lookup->expects( $this->any() )
-   ->method( 'getEntityRevision' )
-   ->will( $this->returnCallback( array( $this, 
'getEntityRevision' ) ) );
-
-   return $lookup;
-   }
-
-   public function redirectResolutionProvider() {
-   // Redirects as per $this->getEntityRevision:
-   // Q1 -> Q5 -> Q10
-
-   $q1 = new ItemId( 'Q1' );
-   $q5 = new ItemId( 'Q5' );
-   $q10 = new ItemId( 'Q10' );
-
-   return array(
-   'no redirect' => array( $q10, 1, $q10 ),
-   'redirect resolved' => array( $q5, 1, $q10 ),
-   'double redirect resolved' => array( $q1, 2, $q10 ),
-   );
-   }
-
-   /**
-* @dataProvider redirectResolutionProvider
-*/
-   public function testRedirectResolution( EntityId $id, $levels, EntityId 
$expected ) {
-   $target = $this->getEntityRevisionLookup();
-
-   /* @var EntityRevisionLookup $decorator */
-   $decorator = new EntityRedirectResolvingDecorator( $target, 
$levels );
-   $revision = $decorator->getEntityRevision( $id );
-
-   $this->assertEquals( $expected, $revision->getEntity()->getId() 
);
-   }
-
-   public function redirectResolutionFailureProvider() {
-   // Redirects as per $this->getEntityRevision:
-   // Q1 -> Q5 -> Q10
-
-   $q1 = new ItemId( 'Q1' );
- 

[MediaWiki-commits] [Gerrit] Update references migration to reflect production status - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: Update references migration to reflect production status
..

Update references migration to reflect production status

phase4 has already been executed.
phase5 still has to be executed, but can not happen before deploying
Ie4d2abb0af83b680640cb46c6c8adbb774488e91 (otherwise we'd drop indices that are
still in use)

Note that 2 of the indices in phase5 (*_tmp) have already been dropped in
officewiki (which is fine, they're unused)

Bug: T111084
Change-Id: If12e5822fce744b8fe98ca44654636483e68293d
---
M db_patches/patch-reference_wiki-phase4.sql
A db_patches/patch-reference_wiki-phase5.sql
2 files changed, 10 insertions(+), 9 deletions(-)


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

diff --git a/db_patches/patch-reference_wiki-phase4.sql 
b/db_patches/patch-reference_wiki-phase4.sql
index 898dc10..c68050a 100644
--- a/db_patches/patch-reference_wiki-phase4.sql
+++ b/db_patches/patch-reference_wiki-phase4.sql
@@ -7,12 +7,3 @@
 -- Mark field as not null
 ALTER TABLE /*_*/flow_wiki_ref MODIFY ref_src_wiki varchar(16) binary not null;
 ALTER TABLE /*_*/flow_ext_ref MODIFY ref_src_wiki varchar(16) binary not null;
-
--- Drop old indexes
-DROP INDEX /*i*/flow_wiki_ref_idx ON /*_*/flow_wiki_ref;
-DROP INDEX /*i*/flow_wiki_ref_revision ON /*_*/flow_wiki_ref;
-DROP INDEX /*i*/flow_wiki_ref_workflow_id_idx_tmp ON /*_*/flow_wiki_ref;
-
-DROP INDEX /*i*/flow_ext_ref_idx ON /*_*/flow_ext_ref;
-DROP INDEX /*i*/flow_ext_ref_revision ON /*_*/flow_ext_ref;
-DROP INDEX /*i*/flow_ext_ref_workflow_id_idx_tmp ON /*_*/flow_ext_ref;
diff --git a/db_patches/patch-reference_wiki-phase5.sql 
b/db_patches/patch-reference_wiki-phase5.sql
new file mode 100644
index 000..dbea456
--- /dev/null
+++ b/db_patches/patch-reference_wiki-phase5.sql
@@ -0,0 +1,10 @@
+-- Drop old indexes
+DROP INDEX /*i*/flow_wiki_ref_idx ON /*_*/flow_wiki_ref;
+DROP INDEX /*i*/flow_wiki_ref_revision ON /*_*/flow_wiki_ref;
+
+DROP INDEX /*i*/flow_ext_ref_idx ON /*_*/flow_ext_ref;
+DROP INDEX /*i*/flow_ext_ref_revision ON /*_*/flow_ext_ref;
+
+-- Temporary migration leftovers. These have already been removed from 
officewiki.
+DROP INDEX /*i*/flow_wiki_ref_workflow_id_idx_tmp ON /*_*/flow_wiki_ref;
+DROP INDEX /*i*/flow_ext_ref_workflow_id_idx_tmp ON /*_*/flow_ext_ref;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If12e5822fce744b8fe98ca44654636483e68293d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] Add safeguard to edit conflict message - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Add safeguard to edit conflict message
..


Add safeguard to edit conflict message

as of
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikibase-error-ui-edit-conflict/ksh

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

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



diff --git a/lib/i18n/en.json b/lib/i18n/en.json
index 1c062f2..9222ab5 100644
--- a/lib/i18n/en.json
+++ b/lib/i18n/en.json
@@ -20,7 +20,7 @@
"wikibase-error-autocomplete-connection": "Could not query site API. 
Please try again later.",
"wikibase-error-autocomplete-response": "Server responded: $1",
"wikibase-error-ui-no-external-page": "The specified article could not 
be found on the corresponding site.",
-   "wikibase-error-ui-edit-conflict": "There is an edit conflict. Please 
reload and save again.",
+   "wikibase-error-ui-edit-conflict": "There is an edit conflict. Please 
save your changes locally, reload this page and save them again.",
"wikibase-language-fallback-transliteration-hint": "$1 
(transliterated)",
"wikibase-quantitydetails-amount": "Amount",
"wikibase-quantitydetails-upperbound": "Upper bound",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I687da9c06fe1f1a6691a9583df2d6e1fa12cbe0e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Purodha 
Gerrit-Reviewer: Ricordisamoa 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-09-14T10:00:01+0000 - change (mediawiki...Wikidata)

[jenkins-bot (Code Review)]

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

Change subject: New Wikidata Build - 2015-09-14T10:00:01+
..


New Wikidata Build - 2015-09-14T10:00:01+

Change-Id: I108cd53b1946cca81d1d5878ff5b9c3748d023cc
---
M composer.lock
M extensions/Wikibase/Gruntfile.js
M extensions/Wikibase/client/WikibaseClient.datatypes.php
M extensions/Wikibase/client/WikibaseClient.i18n.alias.php
M extensions/Wikibase/client/i18n/el.json
M extensions/Wikibase/client/i18n/en.json
M extensions/Wikibase/client/i18n/it.json
M extensions/Wikibase/client/i18n/olo.json
M extensions/Wikibase/client/i18n/qqq.json
M extensions/Wikibase/client/i18n/wo.json
M extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/lib/config/WikibaseLib.default.php
M extensions/Wikibase/lib/i18n/el.json
M 
extensions/Wikibase/lib/includes/formatters/OutputFormatValueFormatterFactory.php
M extensions/Wikibase/repo/WikibaseRepo.datatypes.php
M extensions/Wikibase/repo/config/Wikibase.default.php
M extensions/Wikibase/repo/i18n/el.json
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/wo.json
M extensions/Wikibase/repo/includes/api/EditEntity.php
M extensions/Wikibase/repo/includes/specials/SpecialItemDisambiguation.php
M extensions/Wikibase/repo/tests/phpunit/includes/content/ItemContentTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialGoToLinkedPageTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialItemDisambiguationTest.php
M vendor/composer/installed.json
26 files changed, 161 insertions(+), 111 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index 4ee7f35..9ebf3ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1385,12 +1385,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "f73a4f7fb5deaa7f906dccff88dbcb2dcfbdd312"
+"reference": "17e8a8d9b3810072920532369277c572c28f79fb"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f73a4f7fb5deaa7f906dccff88dbcb2dcfbdd312;,
-"reference": "f73a4f7fb5deaa7f906dccff88dbcb2dcfbdd312",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/17e8a8d9b3810072920532369277c572c28f79fb;,
+"reference": "17e8a8d9b3810072920532369277c572c28f79fb",
 "shasum": ""
 },
 "require": {
@@ -1459,7 +1459,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2015-09-12 18:06:04"
+"time": "2015-09-14 09:39:08"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/Gruntfile.js b/extensions/Wikibase/Gruntfile.js
index 24984ad..5429ed7 100644
--- a/extensions/Wikibase/Gruntfile.js
+++ b/extensions/Wikibase/Gruntfile.js
@@ -16,7 +16,6 @@
},
banana: {
options: {
-   disallowBlankTranslations: false,
disallowDuplicateTranslations: false,
disallowUnusedTranslations: false
},
diff --git a/extensions/Wikibase/client/WikibaseClient.datatypes.php 
b/extensions/Wikibase/client/WikibaseClient.datatypes.php
index 829e4ad..2e977a4 100644
--- a/extensions/Wikibase/client/WikibaseClient.datatypes.php
+++ b/extensions/Wikibase/client/WikibaseClient.datatypes.php
@@ -2,7 +2,7 @@
 /**
  * Definition of data types for use with Wikibase.
  * The array returned by the code below is supposed to be merged into 
$wgWBClientDataTypes.
- * It defines the formatters used by the repo to display data values of 
different types.
+ * It defines the formatters used by the client to display data values of 
different types.
  *
  * @note: Keep in sync with lib/WikibaseLib.datatypes.php
  *
diff --git a/extensions/Wikibase/client/WikibaseClient.i18n.alias.php 
b/extensions/Wikibase/client/WikibaseClient.i18n.alias.php
index 0d60cd3..0ff2a52 100644
--- a/extensions/Wikibase/client/WikibaseClient.i18n.alias.php
+++ b/extensions/Wikibase/client/WikibaseClient.i18n.alias.php
@@ -66,6 +66,7 @@
 /** Italian (italiano) */
 $specialPageAliases['it'] = array(
'UnconnectedPages' => array( 'PagineNonConnesse' ),
+   'PagesWithBadges' => array( 'PagineConDistintivi' ),
 );
 
 /** Japanese (日本語) */
diff --git a/extensions/Wikibase/client/i18n/el.json 
b/extensions/Wikibase/client/i18n/el.json
index d0e5d7d..e65f794 100644
--- a/extensions/Wikibase/client/i18n/el.json
+++ 

[MediaWiki-commits] [Gerrit] Stats: Weekly trends - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Stats: Weekly trends
..


Stats: Weekly trends

While doing this, as per Pau's suggestion, I changed
the colors (again).

Also upgraded Chart.js and added Chart.Bar.js for
bar charts.

Bug: T105192
Change-Id: I8301bcd7e595e8144a43622a27503b8ed9494bbf
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A lib/chart.js/Chart.Bar.js
M lib/chart.js/Chart.Core.js
M lib/chart.js/Chart.Line.js
M modules/stats/ext.cx.stats.js
M modules/stats/styles/ext.cx.stats.less
8 files changed, 712 insertions(+), 63 deletions(-)

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



diff --git a/extension.json b/extension.json
index 5ed4bb8..383b0d0 100644
--- a/extension.json
+++ b/extension.json
@@ -867,6 +867,8 @@
"cx-stats-local-published-number",
"cx-stats-local-published",
"cx-stats-grouping-title",
+   "cx-trend-published-translations-title",
+   "cx-trend-translations-to-title",
"percent"
]
},
@@ -875,7 +877,8 @@
"remoteExtPath": "ContentTranslation/lib",
"scripts": [
"chart.js/Chart.Core.js",
-   "chart.js/Chart.Line.js"
+   "chart.js/Chart.Line.js",
+   "chart.js/Chart.Bar.js"
]
},
"ext.cx.beta.notification": {
diff --git a/i18n/en.json b/i18n/en.json
index bf13237..159737a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -169,6 +169,8 @@
"cx-stats-local-published-number": "$1 in $2",
"cx-stats-local-published": "$1 ($3) in $2",
"cx-stats-grouping-title": "{{PLURAL:$1|$1 translation|$1 
translations}}",
+   "cx-trend-published-translations-title": "Translation trend",
+   "cx-trend-translations-to-title": "Translation trend to $1",
"cx-tools-missing-link-text": "{{GENDER:|Mark}} the page as missing to 
encourage its creation.",
"cx-tools-missing-link-tooltip": "Translate (in new window)",
"cx-tools-missing-link-title": "Missing link",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 45c4b4b..7f2cae3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -174,6 +174,8 @@
"cx-stats-local-published-number": "A message shown in 
[[Special:CXStats]] as highlights of CX analytics. $1 is a number, $2 is 
language name (autonym).",
"cx-stats-local-published": "A message shown in [[Special:CXStats]] as 
highlights of CX analytics. $1 is a number, $2 is language name (autonym), $3 
is percentage.",
"cx-stats-grouping-title": "Title text for language grouping based on 
number of translations. $1 is number of 
translations\n{{Identical|Translation}}",
+   "cx-trend-published-translations-title": "A message shown in 
[[Special:CXStats]]",
+   "cx-trend-translations-to-title": "Label shown in the legend section 
Content translation trends graph visualization.\n* $1 - language name",
"cx-tools-missing-link-text": "Message with instructions for marking 
links as missing",
"cx-tools-missing-link-tooltip": "Tooltip that shows when hovering over 
target link card link when working with missing links.\nClicking on link opens 
a new translation view for the missing link.",
"cx-tools-missing-link-title": "Title for target link card when card is 
used for working with missing links",
diff --git a/lib/chart.js/Chart.Bar.js b/lib/chart.js/Chart.Bar.js
new file mode 100644
index 000..81532b4
--- /dev/null
+++ b/lib/chart.js/Chart.Bar.js
@@ -0,0 +1,303 @@
+(function(){
+   "use strict";
+
+   var root = this,
+   Chart = root.Chart,
+   helpers = Chart.helpers;
+
+
+   var defaultConfig = {
+   //Boolean - Whether the scale should start at zero, or an order 
of magnitude down from the lowest value
+   scaleBeginAtZero : true,
+
+   //Boolean - Whether grid lines are shown across the chart
+   scaleShowGridLines : true,
+
+   //String - Colour of the grid lines
+   scaleGridLineColor : "rgba(0,0,0,.05)",
+
+   //Number - Width of the grid lines
+   scaleGridLineWidth : 1,
+
+   //Boolean - Whether to show horizontal lines (except X axis)
+   scaleShowHorizontalLines: true,
+
+   //Boolean - Whether to show vertical lines (except Y axis)
+   scaleShowVerticalLines: true,
+
+   //Boolean - If there is a stroke on each bar
+   barShowStroke : true,
+
+   //Number - Pixel width of the bar stroke
+   barStrokeWidth : 

[MediaWiki-commits] [Gerrit] Remove old copy of TermBuffer interface - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Remove old copy of TermBuffer interface
..

Remove old copy of TermBuffer interface

Change-Id: I508ff1e5751eb66c05fdda8f68550e5da47e7b6a
---
M lib/includes/store/BufferingTermLookup.php
M lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
D lib/includes/store/TermBuffer.php
M lib/tests/phpunit/store/LanguageFallbackLabelDescriptionLookupFactoryTest.php
M repo/includes/Hooks/LabelPrefetchHookHandlers.php
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
M repo/tests/phpunit/includes/WikibaseRepoTest.php
8 files changed, 7 insertions(+), 48 deletions(-)


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

diff --git a/lib/includes/store/BufferingTermLookup.php 
b/lib/includes/store/BufferingTermLookup.php
index 3622c40..e5da1a8 100644
--- a/lib/includes/store/BufferingTermLookup.php
+++ b/lib/includes/store/BufferingTermLookup.php
@@ -4,6 +4,7 @@
 
 use MapCacheLRU;
 use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\Lib\Store\EntityTermLookupBase;
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\TermIndexEntry;
diff --git 
a/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php 
b/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
index 0661685..6b3b890 100644
--- a/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
+++ b/lib/includes/store/LanguageFallbackLabelDescriptionLookupFactory.php
@@ -7,7 +7,7 @@
 use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
 use Wikibase\DataModel\Services\Lookup\TermLookup;
 use Wikibase\LanguageFallbackChainFactory;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 
 /**
  * Factory to provide an LabelDescriptionLookup which does automatic 
prefetching
diff --git a/lib/includes/store/TermBuffer.php 
b/lib/includes/store/TermBuffer.php
deleted file mode 100644
index 8994c76..000
--- a/lib/includes/store/TermBuffer.php
+++ /dev/null
@@ -1,42 +0,0 @@
-getMock( 'Wikibase\Store\TermBuffer' );
+   $termBuffer = $this->getMock( 
'Wikibase\DataModel\Services\Term\TermBuffer' );
$termBuffer->expects( $this->once() )
->method( 'prefetchTerms' )
->with(
diff --git a/repo/includes/Hooks/LabelPrefetchHookHandlers.php 
b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
index e6b483e..1f8a258 100644
--- a/repo/includes/Hooks/LabelPrefetchHookHandlers.php
+++ b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
@@ -10,7 +10,7 @@
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\Repo\WikibaseRepo;
 use Wikibase\Store\EntityIdLookup;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\TermIndexEntry;
 
 /**
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 90a4fc3..b92c6e4 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -94,7 +94,7 @@
 use Wikibase\Store;
 use Wikibase\Store\BufferingTermLookup;
 use Wikibase\Store\EntityIdLookup;
-use Wikibase\Store\TermBuffer;
+use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\StringNormalizer;
 use Wikibase\SummaryFormatter;
 use Wikibase\View\EntityViewFactory;
diff --git 
a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php 
b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
index 2725da7..1486476 100644
--- a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
+++ b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
@@ -63,7 +63,7 @@
 * @return LabelPrefetchHookHandlers
 */
private function getLabelPrefetchHookHandlers( $prefetchTerms, array 
$termTypes, array $languageCodes ) {
-   $termBuffer = $this->getMock( 'Wikibase\Store\TermBuffer' );
+   $termBuffer = $this->getMock( 
'Wikibase\DataModel\Services\Term\TermBuffer' );
$termBuffer->expects( $this->atLeastOnce() )
->method( 'prefetchTerms' )
->will( $this->returnCallback( $prefetchTerms ) );
diff --git a/repo/tests/phpunit/includes/WikibaseRepoTest.php 
b/repo/tests/phpunit/includes/WikibaseRepoTest.php
index 5e79011..13bd6e7 100644
--- a/repo/tests/phpunit/includes/WikibaseRepoTest.php
+++ b/repo/tests/phpunit/includes/WikibaseRepoTest.php
@@ -244,7 +244,7 @@
 
public function testGetTermBuffer() {
$service = $this->getWikibaseRepo()->getTermBuffer();
-   $this->assertInstanceOf( 'Wikibase\Store\TermBuffer', $service 
);
+   $this->assertInstanceOf( 
'Wikibase\DataModel\Services\Term\TermBuffer', $service );
  

[MediaWiki-commits] [Gerrit] Stats: Optimize the query behind contenttranslationlangtrend... - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Stats: Optimize the query behind contenttranslationlangtrend API
..


Stats: Optimize the query behind contenttranslationlangtrend API

Query simplified by avoiding subquery, single method of both
published and draft stats.

Bug: T111943
Change-Id: I1503d7bf0f677955c7e740cd0290e02f398a4edc
---
M api/ApiQueryContentTranslationLanguageTrend.php
M includes/Translation.php
2 files changed, 31 insertions(+), 111 deletions(-)

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



diff --git a/api/ApiQueryContentTranslationLanguageTrend.php 
b/api/ApiQueryContentTranslationLanguageTrend.php
index a790c47..2ade9f4 100644
--- a/api/ApiQueryContentTranslationLanguageTrend.php
+++ b/api/ApiQueryContentTranslationLanguageTrend.php
@@ -33,8 +33,8 @@
$interval = $params['interval'];
 
$data = array(
-   'translations' => Translation::getPublishTrend( 
$source, $target, $interval ),
-   'drafts' => Translation::getDraftTrend( $source, 
$target, $interval ),
+   'translations' => Translation::getTrendByStatus( 
$source, $target, 'published', $interval ),
+   'drafts' => Translation::getTrendByStatus( $source, 
$target, 'draft', $interval ),
);
 
if ( $target !== null ) {
diff --git a/includes/Translation.php b/includes/Translation.php
index 3a7ba17..2384225 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -211,86 +211,6 @@
}
 
/**
-* Get time-wise cumulative number of drafts for given
-* language pairs, with given interval.
-* @param string $source Source language code
-* @param string $target Target language code
-* @param string $interval 'weekly' or 'monthly' trend
-* @return array
-*/
-   public static function getDraftTrend( $source, $target, $interval ) {
-   $dbr = Database::getConnection( DB_SLAVE );
-
-   $draftCondition = $dbr->makeList(
-   array(
-   'translation_status' => 'draft',
-   'translation_target_url IS NULL'
-   ),
-   LIST_AND
-   );
-
-   $conditions = array();
-   $conditions[] = $draftCondition;
-   if ( $source !== null ) {
-   $conditions['translation_source_language'] = $source;
-   }
-   if ( $target !== null ) {
-   $conditions['translation_target_language'] = $target;
-   }
-
-   $options = null;
-   if ( $interval === 'week' ) {
-$options = array(
-   'GROUP BY' => array(
-   
'YEARWEEK(translation_last_updated_timestamp)',
-   ),
-   );
-   } elseif ( $interval === 'month' ) {
-$options = array(
-   'GROUP BY' => array(
-   
'YEAR(translation_last_updated_timestamp), 
MONTH(translation_last_updated_timestamp)',
-   ),
-   );
-   }
-
-   $subQuery = $dbr->selectSQLText(
-   'cx_translations',
-   'count(*)',
-   $dbr->makeList( array(
-   'translation_last_updated_timestamp <= 
MAX(translations.translation_last_updated_timestamp)',
-   $dbr->makeList( $conditions, LIST_AND ),
-   ),
-   LIST_AND )
-   );
-
-   $rows = $dbr->select(
-   array( 'translations' => 'cx_translations' ),
-   array(
-   
"translations.translation_last_updated_timestamp AS date",
-   '(' . $subQuery . ') translatons_count',
-   ),
-   $dbr->makeList( $conditions, LIST_AND ),
-   __METHOD__,
-   $options
-   );
-
-   $prev = 0;
-   $result = array();
-   foreach ( $rows as $row ) {
-   $count = (int)$row->translatons_count;
-   $time = self::getResultTime( $row->date, $interval );
-   $result[$time] = array(
-   'count' => $count,
-   'delta' => $count - $prev,
-   );
-
-   $prev = $count;
-   }
-
-   return $result;
-   }
-
-   /**
 * Get 

[MediaWiki-commits] [Gerrit] Fix flake8 errors for python2.x - change (pywikibot/wikibase)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Fix flake8 errors for python2.x
..

Fix flake8 errors for python2.x

Change-Id: I1e5dbe353809961bfa897d22834e5651c5b97c8f
---
M pywikibase/claim.py
M pywikibase/wbproperty.py
M pywikibase/wbtime.py
M pywikibase/wikibasepage.py
M tests/test_itempage.py
M tests/test_wikibasepage.py
6 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/34/238134/1

diff --git a/pywikibase/claim.py b/pywikibase/claim.py
index 1c77732..2758dd7 100644
--- a/pywikibase/claim.py
+++ b/pywikibase/claim.py
@@ -17,6 +17,7 @@
 from pywikibase import Property
 import pywikibase.itempage
 
+
 class Claim(Property):
 
 """
@@ -145,7 +146,6 @@
 
 def __eq__(self, other):
 return other.toJSON() == self.toJSON()
-
 
 def toJSON(self):
 """
diff --git a/pywikibase/wbproperty.py b/pywikibase/wbproperty.py
index 15ed20b..f4363ab 100644
--- a/pywikibase/wbproperty.py
+++ b/pywikibase/wbproperty.py
@@ -33,7 +33,7 @@
 it subclasses this Property class, but a claim does not have Page like
 behaviour and semantics.
 """
-from pywikibase.itempage import ItemPage # noqa
+from pywikibase.itempage import ItemPage  # noqa
 types = {'wikibase-item': ItemPage,
  'string': basestring,
  'commonsMedia': basestring,
diff --git a/pywikibase/wbtime.py b/pywikibase/wbtime.py
index 7f38ad8..6fa8de8 100644
--- a/pywikibase/wbtime.py
+++ b/pywikibase/wbtime.py
@@ -18,6 +18,7 @@
 except NameError:
 long = int
 
+
 class WbTime(object):
 
 """A Wikibase time representation."""
diff --git a/pywikibase/wikibasepage.py b/pywikibase/wikibasepage.py
index 7b64ffc..e8acb47 100644
--- a/pywikibase/wikibasepage.py
+++ b/pywikibase/wikibasepage.py
@@ -25,7 +25,6 @@
 def __eq__(self, other):
 return other.id == self.id
 
-
 def get(self, content=None):
 """
 Fetch all page data, and cache it.
diff --git a/tests/test_itempage.py b/tests/test_itempage.py
index ffd6147..35a3372 100644
--- a/tests/test_itempage.py
+++ b/tests/test_itempage.py
@@ -1,5 +1,4 @@
 import unittest
-import codecs
 import json
 import os
 
@@ -10,10 +9,12 @@
 except NameError:
 basestring = str
 
+
 class TestWikibasePage(unittest.TestCase):
 
 def setUp(self):
-with open(os.path.join(os.path.split(__file__)[0], 'data', 
'Q7251.wd')) as f:
+with open(os.path.join(os.path.split(__file__)[0],
+   'data', 'Q7251.wd')) as f:
 self._content = json.load(f)['entities']['Q7251']
 self.item_page = ItemPage()
 self.item_page.get(content=self._content)
diff --git a/tests/test_wikibasepage.py b/tests/test_wikibasepage.py
index 8369556..e9a5bd1 100644
--- a/tests/test_wikibasepage.py
+++ b/tests/test_wikibasepage.py
@@ -1,5 +1,4 @@
 import unittest
-import codecs
 import json
 import os
 
@@ -10,10 +9,12 @@
 except NameError:
 basestring = str
 
+
 class TestWikibasePage(unittest.TestCase):
 
 def setUp(self):
-with open(os.path.join(os.path.split(__file__)[0], 'data', 
'Q7251.wd')) as f:
+with open(os.path.join(os.path.split(__file__)[0],
+   'data', 'Q7251.wd')) as f:
 self._content = json.load(f)['entities']['Q7251']
 self.wb_page = WikibasePage()
 self.wb_page.get(content=self._content)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e5dbe353809961bfa897d22834e5651c5b97c8f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
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] Remove old copy of PropertyLabelResolver interface - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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

Change subject: Remove old copy of PropertyLabelResolver interface
..

Remove old copy of PropertyLabelResolver interface

Change-Id: I1a236cbfc05a0dc28d6a7377f34009383dde0f29
---
M client/includes/DataAccess/PropertyIdResolver.php
M client/includes/store/ClientStore.php
M client/includes/store/sql/DirectSqlStore.php
M client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
D lib/includes/store/PropertyLabelResolver.php
M lib/includes/store/TermPropertyLabelResolver.php
M lib/tests/phpunit/MockPropertyLabelResolver.php
M lib/tests/phpunit/store/EntityRedirectResolvingDecoratorTest.php
M lib/tests/phpunit/store/TermPropertyLabelResolverTest.php
9 files changed, 10 insertions(+), 34 deletions(-)


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

diff --git a/client/includes/DataAccess/PropertyIdResolver.php 
b/client/includes/DataAccess/PropertyIdResolver.php
index 581131f..81bfcb8 100644
--- a/client/includes/DataAccess/PropertyIdResolver.php
+++ b/client/includes/DataAccess/PropertyIdResolver.php
@@ -6,7 +6,7 @@
 use Wikibase\Client\PropertyLabelNotResolvedException;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
-use Wikibase\PropertyLabelResolver;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
 
 /**
  * Resolves the PropertyId for the input, which might be a property label or 
prefixed id.
diff --git a/client/includes/store/ClientStore.php 
b/client/includes/store/ClientStore.php
index 2948382..260f737 100644
--- a/client/includes/store/ClientStore.php
+++ b/client/includes/store/ClientStore.php
@@ -9,6 +9,7 @@
 use Wikibase\Client\Usage\UsageTracker;
 use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\SiteLinkLookup;
 use Wikibase\Store\EntityIdLookup;
diff --git a/client/includes/store/sql/DirectSqlStore.php 
b/client/includes/store/sql/DirectSqlStore.php
index 0f78842..28ba010 100644
--- a/client/includes/store/sql/DirectSqlStore.php
+++ b/client/includes/store/sql/DirectSqlStore.php
@@ -19,6 +19,7 @@
 use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
 use Wikibase\Lib\Store\CachingEntityRevisionLookup;
 use Wikibase\Lib\Store\CachingSiteLinkLookup;
 use Wikibase\Lib\Store\EntityContentDataCodec;
diff --git a/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php 
b/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
index b1af0f2..3ab55ac 100644
--- a/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
+++ b/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php
@@ -47,7 +47,7 @@
array( 'getSiteLinkLookup', 
'Wikibase\Lib\Store\SiteLinkLookup' ),
array( 'getEntityLookup', 
'Wikibase\DataModel\Services\Lookup\EntityLookup' ),
array( 'getTermIndex', 'Wikibase\TermIndex' ),
-   array( 'getPropertyLabelResolver', 
'Wikibase\PropertyLabelResolver' ),
+   array( 'getPropertyLabelResolver', 
'Wikibase\DataModel\Services\Term\PropertyLabelResolver' ),
array( 'newChangesTable', 'Wikibase\ChangesTable' ),
array( 'getPropertyInfoStore', 
'Wikibase\PropertyInfoStore' ),
array( 'getUsageTracker', 
'Wikibase\Client\Usage\UsageTracker' ),
diff --git a/lib/includes/store/PropertyLabelResolver.php 
b/lib/includes/store/PropertyLabelResolver.php
deleted file mode 100644
index c55a6f0..000
--- a/lib/includes/store/PropertyLabelResolver.php
+++ /dev/null
@@ -1,27 +0,0 @@
-getMock( 'Wikibase\PropertyLabelResolver' );
+   $target = $this->getMock( 
'Wikibase\DataModel\Services\Term\PropertyLabelResolver' );
$target->expects( $this->once() )
->method( 'getPropertyIdsForLabels' )
->will( $this->throwException( new 
UnresolvedRedirectException( new ItemId( 'Q12' ) ) ) );
@@ -131,7 +131,7 @@
}
 
public function testError() {
-   $target = $this->getMock( 'Wikibase\PropertyLabelResolver' );
+   $target = $this->getMock( 
'Wikibase\DataModel\Services\Term\PropertyLabelResolver' );
$target->expects( $this->once() )
->method( 'getPropertyIdsForLabels' )
->will( $this->throwException( new RuntimeException( 
'Boo!' ) ) );
diff --git a/lib/tests/phpunit/store/TermPropertyLabelResolverTest.php 

[MediaWiki-commits] [Gerrit] Git ignore: /*.egg-info - change (pywikibot/wikibase)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Git ignore: /*.egg-info
..

Git ignore: /*.egg-info

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


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/33/238133/1

diff --git a/.gitignore b/.gitignore
index 90a5959..a14d94d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.*~
 /.tox
 /*.egg
+/*.egg-info
 *pycache*
 build
 dist

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0255f40a45c9ea9e898a3be1b85f0d8bd7a1791
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
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] Fix tox env name: flake83 -> flake8-py3 - change (pywikibot/wikibase)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Fix tox env name: flake83 -> flake8-py3
..

Fix tox env name: flake83 -> flake8-py3

Change-Id: Id51c55bd95ae4b02368848ab7f3f23c03b91ce11
---
M tox.ini
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/32/238132/1

diff --git a/tox.ini b/tox.ini
index e52dfd4..f609f1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = flake8,flake83,flake8-docstrings,py26,py27,py34
+envlist = flake8,flake8-py3,flake8-docstrings,py26,py27,py34
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -28,7 +28,7 @@
 
 [testenv:nose34]
 basepython = python3
-commands = 
+commands =
 nosetests --version
 nosetests -v -a "!net" tests pywikiase
 deps =

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id51c55bd95ae4b02368848ab7f3f23c03b91ce11
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
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] Stats: Misc cleanup on getDeletionTrend method - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Stats: Misc cleanup on getDeletionTrend method
..


Stats: Misc cleanup on getDeletionTrend method

Change-Id: I0cbf399c57a4a44b573d09dd0287d5b9aed11543
---
M includes/Translation.php
1 file changed, 5 insertions(+), 7 deletions(-)

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



diff --git a/includes/Translation.php b/includes/Translation.php
index 2384225..84100b1 100644
--- a/includes/Translation.php
+++ b/includes/Translation.php
@@ -221,16 +221,16 @@
'ct_tag' => 'contenttranslation',
'ar_rev_id = ct_rev_id'
);
-   $groupBy = null;
 
+   $options = null;
if ( $interval === 'week' ) {
-   $groupBy = array(
+   $options = array(
'GROUP BY' => array(
'YEARWEEK(ar_timestamp)',
),
);
} elseif ( $interval === 'month' ) {
-   $groupBy = array(
+   $options = array(
'GROUP BY' => array(
'YEAR(ar_timestamp), 
MONTH(ar_timestamp)',
),
@@ -242,10 +242,9 @@
array( 'ar_timestamp', 'count(ar_page_id) as count' ),
$conditions,
__METHOD__,
-   $groupBy
+   $options
);
 
-   $prev = 0;
$count = 0;
$result = array();
foreach ( $rows as $row ) {
@@ -253,9 +252,8 @@
$time = self::getResultTime( $row->ar_timestamp, 
$interval );
$result[$time] = array(
'count' => $count,
-   'delta' => $count - $prev,
+   'delta' => (int)$row->count,
);
-   $prev = $count;
}
 
return $result;

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

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

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

[MediaWiki-commits] [Gerrit] Fix sequencing of logged session events in ShareHandler. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Fix sequencing of logged session events in ShareHandler.
..

Fix sequencing of logged session events in ShareHandler.

In looking at the data from ShareAFactFunnel, I noticed that the session
ID always changes between the "highlight" and "sharetap" events, which
breaks the expected continuity between these events.

This fixes it so that the session ID remains constant between the
"highlight" and "sharetap" events.

Change-Id: I78e1ec3e2ba021037811385295f546b7f029c303
---
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java 
b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index 721b456..c683371 100755
--- a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -77,7 +77,9 @@
 String purpose = messagePayload.optString("purpose", "");
 String text = messagePayload.optString("text", "");
 if (purpose.equals("share")) {
-createFunnel();
+if (funnel == null) {
+createFunnel();
+}
 shareSnippet(text);
 funnel.logShareTap(text);
 }

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

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

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

[MediaWiki-commits] [Gerrit] cassandra: add codfw test nodes - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: add codfw test nodes
..

cassandra: add codfw test nodes

Bug: T108613
Change-Id: Ie423f44faad3d462c86111df595edb8fded53093
---
M hieradata/regex.yaml
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/238138/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 2ea5032..368850b 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -32,10 +32,16 @@
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   restbase::seeds:
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test
@@ -48,10 +54,16 @@
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   restbase::seeds:
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test

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

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

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

[MediaWiki-commits] [Gerrit] cassandra: add codfw test nodes - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: add codfw test nodes
..


cassandra: add codfw test nodes

Bug: T108613
Change-Id: Ie423f44faad3d462c86111df595edb8fded53093
---
M hieradata/regex.yaml
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 2ea5032..368850b 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -32,10 +32,16 @@
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   restbase::seeds:
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test
@@ -48,10 +54,16 @@
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   restbase::seeds:
   - cerium.eqiad.wmnet
   - praseodymium.eqiad.wmnet
   - xenon.eqiad.wmnet
+  - restbase-test2001.codfw.wmnet
+  - restbase-test2002.codfw.wmnet
+  - restbase-test2003.codfw.wmnet
   cassandra::max_heap_size: 4g
   cassandra::heap_newsize: 1g
   cassandra::cluster_name: services-test

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie423f44faad3d462c86111df595edb8fded53093
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 502d02d..aa7fcf2 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 502d02d..aa7fcf2
..

Syncronize VisualEditor: 502d02d..aa7fcf2

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


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

diff --git a/VisualEditor b/VisualEditor
index 502d02d..aa7fcf2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 502d02d3c4a9563abb1bc7241147ba7c32b291bb
+Subproject commit aa7fcf27e60d6371455d7f6b4d7f5342c24c5407

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6622e6cf0fa246dd8e01fecb08e82d15d75a0aba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Use ActionFieldLayout for 'Add parameter' - change (mediawiki...TemplateData)

[jenkins-bot (Code Review)]

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

Change subject: Use ActionFieldLayout for 'Add parameter'
..


Use ActionFieldLayout for 'Add parameter'

Change-Id: I0d69b689cabfa9bd3a503b39a08ec98028a7eca8
---
M modules/ext.templateDataGenerator.ui.tdDialog.js
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 92ebb9e..62fdacc 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -100,10 +100,14 @@
this.addParamButton = new OO.ui.ButtonWidget( {
label: mw.msg( 'templatedata-modal-button-addparam' )
} );
-   addParamFieldlayout = new OO.ui.FieldsetLayout( {
-   label: mw.msg( 'templatedata-modal-title-addparam' ),
-   items: [ this.newParamInput, this.addParamButton ]
-   } );
+   addParamFieldlayout = new OO.ui.ActionFieldLayout(
+   this.newParamInput,
+   this.addParamButton,
+   {
+   align: 'top',
+   label: mw.msg( 'templatedata-modal-title-addparam' )
+   }
+   );
 
// Param list panel (main)
this.languageDropdownWidget = new OO.ui.DropdownWidget();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d69b689cabfa9bd3a503b39a08ec98028a7eca8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix language widget - change (mediawiki...TemplateData)

[jenkins-bot (Code Review)]

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

Change subject: Fix language widget
..


Fix language widget

Change-Id: I2fc6984d20863cbe54153fbd83530cbaca585cca
---
M modules/ext.templateDataGenerator.ui.css
M modules/ext.templateDataGenerator.ui.tdDialog.js
M modules/widgets/ext.templateDataGenerator.languageSearchWidget.js
3 files changed, 26 insertions(+), 15 deletions(-)

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



diff --git a/modules/ext.templateDataGenerator.ui.css 
b/modules/ext.templateDataGenerator.ui.css
index b6335f5..32128c5 100644
--- a/modules/ext.templateDataGenerator.ui.css
+++ b/modules/ext.templateDataGenerator.ui.css
@@ -61,6 +61,15 @@
color: #555;
 }
 
+/* mw.TemplateData.LanguageSearchWidget */
+
+.tdg-languageResultWidget-otherMatch {
+   float: right;
+   color: #777;
+}
+
+/* Icons */
+
 .oo-ui-icon-parameter {
/* @embed */
background-image: url(images/parameter-ltr.svg);
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 7a0e012..92ebb9e 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -91,7 +91,7 @@
this.addParamPanel = new OO.ui.PanelLayout();
 
// Language panel
-   this.newLanguageSearchWidget = new 
mw.TemplateData.LanguageSearchWidget();
+   this.newLanguageSearch = new mw.TemplateData.LanguageSearchWidget();
 
// Add parameter panel
this.newParamInput = new OO.ui.TextInputWidget( {
@@ -170,7 +170,7 @@
this.languagePanel.$element
.addClass( 'tdg-templateDataDialog-languagePanel' )
.append(
-   this.newLanguageSearchWidget.$element
+   this.newLanguageSearch.$element
);
this.addParamPanel.$element
.addClass( 'tdg-templateDataDialog-addParamPanel' )
@@ -195,13 +195,13 @@
);
 
// Events
-   this.newLanguageSearchWidget.connect( this, { select: 
'newLanguageSearchWidgetSelect' } );
+   this.newLanguageSearch.getResults().connect( this, { choose: 
'onNewLanguageSearchResultsChoose' } );
this.newParamInput.connect( this, { change: 'onAddParamInputChange' } );
this.addParamButton.connect( this, { click: 'onAddParamButtonClick' } );
this.descriptionInput.connect( this, { change: 
'onDescriptionInputChange' } );
this.paramOrderWidget.connect( this, { reorder: 
'onParamOrderWidgetReorder' } );
this.languagePanelButton.connect( this, { click: 
'onLanguagePanelButton' } );
-   this.languageDropdownWidget.getMenu().connect( this, { choose: 
'onLanguageDropdownWidgetChoose' } );
+   this.languageDropdownWidget.getMenu().connect( this, { select: 
'onLanguageDropdownWidgetSelect' } );
this.paramSelectWidget.connect( this, { choose: 
'onParamSelectWidgetChoose' } );
 };
 
@@ -298,10 +298,11 @@
 };
 
 /**
- * Respond to language select widget choose event
- * @param {OO.ui.OptionWidget} item Chosen item
+ * Respond to language select widget select event
+ *
+ * @param {OO.ui.OptionWidget} item Selected item
  */
-mw.TemplateData.Dialog.prototype.onLanguageDropdownWidgetChoose = function ( 
item ) {
+mw.TemplateData.Dialog.prototype.onLanguageDropdownWidgetSelect = function ( 
item ) {
var language = item ? item.getData() : this.language;
 
// Change current language
@@ -325,12 +326,13 @@
 };
 
 /**
- * Respond to add language button
- * @param {Object} data Data from the selected option widget
+ * Handle choose events from the new language search widget
+ *
+ * @param {mw.TemplateData.LanguageResultWidget} item Chosen item
  */
-mw.TemplateData.Dialog.prototype.newLanguageSearchWidgetSelect = function ( 
data ) {
+mw.TemplateData.Dialog.prototype.onNewLanguageSearchResultsChoose = function ( 
item ) {
var languageButton,
-   newLanguage = data.code;
+   newLanguage = item.getData().code;
 
if ( newLanguage ) {
if ( $.inArray( newLanguage, this.availableLanguages ) === -1 ) 
{
@@ -344,9 +346,7 @@
}
 
// Select the new item
-   this.languageDropdownWidget.getMenu().chooseItem(
-   this.languageDropdownWidget.getMenu().getItemFromData( 
newLanguage )
-   );
+   this.languageDropdownWidget.getMenu().selectItemByData( 
newLanguage );
}
 
// Go to the main panel
@@ -803,7 +803,7 @@
}
this.languageDropdownWidget.getMenu().addItems( 
languageItems );
// Trigger the initial language choice
-   this.languageDropdownWidget.getMenu().chooseItem( 
this.languageDropdownWidget.getMenu().getItemFromData( language ) );
+ 

[MediaWiki-commits] [Gerrit] labs key monitor/delete script: don't rotate saltmaster aes ... - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: labs key monitor/delete script: don't rotate saltmaster aes key 
on key deletion
..


labs key monitor/delete script: don't rotate saltmaster aes key on key deletion

Change-Id: I916df43f02a1ddb161fc6440d78fc7611c428ef6
---
M modules/openstack/files/monitor_labs_salt_keys.py
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/openstack/files/monitor_labs_salt_keys.py 
b/modules/openstack/files/monitor_labs_salt_keys.py
index dc017a1..4b8af49 100644
--- a/modules/openstack/files/monitor_labs_salt_keys.py
+++ b/modules/openstack/files/monitor_labs_salt_keys.py
@@ -195,6 +195,8 @@
 client will wait for the minion response
 '''
 self.client = salt.client.LocalClient()
+# don't rotate saltmaster aes key on salt key deletion
+self.client.opts['rotate_aes_key'] = False
 self.all_keys = None
 self.accepted_keys = None
 self.key_manager = salt.key.Key(self.client.opts)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I916df43f02a1ddb161fc6440d78fc7611c428ef6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
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 i18n shim - change (mediawiki...MoodBar)

[Paladox (Code Review)]

Paladox has uploaded a new change for review.

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

Change subject: Remove i18n shim
..

Remove i18n shim

Change-Id: I7d63afd60457ce44fdfa9e8f4319b283732ac4fa
---
M MoodBar.php
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/MoodBar.php b/MoodBar.php
index bdc33fa..af1b29c 100644
--- a/MoodBar.php
+++ b/MoodBar.php
@@ -85,7 +85,6 @@
 
 // Internationalisation
 $wgMessagesDirs['MoodBar'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MoodBar'] = $moodBarDir . 'MoodBar.i18n.php';
 $wgExtensionMessagesFiles['MoodBarAliases'] = $moodBarDir . 
'MoodBar.alias.php';
 
 // Resources

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

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

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

[MediaWiki-commits] [Gerrit] Fix sharing of links in Gingerbread. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Fix sharing of links in Gingerbread.
..

Fix sharing of links in Gingerbread.

Our method of removing "blacklisted" intents from the system-provided
intent chooser doesn't seem to work in GB. It's supposed to work by
initializing the chooser with one of the actual intents that will handle
the link sharing, and then adding the rest of the intents using the
EXTRA_INITIAL_INTENTS parameter. Neither of these things seems to have any
effect in GB.

Therefore, in GB, we'll just show the chooser with the blacklisted intents
included (a tradeoff we can live with).

Bug: T111583
Change-Id: Idaedfcbe1f9e576f8a79c3a44bfe78a6034dc8fb
---
M app/src/main/java/org/wikipedia/util/ShareUtils.java
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/src/main/java/org/wikipedia/util/ShareUtils.java 
b/app/src/main/java/org/wikipedia/util/ShareUtils.java
index b4262e7..3b5a642 100644
--- a/app/src/main/java/org/wikipedia/util/ShareUtils.java
+++ b/app/src/main/java/org/wikipedia/util/ShareUtils.java
@@ -179,7 +179,7 @@
 return null;
 }
 
-Intent bestIntent = intents.remove(0);
+Intent bestIntent = ApiUtil.hasHoneyComb() ? intents.remove(0) : 
targetIntent;
 return Intent.createChooser(bestIntent, chooserTitle)
 .putExtra(Intent.EXTRA_INITIAL_INTENTS, intents.toArray(new 
Parcelable[intents.size()]));
 }

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

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

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

[MediaWiki-commits] [Gerrit] Add instrumentation - change (operations...pybal)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

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

Change subject: Add instrumentation
..

Add instrumentation

Pybal has always been pretty private on its own internal state to
outside observers, making it a bit difficult to monitor or poll its
state.

We add a simple HTTP listener chain of monitoring endpoints describing
the actual state (pooled/depooled, up/down) of all servers (or a single
one) in a pool

Url space is left free for others to use for stats or other kind of
instrumentation in the future.

UNTESTED MOCK.

Bug: T102394
Change-Id: Ied88d44e63f91df3816df4b44f29bb0cd444cd05
---
M pybal/__init__.py
A pybal/instrumentation.py
M pybal/pybal.py
3 files changed, 115 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/52/238152/1

diff --git a/pybal/__init__.py b/pybal/__init__.py
index 20d9e50..e838db5 100644
--- a/pybal/__init__.py
+++ b/pybal/__init__.py
@@ -11,4 +11,4 @@
 USER_AGENT_STRING = 'PyBal/%s' % __version__
 
 __all__ = ('ipvs', 'monitor', 'pybal', 'util', 'monitors', 'bgp',
-   'config', 'USER_AGENT_STRING')
+   'config', 'instrumentation', 'USER_AGENT_STRING')
diff --git a/pybal/instrumentation.py b/pybal/instrumentation.py
new file mode 100644
index 000..c76ef80
--- /dev/null
+++ b/pybal/instrumentation.py
@@ -0,0 +1,98 @@
+"""
+  Instrumentation HTTP server for PyBal
+  ~
+
+  A simple http server that can return the state of a pool,
+  or the state of a single server within a pool.
+
+  Urls:
+
+  /pools  - a list of the available pools
+  /pools/ - The full state of a pool
+  /pools// - the state of a single host in a pool
+
+  All results are returned either as human-readable lists or as json
+  structures, depending on the Accept header of the request.
+"""
+
+from twisted.web.resource import Resource
+import json
+
+
+def renderConditional(msg, request):
+if request.requestHeaders.hasHeader('Accept'):
+val = request.requestHeaders.getRawHeaders('Accept')
+if 'application/json' in val:
+return json.dumps(msg)
+else:
+return str(msg)
+
+
+class Resp404(Resource):
+isLeaf = True
+
+def render_GET(self, request):
+request.setResponseCode(404)
+msg = {'error':
+   "The desired url {} was not found".format(request.path)}
+return renderConditional(msg, request)
+
+
+def Server(Resource):
+
+def getChild(self, path, request):
+if path == 'pools':
+return PoolsRoot()
+else:
+return Resp404()
+
+
+class PoolsRoot(Resource):
+_pools = {}
+
+def __init__(self):
+Resource.__init__(self)
+
+@classmethod
+def addPool(cls, coordinator):
+cls._pools[coordinator.lvsservice.name] = coordinator
+
+def getChild(self, path, request):
+if not path:
+return self
+if path in self._pools:
+return PoolServers(self._pools[path])
+return Resp404()
+
+def render_GET(self, request):
+return renderConditional(self._pools.keys())
+
+
+class PoolServers(Resource):
+
+def __init__(self, coordinator):
+Resource.__init__(self)
+self.coordinator = coordinator
+
+def getChild(self, path, request):
+if not path:
+return self
+if path in self.coordinator.servers:
+return PoolServer(self.coordinator.servers[path])
+return Resp404()
+
+def render_GET(self, request):
+res = {}
+for hostname, server in self.coordinator.servers.items():
+res[hostname] = server.dumpState()
+return renderConditional(res, request)
+
+
+class PoolServer(Resource):
+isLeaf = True
+
+def __init__(self, server):
+self.state = server.dumpState()
+
+def render_GET(self, request):
+return renderConditional(self.state, request)
diff --git a/pybal/pybal.py b/pybal/pybal.py
index ea6cf63..e0eb286 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 import os, sys, signal, socket, random
-from pybal import ipvs, monitor, util, config
+from pybal import ipvs, monitor, util, config, instrumentation
 
 from twisted.python import failure, filepath
 from twisted.internet import reactor, defer
@@ -25,6 +25,7 @@
 from pybal import bgp
 except ImportError:
 pass
+
 
 class Server:
 """
@@ -245,6 +246,10 @@
 self.maintainState()
 self.modified = True# Indicate that this instance previously 
existed
 
+def dumpState(self):
+"""Dump current state of the server"""
+return {'pooled': self.pooled, 'weight': self.weight, 'up': self.up}
+
 @classmethod
 def buildServer(cls, hostName, configuration, lvsservice):
 """
@@ -257,6 +262,7 @@
 

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 502d02d..66dd0e2 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 502d02d..66dd0e2
..


Syncronize VisualEditor: 502d02d..66dd0e2

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

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



diff --git a/VisualEditor b/VisualEditor
index 502d02d..66dd0e2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 502d02d3c4a9563abb1bc7241147ba7c32b291bb
+Subproject commit 66dd0e2610e2034ea9c5ffe24b10a5fa9caf6c96

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I403d2f3f9d38301c509cad08813939b6df785796
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Upgrade labvirt1007 to kilo - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Upgrade labvirt1007 to kilo
..

Upgrade labvirt1007 to kilo

Change-Id: If58c356ba505b9b98495137868951202123640e2
---
M hieradata/hosts/labvirt1007.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/238154/1

diff --git a/hieradata/hosts/labvirt1007.yaml b/hieradata/hosts/labvirt1007.yaml
index 0f97ce9..fac61c2 100644
--- a/hieradata/hosts/labvirt1007.yaml
+++ b/hieradata/hosts/labvirt1007.yaml
@@ -1 +1,2 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
+openstack::version: kilo

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If58c356ba505b9b98495137868951202123640e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Dialog: Use a 'done' button on edit param page instead of 'b... - change (mediawiki...TemplateData)

[jenkins-bot (Code Review)]

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

Change subject: Dialog: Use a 'done' button on edit param page instead of 'back'
..


Dialog: Use a 'done' button on edit param page instead of 'back'

'Back' suggests that changes in the form won't be saved.

Change-Id: I0df0887caa6317393a3a891dd292aa4dc54cc32b
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.ui.tdDialog.js
4 files changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index f150e2b..0a96b6c 100644
--- a/extension.json
+++ b/extension.json
@@ -103,6 +103,7 @@
"templatedata-modal-button-cancel",
"templatedata-modal-button-changelang",
"templatedata-modal-button-delparam",
+   "templatedata-modal-button-done",
"templatedata-modal-button-importParams",
"templatedata-modal-button-restoreparam",
"templatedata-modal-button-saveparam",
diff --git a/i18n/en.json b/i18n/en.json
index a42b2f4..0bc182a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -51,6 +51,7 @@
"templatedata-modal-button-cancel": "Cancel",
"templatedata-modal-button-changelang": "Change language",
"templatedata-modal-button-delparam": "Remove parameter information",
+   "templatedata-modal-button-done": "Done",
"templatedata-modal-button-importParams": "Import parameters",
"templatedata-modal-button-restoreparam": "Restore parameter",
"templatedata-modal-button-saveparam": "Save",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e64c5c0..23c6504 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -59,6 +59,7 @@
"templatedata-modal-button-cancel": "Label of the cancel 
button.\n{{Identical|Cancel}}",
"templatedata-modal-button-changelang": "Label for the button to change 
language in the edit dialog.\n{{Identical|Change language}}",
"templatedata-modal-button-delparam": "Button to remove a parameter.",
+   "templatedata-modal-button-done": "Label of the done button.",
"templatedata-modal-button-importParams": "Label of the import button",
"templatedata-modal-button-restoreparam": "Label for the button to 
restore a previously deleted parameter in the edit dialog.",
"templatedata-modal-button-saveparam": "Label for the button to save 
parameter details in the templatedata edit dialog.\n{{Identical|Save}}",
diff --git a/modules/ext.templateDataGenerator.ui.tdDialog.js 
b/modules/ext.templateDataGenerator.ui.tdDialog.js
index 62fdacc..d751cb7 100644
--- a/modules/ext.templateDataGenerator.ui.tdDialog.js
+++ b/modules/ext.templateDataGenerator.ui.tdDialog.js
@@ -36,6 +36,12 @@
modes: 'list'
},
{
+   action: 'done',
+   label: mw.msg( 'templatedata-modal-button-done' ),
+   flags: [ 'primary', 'progressive' ],
+   modes: 'edit'
+   },
+   {
action: 'add',
label: mw.msg( 'templatedata-modal-button-addparam' ),
flags: [ 'constructive' ],
@@ -56,7 +62,7 @@
action: 'back',
label: mw.msg( 'templatedata-modal-button-back' ),
flags: 'safe',
-   modes: [ 'edit', 'language', 'add' ]
+   modes: [ 'language', 'add' ]
}
 ];
 
@@ -904,7 +910,7 @@
  * @return {OO.ui.Process} Action process
  */
 mw.TemplateData.Dialog.prototype.getActionProcess = function ( action ) {
-   if ( action === 'back' ) {
+   if ( action === 'back' || action === 'done' ) {
return new OO.ui.Process( function () {
this.switchPanels( 'listParams' );
}, this );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0df0887caa6317393a3a891dd292aa4dc54cc32b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
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] MWSaveDialog: Checkbox vertical alignment tweak - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: MWSaveDialog: Checkbox vertical alignment tweak
..


MWSaveDialog: Checkbox vertical alignment tweak

Change-Id: I3741d2d5c9bc5b5500440c053766582cfd298841
---
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css 
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
index 3d1f158..0fdce81 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css
@@ -35,7 +35,7 @@
 
 .ve-ui-mwSaveDialog-checkboxes {
margin-right: 3.25em; /* Hack to prevent overlap on edit summary count 
*/
-   padding: 0.2em 0.75em 0 0.75em;
+   padding: 0.25em 0.75em 0 0.75em;
 }
 
 .ve-ui-mwSaveDialog-checkboxes .oo-ui-fieldLayout {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3741d2d5c9bc5b5500440c053766582cfd298841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add *.ggpht.com to Wikimedia Commons upload whitelist - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Add *.ggpht.com to Wikimedia Commons upload whitelist
..


Add *.ggpht.com to Wikimedia Commons upload whitelist

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

Approvals:
  Alex Monk: Looks good to me, approved
  Brian Wolff: Looks good to me, but someone else must approve
  Jean-Frédéric: Looks good to me, but someone else must approve
  Steinsplitter: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b436ba4..45d9869 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11431,6 +11431,7 @@
'*.unibas.ch',  // Universität Basel - 
T104178
'www.workwithsounds.eu',// Work With Sounds - 
T105143
'*.archive.org', 'archive.org', // Internet Archive - 
T106293
+   '*.ggpht.com',  // Google Cloud Storage - 
Temporary domain add for Rijksmuseum - T110869
),
 ),
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2454c7f57703db8aa1b6faa2d404f8e4acaf1c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Dereckson 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Jean-Frédéric 
Gerrit-Reviewer: Steinsplitter 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Drop unused, trivial EntityLabelUnitFormatter - change (mediawiki...Wikibase)

[WMDE]

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

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

Change subject: Drop unused, trivial EntityLabelUnitFormatter
..

Drop unused, trivial EntityLabelUnitFormatter

Change-Id: Iec4ab8591a4abc21d4962f5857f5ca459341ae77
---
D lib/includes/formatters/EntityLabelUnitFormatter.php
D lib/tests/phpunit/formatters/EntityLabelUnitFormatterTest.php
2 files changed, 0 insertions(+), 114 deletions(-)


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

diff --git a/lib/includes/formatters/EntityLabelUnitFormatter.php 
b/lib/includes/formatters/EntityLabelUnitFormatter.php
deleted file mode 100644
index 12c3c57..000
--- a/lib/includes/formatters/EntityLabelUnitFormatter.php
+++ /dev/null
@@ -1,54 +0,0 @@
-vocabularyUriFormatter = $vocabularyUriFormatter;
-   }
-
-   /**
-* @see QuantityUnitFormatter::applyUnit
-*
-* This implementation will interpret $unit as an external entity ID 
(typically a URI), which
-* can be parsed using the EntityIdParser supplied to the constructor. 
If $unit is successfully
-* parsed, the label of the entity is looked up, and appended to 
$numberText with a single
-* space as a separator.
-*
-* @param string $conceptUri
-* @param string $numberText
-*
-* @return string Text
-*/
-   public function applyUnit( $conceptUri, $numberText ) {
-   $label = $this->vocabularyUriFormatter->format( $conceptUri );
-
-   if ( $label === null ) {
-   return $numberText;
-   }
-
-   // TODO: localizable pattern for placement (before/after, 
separator)
-   return $numberText . ' ' . $label;
-   }
-
-}
diff --git a/lib/tests/phpunit/formatters/EntityLabelUnitFormatterTest.php 
b/lib/tests/phpunit/formatters/EntityLabelUnitFormatterTest.php
deleted file mode 100644
index b775a59..000
--- a/lib/tests/phpunit/formatters/EntityLabelUnitFormatterTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
- array( '', '12345', '12345' ),
-   'unit is 1' => array( '1', '12345', '12345' ),
-   'unit is "NotAUnit"' => array( 'NotAUnit', '12345', 
'12345' ),
-   'unit is bad id' => array( 'kittens', '12345', '12345 
kittens' ),
-   'unit has label' => array( 'Q7', '12345', '12345 
LABEL:Q7' ),
-   'unit has no label' => array( 'Q112233', '12345', 
'12345 Q112233' ),
-   'unknown int' => array( '2', '123', '123 2' ),
-   'unknown URI' => array( 
'http://www.wikidata.org/entity/Q200', '123', '123 
http://www.wikidata.org/entity/Q200' ),
-   'property id' => array( 'P7', '123', '123 LABEL:P7' ),
-   );
-   }
-
-   /**
-* @dataProvider provideApplyUnit
-*/
-   public function testApplyUnit( $unit, $number, $expected ) {
-   $labelLookup = $this->getMock( 
'Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup' );
-   $labelLookup->expects( $this->any() )
-   ->method( 'getLabel' )
-   ->will( $this->returnCallback( function( EntityId $id ) 
{
-   if ( $id->getNumericId() > 1000 ) {
-   return null;
-   }
-   return new Term( 'en', 'LABEL:' . 
$id->getSerialization() );
-   } ) );
-
-   $idParser = new BasicEntityIdParser();
-
-   $vocabularyUriFormatter = new VocabularyUriFormatter( 
$idParser, $labelLookup, array( 'NotAUnit' ) );
-   $formatter = new EntityLabelUnitFormatter( 
$vocabularyUriFormatter );
-   $this->assertEquals( $expected, $formatter->applyUnit( $unit, 
$number ) );
-   }
-
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec4ab8591a4abc21d4962f5857f5ca459341ae77
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] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

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

Localisation updates from https://translatewiki.net.

Change-Id: Ia59aa6bd62ca8e92b00c834be90e68da18cb4ff1
---
M app/src/main/res/values-af/strings.xml
M app/src/main/res/values-as/strings.xml
M app/src/main/res/values-bn/strings.xml
M app/src/main/res/values-br/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-cs/strings.xml
A app/src/main/res/values-cu/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-eo/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-et/strings.xml
M app/src/main/res/values-eu/strings.xml
M app/src/main/res/values-fa/strings.xml
M app/src/main/res/values-fi/strings.xml
M app/src/main/res/values-fr/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-gu/strings.xml
M app/src/main/res/values-in/strings.xml
M app/src/main/res/values-it/strings.xml
M app/src/main/res/values-iw/strings.xml
M app/src/main/res/values-ja/strings.xml
M app/src/main/res/values-ji/strings.xml
M app/src/main/res/values-ko/strings.xml
M app/src/main/res/values-ky/strings.xml
M app/src/main/res/values-lb/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-mr/strings.xml
M app/src/main/res/values-nb/strings.xml
M app/src/main/res/values-nl/strings.xml
M app/src/main/res/values-pl/strings.xml
M app/src/main/res/values-pt-rBR/strings.xml
M app/src/main/res/values-pt/strings.xml
M app/src/main/res/values-ro/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-sk/strings.xml
M app/src/main/res/values-sr/strings.xml
M app/src/main/res/values-sv/strings.xml
M app/src/main/res/values-ta/strings.xml
M app/src/main/res/values-te/strings.xml
M app/src/main/res/values-th/strings.xml
M app/src/main/res/values-tr/strings.xml
M app/src/main/res/values-uk/strings.xml
M app/src/main/res/values-vi/strings.xml
M app/src/main/res/values-zh-rTW/strings.xml
M app/src/main/res/values-zh/strings.xml
46 files changed, 158 insertions(+), 54 deletions(-)


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

diff --git a/app/src/main/res/values-af/strings.xml 
b/app/src/main/res/values-af/strings.xml
index 48e8c18..5d05c23 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -10,7 +10,7 @@
   Wat was u besig om te doen toe die 
breek plaasgevind het?
   Soek in Wikipedia
   Geskiedenis
-  Daar is geen netwerkverbinding 
nie.
+  Daar is geen 
netwerkverbinding nie.
   Netwerkfout. Kliek om weer te 
probeer.
   Daar was \'n probleem met die hantering 
van u versoek.
   Bediener statuskode 
onbeskikbaar.
diff --git a/app/src/main/res/values-as/strings.xml 
b/app/src/main/res/values-as/strings.xml
index ea39522..fb45d64 100644
--- a/app/src/main/res/values-as/strings.xml
+++ b/app/src/main/res/values-as/strings.xml
@@ -10,7 +10,7 @@
   ত্ৰুটি হোৱাৰ সময়ত আপুনি কি কৰি 
আছিল?
   ৱিকিপিডিয়াত সন্ধান কৰক
   ইতিহাস
-  নে\'টৱৰ্কৰ সংযোগ স্থাপন কৰিব পৰা 
নগ\'ল।
+  নে\'টৱৰ্কৰ সংযোগ স্থাপন কৰিব 
পৰা নগ\'ল।
   নে\'টৱৰ্ক ত্ৰুটি। পুনৰ চেষ্টা 
কৰক।
   আপোনাৰ অনুৰোধ গ্ৰহণত এটা সমস্যা 
হৈছে।
   চাৰ্ভাৰৰ অৱস্থা সংকেত 
অনুপলব্ধ।
diff --git a/app/src/main/res/values-bn/strings.xml 
b/app/src/main/res/values-bn/strings.xml
index fb4acab..e0ae743 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -10,7 +10,7 @@
   অ্যাপটি অকার্যকর হওয়ার সময় আপনি 
কি করছিলেন?
   উইকিপিডিয়া অনুসন্ধান
   ইতিহাস
-  নেটওয়ার্ক সংযোগ স্থাপন করা 
যায়নি।
+  নেটওয়ার্ক সংযোগ স্থাপন করা 
যায়নি।
   নেটওয়ার্ক ত্রুটি। পুনরায় চেষ্টা 
করুন।
   আপনার অনুরোধ পরিচালনার সময় একটি ত্রুটি 
ঘটেছে।
   সার্ভারের অবস্থা কোড 
অনুপলব্ধ।
diff --git a/app/src/main/res/values-br/strings.xml 
b/app/src/main/res/values-br/strings.xml
index 766f0f5..9be3e80 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -10,7 +10,7 @@
   Petra e oac\'h oc\'h ober pa oa 
chomet sac\'het ?
   Klask e Wikipedia
   Istor
-  N\'eus ket bet gallet kevreañ ouzh ar 
rouedad :(
+  N\'eus ket bet gallet 
kevreañ ouzh ar rouedad :(
   Fazi rouedad : pouezañ evit klask 
en-dro.
   Ur gudenn zo beet pa\'z eo bet war-dro ho 
koulenn.
   Ne c\'haller ket kaout kod stad ar 
servijer.
diff --git a/app/src/main/res/values-ca/strings.xml 
b/app/src/main/res/values-ca/strings.xml
index e9cb2c6..e4e05a9 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -10,7 +10,7 @@
   Què féieu quan ha fallat?
   Cerca a la Viquipèdia
   Historial
-  No es pot establir una connexió de 
xarxa
+  No es pot establir una 
connexió de xarxa
   Error de xarxa. Toqueu la pantalla per a 
tornar-ho a 

[MediaWiki-commits] [Gerrit] Upgrade labvirt1007 to kilo - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Upgrade labvirt1007 to kilo
..


Upgrade labvirt1007 to kilo

Change-Id: If58c356ba505b9b98495137868951202123640e2
---
M hieradata/hosts/labvirt1007.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/labvirt1007.yaml b/hieradata/hosts/labvirt1007.yaml
index 0f97ce9..fac61c2 100644
--- a/hieradata/hosts/labvirt1007.yaml
+++ b/hieradata/hosts/labvirt1007.yaml
@@ -1 +1,2 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
+openstack::version: kilo

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

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

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

[MediaWiki-commits] [Gerrit] Fix typo in Ib09944359 - change (mediawiki...Gadgets)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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

Change subject: Fix typo in Ib09944359
..

Fix typo in Ib09944359

Change-Id: Ic9c645d145cc079e43be0f4a225e87b005fc3ea0
---
M Gadgets.namespaces.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/Gadgets.namespaces.php b/Gadgets.namespaces.php
index deb57cb..4e35548 100644
--- a/Gadgets.namespaces.php
+++ b/Gadgets.namespaces.php
@@ -76,7 +76,7 @@
NS_GADGET => '소도구',
NS_GADGET_TALK => '소도구토론',
NS_GADGET_DEFINITION => '소도구정의',
-   NS_GADGET_DEFINITIKN_TALK => '소도구정의토론',
+   NS_GADGET_DEFINITION_TALK => '소도구정의토론',
 );
 
 $namespaceNames['lrc'] = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9c645d145cc079e43be0f4a225e87b005fc3ea0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
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] cassandra: enable ssl_storage_port (7001) in ferm - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: enable ssl_storage_port (7001) in ferm
..


cassandra: enable ssl_storage_port (7001) in ferm

Bug: T108953
Change-Id: I8875c25c0cab5b5e2060caf732906f1d5da95ba7
---
M manifests/role/cassandra.pp
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 4acd598..ea9b5c3 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -38,6 +38,12 @@
 port   => '7000',
 srange => "@resolve(($cassandra_hosts_ferm))",
 }
+# Cassandra intra-node SSL messaging
+ferm::service { 'cassandra-intra-node-ssl':
+proto  => 'tcp',
+port   => '7001',
+srange => "@resolve(($cassandra_hosts_ferm))",
+}
 # Cassandra JMX/RMI
 ferm::service { 'cassandra-jmx-rmi':
 proto  => 'tcp',

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

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

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

[MediaWiki-commits] [Gerrit] Migrate puppet-lint from Precise to Trusty - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Migrate puppet-lint from Precise to Trusty
..


Migrate puppet-lint from Precise to Trusty

Change-Id: I00ceb426e3468432ff9174f22727e6bf6025c9b8
---
M jjb/job-templates.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 7a1e72b..63dc1ca 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -173,7 +173,7 @@
 
 - job-template:
 name: '{name}-puppetlint-lenient'
-node: contintLabsSlave && UbuntuPrecise
+node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -193,7 +193,7 @@
 
 - job-template:
 name: '{name}-puppetlint-strict'
-node: contintLabsSlave && UbuntuPrecise
+node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00ceb426e3468432ff9174f22727e6bf6025c9b8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ve.dm.Scalable: Create unit tests - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: ve.dm.Scalable: Create unit tests
..

ve.dm.Scalable: Create unit tests

Bonus: Make isDimensionsObjectValid static because it is.

Bug: T95411
Change-Id: I3c9bff32a996b876eb3c404845e28fbfd8837c33
---
M build/modules.json
M src/dm/ve.dm.Scalable.js
M src/ui/widgets/ve.ui.MediaSizeWidget.js
A tests/dm/ve.dm.Scalable.test.js
M tests/index.html
5 files changed, 170 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/48/238148/1

diff --git a/build/modules.json b/build/modules.json
index d7db279..5bea569 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -547,6 +547,7 @@
"tests/dm/ve.dm.SurfaceFragment.test.js",
"tests/dm/ve.dm.ModelRegistry.test.js",
"tests/dm/ve.dm.MetaList.test.js",
+   "tests/dm/ve.dm.Scalable.test.js",
"tests/dm/selections/ve.dm.LinearSelection.test.js",
"tests/dm/selections/ve.dm.NullSelection.test.js",
"tests/dm/selections/ve.dm.TableSelection.test.js",
diff --git a/src/dm/ve.dm.Scalable.js b/src/dm/ve.dm.Scalable.js
index 41809fe..0a8d88a 100644
--- a/src/dm/ve.dm.Scalable.js
+++ b/src/dm/ve.dm.Scalable.js
@@ -150,6 +150,27 @@
return dimensions;
 };
 
+/**
+ * Check if an object is a dimensions object.
+ * Make sure that if width or height are set, they are not 'undefined'.
+ *
+ * @param {Object} dimensions A dimensions object to test
+ * @return {boolean} Valid or invalid dimensions object
+ */
+ve.dm.Scalable.static.isDimensionsObjectValid = function ( dimensions ) {
+   if (
+   dimensions &&
+   !$.isEmptyObject( dimensions ) &&
+   (
+   dimensions.width !== undefined ||
+   dimensions.height !== undefined
+   )
+   ) {
+   return true;
+   }
+   return false;
+};
+
 /* Methods */
 
 /**
@@ -595,25 +616,4 @@
)
);
return this.valid;
-};
-
-/**
- * Check if an object is a dimensions object.
- * Make sure that if width or height are set, they are not 'undefined'.
- *
- * @param {Object} dimensions A dimensions object to test
- * @return {boolean} Valid or invalid dimensions object
- */
-ve.dm.Scalable.prototype.isDimensionsObjectValid = function ( dimensions ) {
-   if (
-   dimensions &&
-   !$.isEmptyObject( dimensions ) &&
-   (
-   dimensions.width !== undefined ||
-   dimensions.height !== undefined
-   )
-   ) {
-   return true;
-   }
-   return false;
 };
diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js 
b/src/ui/widgets/ve.ui.MediaSizeWidget.js
index da16a9b..fcd5a0a 100644
--- a/src/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -477,7 +477,7 @@
 
if (
// Update only if the dimensions object is valid
-   this.scalable.isDimensionsObjectValid( normalizedDimensions ) &&
+   ve.dm.Scalable.static.isDimensionsObjectValid( 
normalizedDimensions ) &&
// And only if the dimensions object is not default
!this.scalable.isDefault()
) {
diff --git a/tests/dm/ve.dm.Scalable.test.js b/tests/dm/ve.dm.Scalable.test.js
new file mode 100644
index 000..8e38d20
--- /dev/null
+++ b/tests/dm/ve.dm.Scalable.test.js
@@ -0,0 +1,146 @@
+/*!
+ * VisualEditor DataModel Scalable tests.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+QUnit.module( 've.dm.Scalable' );
+
+QUnit.test( 'construction/clone/getters/toggleDefault/clearers', 12, function 
( assert ) {
+   var currentDimensions = {
+   width: 300,
+   height: 200
+   },
+   originalDimensions = {
+   width: 600,
+   height: 400
+   },
+   defaultDimensions = {
+   width: 150,
+   height: 50
+   },
+   minDimensions = {
+   width: 1,
+   height: 1
+   },
+   maxDimensions = {
+   width: 1200,
+   height: 800
+   },
+   scalable = new ve.dm.Scalable( {
+   currentDimensions: currentDimensions,
+   originalDimensions: originalDimensions,
+   defaultDimensions: defaultDimensions,
+   minDimensions: minDimensions,
+   maxDimensions: maxDimensions
+   } ),
+   

[MediaWiki-commits] [Gerrit] Fix typo in Ib09944359 - change (mediawiki...Gadgets)

[jenkins-bot (Code Review)]

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

Change subject: Fix typo in Ib09944359
..


Fix typo in Ib09944359

Change-Id: Ic9c645d145cc079e43be0f4a225e87b005fc3ea0
---
M Gadgets.namespaces.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/Gadgets.namespaces.php b/Gadgets.namespaces.php
index deb57cb..4e35548 100644
--- a/Gadgets.namespaces.php
+++ b/Gadgets.namespaces.php
@@ -76,7 +76,7 @@
NS_GADGET => '소도구',
NS_GADGET_TALK => '소도구토론',
NS_GADGET_DEFINITION => '소도구정의',
-   NS_GADGET_DEFINITIKN_TALK => '소도구정의토론',
+   NS_GADGET_DEFINITION_TALK => '소도구정의토론',
 );
 
 $namespaceNames['lrc'] = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9c645d145cc079e43be0f4a225e87b005fc3ea0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nemo bis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] flake8 - change (pywikibot/wikibase)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: flake8
..

flake8

Change-Id: I00beee8787119b0c55e4e999469e8b1c8fe5d883
---
M pywikibase/claim.py
M pywikibase/wbproperty.py
M pywikibase/wbtime.py
M pywikibase/wikibasepage.py
M tests/test_itempage.py
M tests/test_wikibasepage.py
6 files changed, 9 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/43/238143/1

diff --git a/pywikibase/claim.py b/pywikibase/claim.py
index 1c77732..2758dd7 100644
--- a/pywikibase/claim.py
+++ b/pywikibase/claim.py
@@ -17,6 +17,7 @@
 from pywikibase import Property
 import pywikibase.itempage
 
+
 class Claim(Property):
 
 """
@@ -145,7 +146,6 @@
 
 def __eq__(self, other):
 return other.toJSON() == self.toJSON()
-
 
 def toJSON(self):
 """
diff --git a/pywikibase/wbproperty.py b/pywikibase/wbproperty.py
index 15ed20b..f4363ab 100644
--- a/pywikibase/wbproperty.py
+++ b/pywikibase/wbproperty.py
@@ -33,7 +33,7 @@
 it subclasses this Property class, but a claim does not have Page like
 behaviour and semantics.
 """
-from pywikibase.itempage import ItemPage # noqa
+from pywikibase.itempage import ItemPage  # noqa
 types = {'wikibase-item': ItemPage,
  'string': basestring,
  'commonsMedia': basestring,
diff --git a/pywikibase/wbtime.py b/pywikibase/wbtime.py
index 7f38ad8..6fa8de8 100644
--- a/pywikibase/wbtime.py
+++ b/pywikibase/wbtime.py
@@ -18,6 +18,7 @@
 except NameError:
 long = int
 
+
 class WbTime(object):
 
 """A Wikibase time representation."""
diff --git a/pywikibase/wikibasepage.py b/pywikibase/wikibasepage.py
index 7b64ffc..e8acb47 100644
--- a/pywikibase/wikibasepage.py
+++ b/pywikibase/wikibasepage.py
@@ -25,7 +25,6 @@
 def __eq__(self, other):
 return other.id == self.id
 
-
 def get(self, content=None):
 """
 Fetch all page data, and cache it.
diff --git a/tests/test_itempage.py b/tests/test_itempage.py
index ffd6147..6ea2d5b 100644
--- a/tests/test_itempage.py
+++ b/tests/test_itempage.py
@@ -1,5 +1,4 @@
 import unittest
-import codecs
 import json
 import os
 
@@ -10,10 +9,12 @@
 except NameError:
 basestring = str
 
+
 class TestWikibasePage(unittest.TestCase):
 
 def setUp(self):
-with open(os.path.join(os.path.split(__file__)[0], 'data', 
'Q7251.wd')) as f:
+with open(os.path.join(os.path.split(__file__)[0],
+  'data', 'Q7251.wd')) as f:
 self._content = json.load(f)['entities']['Q7251']
 self.item_page = ItemPage()
 self.item_page.get(content=self._content)
diff --git a/tests/test_wikibasepage.py b/tests/test_wikibasepage.py
index 8369556..df6281f 100644
--- a/tests/test_wikibasepage.py
+++ b/tests/test_wikibasepage.py
@@ -1,5 +1,4 @@
 import unittest
-import codecs
 import json
 import os
 
@@ -10,10 +9,12 @@
 except NameError:
 basestring = str
 
+
 class TestWikibasePage(unittest.TestCase):
 
 def setUp(self):
-with open(os.path.join(os.path.split(__file__)[0], 'data', 
'Q7251.wd')) as f:
+with open(os.path.join(os.path.split(__file__)[0],
+  'data', 'Q7251.wd')) as f:
 self._content = json.load(f)['entities']['Q7251']
 self.wb_page = WikibasePage()
 self.wb_page.get(content=self._content)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00beee8787119b0c55e4e999469e8b1c8fe5d883
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 

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

[MediaWiki-commits] [Gerrit] Changes to be committed: modified: InviteSignupHooks.php... - change (mediawiki...InviteSignup)

[Yoonghm (Code Review)]

Yoonghm has uploaded a new change for review.

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

Change subject: Changes to be committed:modified:   
InviteSignupHooks.php   new file:   sql/invitesignup.pg.sql
..

Changes to be committed:
modified:   InviteSignupHooks.php
new file:   sql/invitesignup.pg.sql

This feature add support for PostgreSQL database

Change-Id: Ie50341f88e0c0d674d4ef9f16d627c5f2d138ec8
---
M InviteSignupHooks.php
A sql/invitesignup.pg.sql
2 files changed, 22 insertions(+), 1 deletion(-)


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

diff --git a/InviteSignupHooks.php b/InviteSignupHooks.php
index db7ede1..1377226 100644
--- a/InviteSignupHooks.php
+++ b/InviteSignupHooks.php
@@ -63,6 +63,15 @@
 
public static function onLoadExtensionSchemaUpdates( DatabaseUpdater 
$updater ) {
$dir = __DIR__ . '/sql';
-   $updater->addExtensionTable( 'invitesignup', 
"$dir/invitesignup.sql" );
+   switch ( $updater->getDB()->getType() ) {
+   case "mysql":
+   $updater->addExtensionTable( 'invitesignup', 
"$dir/invitesignup.sql" );
+   break;
+   case "postgres":
+   $updater->addExtensionTable( 'invitesignup', 
"$dir/invitesignup.pg.sql" );
+   break;
+   default:
+   throw new MWException("InviteSignup does not support 
{$updater->getDB()->getType()} yet.");
+   }
}
 }
diff --git a/sql/invitesignup.pg.sql b/sql/invitesignup.pg.sql
new file mode 100644
index 000..7691c26
--- /dev/null
+++ b/sql/invitesignup.pg.sql
@@ -0,0 +1,12 @@
+-- Invite signup signups
+CREATE TABLE /*$wgDBprefix*/invitesignup (
+  is_inviter INTEGER  NOT NULL,
+  is_invitee INTEGER,
+  is_email   BYTEANOT NULL,
+  is_whenBYTEANOT NULL,
+  is_usedBYTEA,
+  is_hashBYTEANOT NULL,
+  is_groups  BYTEA,
+
+  PRIMARY KEY (is_hash)
+) /*$wgDBTableOptions*/;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie50341f88e0c0d674d4ef9f16d627c5f2d138ec8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InviteSignup
Gerrit-Branch: master
Gerrit-Owner: Yoonghm 

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

[MediaWiki-commits] [Gerrit] Changes are wrongly detected in the last langlink - change (pywikibot/core)

[Malafaya (Code Review)]

Malafaya has uploaded a new change for review.

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

Change subject: Changes are wrongly detected in the last langlink
..

Changes are wrongly detected in the last langlink

This was first detected in cosmetic_changes.py, where pages not undergoing any
cosmetic changes were being updated, and the supposed changed was an unchanged
langlink (the last one). Then I realized this also happens in interwiki.py, but
only when changes are supposed to be made to the page.
After checking textlib.py, I noticed that removeLanguageLinks() returns a
stripped version of the text whereas replaceLanguageLinks() does not. So the
actual difference is related to blank space.
This explains why cosmetic_changes.py detects a change and updates the page,
but interwiki.py does not: interwiki.py does not rely in differences in the
final text to make an update, but when it does need to make an update, it
outputs that diff.

This patch strips the text in replaceLanguageLinks() before returning.

Change-Id: Icd7252be8dbccf3fb04a4b4a465f6b057e3a8e3a
---
M pywikibot/textlib.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/49/238149/1

diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 5c13101..bc93290 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -910,7 +910,7 @@
 newtext = s2.replace(marker, '').strip() + separator + s
 else:
 newtext = s2.replace(marker, '')
-return newtext
+return newtext.strip()
 
 
 def interwikiFormat(links, insite=None):

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

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

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

[MediaWiki-commits] [Gerrit] labs key monitor/delete script: don't rotate saltmaster aes ... - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: labs key monitor/delete script: don't rotate saltmaster aes key 
on key deletion
..

labs key monitor/delete script: don't rotate saltmaster aes key on key deletion

Change-Id: I916df43f02a1ddb161fc6440d78fc7611c428ef6
---
M modules/openstack/files/monitor_labs_salt_keys.py
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/238151/1

diff --git a/modules/openstack/files/monitor_labs_salt_keys.py 
b/modules/openstack/files/monitor_labs_salt_keys.py
index dc017a1..4b8af49 100644
--- a/modules/openstack/files/monitor_labs_salt_keys.py
+++ b/modules/openstack/files/monitor_labs_salt_keys.py
@@ -195,6 +195,8 @@
 client will wait for the minion response
 '''
 self.client = salt.client.LocalClient()
+# don't rotate saltmaster aes key on salt key deletion
+self.client.opts['rotate_aes_key'] = False
 self.all_keys = None
 self.accepted_keys = None
 self.key_manager = salt.key.Key(self.client.opts)

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

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

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

[MediaWiki-commits] [Gerrit] Migrate puppet-lint from Precise to Trusty - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Migrate puppet-lint from Precise to Trusty
..

Migrate puppet-lint from Precise to Trusty

Change-Id: I00ceb426e3468432ff9174f22727e6bf6025c9b8
---
M jjb/job-templates.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/238140/1

diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 7a1e72b..63dc1ca 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -173,7 +173,7 @@
 
 - job-template:
 name: '{name}-puppetlint-lenient'
-node: contintLabsSlave && UbuntuPrecise
+node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:
@@ -193,7 +193,7 @@
 
 - job-template:
 name: '{name}-puppetlint-strict'
-node: contintLabsSlave && UbuntuPrecise
+node: contintLabsSlave && UbuntuTrusty
 defaults: use-remote-zuul-no-submodules
 concurrent: true
 triggers:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00ceb426e3468432ff9174f22727e6bf6025c9b8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] cassandra: enable ssl_storage_port (7001) in ferm - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: enable ssl_storage_port (7001) in ferm
..

cassandra: enable ssl_storage_port (7001) in ferm

Bug: T108953
Change-Id: I8875c25c0cab5b5e2060caf732906f1d5da95ba7
---
M manifests/role/cassandra.pp
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 4acd598..2679622 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -38,6 +38,12 @@
 port   => '7000',
 srange => "@resolve(($cassandra_hosts_ferm))",
 }
+# Cassandra intra-node SSL messaging
+ferm::service { 'cassandra-intra-node':
+proto  => 'tcp',
+port   => '7001',
+srange => "@resolve(($cassandra_hosts_ferm))",
+}
 # Cassandra JMX/RMI
 ferm::service { 'cassandra-jmx-rmi':
 proto  => 'tcp',

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

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

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

[MediaWiki-commits] [Gerrit] Add new krl language - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Add new krl language
..

Add new krl language

Change-Id: I2e43f6be579d71a8a091f643b282763742d35236
---
M .jsduck/eg-iframe.html
M demos/ve/desktop-dist.html
M demos/ve/desktop.html
M demos/ve/mobile-dist.html
M demos/ve/mobile.html
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/47/238147/1

diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index f0aceb1..616951b 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -58,7 +58,7 @@
 

ve.messagePaths = ["../i18n/","../lib/oojs-ui/i18n/"];
-   ve.availableLanguages = 
["ace","af","am","ang","ar","arc","arq","as","ast","av","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","cjy-hant","ckb","co","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en-ca","en-gb","en","eo","es","et","eu","fa","fi","fo","fr","frp","frr","fur","fy","ga","gd","gl","glk","gn","gsw","gu","gv","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","kri","ksh","ku-latn","kw","ky","la","lb","lez","li","lmo","lrc","lt","luz","lv","lzh","lzz","mg","min","mk","ml","mn","mr","ms","mt","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","os","pa","pam","pfl","pl","pms","ps","pt-br","pt","qqq","qu","rm","ro","roa-tara","ru","rue","sa","sah","sc","scn","sco","sh","shn","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","tzm","ug-arab","uk","ur","uz","vec","vi","vo","wuu","xmf","yi","yue","zh-hans","zh-hant","ace","af","am","ar","arc","arq","as","ast","awa","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","ckb","co","crh-cyrl","crh-latn","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en-ca","en","eo","es","et","eu","fa","fi","fo","fr","frr","fur","fy","gd","gl","glk","gu","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","ksh","ku-latn","kw","ky","la","lb","li","lmo","lt","luz","lv","lzh","mg","min","mk","ml","mr","ms","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","pa","pfl","pl","pms","ps","pt-br","pt","qqq","qu","ro","roa-tara","ru","sa","sah","scn","sco","sh","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","ug-arab","uk","uz","vec","vi","vo","wuu","xmf","yi","yo","yue","zh-hans","zh-hant"];
+   ve.availableLanguages = 
["ace","af","am","ang","ar","arc","arq","as","ast","av","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","cjy-hant","ckb","co","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en-ca","en-gb","en","eo","es","et","eu","fa","fi","fo","fr","frp","frr","fur","fy","ga","gd","gl","glk","gn","gsw","gu","gv","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","kri","krl","ksh","ku-latn","kw","ky","la","lb","lez","li","lmo","lrc","lt","luz","lv","lzh","lzz","mg","min","mk","ml","mn","mr","ms","mt","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","os","pa","pam","pfl","pl","pms","ps","pt-br","pt","qqq","qu","rm","ro","roa-tara","ru","rue","sa","sah","sc","scn","sco","sh","shn","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","tzm","ug-arab","uk","ur","uz","vec","vi","vo","wuu","xmf","yi","yue","zh-hans","zh-hant","ace","af","am","ar","arc","arq","as","ast","awa","az","ba","bcc","bcl","be-tarask","be","bg","bn","br","bs","ca","ce","ckb","co","crh-cyrl","crh-latn","cs","cu","cy","da","de","diq","dsb","dty","egl","el","eml","en-ca","en","eo","es","et","eu","fa","fi","fo","fr","frr","fur","fy","gd","gl","glk","gu","he","hi","hr","hrx","hsb","hu-formal","hu","hy","ia","id","ie","ilo","is","it","ja","jv","ka","kk-cyrl","km","kn","ko","krc","ksh","ku-latn","kw","ky","la","lb","li","lmo","lt","luz","lv","lzh","mg","min","mk","ml","mr","ms","nap","nb","nds-nl","nds","ne","nl","nn","oc","om","or","pa","pfl","pl","pms","ps","pt-br","pt","qqq","qu","ro","roa-tara","ru","sa","sah","scn","sco","sh","si","sk","sl","sq","sr-ec","sr-el","su","sv","sw","ta","te","tg-cyrl","th","tl","tr","tt-cyrl","ug-arab","uk","uz","vec","vi","vo","wuu","xmf","yi","yo","yue","zh-hans","zh-hant"];

 

diff --git a/demos/ve/desktop-dist.html b/demos/ve/desktop-dist.html
index f1ca645..1f2cdd2 100644
--- a/demos/ve/desktop-dist.html
+++ b/demos/ve/desktop-dist.html
@@ -72,7 +72,7 @@
 

ve.messagePaths = 
["../../dist/i18n/","../../lib/oojs-ui/i18n/"];
-   ve.availableLanguages = 

[MediaWiki-commits] [Gerrit] Revert "Add interwiki-labs.cdb" - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Revert "Add interwiki-labs.cdb"
..


Revert "Add interwiki-labs.cdb"

In hindsight, this doesn't make sense since we stopped committing interwiki.cdb.
It also causes issues on beta because `updateinterwikicache` only writes to 
interwiki.cdb, which is unused there.

This reverts commit d48bdbd9466ace3f0ca940d1ee3cd155d4bec1ad.

Change-Id: I85cf6084b5aaf57c1f398f3d147f444e4fb86fa6
---
M .gitignore
D docroot/noc/conf/interwiki-labs.cdb
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings.php
4 files changed, 2 insertions(+), 7 deletions(-)

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



diff --git a/.gitignore b/.gitignore
index 09f244e..8154be7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@
 wmf-config/*-setup.php
 wmf-config/checkers.php
 wmf-config/interwiki.cdb
-wmf-config/interwiki-labs.cdb
 lib
 cgi-bin
 boardvote.gpg
diff --git a/docroot/noc/conf/interwiki-labs.cdb 
b/docroot/noc/conf/interwiki-labs.cdb
deleted file mode 12
index 492324a..000
--- a/docroot/noc/conf/interwiki-labs.cdb
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/interwiki-labs.cdb
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh 
b/docroot/noc/createTxtFileSymlinks.sh
index 2a1f621..21abcee 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -92,7 +92,6 @@
wmf-config/extension-list-labs
wmf-config/extension-list-wikitech
wmf-config/interwiki.cdb
-   wmf-config/interwiki-labs.cdb
wmf-config/trusted-xff.cdb
 )
 
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index be7a96a..00526ad 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1159,11 +1159,9 @@
$wgDiff = false;
 }
 
-$iwCacheFile = getRealmSpecificFilename( "$wmfConfigDir/interwiki.cdb" );
-if ( file_exists( $iwCacheFile ) ) {
-   $wgInterwikiCache = $iwCacheFile;
+if ( file_exists( "$wmfConfigDir/interwiki.cdb" ) ) {
+   $wgInterwikiCache = "$wmfConfigDir/interwiki.cdb";
 }
-unset( $iwCacheFile );
 
 $wgEnotifUseJobQ = true;
 

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

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

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

[MediaWiki-commits] [Gerrit] Tweak pywikibot/wikibase jobs - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Tweak pywikibot/wikibase jobs
..


Tweak pywikibot/wikibase jobs

The software is not compatible with python3, hence for the jobs:

wikibot-wikibase-tox-flake8-py3-trusty
pywikibot-wikibase-tox-nose34-trusty

Make them non voting and comment them from gate-and-submit.

Remove tox-doc-trusty since there is no 'doc' env.

Add pywikibot-wikibase-tox-nose to gate-and-submit.

Change-Id: I137ddd8a390b775408dec122db2d15718378adfb
---
M zuul/layout.yaml
1 file changed, 10 insertions(+), 5 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c872137..249afb8 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1573,6 +1573,11 @@
   - name: pywikibot-core-tox-flake8-docstrings
 voting: false
 
+  - name: pywikibot-wikibase-tox-flake8-py3-trusty
+voting: false
+  - name: pywikibot-wikibase-tox-nose34-trusty
+voting: false
+
   # Exceptions for projects not yet passing pep8 or pyflakes
   #
   - name: operations-puppet-pep8
@@ -7769,15 +7774,15 @@
   - noop
 test:
   - 'tox-flake8'
-  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
   - 'pywikibot-wikibase-tox-nose'
+  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
   - 'pywikibot-wikibase-tox-nose34-trusty'
-  - 'tox-doc-trusty'
 gate-and-submit:
   - 'tox-flake8'
-  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
-  - 'pywikibot-wikibase-tox-nose34-trusty'
-  - 'tox-doc-trusty'
+  - 'pywikibot-wikibase-tox-nose'
+  # Non voting for now:
+  #- 'pywikibot-wikibase-tox-flake8-py3-trusty'
+  #- 'pywikibot-wikibase-tox-nose34-trusty'
 
   - name: qrpedia
 check-voter:

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

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

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

[MediaWiki-commits] [Gerrit] Remove useless padding-on-hover rule - change (mediawiki...MonoBook)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Remove useless padding-on-hover rule
..

Remove useless padding-on-hover rule

This only makes it more difficult to change the padding
of links in the personal tools, because you have to override
it twice.

Change-Id: Ic158f06b982deea250f15d3be2b3694078042a44
---
M main.css
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MonoBook 
refs/changes/66/238166/1

diff --git a/main.css b/main.css
index 7269573..4f29ee9 100644
--- a/main.css
+++ b/main.css
@@ -338,7 +338,6 @@
 
 #p-personal li a:hover {
background-color: white;
-   padding-bottom: .2em;
text-decoration: none;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic158f06b982deea250f15d3be2b3694078042a44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Openstack: Return the nova scheduler pool to normal. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Openstack:  Return the nova scheduler pool to normal.
..

Openstack:  Return the nova scheduler pool to normal.

Now that everything is running kilo, we can schedule on any
labvirt nodes.  Labvirt1005 is still left out, as it remains
the test box.

Change-Id: I6b23b9aa8432f216f5a4686baada736e42f23dec
---
M modules/openstack/templates/kilo/nova/nova.conf.erb
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/238169/1

diff --git a/modules/openstack/templates/kilo/nova/nova.conf.erb 
b/modules/openstack/templates/kilo/nova/nova.conf.erb
index 99e040e..771c15b 100644
--- a/modules/openstack/templates/kilo/nova/nova.conf.erb
+++ b/modules/openstack/templates/kilo/nova/nova.conf.erb
@@ -9,9 +9,7 @@
 instance_name_template=i-%08x
 daemonize=1
 scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler
-#wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009
-# Temporarily limit the pool to just labvirt1004 and 1009 until everything is 
moved to Kilo.
-wmf_scheduler_hosts_pool=labvirt1004, labvirt1009
+wmf_scheduler_hosts_pool=labvirt1001,labvirt1002,labvirt1003,labvirt1004,labvirt1006,labvirt1007,labvirt1008,labvirt1009
 
scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,SchedulerPoolFilter,DiskFilter
 
 # Don't allow duplicate instance names

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b23b9aa8432f216f5a4686baada736e42f23dec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Fix NPE in PageLoadPerformanceTests - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Fix NPE in PageLoadPerformanceTests
..

Fix NPE in PageLoadPerformanceTests

Minor refactoring of PageLoadPerformanceTests to replace member
variables with locals. CI reported a rare test failure[0] I hope the new
nonnullness guarantees fix.

[0] 
https://integration.wikimedia.org/ci/job/apps-android-wikipedia-test/20/artifact/logcat.txt/*view*/

Change-Id: I28aa725812e895d808628df8235fa05a76c336a7
---
M app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
1 file changed, 24 insertions(+), 22 deletions(-)


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

diff --git 
a/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
 
b/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
index 8c58de0..9377786 100644
--- 
a/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
+++ 
b/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
@@ -18,19 +18,7 @@
 public class PageLoadPerformanceTests extends 
ActivityInstrumentationTestCase2 {
 private static final int TASK_COMPLETION_TIMEOUT = (int) 
TimeUnit.SECONDS.toMillis(30);
 private static final int NUM_RUNS = 1; //50;
-private PageActivity activity;
-private CountDownLatch completionLatch;
-private PageFragment fragment;
-private String title;
-private MeasurementController measurement = new MeasurementController();
-
-private PageLoadCallbacks callback = new PageLoadCallbacks() {
-@Override
-public void onLoadComplete() {
-measurement.stop(title);
-completionLatch.countDown();
-}
-};
+private final MeasurementController measurement = new 
MeasurementController();
 
 public PageLoadPerformanceTests() {
 super(PageActivity.class);
@@ -39,7 +27,9 @@
 @Override
 protected void setUp() throws Exception {
 super.setUp();
-activity = getActivity();
+
+// Launch Activity.
+getActivity();
 }
 
 public void testLoadPages() throws Throwable {
@@ -51,24 +41,36 @@
 }
 
 private void loadPageMultipleTimes(String title) throws Throwable {
-this.title = title;
 for (int i = 0; i < NUM_RUNS; i++) {
-loadPageUi();
+loadPageUi(title);
 }
 }
 
-private void loadPageUi() throws Throwable {
-completionLatch = new CountDownLatch(1);
+private void loadPageUi(final String title) throws Throwable {
+final CountDownLatch latch = new CountDownLatch(1);
 getInstrumentation().runOnMainSync(new Runnable() {
 @Override
 public void run() {
-fragment = (PageFragment) activity.getTopFragment();
-fragment.setPageLoadCallbacks(callback);
+getFragment().setPageLoadCallbacks(newCallbacks(title, latch));
 
 measurement.start(title);
-PageLoadTests.loadPage(fragment, title);
+PageLoadTests.loadPage(getFragment(), title);
 }
 });
-assertTrue(completionLatch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
+assertTrue(latch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
+}
+
+private PageLoadCallbacks newCallbacks(final String title, final 
CountDownLatch latch) {
+return new PageLoadCallbacks() {
+@Override
+public void onLoadComplete() {
+measurement.stop(title);
+latch.countDown();
+}
+};
+}
+
+private PageFragment getFragment() {
+return (PageFragment) getActivity().getTopFragment();
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Migrate labs/toollabs to new debian glue job - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Migrate labs/toollabs to new debian glue job
..


Migrate labs/toollabs to new debian glue job

It went broken on our Trusty slaves due to the git plugin upgrade.
Migrate to the new debian-glue job.

debian/changelog points to 'unstable' which will be the 'sid' cowbuilder
image.

Bug: T110939
Change-Id: I594338d2d60263f60e9fc6471e88ce60b9b82d08
---
M jjb/labs.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 3 deletions(-)

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



diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index c7df18e..dba4fc6 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -13,8 +13,6 @@
 - project:
 name: 'labs-toollabs'
 jobs:
- - '{name}-debian-glue':
- distribution: trusty
  - '{name}-jslint'  # Unused?
 
 - project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 249afb8..e636770 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2247,7 +2247,7 @@
 
   - name: labs/toollabs
 test:
- - labs-toollabs-debian-glue
+ - debian-glue
  - phplint
 gate-and-submit:
  - phplint

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

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

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

[MediaWiki-commits] [Gerrit] Adding new journalnodes in prep for decomissioning analytics... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Adding new journalnodes in prep for decomissioning 
analytics1011 and analytics1019
..


Adding new journalnodes in prep for decomissioning analytics1011 and 
analytics1019

Bug: T112113
Change-Id: I669c27eba6cccbaa22a7688b55674857c38e434e
---
M manifests/role/analytics/hadoop.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/analytics/hadoop.pp 
b/manifests/role/analytics/hadoop.pp
index 1a40c21..c516bd6 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -87,8 +87,10 @@
 # JournalNodes are colocated on worker DataNodes.
 $journalnode_hosts= [
 'analytics1011.eqiad.wmnet',  # Row A2
+'analytics1052.eqiad.wmnet',  # Row A3
 'analytics1028.eqiad.wmnet',  # Row C2
 'analytics1019.eqiad.wmnet',  # Row D2
+'analytics1035.eqiad.wmnet',  # Row D2
 ]
 
 # analytics1011-analytics1020 have 12 mounts on disks sda - sdl.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I669c27eba6cccbaa22a7688b55674857c38e434e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
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] Adding new journalnodes in prep for decomissioning analytics... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Adding new journalnodes in prep for decomissioning 
analytics1011 and analytics1019
..

Adding new journalnodes in prep for decomissioning analytics1011 and 
analytics1019

Bug: T112113
Change-Id: I669c27eba6cccbaa22a7688b55674857c38e434e
---
M manifests/role/analytics/hadoop.pp
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/analytics/hadoop.pp 
b/manifests/role/analytics/hadoop.pp
index 1a40c21..c516bd6 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -87,8 +87,10 @@
 # JournalNodes are colocated on worker DataNodes.
 $journalnode_hosts= [
 'analytics1011.eqiad.wmnet',  # Row A2
+'analytics1052.eqiad.wmnet',  # Row A3
 'analytics1028.eqiad.wmnet',  # Row C2
 'analytics1019.eqiad.wmnet',  # Row D2
+'analytics1035.eqiad.wmnet',  # Row D2
 ]
 
 # analytics1011-analytics1020 have 12 mounts on disks sda - sdl.

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

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

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

[MediaWiki-commits] [Gerrit] Fix python3 basestring issue - change (pywikibot/wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Fix python3 basestring issue
..


Fix python3 basestring issue

Change-Id: I0afcfd607f576c7ac6a07bfadf6209e87f4317c7
---
M pywikibase/claim.py
M pywikibase/wikibasepage.py
M tests/test_itempage.py
M tests/test_propertypage.py
M tests/test_wikibasepage.py
M tox.ini
6 files changed, 17 insertions(+), 7 deletions(-)

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



diff --git a/pywikibase/claim.py b/pywikibase/claim.py
index 2758dd7..704625b 100644
--- a/pywikibase/claim.py
+++ b/pywikibase/claim.py
@@ -17,6 +17,11 @@
 from pywikibase import Property
 import pywikibase.itempage
 
+try:
+unicode = unicode
+except NameError:
+basestring = (str, bytes)
+
 
 class Claim(Property):
 
diff --git a/pywikibase/wikibasepage.py b/pywikibase/wikibasepage.py
index e8acb47..3bbbdf2 100644
--- a/pywikibase/wikibasepage.py
+++ b/pywikibase/wikibasepage.py
@@ -13,6 +13,11 @@
 
 import json
 
+try:
+unicode = unicode
+except NameError:
+basestring = (str, bytes)
+
 
 class WikibasePage(object):
 
diff --git a/tests/test_itempage.py b/tests/test_itempage.py
index cc692d4..24e2357 100644
--- a/tests/test_itempage.py
+++ b/tests/test_itempage.py
@@ -5,9 +5,9 @@
 from pywikibase import ItemPage, Claim
 
 try:
-basestring
+unicode = unicode
 except NameError:
-basestring = str
+basestring = (str, bytes)
 
 
 class TestItemPage(unittest.TestCase):
diff --git a/tests/test_propertypage.py b/tests/test_propertypage.py
index 7ff34c0..4a10420 100644
--- a/tests/test_propertypage.py
+++ b/tests/test_propertypage.py
@@ -2,9 +2,9 @@
 from pywikibase import PropertyPage, Claim
 
 try:
-basestring
+unicode = unicode
 except NameError:
-basestring = str
+basestring = (str, bytes)
 
 
 class TestPropertyPage(unittest.TestCase):
diff --git a/tests/test_wikibasepage.py b/tests/test_wikibasepage.py
index e9a5bd1..de1aa1c 100644
--- a/tests/test_wikibasepage.py
+++ b/tests/test_wikibasepage.py
@@ -5,9 +5,9 @@
 from pywikibase import WikibasePage, Claim
 
 try:
-basestring
+unicode = unicode
 except NameError:
-basestring = str
+basestring = (str, bytes)
 
 
 class TestWikibasePage(unittest.TestCase):
diff --git a/tox.ini b/tox.ini
index f609f1b..167d60d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,7 +30,7 @@
 basepython = python3
 commands =
 nosetests --version
-nosetests -v -a "!net" tests pywikiase
+nosetests -v -a "!net" tests pywikibase
 deps =
 nose
 six

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0afcfd607f576c7ac6a07bfadf6209e87f4317c7
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] python3 tests passes in pywikibot/wikibase, mark them voting - change (integration/config)

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: python3 tests passes in pywikibot/wikibase, mark them voting
..

python3 tests passes in pywikibot/wikibase, mark them voting

In change I0afcfd60 I fixed python 3 issues.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/78/238178/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e636770..9276ec5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1573,11 +1573,6 @@
   - name: pywikibot-core-tox-flake8-docstrings
 voting: false
 
-  - name: pywikibot-wikibase-tox-flake8-py3-trusty
-voting: false
-  - name: pywikibot-wikibase-tox-nose34-trusty
-voting: false
-
   # Exceptions for projects not yet passing pep8 or pyflakes
   #
   - name: operations-puppet-pep8
@@ -7780,9 +7775,8 @@
 gate-and-submit:
   - 'tox-flake8'
   - 'pywikibot-wikibase-tox-nose'
-  # Non voting for now:
-  #- 'pywikibot-wikibase-tox-flake8-py3-trusty'
-  #- 'pywikibot-wikibase-tox-nose34-trusty'
+  - 'pywikibot-wikibase-tox-flake8-py3-trusty'
+  - 'pywikibot-wikibase-tox-nose34-trusty'
 
   - name: qrpedia
 check-voter:

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

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

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

[MediaWiki-commits] [Gerrit] Update net-topology.py for Hadoop so that the default rack h... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Update net-topology.py for Hadoop so that the default rack has 
the same hierarchy as real nodes
..


Update net-topology.py for Hadoop so that the default rack has the same 
hierarchy as real nodes

Change-Id: I14c6a3f85297c00b0e1b27de40436dbaabf1b8c8
---
M templates/hadoop/net-topology.py.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/hadoop/net-topology.py.erb 
b/templates/hadoop/net-topology.py.erb
index 7a4eab7..8d9f6d4 100755
--- a/templates/hadoop/net-topology.py.erb
+++ b/templates/hadoop/net-topology.py.erb
@@ -69,4 +69,4 @@
 if not nodes.has_key(node):
 node = socket.getfqdn(node)
 
-print(nodes.get(node, '/default-rack'))
+print(nodes.get(node, '/eqiad/default/rack'))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14c6a3f85297c00b0e1b27de40436dbaabf1b8c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
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] Purge Varnish by filename - change (mediawiki/vagrant)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Purge Varnish by filename
..

Purge Varnish by filename

Purging the original or any thumbnail purges everything (original + thumbs)

Bug: T112532
Change-Id: I8d152a23c9080a6baf16c671f352dbb5f09257e3
---
M puppet/modules/varnish/templates/default.vcl.erb
1 file changed, 33 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/56/238156/1

diff --git a/puppet/modules/varnish/templates/default.vcl.erb 
b/puppet/modules/varnish/templates/default.vcl.erb
index 55536c3..f4719d4 100755
--- a/puppet/modules/varnish/templates/default.vcl.erb
+++ b/puppet/modules/varnish/templates/default.vcl.erb
@@ -28,6 +28,12 @@
 }
 <% end -%>
 
+# Copy the thumbnail URLs so that they create variants of the same object
+# By later adding X-Url to the Vary header
+if (req.url ~ "^/images/") {
+set req.http.X-Url = req.url;
+}
+
 # Since we expose varnish on the default port (6081) we need to rewrite
 # requests that are generated using the default wiki port (8080)
 # This needs to be done early because it's needed for PURGE calls
@@ -150,7 +156,7 @@
 }
 
 <% if @thumbor -%>
-# Thumbor doesn't even fine-grained config for the headers it returns
+# Thumbor doesn't do fine-grained config for the headers it returns
 if (req.url ~ "^/images/thumb/.*\.(jpg|png)") {
 unset resp.http.Cache-Control;
 unset resp.http.Expires;
@@ -160,6 +166,14 @@
 
 # Called after a document has been successfully retrieved from the backend.
 sub vcl_fetch {
+if (req.http.X-Url) {
+set beresp.http.X-Url = req.http.X-Url;
+if (!beresp.http.Vary) {
+set beresp.http.Vary = "X-Url";
+} elsif (beresp.http.Vary !~ "(?i)X-Url") {
+set beresp.http.Vary = beresp.http.Vary + ", X-Url";
+}
+}
 
 # set minimum timeouts to auto-discard stored objects
 #   set beresp.prefetch = -30s;
@@ -183,4 +197,22 @@
 if (req.http.Authorization && !beresp.http.Cache-Control ~ "public") {
 return(hit_for_pass);
 }
+}
+
+sub vcl_hash {
+# For thumbnails and originals we hash on the filename, to store them all 
under the same object. This will make purging any of them purge all of them.
+if (req.url ~ "^/images/thumb/") {
+hash_data("Image-" + regsub(req.url, 
"^/images/thumb/[^/]+/[^/]+/([^/]+)/[^/]+$", "\1"));
+} elsif (req.url ~ "^/images/") {
+hash_data("Image-" + regsub(req.url, "^/images/[^/]+/[^/]+/(.*)", 
"\1"));
+} else {
+hash_data(req.url);
+}
+
+if (req.http.host) {
+hash_data(req.http.host);
+} else {
+hash_data(server.ip);
+}
+return (hash);
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d152a23c9080a6baf16c671f352dbb5f09257e3
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] Fix tox env name: flake83 -> flake8-py3 - change (pywikibot/wikibase)

[Ladsgroup (Code Review)]

Ladsgroup has submitted this change and it was merged.

Change subject: Fix tox env name: flake83 -> flake8-py3
..


Fix tox env name: flake83 -> flake8-py3

Change-Id: Id51c55bd95ae4b02368848ab7f3f23c03b91ce11
---
M tox.ini
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/tox.ini b/tox.ini
index e52dfd4..f609f1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = flake8,flake83,flake8-docstrings,py26,py27,py34
+envlist = flake8,flake8-py3,flake8-docstrings,py26,py27,py34
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -28,7 +28,7 @@
 
 [testenv:nose34]
 basepython = python3
-commands = 
+commands =
 nosetests --version
 nosetests -v -a "!net" tests pywikiase
 deps =

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id51c55bd95ae4b02368848ab7f3f23c03b91ce11
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't load oojs-ui.styles on every page - change (mediawiki...Echo)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Don't load oojs-ui.styles on every page
..

Don't load oojs-ui.styles on every page

We don't really need it to render the no-JS version
of the notification badges (the only rule we were missing
was background-repeat: no-repeat;) and it significantly
increased the amount of render-blocking CSS.

This means we do need to call setupOOUI() ourselves
in order for our get_class( OOUI\Theme::singleton() ) hack
to keep working.

Bug: T112401
Change-Id: I148f8ac19dfe62cc84abe03e1a2ff00683d515c1
(cherry picked from commit b046a1062d0210f5ebc76c316c08d247079b82a1)
---
M Hooks.php
M modules/echo.mixins.less
M modules/nojs/mw.echo.badge.less
3 files changed, 2 insertions(+), 3 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index 75a3eb5..3d26498 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -591,10 +591,8 @@
// Load the styles for the Notifications badge
$out->addModuleStyles( array(
'ext.echo.nojs',
-   'oojs-ui.styles',
'oojs-ui.styles.icons-alerts'
) );
-   $out->enableOOUI();
}
 
return true;
@@ -653,6 +651,7 @@
 
// HACK: inverted icons only work in the "MediaWiki" OOUI theme
// Avoid flashes in skins that don't use it (T111821)
+   $sk->getOutput()->setupOOUI( strtolower( $sk->getSkinName() ), 
$sk->getOutput()->getLanguage()->getDir() );
$oouiImageClass = get_class( OOUI\Theme::singleton() ) === 
'OOUI\\MediaWikiTheme'
? 'oo-ui-image-invert'
: '';
diff --git a/modules/echo.mixins.less b/modules/echo.mixins.less
index 1f0f257..bef7264 100644
--- a/modules/echo.mixins.less
+++ b/modules/echo.mixins.less
@@ -8,6 +8,5 @@
color: white;
cursor: pointer;
text-decoration: none;
-   background-color: #d2d2d2;
margin-top: -0.2em;
 }
diff --git a/modules/nojs/mw.echo.badge.less b/modules/nojs/mw.echo.badge.less
index f074d52..242f5b1 100644
--- a/modules/nojs/mw.echo.badge.less
+++ b/modules/nojs/mw.echo.badge.less
@@ -20,6 +20,7 @@
background-position: ~"calc(100% - @{badge-padding}) 
center";
}
background-size: @badge-icon-size;
+   background-repeat: no-repeat;
 
&:hover,
&:active,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I148f8ac19dfe62cc84abe03e1a2ff00683d515c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.26wmf22
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Fix toggling initialization code - change (mediawiki...MobileFrontend)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

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

Change subject: Fix toggling initialization code
..

Fix toggling initialization code

If37a623 introduced a bug in the the toggling initialization code
wherein the page parameter of the toggle#enable function was added but
the client code was never updated.

Bug: T112538
Change-Id: I1166f725927d0564101c72bfad7c493e4d8e79c7
---
M resources/skins.minerva.toggling/init.js
1 file changed, 4 insertions(+), 3 deletions(-)


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

diff --git a/resources/skins.minerva.toggling/init.js 
b/resources/skins.minerva.toggling/init.js
index 97ee383..929952d 100644
--- a/resources/skins.minerva.toggling/init.js
+++ b/resources/skins.minerva.toggling/init.js
@@ -10,12 +10,13 @@
 * @method
 * @param {jQuery.Object} $container to enable toggling on
 * @param {String} prefix a prefix to use for the id.
+* @param {Page} The current page
 * @ignore
 */
-   function init( $container, prefix ) {
+   function init( $container, prefix, page ) {
// distinguish headings in content from other headings
$container.find( '> h1,> h2,> h3,> h4,> h5,> h6' ).addClass( 
'section-heading' );
-   toggle.enable( $container, prefix );
+   toggle.enable( $container, prefix, page );
}
 
// avoid this running on Watchlist
@@ -24,6 +25,6 @@
!mw.config.get( 'wgIsMainPage' ) &&
mw.config.get( 'wgAction' ) === 'view'
) {
-   init( $contentContainer, 'content-' );
+   init( $contentContainer, 'content-', page );
}
 }( mw.mobileFrontend, jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1166f725927d0564101c72bfad7c493e4d8e79c7
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] Support "standalone mode" for single-article conversion. - change (mediawiki...text_renderer)

[jenkins-bot (Code Review)]

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

Change subject: Support "standalone mode" for single-article conversion.
..


Support "standalone mode" for single-article conversion.

Change-Id: I1f53b0c811bfcbdf51317dfd622877f26763a4d4
---
M README.md
M bin/mw-ocg-texter
M lib/index.js
A lib/standalone.js
M package.json
5 files changed, 83 insertions(+), 8 deletions(-)

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



diff --git a/README.md b/README.md
index 3ac0613..521407a 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,16 @@
 bin/mw-ocg-texter --help
 ```
 
+## Standalone mode
+To convert a single article without the bundle creation step, use:
+```
+bin/mw-ocg-texter -h en.wikipedia.org -t "United States"
+```
+The `-h` option specifies the hostname of the wiki, and the `-t`
+option gives the title to convert.  The content will be fetched
+from RESTBase and converted, with output to standard out (unless
+the `-o` option is given).
+
 ## Other ideas
 This backend should implement the [Unicode Nearly Plain-Text Encoding of
 Mathematics](http://unicode.org/notes/tn28/UTN28-PlainTextMath-v3.pdf)
diff --git a/bin/mw-ocg-texter b/bin/mw-ocg-texter
index d1a1de5..b06c0e3 100755
--- a/bin/mw-ocg-texter
+++ b/bin/mw-ocg-texter
@@ -20,11 +20,16 @@
.option('-D, --debug',
'Turn on debugging features (eg, full stack traces on 
exceptions)')
.option('-T, --temporary-directory ',
-   'Use  for temporaries, not $TMPDIR or /tmp', null);
+   'Use  for temporaries, not $TMPDIR or /tmp', null)
+   .option('-h, --domain ',
+   'Wiki hostname to use to resolve the title 
[en.wikipedia.org]', null)
+   .option('-t, --title ',
+   'Don\'t use a bundle, download the given title 
instead.',
+   null);
 
 program.parse(process.argv);
 
-if (program.args.length === 0) {
+if (program.args.length === 0 && !program.title) {
console.error('A bundle filename or directory is required.');
return 1;
 }
@@ -73,7 +78,15 @@
log: log
 };
 
-texter.convert(options).catch(function(err) {
+var p;
+if (!program.title) {
+   p = texter.convert(options);
+} else {
+   options.domain = program.domain || 'en.wikipedia.org';
+   options.title = program.title;
+   p = require('../lib/standalone').convert(options);
+}
+p.catch(function(err) {
var msg = {
type: 'log',
level: 'error'
diff --git a/lib/index.js b/lib/index.js
index d01a1fa..9c20729 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -992,10 +992,10 @@

format.writeSummary(textEscape(metabook.summary).replace(/\s+/g, ' '));
}
 
-   var pdb = new Db(
+   var pdb = options.pdb || new Db(
path.join(builddir, 'bundle', 'parsoid.db'), { readonly: true }
);
-   var sidb = new Db(
+   var sidb = options.sidb || new Db(
path.join(builddir, 'bundle', 'siteinfo.db'), { readonly: true }
);
var write = {};
@@ -1006,7 +1006,9 @@
var document, base = '', articleLanguage;
var key = (item.wiki ? (item.wiki+'|') : '') + revid;
return pdb.get(key, 'nojson').then(function(data) {
-   document = domino.createDocument(data);
+   // avoid redundant parsing in standalone mode (which 
will
+   // return an object with a `document` property)
+   document = data.document || domino.createDocument(data);
var baseElem = document.querySelector('head > 
base[href]');
if (baseElem) {
base = baseElem.getAttribute('href').
@@ -1109,5 +,6 @@
 module.exports = {
name: json.name, // package name
version: json.version, // version # for this package
-   convert: convert
+   convert: convert,
+   generateOutput: generateOutput // for use by standalone.js
 };
diff --git a/lib/standalone.js b/lib/standalone.js
new file mode 100644
index 000..d6482ae
--- /dev/null
+++ b/lib/standalone.js
@@ -0,0 +1,46 @@
+"use strict";
+require('core-js/shim');
+var Promise = require('prfun');
+var main = require('./');
+var bundler = require('mw-ocg-bundler');
+
+var convert = module.exports.convert = function(options) {
+   // make metabook.
+   return bundler.metabook.fromArticles([{
+   prefix: options.prefix,
+   domain: options.domain,
+   title: options.title
+   }], options).then(function(metabook) {
+   var item = metabook.items[0];
+   var Parsoid = new bundler.parsoid(
+   metabook.wikis, options.apiVersion, options.log
+   );
+   var siteinfo = options.siteinfo || 

[MediaWiki-commits] [Gerrit] Migrate labs/toollabs to new debian glue job - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Migrate labs/toollabs to new debian glue job
..

Migrate labs/toollabs to new debian glue job

It went broken on our Trusty slaves due to the git plugin upgrade.
Migrate to the new debian-glue job.

debian/changelog points to 'unstable' which will be the 'sid' cowbuilder
image.

Bug: T110939
Change-Id: I594338d2d60263f60e9fc6471e88ce60b9b82d08
---
M jjb/labs.yaml
M zuul/layout.yaml
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/71/238171/1

diff --git a/jjb/labs.yaml b/jjb/labs.yaml
index c7df18e..dba4fc6 100644
--- a/jjb/labs.yaml
+++ b/jjb/labs.yaml
@@ -13,8 +13,6 @@
 - project:
 name: 'labs-toollabs'
 jobs:
- - '{name}-debian-glue':
- distribution: trusty
  - '{name}-jslint'  # Unused?
 
 - project:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 249afb8..e636770 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2247,7 +2247,7 @@
 
   - name: labs/toollabs
 test:
- - labs-toollabs-debian-glue
+ - debian-glue
  - phplint
 gate-and-submit:
  - phplint

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I594338d2d60263f60e9fc6471e88ce60b9b82d08
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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] Change a bunch of parsoid references to acknowledge that RES... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Change a bunch of parsoid references to acknowledge that 
RESTBase is sometimes in the middle
..

Change a bunch of parsoid references to acknowledge that RESTBase is sometimes 
in the middle

Bug: T112339
Change-Id: I0eac521a89fc399de168408ef55c9143c0db742a
---
M ApiVisualEditor.php
M ApiVisualEditorEdit.php
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/ve.init.mw.TargetLoader.js
4 files changed, 15 insertions(+), 15 deletions(-)


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

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 55e908e..8aada66 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -1,6 +1,6 @@
 header( 'X-Cache: ' . $rp );
}
} elseif ( $response['error'] !== '' ) {
-   $this->dieUsage( 'parsoidserver-http-error: ' . 
$response['error'], $response['error'] );
+   $this->dieUsage( 'docserver-http-error: ' . 
$response['error'], $response['error'] );
} else { // error null, code not 200
-   $this->dieUsage( 'parsoidserver-http: HTTP ' . 
$response['code'], $response['code'] );
+   $this->dieUsage( 'docserver-http: HTTP ' . 
$response['code'], $response['code'] );
}
return $response['body'];
}
@@ -347,7 +347,7 @@
array()
);
if ( $content === false ) {
-   $this->dieUsage( 'Error 
contacting the Parsoid server', 'parsoidserver' );
+   $this->dieUsage( 'Error 
contacting the document server', 'docserver' );
}
}
 
@@ -549,7 +549,7 @@
}
$content = $this->parseWikitextFragment( 
$title, $wikitext );
if ( $content === false ) {
-   $this->dieUsage( 'Error contacting the 
Parsoid server', 'parsoidserver' );
+   $this->dieUsage( 'Error contacting the 
document server', 'docserver' );
} else {
$result = array(
'result' => 'success',
@@ -570,7 +570,7 @@
}
$content = $this->postHTML( $title, 
$html, $parserParams );
if ( $content === false ) {
-   $this->dieUsage( 'Error 
contacting the Parsoid server', 'parsoidserver' );
+   $this->dieUsage( 'Error 
contacting the document server', 'docserver' );
}
}
$result = array( 'result' => 'success', 
'content' => $content );
@@ -585,7 +585,7 @@
} else {
$wikitext = $this->postHTML( $title, 
$html, $parserParams );
if ( $wikitext === false ) {
-   $this->dieUsage( 'Error 
contacting the Parsoid server', 'parsoidserver' );
+   $this->dieUsage( 'Error 
contacting the document server', 'docserver' );
}
}
 
@@ -608,7 +608,7 @@
case 'getlanglinks':
$langlinks = $this->getLangLinks( $title );
if ( $langlinks === false ) {
-   $this->dieUsage( 'Error querying 
MediaWiki API', 'parsoidserver' );
+   $this->dieUsage( 'Error querying 
MediaWiki API', 'api-langlinks-error' );
} else {
$result = array( 'result' => 'success', 
'langlinks' => $langlinks );
}
@@ -710,6 +710,6 @@
 * @deprecated since MediaWiki core 1.25
 */
public function getDescription() {
-   return 'Returns HTML5 for a page from the parsoid service.';
+   return 'Returns HTML5 for a page from RESTBase and the Parsoid 
service.';
}
 }
diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index aa09656..4c6a638 100644
--- a/ApiVisualEditorEdit.php
+++ 

[MediaWiki-commits] [Gerrit] Update net-topology.py for Hadoop so that the default rack h... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Update net-topology.py for Hadoop so that the default rack has 
the same hierarchy as real nodes
..

Update net-topology.py for Hadoop so that the default rack has the same 
hierarchy as real nodes

Change-Id: I14c6a3f85297c00b0e1b27de40436dbaabf1b8c8
---
M templates/hadoop/net-topology.py.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/238179/1

diff --git a/templates/hadoop/net-topology.py.erb 
b/templates/hadoop/net-topology.py.erb
index 7a4eab7..8d9f6d4 100755
--- a/templates/hadoop/net-topology.py.erb
+++ b/templates/hadoop/net-topology.py.erb
@@ -69,4 +69,4 @@
 if not nodes.has_key(node):
 node = socket.getfqdn(node)
 
-print(nodes.get(node, '/default-rack'))
+print(nodes.get(node, '/eqiad/default/rack'))

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

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

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

[MediaWiki-commits] [Gerrit] Stats: Fix the color for points in deletion graph - change (mediawiki...ContentTranslation)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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

Change subject: Stats: Fix the color for points in deletion graph
..

Stats: Fix the color for points in deletion graph

Change-Id: I5875dfa78817b46ab1db3f38d8f158611d83389f
---
M modules/stats/ext.cx.stats.js
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/stats/ext.cx.stats.js b/modules/stats/ext.cx.stats.js
index 7c72029..681bb9f 100644
--- a/modules/stats/ext.cx.stats.js
+++ b/modules/stats/ext.cx.stats.js
@@ -541,10 +541,10 @@
{
label: mw.msg( 'cx-trend-deletions' ),
strokeColor: '#FF',
-   pointColor: 'FF',
+   pointColor: '#FF',
pointStrokeColor: '#fff',
pointHighlightFill: '#fff',
-   pointHighlightStroke: 'FF',
+   pointHighlightStroke: '#FF',
data: $.map( 
this.languageDeletionTrend, function ( data ) {
return data[ type ];
} )

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

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

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

[MediaWiki-commits] [Gerrit] Git ignore: /*.egg-info - change (pywikibot/wikibase)

[Ladsgroup (Code Review)]

Ladsgroup has submitted this change and it was merged.

Change subject: Git ignore: /*.egg-info
..


Git ignore: /*.egg-info

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

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



diff --git a/.gitignore b/.gitignore
index 90a5959..a14d94d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.*~
 /.tox
 /*.egg
+/*.egg-info
 *pycache*
 build
 dist

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If0255f40a45c9ea9e898a3be1b85f0d8bd7a1791
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move default openstack version to Kilo - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Move default openstack version to Kilo
..

Move default openstack version to Kilo

Change-Id: Icbb86a5a79ee0794e1a401678eabd84ce7dbcee0
---
M hieradata/common/openstack.yaml
M hieradata/hosts/holmium.yaml
M hieradata/hosts/labcontrol1001.yaml
M hieradata/hosts/labnet1001.yaml
M hieradata/hosts/labnet1002.yaml
M hieradata/hosts/labvirt1002.yaml
M hieradata/hosts/labvirt1004.yaml
M hieradata/hosts/labvirt1005.yaml
M hieradata/hosts/labvirt1007.yaml
M hieradata/hosts/labvirt1008.yaml
M hieradata/hosts/labvirt1009.yaml
11 files changed, 1 insertion(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/238158/1

diff --git a/hieradata/common/openstack.yaml b/hieradata/common/openstack.yaml
index c283885..d2a8e69 100644
--- a/hieradata/common/openstack.yaml
+++ b/hieradata/common/openstack.yaml
@@ -1 +1 @@
-version: 'juno'
+version: 'kilo'
diff --git a/hieradata/hosts/holmium.yaml b/hieradata/hosts/holmium.yaml
index 3a073e0..4559a8a 100644
--- a/hieradata/hosts/holmium.yaml
+++ b/hieradata/hosts/holmium.yaml
@@ -1,2 +1 @@
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labcontrol1001.yaml 
b/hieradata/hosts/labcontrol1001.yaml
index 45892f2..8a2b9ee 100644
--- a/hieradata/hosts/labcontrol1001.yaml
+++ b/hieradata/hosts/labcontrol1001.yaml
@@ -1,3 +1,2 @@
 labs_ldap_dns_ip_override: 208.80.154.94
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labnet1001.yaml b/hieradata/hosts/labnet1001.yaml
index 3a073e0..4559a8a 100644
--- a/hieradata/hosts/labnet1001.yaml
+++ b/hieradata/hosts/labnet1001.yaml
@@ -1,2 +1 @@
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labnet1002.yaml b/hieradata/hosts/labnet1002.yaml
index 3a073e0..4559a8a 100644
--- a/hieradata/hosts/labnet1002.yaml
+++ b/hieradata/hosts/labnet1002.yaml
@@ -1,2 +1 @@
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1002.yaml b/hieradata/hosts/labvirt1002.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1002.yaml
+++ b/hieradata/hosts/labvirt1002.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1004.yaml b/hieradata/hosts/labvirt1004.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1004.yaml
+++ b/hieradata/hosts/labvirt1004.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1005.yaml b/hieradata/hosts/labvirt1005.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1005.yaml
+++ b/hieradata/hosts/labvirt1005.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1007.yaml b/hieradata/hosts/labvirt1007.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1007.yaml
+++ b/hieradata/hosts/labvirt1007.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1008.yaml b/hieradata/hosts/labvirt1008.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1008.yaml
+++ b/hieradata/hosts/labvirt1008.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1009.yaml b/hieradata/hosts/labvirt1009.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1009.yaml
+++ b/hieradata/hosts/labvirt1009.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbb86a5a79ee0794e1a401678eabd84ce7dbcee0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] Don't load oojs-ui.styles on every page - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Don't load oojs-ui.styles on every page
..


Don't load oojs-ui.styles on every page

We don't really need it to render the no-JS version
of the notification badges (the only rule we were missing
was background-repeat: no-repeat;) and it significantly
increased the amount of render-blocking CSS.

This means we do need to call setupOOUI() ourselves
in order for our get_class( OOUI\Theme::singleton() ) hack
to keep working.

Bug: T112401
Change-Id: I148f8ac19dfe62cc84abe03e1a2ff00683d515c1
---
M Hooks.php
M modules/echo.mixins.less
M modules/nojs/mw.echo.badge.less
3 files changed, 2 insertions(+), 3 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Hooks.php b/Hooks.php
index 75a3eb5..3d26498 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -591,10 +591,8 @@
// Load the styles for the Notifications badge
$out->addModuleStyles( array(
'ext.echo.nojs',
-   'oojs-ui.styles',
'oojs-ui.styles.icons-alerts'
) );
-   $out->enableOOUI();
}
 
return true;
@@ -653,6 +651,7 @@
 
// HACK: inverted icons only work in the "MediaWiki" OOUI theme
// Avoid flashes in skins that don't use it (T111821)
+   $sk->getOutput()->setupOOUI( strtolower( $sk->getSkinName() ), 
$sk->getOutput()->getLanguage()->getDir() );
$oouiImageClass = get_class( OOUI\Theme::singleton() ) === 
'OOUI\\MediaWikiTheme'
? 'oo-ui-image-invert'
: '';
diff --git a/modules/echo.mixins.less b/modules/echo.mixins.less
index 1f0f257..bef7264 100644
--- a/modules/echo.mixins.less
+++ b/modules/echo.mixins.less
@@ -8,6 +8,5 @@
color: white;
cursor: pointer;
text-decoration: none;
-   background-color: #d2d2d2;
margin-top: -0.2em;
 }
diff --git a/modules/nojs/mw.echo.badge.less b/modules/nojs/mw.echo.badge.less
index f074d52..242f5b1 100644
--- a/modules/nojs/mw.echo.badge.less
+++ b/modules/nojs/mw.echo.badge.less
@@ -20,6 +20,7 @@
background-position: ~"calc(100% - @{badge-padding}) 
center";
}
background-size: @badge-icon-size;
+   background-repeat: no-repeat;
 
&:hover,
&:active,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I148f8ac19dfe62cc84abe03e1a2ff00683d515c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] switch lvs[34]00x installer to jessie - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: switch lvs[34]00x installer to jessie
..


switch lvs[34]00x installer to jessie

Bug: T96375
Change-Id: I3e5307c9658a9d56e593cf8886ee63aa18f646c1
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index d995742..22ea4c9 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2828,41 +2828,57 @@
 host lvs3001 {
hardware ethernet 90:b1:1c:45:56:0d;
fixed-address lvs3001.esams.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs3002 {
hardware ethernet 90:b1:1c:57:3b:35;
fixed-address lvs3002.esams.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs3003 {
hardware ethernet 90:b1:1c:57:53:93;
fixed-address lvs3003.esams.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs3004 {
hardware ethernet 90:b1:1c:57:5f:2a;
fixed-address lvs3004.esams.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs4001 {
hardware ethernet 90:b1:1c:42:f0:9e;
fixed-address lvs4001.ulsfo.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs4002 {
hardware ethernet 90:b1:1c:45:51:ef;
fixed-address lvs4002.ulsfo.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs4003 {
hardware ethernet 90:b1:1c:45:5d:91;
fixed-address lvs4003.ulsfo.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host lvs4004 {
hardware ethernet 90:b1:1c:42:c3:7a;
fixed-address lvs4004.ulsfo.wmnet;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
 host maerlant {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e5307c9658a9d56e593cf8886ee63aa18f646c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (pywikibot/wikibase)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Jenkins job validation (DO NOT SUBMIT)
..

Jenkins job validation (DO NOT SUBMIT)

Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
---
A JENKINS
A jenkins-testfile.py
A jenkins.erb
A jenkins.js
A jenkins.php
A jenkins.pp
A jenkins.rb
7 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/63/238163/1

diff --git a/JENKINS b/JENKINS
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/JENKINS
diff --git a/jenkins-testfile.py b/jenkins-testfile.py
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins-testfile.py
diff --git a/jenkins.erb b/jenkins.erb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.erb
diff --git a/jenkins.js b/jenkins.js
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.js
diff --git a/jenkins.php b/jenkins.php
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.php
diff --git a/jenkins.pp b/jenkins.pp
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.pp
diff --git a/jenkins.rb b/jenkins.rb
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/jenkins.rb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cbfadb4363df19f3a3ff6819280e5ccbedc50b9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/wikibase
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] Don't load oojs-ui.styles on every page - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Don't load oojs-ui.styles on every page
..


Don't load oojs-ui.styles on every page

We don't really need it to render the no-JS version
of the notification badges (the only rule we were missing
was background-repeat: no-repeat;) and it significantly
increased the amount of render-blocking CSS.

This means we do need to call setupOOUI() ourselves
in order for our get_class( OOUI\Theme::singleton() ) hack
to keep working.

Bug: T112401
Change-Id: I148f8ac19dfe62cc84abe03e1a2ff00683d515c1
(cherry picked from commit b046a1062d0210f5ebc76c316c08d247079b82a1)
---
M Hooks.php
M modules/echo.mixins.less
M modules/nojs/mw.echo.badge.less
3 files changed, 2 insertions(+), 3 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index 75a3eb5..3d26498 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -591,10 +591,8 @@
// Load the styles for the Notifications badge
$out->addModuleStyles( array(
'ext.echo.nojs',
-   'oojs-ui.styles',
'oojs-ui.styles.icons-alerts'
) );
-   $out->enableOOUI();
}
 
return true;
@@ -653,6 +651,7 @@
 
// HACK: inverted icons only work in the "MediaWiki" OOUI theme
// Avoid flashes in skins that don't use it (T111821)
+   $sk->getOutput()->setupOOUI( strtolower( $sk->getSkinName() ), 
$sk->getOutput()->getLanguage()->getDir() );
$oouiImageClass = get_class( OOUI\Theme::singleton() ) === 
'OOUI\\MediaWikiTheme'
? 'oo-ui-image-invert'
: '';
diff --git a/modules/echo.mixins.less b/modules/echo.mixins.less
index 1f0f257..bef7264 100644
--- a/modules/echo.mixins.less
+++ b/modules/echo.mixins.less
@@ -8,6 +8,5 @@
color: white;
cursor: pointer;
text-decoration: none;
-   background-color: #d2d2d2;
margin-top: -0.2em;
 }
diff --git a/modules/nojs/mw.echo.badge.less b/modules/nojs/mw.echo.badge.less
index f074d52..242f5b1 100644
--- a/modules/nojs/mw.echo.badge.less
+++ b/modules/nojs/mw.echo.badge.less
@@ -20,6 +20,7 @@
background-position: ~"calc(100% - @{badge-padding}) 
center";
}
background-size: @badge-icon-size;
+   background-repeat: no-repeat;
 
&:hover,
&:active,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I148f8ac19dfe62cc84abe03e1a2ff00683d515c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.26wmf22
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Maps fix - removed info windows for markers without a title - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Maps fix - removed info windows for markers without a title
..

Maps fix - removed info windows for markers without a title

Also a smaller fix involving a global variable.

Change-Id: Ie33248545b3926d609d51291ca06f01943aee05f
---
M libs/ext.cargo.maps.js
1 file changed, 27 insertions(+), 21 deletions(-)


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

diff --git a/libs/ext.cargo.maps.js b/libs/ext.cargo.maps.js
index 5b51fbe..240d186 100644
--- a/libs/ext.cargo.maps.js
+++ b/libs/ext.cargo.maps.js
@@ -98,9 +98,11 @@
var infoWindows = [];
var numItems = this.allItemValues.length;
for ( i = 0; i < numItems; i++ ) {
-   infoWindows[i] = new google.maps.InfoWindow({
-   content: CargoMap.createPopupHTMLForRow( 
this.allItemValues[i] )
-   });
+   if ( this.allItemValues[i]['title'] != null ) {
+   infoWindows[i] = new google.maps.InfoWindow({
+   content: CargoMap.createPopupHTMLForRow( 
this.allItemValues[i] )
+   });
+   }
}
 
if ( doMarkerClustering ) {
@@ -123,12 +125,14 @@
markers.push( marker );
}
 
-   google.maps.event.addListener(marker, 'click', function() {
-   for ( i = 0; i < numItems; i++ ) {
-   infoWindows[i].close();
-   }
-   infoWindows[this.itemNum].open(map,this);
-   });
+   if ( curItem['title'] != null ) {
+   google.maps.event.addListener(marker, 'click', 
function() {
+   for ( i = 0; i < numItems; i++ ) {
+   infoWindows[i].close();
+   }
+   infoWindows[this.itemNum].open(map,this);
+   });
+   }
}
if ( doMarkerClustering ) {
var mc = new MarkerClusterer( map, markers );
@@ -185,17 +189,19 @@
}
markers.addMarker( marker );
 
-   marker.events.register( 'mousedown', feature, function(evt) {
-   if (this.popup == null ) {
-   this.popup = this.createPopup( true );
-   map.addPopup( this.popup );
-   this.popup.show();
-   } else {
-   this.popup.toggle();
-   }
-   currentPopup = this.popup;
-   OpenLayers.Event.stop( evt );
-   });
+   if ( curItem['title'] != null ) {
+   marker.events.register( 'mousedown', feature, 
function(evt) {
+   if (this.popup == null ) {
+   this.popup = this.createPopup( true );
+   map.addPopup( this.popup );
+   this.popup.show();
+   } else {
+   this.popup.toggle();
+   }
+   currentPopup = this.popup;
+   OpenLayers.Event.stop( evt );
+   });
+   }
}
 }
 
@@ -205,7 +211,7 @@
var valuesForMap = jQuery.parseJSON(mapDataText);
var mappingService = 
$(this).find(".cargoMapData").attr('mappingService');
var zoomLevel = $(this).find(".cargoMapData").attr('zoom');
-   var doMarkerClustering = valuesForMap.length >= 
wgCargoMapClusteringMinimum;
+   var doMarkerClustering = valuesForMap.length >= mw.config.get( 
'wgCargoMapClusteringMinimum' );
var cargoMap = new CargoMap( valuesForMap, $(this).attr('id'), 
zoomLevel );
cargoMap.display( mappingService, doMarkerClustering );
});

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie33248545b3926d609d51291ca06f01943aee05f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 

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

[MediaWiki-commits] [Gerrit] Fix flake8 errors for python2.x - change (pywikibot/wikibase)

[Ladsgroup (Code Review)]

Ladsgroup has submitted this change and it was merged.

Change subject: Fix flake8 errors for python2.x
..


Fix flake8 errors for python2.x

Change-Id: I1e5dbe353809961bfa897d22834e5651c5b97c8f
---
M pywikibase/claim.py
M pywikibase/wbproperty.py
M pywikibase/wbtime.py
M pywikibase/wikibasepage.py
M tests/test_itempage.py
M tests/test_wikibasepage.py
6 files changed, 9 insertions(+), 7 deletions(-)

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



diff --git a/pywikibase/claim.py b/pywikibase/claim.py
index 1c77732..2758dd7 100644
--- a/pywikibase/claim.py
+++ b/pywikibase/claim.py
@@ -17,6 +17,7 @@
 from pywikibase import Property
 import pywikibase.itempage
 
+
 class Claim(Property):
 
 """
@@ -145,7 +146,6 @@
 
 def __eq__(self, other):
 return other.toJSON() == self.toJSON()
-
 
 def toJSON(self):
 """
diff --git a/pywikibase/wbproperty.py b/pywikibase/wbproperty.py
index 15ed20b..f4363ab 100644
--- a/pywikibase/wbproperty.py
+++ b/pywikibase/wbproperty.py
@@ -33,7 +33,7 @@
 it subclasses this Property class, but a claim does not have Page like
 behaviour and semantics.
 """
-from pywikibase.itempage import ItemPage # noqa
+from pywikibase.itempage import ItemPage  # noqa
 types = {'wikibase-item': ItemPage,
  'string': basestring,
  'commonsMedia': basestring,
diff --git a/pywikibase/wbtime.py b/pywikibase/wbtime.py
index 7f38ad8..6fa8de8 100644
--- a/pywikibase/wbtime.py
+++ b/pywikibase/wbtime.py
@@ -18,6 +18,7 @@
 except NameError:
 long = int
 
+
 class WbTime(object):
 
 """A Wikibase time representation."""
diff --git a/pywikibase/wikibasepage.py b/pywikibase/wikibasepage.py
index 7b64ffc..e8acb47 100644
--- a/pywikibase/wikibasepage.py
+++ b/pywikibase/wikibasepage.py
@@ -25,7 +25,6 @@
 def __eq__(self, other):
 return other.id == self.id
 
-
 def get(self, content=None):
 """
 Fetch all page data, and cache it.
diff --git a/tests/test_itempage.py b/tests/test_itempage.py
index ffd6147..35a3372 100644
--- a/tests/test_itempage.py
+++ b/tests/test_itempage.py
@@ -1,5 +1,4 @@
 import unittest
-import codecs
 import json
 import os
 
@@ -10,10 +9,12 @@
 except NameError:
 basestring = str
 
+
 class TestWikibasePage(unittest.TestCase):
 
 def setUp(self):
-with open(os.path.join(os.path.split(__file__)[0], 'data', 
'Q7251.wd')) as f:
+with open(os.path.join(os.path.split(__file__)[0],
+   'data', 'Q7251.wd')) as f:
 self._content = json.load(f)['entities']['Q7251']
 self.item_page = ItemPage()
 self.item_page.get(content=self._content)
diff --git a/tests/test_wikibasepage.py b/tests/test_wikibasepage.py
index 8369556..e9a5bd1 100644
--- a/tests/test_wikibasepage.py
+++ b/tests/test_wikibasepage.py
@@ -1,5 +1,4 @@
 import unittest
-import codecs
 import json
 import os
 
@@ -10,10 +9,12 @@
 except NameError:
 basestring = str
 
+
 class TestWikibasePage(unittest.TestCase):
 
 def setUp(self):
-with open(os.path.join(os.path.split(__file__)[0], 'data', 
'Q7251.wd')) as f:
+with open(os.path.join(os.path.split(__file__)[0],
+   'data', 'Q7251.wd')) as f:
 self._content = json.load(f)['entities']['Q7251']
 self.wb_page = WikibasePage()
 self.wb_page.get(content=self._content)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e5dbe353809961bfa897d22834e5651c5b97c8f
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/wikibase
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] for wmf reimage script, don't rotate saltmaster aes key on m... - change (operations/puppet)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: for wmf reimage script, don't rotate saltmaster aes key on 
minion key deletion
..

for wmf reimage script, don't rotate saltmaster aes key on minion key deletion

Change-Id: Iab20e6b8856dcde076c5080d44f00ba83798c216
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/238164/1

diff --git a/modules/puppetmaster/files/wmf-reimage 
b/modules/puppetmaster/files/wmf-reimage
index a26b4b3..8a98686 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -35,9 +35,9 @@
 # ask confirmation later about unaccepted keys
 if salt-key --list accepted | fgrep -q ${nodename}; then
 if [ ${force_yes} -eq 1 ]; then
-salt-key -y --delete ${nodename}
+salt-key -y --rotate-aes-key= --delete ${nodename}
 else
-salt-key --delete ${nodename}
+salt-key --rotate-aes-key= --delete ${nodename}
 fi
 fi
 # salt-key --delete above exits 0 regardless, double check

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

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

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

[MediaWiki-commits] [Gerrit] VisualEditor: Ignore id when getting hash object - change (mediawiki...Math)

[Tchanders (Code Review)]

Tchanders has uploaded a new change for review.

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

Change subject: VisualEditor: Ignore id when getting hash object
..

VisualEditor: Ignore id when getting hash object

Because the id doesn't affect the rendering of a
math node, it is not needed in the hash object.
Also removed event listner from the id input for
the same reason.

Bug: T112466
Change-Id: I4da07cb7c112ce9ab449a060132856a2d054e57f
---
M modules/VisualEditor/ve.ce.MWMathNode.js
M modules/VisualEditor/ve.dm.MWMathNode.js
M modules/VisualEditor/ve.ui.MWMathInspector.js
3 files changed, 18 insertions(+), 3 deletions(-)


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

diff --git a/modules/VisualEditor/ve.ce.MWMathNode.js 
b/modules/VisualEditor/ve.ce.MWMathNode.js
index aa523a9..4b6bacd 100644
--- a/modules/VisualEditor/ve.ce.MWMathNode.js
+++ b/modules/VisualEditor/ve.ce.MWMathNode.js
@@ -34,7 +34,9 @@
 
 /* Methods */
 
-/** */
+/**
+ * @inheritdoc
+ */
 ve.ce.MWMathNode.prototype.onSetup = function () {
// Parent method
ve.ce.MWMathNode.super.prototype.onSetup.call( this );
diff --git a/modules/VisualEditor/ve.dm.MWMathNode.js 
b/modules/VisualEditor/ve.dm.MWMathNode.js
index 116efe6..7a20fad 100644
--- a/modules/VisualEditor/ve.dm.MWMathNode.js
+++ b/modules/VisualEditor/ve.dm.MWMathNode.js
@@ -33,6 +33,21 @@
 
 ve.dm.MWMathNode.static.extensionName = 'math';
 
+/* Methods */
+
+/**
+ * @inheritdoc
+ */
+ve.dm.MWMathNode.static.getHashObject = function ( dataElement ) {
+   // Parent method
+   var hashObject = ve.dm.MWMathNode.super.static.getHashObject.call( 
this, dataElement );
+   // The id does not affect the rendering.
+   if ( hashObject.mw.attrs ) {
+   delete hashObject.mw.attrs.id;
+   }
+   return hashObject;
+};
+
 /* Registration */
 
 ve.dm.modelRegistry.register( ve.dm.MWMathNode );
diff --git a/modules/VisualEditor/ve.ui.MWMathInspector.js 
b/modules/VisualEditor/ve.ui.MWMathInspector.js
index d00644e..ecc866d 100644
--- a/modules/VisualEditor/ve.ui.MWMathInspector.js
+++ b/modules/VisualEditor/ve.ui.MWMathInspector.js
@@ -98,7 +98,6 @@
var display = this.selectedNode.getAttribute( 'mw' 
).attrs.display || 'default';
this.displaySelect.selectItemByData( display );
this.displaySelect.on( 'choose', this.onChangeHandler );
-   this.idInput.on( 'change', this.onChangeHandler );
}, this );
 };
 
@@ -109,7 +108,6 @@
return ve.ui.MWMathInspector.super.prototype.getTeardownProcess.call( 
this, data )
.first( function () {
this.displaySelect.off( 'choose', this.onChangeHandler 
);
-   this.idInput.off( 'change', this.onChangeHandler );
}, this );
 };
 

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

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

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

[MediaWiki-commits] [Gerrit] Generic debian-glue - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Generic debian-glue
..


Generic debian-glue

Creates debian-glue

Always end up selection jessie as the cowbuilder image ...

When checking out a reference, the Jenkins Git plugin set GIT_BRANCH to
detached.  That causes an issue in debian-glue 0.13.0, work around it by
using a local branch named ZUUL_REF and overriding GIT_BRANCH.

Set the distribution from debian/changelog

Change-Id: Id1f86648eaf2704338d89b365144d5ca06dc4a61
---
M jjb/operations-debs.yaml
1 file changed, 45 insertions(+), 1 deletion(-)

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



diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index ff5e0e7..d1347be 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -70,7 +70,7 @@
   - debian-glue-lintian
   - debian-glue-piuparts
 
-publishers:
+publishers: 
   - junit:
   results: 'lintian-*.xml'
   - tap:
@@ -78,6 +78,50 @@
   - archive:
   artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,lintian-*.txt,lintian-*.xml,piuparts.txt,piuparts.tap'
 
+- job-template:
+name: 'debian-glue'
+defaults: use-remoteonly-zuul
+node: DebianGlue && DebianJessie
+concurrent: false
+triggers:
+- zuul
+
+scm:
+ - git:
+url: '$ZUUL_URL/$ZUUL_PROJECT'
+branches:
+ - '$ZUUL_COMMIT'
+refspec: '$ZUUL_REF'
+# Git plugin would set GIT_BRANCH=detached which confuses debian glue
+# Will override it as a workaround
+local-branch: $ZUUL_REF
+basedir: 'source'
+wipe-workspace: true
+shallow-clone: true
+submodule:
+disable: true
+builders:
+- shell: |
+# GIT_BRANCH is set to 'detached' :-(
+export GIT_BRANCH="$ZUUL_REF"
+/usr/bin/generate-git-snapshot
+- shell: |
+# Skip repository setup
+export BUILD_ONLY=yes
+
+export distribution=$(dpkg-parsechangelog --show-field 
distribution -lsource/debian/changelog)
+echo "Distribution set from debian/changelog to $distribution"
+
+/usr/bin/build-and-provide-package
+- debian-glue-lintian
+- debian-glue-piuparts
+publishers: *debian-glue-publishers
+
+- project:
+name: 'debian-glue'
+jobs:
+- 'debian-glue'
+
 #
 # PROJECTS
 #

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

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

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

[MediaWiki-commits] [Gerrit] Move default openstack version to Kilo - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Move default openstack version to Kilo
..


Move default openstack version to Kilo

Change-Id: Icbb86a5a79ee0794e1a401678eabd84ce7dbcee0
---
M hieradata/common/openstack.yaml
M hieradata/hosts/holmium.yaml
M hieradata/hosts/labcontrol1001.yaml
M hieradata/hosts/labnet1001.yaml
M hieradata/hosts/labnet1002.yaml
M hieradata/hosts/labvirt1002.yaml
M hieradata/hosts/labvirt1004.yaml
M hieradata/hosts/labvirt1005.yaml
M hieradata/hosts/labvirt1007.yaml
M hieradata/hosts/labvirt1008.yaml
M hieradata/hosts/labvirt1009.yaml
11 files changed, 1 insertion(+), 11 deletions(-)

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



diff --git a/hieradata/common/openstack.yaml b/hieradata/common/openstack.yaml
index c283885..d2a8e69 100644
--- a/hieradata/common/openstack.yaml
+++ b/hieradata/common/openstack.yaml
@@ -1 +1 @@
-version: 'juno'
+version: 'kilo'
diff --git a/hieradata/hosts/holmium.yaml b/hieradata/hosts/holmium.yaml
index 3a073e0..4559a8a 100644
--- a/hieradata/hosts/holmium.yaml
+++ b/hieradata/hosts/holmium.yaml
@@ -1,2 +1 @@
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labcontrol1001.yaml 
b/hieradata/hosts/labcontrol1001.yaml
index 45892f2..8a2b9ee 100644
--- a/hieradata/hosts/labcontrol1001.yaml
+++ b/hieradata/hosts/labcontrol1001.yaml
@@ -1,3 +1,2 @@
 labs_ldap_dns_ip_override: 208.80.154.94
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labnet1001.yaml b/hieradata/hosts/labnet1001.yaml
index 3a073e0..4559a8a 100644
--- a/hieradata/hosts/labnet1001.yaml
+++ b/hieradata/hosts/labnet1001.yaml
@@ -1,2 +1 @@
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labnet1002.yaml b/hieradata/hosts/labnet1002.yaml
index 3a073e0..4559a8a 100644
--- a/hieradata/hosts/labnet1002.yaml
+++ b/hieradata/hosts/labnet1002.yaml
@@ -1,2 +1 @@
 cluster: virt
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1002.yaml b/hieradata/hosts/labvirt1002.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1002.yaml
+++ b/hieradata/hosts/labvirt1002.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1004.yaml b/hieradata/hosts/labvirt1004.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1004.yaml
+++ b/hieradata/hosts/labvirt1004.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1005.yaml b/hieradata/hosts/labvirt1005.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1005.yaml
+++ b/hieradata/hosts/labvirt1005.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1007.yaml b/hieradata/hosts/labvirt1007.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1007.yaml
+++ b/hieradata/hosts/labvirt1007.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1008.yaml b/hieradata/hosts/labvirt1008.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1008.yaml
+++ b/hieradata/hosts/labvirt1008.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo
diff --git a/hieradata/hosts/labvirt1009.yaml b/hieradata/hosts/labvirt1009.yaml
index fac61c2..0f97ce9 100644
--- a/hieradata/hosts/labvirt1009.yaml
+++ b/hieradata/hosts/labvirt1009.yaml
@@ -1,2 +1 @@
 role::nova::compute::instance_dev: "/dev/sdb1"
-openstack::version: kilo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbb86a5a79ee0794e1a401678eabd84ce7dbcee0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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 useless padding-on-hover rule - change (mediawiki...MonoBook)

[jenkins-bot (Code Review)]

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

Change subject: Remove useless padding-on-hover rule
..


Remove useless padding-on-hover rule

This only makes it more difficult to change the padding
of links in the personal tools, because you have to override
it twice.

Change-Id: Ic158f06b982deea250f15d3be2b3694078042a44
---
M main.css
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/main.css b/main.css
index 7269573..4f29ee9 100644
--- a/main.css
+++ b/main.css
@@ -338,7 +338,6 @@
 
 #p-personal li a:hover {
background-color: white;
-   padding-bottom: .2em;
text-decoration: none;
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic158f06b982deea250f15d3be2b3694078042a44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move lib/TimeFormatterParserRoundtripTest to repo - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Move lib/TimeFormatterParserRoundtripTest to repo
..


Move lib/TimeFormatterParserRoundtripTest to repo

Lib can not use a repo class, but repo can use lib classes.

Change-Id: Iae7aa0e08d1ef7a464e355c592868b18e8c8626a
---
R repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/tests/phpunit/TimeFormatterParserRoundtripTest.php 
b/repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php
similarity index 100%
rename from lib/tests/phpunit/TimeFormatterParserRoundtripTest.php
rename to 
repo/tests/phpunit/includes/Parsers/TimeFormatterParserRoundtripTest.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae7aa0e08d1ef7a464e355c592868b18e8c8626a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
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] Add Thalia Chan to V+2'ers - change (integration/config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Add Thalia Chan to V+2'ers
..

Add Thalia Chan to V+2'ers

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/76/238176/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 249afb8..242cf23 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -157,6 +157,7 @@
 | stefan\.petrea@gmail\.com
 | sucheta\.ghoshal@gmail\.com
 | tamaraslosarek@gmail\.com
+| thalia\.e\.chan@googlemail\.com
 | thomaspt@hotmail\.fr
 | tim@tim-landscheidt\.de
 | trevorparscal@gmail\.com
@@ -356,6 +357,7 @@
- ^se4598@gmx\.de$
- ^skizzerz@gmail\.com$
- ^s7eph4n@gmail\.org$ # Foxtrott
+   - ^thalia\.e\.chan@googlemail\.com$ # Thalia Chan
- ^thomaspt@hotmail\.fr$
- ^at\.light@live\.com\.au$ # This, that and the other
- ^tomasz@twkozlowski\.com$

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

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

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