[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update weblinks in comments from HTTP to HTTPS

[Fomafix (Code Review)]

Fomafix has uploaded a new change for review.

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

Change subject: Update weblinks in comments from HTTP to HTTPS
..

Update weblinks in comments from HTTP to HTTPS

Use HTTPS instead of HTTP where the HTTP link is a redirect to the HTTPS link.

Also update some defect links.

Change-Id: Ic3a5eac910d098ed5c2a21e9f47c9b6ee06b2643
---
M includes/AjaxResponse.php
M includes/DefaultSettings.php
M includes/FormOptions.php
M includes/GlobalFunctions.php
M includes/Html.php
M includes/MediaWikiServices.php
M includes/MimeMagic.php
M includes/OutputPage.php
M includes/Sanitizer.php
M includes/WebRequest.php
M includes/WebRequestUpload.php
M includes/api/ApiMain.php
M includes/api/ApiRsd.php
M includes/cache/localisation/LCStoreCDB.php
M includes/db/DatabaseMssql.php
M includes/export/XmlDumpWriter.php
M includes/filebackend/lockmanager/MySqlLockManager.php
M includes/installer/MssqlInstaller.php
M includes/installer/PhpBugTests.php
M includes/jobqueue/JobQueueDB.php
M includes/jobqueue/JobRunner.php
M includes/libs/MultiHttpClient.php
M includes/libs/Timing.php
M includes/libs/filebackend/FileBackend.php
M includes/libs/filebackend/SwiftFileBackend.php
M includes/libs/jsminplus.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabaseMysqlBase.php
M includes/libs/rdbms/database/DatabasePostgres.php
M includes/libs/rdbms/database/DatabaseSqlite.php
M includes/libs/rdbms/database/IDatabase.php
M includes/libs/rdbms/database/position/MySQLMasterPos.php
M includes/libs/rdbms/lbfactory/LBFactory.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
M includes/libs/time/ConvertibleTimestamp.php
M includes/mail/UserMailer.php
M includes/media/MediaHandler.php
M includes/media/XCF.php
M includes/page/WikiPage.php
M includes/pager/TablePager.php
M includes/resourceloader/ResourceLoader.php
M includes/specials/SpecialUploadStash.php
M includes/tidy/RaggettInternalPHP.php
M includes/user/User.php
M includes/utils/UIDGenerator.php
M maintenance/archives/patch-img_media_type.sql
M maintenance/dev/includes/router.php
M maintenance/findHooks.php
M maintenance/jsduck/external.js
M maintenance/language/digit2html.php
M maintenance/mssql/tables.sql
M maintenance/mwdoc-filter.php
M maintenance/rebuildLocalisationCache.php
M maintenance/sqlite/archives/searchindex-fts3.sql
M maintenance/tables.sql
M resources/src/jquery/jquery.byteLimit.js
M tests/parser/parserTests.txt
M tests/phpunit/includes/HttpTest.php
M tests/phpunit/includes/SampleTest.php
M tests/phpunit/includes/installer/DatabaseUpdaterTest.php
M tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
M tests/phpunit/suites/ParserTestTopLevelSuite.php
63 files changed, 163 insertions(+), 163 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/315679/1

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 4fe46dd..0686578 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -161,7 +161,7 @@
// For back-compat, it is supported that mResponseCode 
be a string like " 200 OK"
// (with leading space and the status message after). 
Cast response code to an integer
// to take advantage of PHP's conversion rules which 
will turn "  200 OK" into 200.
-   // 
http://php.net/string#language.types.string.conversion
+   // 
https://secure.php.net/manual/en/language.types.string.php#language.types.string.conversion
$n = intval( trim( $this->mResponseCode ) );
HttpStatus::header( $n );
}
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2ae33b2..7cdd7c3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -311,7 +311,7 @@
  * Value for the referrer policy meta tag.
  * One of 'never', 'default', 'origin', 'always'. Setting it to false just
  * prevents the meta tag from being output.
- * See http://www.w3.org/TR/referrer-policy/ for details.
+ * See https://www.w3.org/TR/referrer-policy/ for details.
  *
  * @since 1.25
  */
@@ -658,7 +658,7 @@
 
 /**
  * Show Exif data, on by default if available.
- * Requires PHP's Exif extension: http://www.php.net/manual/en/ref.exif.php
+ * Requires PHP's Exif extension: https://secure.php.net/manual/en/ref.exif.php
  *
  * @note FOR WINDOWS USERS:
  * To enable Exif functions, add the following line to the "Windows
@@ -1511,7 +1511,7 @@
  * For now we recommend you use djvudump instead. The djvuxml output is
  * probably more stable, so we'll switch back to it as soon as they fix
  * the efficiency problem.
- * 
http://sourceforge.net/tracker/index.php?func=detail=1704049_id=32953=406583
+ * 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSExtensionManager: Added a fallback when extension got pref...

[Pwirth (Code Review)]

Pwirth has uploaded a new change for review.

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

Change subject: BSExtensionManager: Added a fallback when extension got prefixed
..

BSExtensionManager: Added a fallback when extension got prefixed

* Backwards compatibility: extensions will have a BlueSice prefix in the future

Change-Id: I9aa9a30642577aadadff9666c6f0e8e4ff5b4732
---
M includes/ExtensionManager.class.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/includes/ExtensionManager.class.php 
b/includes/ExtensionManager.class.php
index c5d530a..c8c5720 100644
--- a/includes/ExtensionManager.class.php
+++ b/includes/ExtensionManager.class.php
@@ -191,6 +191,12 @@
 
public static function getExtension( $name ) {
wfProfileIn( 'Performance: ' . __METHOD__ );
+   //Backwards compatibility: extensions will have a BlueSice 
prefix in
+   //the future
+   if ( isset( self::$prRunningExtensions["BlueSpice$name"] ) ) {
+   //TODO: Add a wfDeprecated( __METHOD__, 'next BS 
Version' );
+   return self::$prRunningExtensions["BlueSpice$name"];
+   }
if ( isset( self::$prRunningExtensions[$name] ) ) {
return self::$prRunningExtensions[$name];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aa9a30642577aadadff9666c6f0e8e4ff5b4732
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix aspect assert in SpecialEntityUsageTest

[jenkins-bot (Code Review)]

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

Change subject: Fix aspect assert in SpecialEntityUsageTest
..


Fix aspect assert in SpecialEntityUsageTest

This fails on travis, see for example:
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/167356525

Change-Id: Ib9cd4779d625cd4076a4404f3346a8b9cd41c50f
---
M client/tests/phpunit/includes/Specials/SpecialEntityUsageTest.php
1 file changed, 14 insertions(+), 3 deletions(-)

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



diff --git a/client/tests/phpunit/includes/Specials/SpecialEntityUsageTest.php 
b/client/tests/phpunit/includes/Specials/SpecialEntityUsageTest.php
index df6093e..794289e 100644
--- a/client/tests/phpunit/includes/Specials/SpecialEntityUsageTest.php
+++ b/client/tests/phpunit/includes/Specials/SpecialEntityUsageTest.php
@@ -106,25 +106,36 @@
$special->prepareParams( 'Q3' );
$res = $special->reallyDoQuery( 50 );
$values = [];
+   $expectedUsages = [
+   [ 'L.de' ],
+   [ 'S', 'O' ],
+   ];
 
+   $i = 0;
foreach ( $res as $row ) {
$values[] = [
$row->value,
$row->namespace,
$row->title,
-   $row->aspects,
$row->eu_page_id
];
+
+   $this->assertUsageAspects( $expectedUsages[$i++], 
$row->aspects );
}
 
$expected = [
-   [ '22', '0', 'Berlin', 'L.de', '22' ],
-   [ '11', '0', 'Vienna', 'O|S', '11' ],
+   [ '22', '0', 'Berlin', '22' ],
+   [ '11', '0', 'Vienna', '11' ],
];
 
$this->assertSame( $expected, $values );
}
 
+   private function assertUsageAspects( $expected, $aspectsString ) {
+   // The aspects are not ordered, so don't take this into account 
when asserting
+   $this->assertArrayEquals( $expected, explode( '|', 
$aspectsString ), false );
+   }
+
private function addReallyDoQueryData() {
$db = wfGetDB( DB_MASTER );
$dump = [

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

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

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

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

[Marostegui (Code Review)]

Marostegui has uploaded a new change for review.

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

Change subject: db-eqiad.php: Repool db1068
..

db-eqiad.php: Repool db1068

db1068 was out for maintenance (ALTER table) now pool it back but leave db1081
there to make sure db1068 gets back slowly.
Once it is been there for some time I will remove db1081 from the API
service and restore its normal weight for general traffic

Bug: T147305
Change-Id: I16e0f0bea1e3afb092bbcd10e33c3fb138bf214b
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 17221aa..591d592 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -133,7 +133,7 @@
'db1056' => 1,   # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1059' => 1,   # 2.8TB  96GB, api
'db1064' => 0,   # 2.8TB 160GB, vslow, dump
-#  'db1068' => 1,   # 2.8TB 160GB, api
+   'db1068' => 1,   # 2.8TB 160GB, api
'db1081' => 250, # 3.6TB 512GB, api
'db1084' => 500, # 3.6TB 512GB
'db1091' => 500, # 3.6TB 512GB
@@ -327,7 +327,7 @@
],
'api' => [
'db1059' => 1,
-#  'db1068' => 3,
+   'db1068' => 3,
'db1081' => 3,
],
'watchlist' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1068 for maintenance"

[jenkins-bot (Code Review)]

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

Change subject: Revert "db-eqiad.php: Depool db1068 for maintenance"
..


Revert "db-eqiad.php: Depool db1068 for maintenance"

This reverts commit 2c851bddf1e48ab911e69b04b0f8229fb61fb4a6.

db1068 has finished its maintenance and it is ready to get repooled.

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 17221aa..93456cd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -133,8 +133,8 @@
'db1056' => 1,   # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1059' => 1,   # 2.8TB  96GB, api
'db1064' => 0,   # 2.8TB 160GB, vslow, dump
-#  'db1068' => 1,   # 2.8TB 160GB, api
-   'db1081' => 250, # 3.6TB 512GB, api
+   'db1068' => 1,   # 2.8TB 160GB, api
+   'db1081' => 500, # 3.6TB 512GB
'db1084' => 500, # 3.6TB 512GB
'db1091' => 500, # 3.6TB 512GB
],
@@ -327,8 +327,7 @@
],
'api' => [
'db1059' => 1,
-#  'db1068' => 3,
-   'db1081' => 3,
+   'db1068' => 3,
],
'watchlist' => [
'db1056' => 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2dd41748f29be2338c716f69fb83d2ee56b981f8
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Wait for pointers to finish moving in browsertests

[jenkins-bot (Code Review)]

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

Change subject: Wait for pointers to finish moving in browsertests
..


Wait for pointers to finish moving in browsertests

This will avoid checking pointer data prematurely when
they are still moving and the diff was not reloaded yet.

Change-Id: I3c29a43940e40b7c338a00b3520e5aa6b237ea4a
---
M tests/browser/features/pointers.feature
M tests/browser/features/support/pages/diff_page.rb
M tests/browser/features/support/step_definitions/pointers.rb
3 files changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/tests/browser/features/pointers.feature 
b/tests/browser/features/pointers.feature
index 6f812e8..4cf45fd 100644
--- a/tests/browser/features/pointers.feature
+++ b/tests/browser/features/pointers.feature
@@ -37,6 +37,7 @@
 And I wait until the diff has loaded
 And I click on revision 1 to move the upper pointer
 And I wait until the diff has loaded
+And I wait until the pointers stopped moving
 Then the lower pointer should be on revision 1
 And the upper pointer should be on revision 3
 And revision 1 should be loaded on the left of the diff
diff --git a/tests/browser/features/support/pages/diff_page.rb 
b/tests/browser/features/support/pages/diff_page.rb
index 1dc11d7..b483c2f 100644
--- a/tests/browser/features/support/pages/diff_page.rb
+++ b/tests/browser/features/support/pages/diff_page.rb
@@ -59,6 +59,18 @@
 true
   end
 
+  def wait_for_animations
+sleep_period = 0.25
+max_timeout_seconds = 2
+timeout_loops = (max_timeout_seconds / sleep_period).to_i
+
+while execute_script('return $(\':animated\').length') != 0 && 
timeout_loops > 0
+  sleep(sleep_period)
+  timeout_loops -= 1
+end
+true
+  end
+
   def wait_for_diff_to_load
 wait_until do
   !revisionslider_loading?
diff --git a/tests/browser/features/support/step_definitions/pointers.rb 
b/tests/browser/features/support/step_definitions/pointers.rb
index d73073f..d1e714b 100644
--- a/tests/browser/features/support/step_definitions/pointers.rb
+++ b/tests/browser/features/support/step_definitions/pointers.rb
@@ -26,6 +26,10 @@
   step 'the diff has loaded'
 end
 
+When(/^I wait until the pointers stopped moving$/) do
+  on(DiffPage).wait_for_animations
+end
+
 Then(/^revision (\d+) should be loaded on the left of the diff$/) do |index|
   expect(on(DiffPage).revisionslider_left_summary_element.text).to include 
"RS-Summary-" + index.to_s
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c29a43940e40b7c338a00b3520e5aa6b237ea4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Introduce DataAccessSnakFormatterFactory::newRichWikitextSna...

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Introduce 
DataAccessSnakFormatterFactory::newRichWikitextSnakFormatter
..

Introduce DataAccessSnakFormatterFactory::newRichWikitextSnakFormatter

This is a first step towards implementing new functionality
that uses FORMAT_WIKI, instead of escaped plain text.

This is not yet used anywhere, but we need this to a) test
the new output format and b) to introduce the new Lua functionality
and parser functions.

Note: We might want to consider renaming EscapingSnakFormatter to
WrappedSnakFormatter or something similar.

Bug: T142940
Change-Id: Id96d335bcbc207f0f7265b62b8483ed715931b3e
---
M client/includes/DataAccess/DataAccessSnakFormatterFactory.php
M 
client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
M 
client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterOutputFormatTest.php
3 files changed, 110 insertions(+), 11 deletions(-)


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

diff --git a/client/includes/DataAccess/DataAccessSnakFormatterFactory.php 
b/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
index e8f97a9..b32a959 100644
--- a/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
+++ b/client/includes/DataAccess/DataAccessSnakFormatterFactory.php
@@ -70,6 +70,36 @@
Language $language,
UsageAccumulator $usageAccumulator
) {
+   return $this->newSnakFormatter( 'escaped-plaintext', $language, 
$usageAccumulator );
+   }
+
+   /**
+* This returns a SnakFormatter that will return "rich" wikitext.
+*
+* @param Language $language
+* @param UsageAccumulator $usageAccumulator
+*
+* @return SnakFormatter
+*/
+   public function newRichWikitextSnakFormatter(
+   Language $language,
+   UsageAccumulator $usageAccumulator
+   ) {
+   return $this->newSnakFormatter( 'rich-wikitext', $language, 
$usageAccumulator );
+   }
+
+   /**
+* @param string $type
+* @param Language $language
+* @param UsageAccumulator $usageAccumulator
+*
+* @return SnakFormatter
+*/
+   private function newSnakFormatter(
+   $type,
+   Language $language,
+   UsageAccumulator $usageAccumulator
+   ) {
$fallbackChain = 
$this->languageFallbackChainFactory->newFromLanguage(
$language,
LanguageFallbackChainFactory::FALLBACK_ALL
@@ -80,7 +110,11 @@
SnakFormatter::OPT_LANG => $language->getCode(),
] );
 
-   $snakFormatter = $this->getPlainTextSnakFormatterForOptions( 
$options );
+   if ( $type === 'rich-wikitext' ) {
+   $snakFormatter = 
$this->getRichWikitextSnakFormatterForOptions( $options );
+   } else {
+   $snakFormatter = 
$this->getPlainTextSnakFormatterForOptions( $options );
+   }
 
return new UsageTrackingSnakFormatter(
$snakFormatter,
@@ -96,6 +130,28 @@
 * @param FormatterOptions $options
 * @return BinaryOptionDispatchingSnakFormatter
 */
+   private function getRichWikitextSnakFormatterForOptions( 
FormatterOptions $options ) {
+   $snakFormatter = $this->snakFormatterFactory->getSnakFormatter(
+   SnakFormatter::FORMAT_PLAIN,
+   $options
+   );
+
+   return new EscapingSnakFormatter(
+   SnakFormatter::FORMAT_PLAIN,
+   $snakFormatter,
+   function( $str ) {
+   return "$str";
+   }
+   );
+   }
+
+   /**
+* Our output format is basically wikitext escaped plain text, except
+* for URLs, these are not wikitext escaped.
+*
+* @param FormatterOptions $options
+* @return BinaryOptionDispatchingSnakFormatter
+*/
private function getPlainTextSnakFormatterForOptions( FormatterOptions 
$options ) {
$plainTextSnakFormatter = 
$this->snakFormatterFactory->getSnakFormatter(
SnakFormatter::FORMAT_PLAIN,
diff --git 
a/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
 
b/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
index c1792aa..cac963b 100644
--- 
a/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
+++ 
b/client/tests/phpunit/includes/DataAccess/DataAccessSnakFormatterFactoryTest.php
@@ -26,10 +26,10 @@
  */
 class DataAccessSnakFormatterFactoryTest 

[MediaWiki-commits] [Gerrit] operations/dns[master]: Moving db1053 to row A, updating dns entries(T147774), at sa...

[Cmjohnson (Code Review)]

Cmjohnson has submitted this change and it was merged.

Change subject: Moving db1053 to row A, updating dns entries(T147774), at same 
time removing dns entries for decom host db1010 (T129395)
..


Moving db1053 to row A, updating dns entries(T147774), at same time removing 
dns entries for decom host db1010 (T129395)

Change-Id: Ia195f19deeca6c2666f342bda1a95b8a97186363
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 5 insertions(+), 9 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index c7e377c..6ccfef2 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -248,7 +248,7 @@
 11  1H IN PTR   kafka1001.eqiad.wmnet.
 12  1H IN PTR   pc1004.eqiad.wmnet.
 13  1H IN PTR   db1009.eqiad.wmnet.
-14  1H IN PTR   db1010.eqiad.wmnet.
+
 15  1H IN PTR   db1011.eqiad.wmnet.
 16  1H IN PTR   scb1001.eqiad.wmnet.
 17  1H IN PTR   rcs1002.eqiad.wmnet.
@@ -320,7 +320,7 @@
 84  1H IN PTR   mc1023.eqiad.wmnet.
 85  1H IN PTR   elastic1044.eqiad.wmnet.
 86  1H IN PTR   elastic1045.eqiad.wmnet.
-
+87  1H IN PTR   db1053.eqiad.wmnet.
 91  1H IN PTR   db1079.eqiad.wmnet.
 92  1H IN PTR   db1080.eqiad.wmnet.
 93  1H IN PTR   db1081.eqiad.wmnet.
@@ -694,7 +694,7 @@
 20  1H IN PTR   neodymium.eqiad.wmnet.
 21  1H IN PTR   db1051.eqiad.wmnet.
 22  1H IN PTR   db1052.eqiad.wmnet.
-23  1H IN PTR   db1053.eqiad.wmnet.
+
 24  1H IN PTR   db1054.eqiad.wmnet.
 25  1H IN PTR   db1055.eqiad.wmnet.
 26  1H IN PTR   db1056.eqiad.wmnet.
@@ -2181,8 +2181,7 @@
 8   1H IN PTR   wmf3083.mgmt.eqiad.wmnet.
 9   1H IN PTR   db1009.mgmt.eqiad.wmnet.
 9   1H IN PTR   wmf3082.mgmt.eqiad.wmnet.
-10  1H IN PTR   db1010.mgmt.eqiad.wmnet.
-10  1H IN PTR   wmf3081.mgmt.eqiad.wmnet.
+
 11  1H IN PTR   db1011.mgmt.eqiad.wmnet.
 11  1H IN PTR   wmf3080.mgmt.eqiad.wmnet.
 12  1H IN PTR   stat1002.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index a815531..898c1fc 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -254,7 +254,6 @@
 db1029  1H  IN A10.64.16.18
 db1030  1H  IN A10.64.16.19
 db1031  1H  IN A10.64.16.20
-
 db1033  1H  IN A10.64.16.22
 db1034  1H  IN A10.64.16.23
 db1035  1H  IN A10.64.16.24
@@ -275,7 +274,7 @@
 db1050  1H  IN A10.64.16.145
 db1051  1H  IN A10.64.32.21
 db1052  1H  IN A10.64.32.22
-db1053  1H  IN A10.64.32.23
+db1053  1H  IN A10.64.0.87
 db1054  1H  IN A10.64.32.24
 db1055  1H  IN A10.64.32.25
 db1056  1H  IN A10.64.32.26
@@ -1148,8 +1147,6 @@
 WMF3083 1H  IN A10.65.6.8
 db1009  1H  IN A10.65.6.9
 WMF3082 1H  IN A10.65.6.9
-db1010  1H  IN A10.65.6.10
-WMF3081 1H  IN A10.65.6.10
 db1011  1H  IN A10.65.6.11
 WMF3080 1H  IN A10.65.6.11
 stat10021H  IN A10.65.6.12

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db1053 update IP

[jenkins-bot (Code Review)]

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

Change subject: db1053 update IP
..


db1053 update IP

db1053 has been moved to a different rack and thus it got a different IP
so I am upgrading the files with the new IP it got

Bug: T147774
Change-Id: If7eccbb7839c6183ccad95c4e3bf152c6f25dac0
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 6da0ff4..9a36bad 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -450,7 +450,7 @@
'db1050' => '10.64.16.145', #do not remove or comment out
'db1051' => '10.64.32.21', #do not remove or comment out
'db1052' => '10.64.32.22', #do not remove or comment out
-   'db1053' => '10.64.32.23', #do not remove or comment out
+   'db1053' => '10.64.0.87', #do not remove or comment out
'db1054' => '10.64.32.24', #do not remove or comment out
'db1055' => '10.64.32.25', #do not remove or comment out
'db1056' => '10.64.32.26', #do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 93456cd..8d81471 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -471,7 +471,7 @@
'db1050' => '10.64.16.145', #do not remove or comment out
'db1051' => '10.64.32.21', #do not remove or comment out
'db1052' => '10.64.32.22', #do not remove or comment out
-   'db1053' => '10.64.32.23', #do not remove or comment out
+   'db1053' => '10.64.0.87', #do not remove or comment out
'db1054' => '10.64.32.24', #do not remove or comment out
'db1055' => '10.64.32.25', #do not remove or comment out
'db1056' => '10.64.32.26', #do not remove or comment out

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7eccbb7839c6183ccad95c4e3bf152c6f25dac0
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] data-values/value-view[master]: Add search() integration test for jquery.ui.commonssuggester

[WMDE]

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

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

Change subject: Add search() integration test for jquery.ui.commonssuggester
..

Add search() integration test for jquery.ui.commonssuggester

Bug: T147917
Change-Id: I53d2584f50dc04f8c4107656e8becab367545699
---
M lib/jquery.ui/jquery.ui.commonssuggester.js
M tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js
M tests/lib/jquery.ui/jquery.ui.suggester.tests.js
3 files changed, 44 insertions(+), 9 deletions(-)


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

diff --git a/lib/jquery.ui/jquery.ui.commonssuggester.js 
b/lib/jquery.ui/jquery.ui.commonssuggester.js
index 6979cf5..2720637 100644
--- a/lib/jquery.ui/jquery.ui.commonssuggester.js
+++ b/lib/jquery.ui/jquery.ui.commonssuggester.js
@@ -14,6 +14,14 @@
 * @constructor
 */
$.widget( 'ui.commonssuggester', $.ui.suggester, {
+
+   /**
+* @see jQuery.ui.suggester.options
+*/
+   options: {
+   ajax: $.ajax
+   },
+
/**
 * @inheritdoc
 * @protected
@@ -37,7 +45,7 @@
return function( term ) {
var deferred = $.Deferred();
 
-   $.ajax( {
+   self.options.ajax( {
url: 
'https://commons.wikimedia.org/w/api.php',
dataType: 'jsonp',
data: {
diff --git a/tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js 
b/tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js
index 54b0d77..fa779ec 100644
--- a/tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js
+++ b/tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js
@@ -5,11 +5,15 @@
 ( function( $, QUnit ) {
'use strict';
 
-   var newTestSuggester = function() {
+   /**
+* @param {Object} [options]
+* @return {jQuery}
+*/
+   var newTestSuggester = function( options ) {
return $( '' )
.addClass( 'test_suggester' )
.appendTo( 'body' )
-   .commonssuggester();
+   .commonssuggester( options );
};
 
QUnit.module( 'jquery.ui.commonssuggester', {
@@ -73,16 +77,38 @@
// Do not do anything with invalid URL encoding
'1%': '1%',
'title=1%.jpg': 'title=1%.jpg'
-   };
+   },
+   numberOfTestCases = Object.keys( testCases ).length;
 
-   assert.expect( Object.keys( testCases ).length );
+   assert.expect( numberOfTestCases );
 
-   for ( var input in testCases ) {
-   var actual = suggester._grepFileTitleFromTerm( input ),
-   expected = testCases[input];
+   $.each( testCases, function( input, expected ) {
+   var actual = suggester._grepFileTitleFromTerm( input );
 
assert.strictEqual( actual, expected );
-   }
+   } );
+   } );
+
+   QUnit.test( 'search integration', function( assert ) {
+   assert.expect( 2 );
+   var $suggester = newTestSuggester( { ajax: function( options ) {
+   var response = [ , [] ];
+
+   response[1]._requestTerm = options.data.search;
+
+   return $.Deferred().resolve( response 
).promise();
+   } } ),
+   suggester = $suggester.data( 'commonssuggester' ),
+   input = 'title=Foo/Bar',
+   done = assert.async();
+
+   $suggester.val( input );
+   suggester.search().done( function( suggestions, term ) {
+   assert.strictEqual( suggestions._requestTerm, 'Bar' );
+   assert.strictEqual( term, input );
+
+   done();
+   } );
} );
 
 }( jQuery, QUnit ) );
diff --git a/tests/lib/jquery.ui/jquery.ui.suggester.tests.js 
b/tests/lib/jquery.ui/jquery.ui.suggester.tests.js
index 7be3e36..51cf201 100644
--- a/tests/lib/jquery.ui/jquery.ui.suggester.tests.js
+++ b/tests/lib/jquery.ui/jquery.ui.suggester.tests.js
@@ -17,6 +17,7 @@
 * Factory creating a jQuery.ui.suggester widget suitable for testing.
 *
 * @param {Object} [options]
+* @return {jQuery}
 */
var newTestSuggester = function( options ) {
options = $.extend( {

-- 
To view, visit 

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Fix order when executing pointer update

[jenkins-bot (Code Review)]

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

Change subject: Fix order when executing pointer update
..


Fix order when executing pointer update

This should always happen before updating the diff.

Change-Id: Icf6b52c3495e42e188bfa5d5307f91d0558cc7a4
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index 090ceac..afc8335 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -205,15 +205,15 @@
revId1, revId2;
mw.track( 
'counter.MediaWiki.RevisionSlider.event.pointerMove' );
pointer.setPosition( 
self.slider.getFirstVisibleRevisionIndex() + relativeIndex );
+   self.updatePointerPositionAttributes();

self.resetPointerStylesBasedOnPosition();

self.resetRevisionStylesBasedOnPointerPosition( $revisions );
 
revId1 = self.getRevElementAtPosition( 
$revisions, self.pointerOlder.getPosition() ).data( 'revid' );
+
revId2 = self.getRevElementAtPosition( 
$revisions, self.pointerNewer.getPosition() ).data( 'revid' );
 
self.refreshRevisions( revId1, revId2 );
-
-   self.updatePointerPositionAttributes();
 
$( '.mw-revslider-revision-wrapper' 
).removeClass( 'mw-revslider-pointer-cursor' );
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf6b52c3495e42e188bfa5d5307f91d0558cc7a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix incomplete JSDoc blocks

[WMDE]

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

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

Change subject: Fix incomplete JSDoc blocks
..

Fix incomplete JSDoc blocks

Change-Id: I543969108d68417967faa96f90231a6d6d19821a
---
M lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
M lib/resources/wikibase.Site.js
M view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
M 
view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
M view/resources/jquery/wikibase/jquery.wikibase.pagesuggester.js
M view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
M view/resources/wikibase/wikibase.RevisionStore.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.pagesuggester.tests.js
8 files changed, 44 insertions(+), 2 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
index aa096f4..baabe35 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
@@ -268,6 +268,10 @@
 
/**
 * @see jQuery.ui.suggester._createMenuItemFromSuggestion
+*
+* @param {string} suggestion
+* @param {string} requestTerm
+* @return {jQuery.wikibase.siteselector.Item}
 */
_createMenuItemFromSuggestion: function( suggestion, 
requestTerm ) {
return new $.wikibase.siteselector.Item(
diff --git a/lib/resources/wikibase.Site.js b/lib/resources/wikibase.Site.js
index b555aff..7bb75f3 100644
--- a/lib/resources/wikibase.Site.js
+++ b/lib/resources/wikibase.Site.js
@@ -24,7 +24,9 @@
/**
 * Returns the sites id.
 *
-* @since 0.4 (
+* @since 0.4
+*
+* @return {string}
 */
getId: function() {
return this._siteDetails.id;
diff --git a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js 
b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
index 1b7ca24..14860d5 100644
--- a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
+++ b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
@@ -121,6 +121,8 @@
 
/**
 * Returns whether the widget is in edit mode.
+*
+* @return {boolean}
 */
isInEditMode: function() {
return this.element.hasClass( 'wb-edit' );
diff --git 
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
 
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index fa3fd5d..b09693b 100644
--- 
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++ 
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -331,7 +331,7 @@
 
/**
 * @param {jQuery} $this
-* @param {int} previousTop
+* @param {number} previousTop
 * @private
 */
_scrollUp: function( $this, previousTop ) {
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.pagesuggester.js 
b/view/resources/jquery/wikibase/jquery.wikibase.pagesuggester.js
index 7b5189f..a8b1df0 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.pagesuggester.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.pagesuggester.js
@@ -114,6 +114,10 @@
 
/**
 * @see jQuery.ui.suggester._createMenuItemFromSuggestion
+*
+* @param {string} suggestion
+* @param {string} requestTerm
+* @return {jQuery.ui.ooMenu.Item}
 */
_createMenuItemFromSuggestion: function( suggestion, requestTerm ) {
return new $.ui.ooMenu.Item(
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
index 01eebf0..4110dfc 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
@@ -167,6 +167,11 @@
 
/**
 * Starts the widget's edit mode.
+*
+* @return {Object} jQuery.Promise
+* No resolved parameters.
+* Rejected parameters:
+* - {Error}
 */
_startEditing: function() {
return this._listview.startEditing();
diff --git a/view/resources/wikibase/wikibase.RevisionStore.js 
b/view/resources/wikibase/wikibase.RevisionStore.js
index d8ece36..9bcbe59 100644
--- a/view/resources/wikibase/wikibase.RevisionStore.js
+++ b/view/resources/wikibase/wikibase.RevisionStore.js
@@ -29,6 +29,8 @@
 $.extend( SELF.prototype, {
/**
 * Returns the base revision id.

[MediaWiki-commits] [Gerrit] data-values/value-view[master]: Allow pasting full Wikimedia Commons URLs

[jenkins-bot (Code Review)]

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

Change subject: Allow pasting full Wikimedia Commons URLs
..


Allow pasting full Wikimedia Commons URLs

Slashes are never allowed in file names. This reduces full URLs to the
pure file name, when at least two characters are left.

Bug: T147917
Change-Id: Id8c6907f3a1b4301bdbf5f76240c0b8bfc75c8ee
---
M lib/jquery.ui/jquery.ui.commonssuggester.js
A tests/lib/jquery.ui/jquery.ui.commonssuggester.tests.js
M tests/lib/resources.php
3 files changed, 120 insertions(+), 2 deletions(-)

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



diff --git a/lib/jquery.ui/jquery.ui.commonssuggester.js 
b/lib/jquery.ui/jquery.ui.commonssuggester.js
index 89819a9..6979cf5 100644
--- a/lib/jquery.ui/jquery.ui.commonssuggester.js
+++ b/lib/jquery.ui/jquery.ui.commonssuggester.js
@@ -32,6 +32,8 @@
 * @return {Function}
 */
_initDefaultSource: function() {
+   var self = this;
+
return function( term ) {
var deferred = $.Deferred();
 
@@ -39,14 +41,14 @@
url: 
'https://commons.wikimedia.org/w/api.php',
dataType: 'jsonp',
data: {
-   search: term,
+   search: 
self._grepFileTitleFromTerm( term ),
action: 'opensearch',
namespace: 6
},
timeout: 8000
} )
.done( function( response ) {
-   deferred.resolve( response[1], 
response[0] );
+   deferred.resolve( response[1], term );
} )
.fail( function( jqXHR, textStatus ) {
// Since this is a JSONP request, this 
will always fail with a timeout...
@@ -58,6 +60,25 @@
},
 
/**
+* @private
+*
+* @param {string} term
+* @return {string}
+*/
+   _grepFileTitleFromTerm: function( term ) {
+   try {
+   // Make sure there are always at least 2 
characters left
+   return decodeURIComponent( term
+   .replace( 
/^[^#]*\btitle=([^

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensionInfo: Using real url from extension.json if exists

[Pwirth (Code Review)]

Pwirth has uploaded a new change for review.

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

Change subject: BSExtensionInfo: Using real url from extension.json if exists
..

BSExtensionInfo: Using real url from extension.json if exists

Change-Id: I455a49e8f4712feba81ff3a60bd1627a606a21ed
---
M ExtensionInfo/includes/ViewExtensionInfoTable.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/ExtensionInfo/includes/ViewExtensionInfoTable.php 
b/ExtensionInfo/includes/ViewExtensionInfoTable.php
index 4b9ae5a..53323ae 100644
--- a/ExtensionInfo/includes/ViewExtensionInfoTable.php
+++ b/ExtensionInfo/includes/ViewExtensionInfoTable.php
@@ -101,12 +101,14 @@
 * @return string The URL that points to the aproppriate helpdesk entry.
 */
private function getHelpdeskUrl( $aExtensionInfo ) {
+   if( !empty( $aExtensionInfo['url'] ) ) {
+   return $aExtensionInfo['url'];
+   }
//(09.05.2012)PW: added helpdeskurls to mI18n-files
//$baseUrl = 
BsConfig::get('MW::ExtensionInfo::HelpdeskBaseUrl');
$baseUrl = 'http://help.blue-spice.org/index.php';
$sExtensionName = $aExtensionInfo['name'];
-   $sUrl = $baseUrl . '/' . $sExtensionName;
-   return $sUrl;
+   return "$baseUrl/$sExtensionName";
}
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I455a49e8f4712feba81ff3a60bd1627a606a21ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Use mira for git_server in scap.cfg

[jenkins-bot (Code Review)]

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

Change subject: Use mira for git_server in scap.cfg
..


Use mira for git_server in scap.cfg

Per joe's comments on the related email thread, specify mira here rather
than using deployment.eqiad.wmnet.

(Eventually, this should be handled directly by ops rather than specified
in repo-level config.)

Change-Id: I688d41935c1133cec6d16aabe96c648d16eb02d5
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/scap.cfg b/scap/scap.cfg
index 6cd4dc7..67856e2 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -12,4 +12,4 @@
 lock_file: /tmp/scap.mobileapps.lock
 
 [wmnet]
-git_server: deployment.eqiad.wmnet
+git_server: mira.codfw.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I688d41935c1133cec6d16aabe96c648d16eb02d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db1053 update IP

[Marostegui (Code Review)]

Marostegui has uploaded a new change for review.

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

Change subject: db1053 update IP
..

db1053 update IP

db1053 has been moved to a different rack and thus it got a different IP
so I am upgrading the files with the new IP it got

Bug: T147774
Change-Id: If7eccbb7839c6183ccad95c4e3bf152c6f25dac0
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 6da0ff4..9a36bad 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -450,7 +450,7 @@
'db1050' => '10.64.16.145', #do not remove or comment out
'db1051' => '10.64.32.21', #do not remove or comment out
'db1052' => '10.64.32.22', #do not remove or comment out
-   'db1053' => '10.64.32.23', #do not remove or comment out
+   'db1053' => '10.64.0.87', #do not remove or comment out
'db1054' => '10.64.32.24', #do not remove or comment out
'db1055' => '10.64.32.25', #do not remove or comment out
'db1056' => '10.64.32.26', #do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 17221aa..f98d21e 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -472,7 +472,7 @@
'db1050' => '10.64.16.145', #do not remove or comment out
'db1051' => '10.64.32.21', #do not remove or comment out
'db1052' => '10.64.32.22', #do not remove or comment out
-   'db1053' => '10.64.32.23', #do not remove or comment out
+   'db1053' => '10.64.0.87', #do not remove or comment out
'db1054' => '10.64.32.24', #do not remove or comment out
'db1055' => '10.64.32.25', #do not remove or comment out
'db1056' => '10.64.32.26', #do not remove or comment out

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[wmf/1.28.0-wmf.22]: Don't set the performer property if the user is not available.

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review.

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

Change subject: Don't set the performer property if the user is not available.
..

Don't set the performer property if the user is not available.

Change-Id: I71eff9099652f7819da0506f2220521f1f1707d2
Depends-On: I139f12ae3f592dcf690617f9dd95a4df828c4a70
---
M EventBus.hooks.php
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index ee3a733..3a8b25f 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -641,12 +641,12 @@
 
$title = $linksUpdate->getTitle();
$revision = $linksUpdate->getRevision();
+   $user = $linksUpdate->getTriggeringUser();
 
// Create a mediawiki page delete event.
$attrs = [
// Common Mediawiki entity fields
'database'   => $wgDBname,
-   'performer'  => self::createPerformerAttrs( 
$linksUpdate->getTriggeringUser() ),
 
// page entity fields
'page_id'=> $title->getArticleID(),
@@ -656,6 +656,10 @@
'rev_id' =>$revision->getId()
];
 
+   if ( !is_null( $user ) ) {
+   $attrs[ 'performer' ] = self::createPerformerAttrs( 
$user );
+   }
+
if ( !empty( $addedProps ) ) {
$attrs[ 'added_properties' ] = $addedProps;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71eff9099652f7819da0506f2220521f1f1707d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add dataCubes description to pivot config template

[Joal (Code Review)]

Joal has uploaded a new change for review.

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

Change subject: Add dataCubes description to pivot config template
..

Add dataCubes description to pivot config template

Pivot provides a description for datacubes, we want to use that.
3 dataCubes described, pageview_hourly, pageview_daily, edit-history-test.

Change-Id: Ia68dedf8524d498ce2bf8a3e68b419fb7684d4be
---
M modules/pivot/templates/config.yaml.erb
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/315695/1

diff --git a/modules/pivot/templates/config.yaml.erb 
b/modules/pivot/templates/config.yaml.erb
index 6459038..4dbdb5f 100644
--- a/modules/pivot/templates/config.yaml.erb
+++ b/modules/pivot/templates/config.yaml.erb
@@ -39,6 +39,7 @@
 dataCubes:
   - name: pageviews-daily
 title: Pageviews Daily
+description: Small - Full History - Daily resolution - Monthly loading
 clusterName: druid
 source: pageviews-daily
 # The refresh rule describes how often the data cube looks for new data. 
Default: 'query'/PT1M (every minute)
@@ -70,6 +71,7 @@
 
   - name: edit-history-test
 title: Edit History test
+description: WIP - Don't use for now (probably broken anyway)
 clusterName: druid
 source: edit-history-test
 # The refresh rule describes how often the data cube looks for new data.
@@ -102,6 +104,7 @@
 
   - name: pageviews-hourly
 title: Pageviews Hourly
+description: Large - 3 month history - Hourly resolution - Daily loading
 clusterName: druid
 source: pageviews-hourly
 # The refresh rule describes how often the data cube looks for new data.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Wait for pointers to finish moving in browsertests

[WMDE-Fisch (Code Review)]

WMDE-Fisch has uploaded a new change for review.

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

Change subject: Wait for pointers to finish moving in browsertests
..

Wait for pointers to finish moving in browsertests

This will avoid checking pointer data prematurely when
they are still moving and the diff was not reloaded yet.

Change-Id: I3c29a43940e40b7c338a00b3520e5aa6b237ea4a
---
M tests/browser/features/pointers.feature
M tests/browser/features/support/pages/diff_page.rb
M tests/browser/features/support/step_definitions/pointers.rb
3 files changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/80/315680/1

diff --git a/tests/browser/features/pointers.feature 
b/tests/browser/features/pointers.feature
index 6f812e8..4cf45fd 100644
--- a/tests/browser/features/pointers.feature
+++ b/tests/browser/features/pointers.feature
@@ -37,6 +37,7 @@
 And I wait until the diff has loaded
 And I click on revision 1 to move the upper pointer
 And I wait until the diff has loaded
+And I wait until the pointers stopped moving
 Then the lower pointer should be on revision 1
 And the upper pointer should be on revision 3
 And revision 1 should be loaded on the left of the diff
diff --git a/tests/browser/features/support/pages/diff_page.rb 
b/tests/browser/features/support/pages/diff_page.rb
index 1dc11d7..b483c2f 100644
--- a/tests/browser/features/support/pages/diff_page.rb
+++ b/tests/browser/features/support/pages/diff_page.rb
@@ -59,6 +59,18 @@
 true
   end
 
+  def wait_for_animations
+sleep_period = 0.25
+max_timeout_seconds = 2
+timeout_loops = (max_timeout_seconds / sleep_period).to_i
+
+while execute_script('return $(\':animated\').length') != 0 && 
timeout_loops > 0
+  sleep(sleep_period)
+  timeout_loops -= 1
+end
+true
+  end
+
   def wait_for_diff_to_load
 wait_until do
   !revisionslider_loading?
diff --git a/tests/browser/features/support/step_definitions/pointers.rb 
b/tests/browser/features/support/step_definitions/pointers.rb
index d73073f..d1e714b 100644
--- a/tests/browser/features/support/step_definitions/pointers.rb
+++ b/tests/browser/features/support/step_definitions/pointers.rb
@@ -26,6 +26,10 @@
   step 'the diff has loaded'
 end
 
+When(/^I wait until the pointers stopped moving$/) do
+  on(DiffPage).wait_for_animations
+end
+
 Then(/^revision (\d+) should be loaded on the left of the diff$/) do |index|
   expect(on(DiffPage).revisionslider_left_summary_element.text).to include 
"RS-Summary-" + index.to_s
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c29a43940e40b7c338a00b3520e5aa6b237ea4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1068 for maintenance"

[Marostegui (Code Review)]

Marostegui has uploaded a new change for review.

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

Change subject: Revert "db-eqiad.php: Depool db1068 for maintenance"
..

Revert "db-eqiad.php: Depool db1068 for maintenance"

This reverts commit 2c851bddf1e48ab911e69b04b0f8229fb61fb4a6.

db1068 has finished its maintenance and it is ready to get repooled.

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 17221aa..93456cd 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -133,8 +133,8 @@
'db1056' => 1,   # 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1059' => 1,   # 2.8TB  96GB, api
'db1064' => 0,   # 2.8TB 160GB, vslow, dump
-#  'db1068' => 1,   # 2.8TB 160GB, api
-   'db1081' => 250, # 3.6TB 512GB, api
+   'db1068' => 1,   # 2.8TB 160GB, api
+   'db1081' => 500, # 3.6TB 512GB
'db1084' => 500, # 3.6TB 512GB
'db1091' => 500, # 3.6TB 512GB
],
@@ -327,8 +327,7 @@
],
'api' => [
'db1059' => 1,
-#  'db1068' => 3,
-   'db1081' => 3,
+   'db1068' => 3,
],
'watchlist' => [
'db1056' => 1,

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: refactor insertion of common headers in Retrofit re...

[jenkins-bot (Code Review)]

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

Change subject: Hygiene: refactor insertion of common headers in Retrofit 
requests.
..


Hygiene: refactor insertion of common headers in Retrofit requests.

Change-Id: Id6b13d9bc1483506346e69170a396fc9fa4f3f43
---
M app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
M app/src/main/java/org/wikipedia/analytics/Funnel.java
M app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
6 files changed, 32 insertions(+), 28 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java 
b/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
index 82a9026..8c363f0 100644
--- a/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
+++ b/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
@@ -13,9 +13,12 @@
 
 import okhttp3.Cache;
 import okhttp3.CookieJar;
+import okhttp3.Interceptor;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
 import okhttp3.OkUrlFactory;
+import okhttp3.Request;
+import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 public class OkHttpConnectionFactory implements HttpRequest.ConnectionFactory {
@@ -52,6 +55,24 @@
 .cookieJar(cookieJar)
 .cache(HTTP_CACHE)
 .addInterceptor(loggingInterceptor)
+.addInterceptor(new CommonHeaderInterceptor())
 .build();
 }
+
+// If adding a new header here, make sure to duplicate it in the MWAPI 
header builder
+// (WikipediaApp.buildCustomHeadersMap()).
+// TODO: remove above comment once buildCustomHeadersMap() is removed.
+private static class CommonHeaderInterceptor implements Interceptor {
+@Override
+public Response intercept(Interceptor.Chain chain) throws IOException {
+WikipediaApp app = WikipediaApp.getInstance();
+Request request = chain.request();
+request = request.newBuilder()
+.header("User-Agent", app.getUserAgent())
+.header(app.isEventLoggingEnabled() ? "X-WMF-UUID" : "DNT",
+app.isEventLoggingEnabled() ? 
app.getAppInstallID() : "1")
+.build();
+return chain.proceed(request);
+}
+}
 }
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index e456aee..482edbf 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -65,9 +65,6 @@
 import java.util.Random;
 import java.util.UUID;
 
-import okhttp3.Headers;
-import okhttp3.Request;
-
 import static org.wikipedia.util.DimenUtil.getFontSizeFromSp;
 import static org.wikipedia.util.ReleaseUtil.getChannel;
 import static org.wikipedia.util.StringUtil.emptyIfNull;
@@ -527,18 +524,10 @@
 return PrefsOnboardingStateMachine.getInstance();
 }
 
-/** For Retrofit requests. Keep in sync with #buildCustomHeadersMap */
-public Headers buildCustomHeaders(Request request, Site site) {
-Map toSetHeaders = 
buildCustomHeadersMap(getAcceptLanguage(site));
-
-Headers.Builder moreHeaders = request.headers().newBuilder();
-for (String key : toSetHeaders.keySet()) {
-moreHeaders.set(key, toSetHeaders.get(key));
-}
-return moreHeaders.build();
-}
-
-/** For java-mwapi API requests. */
+// For java-mwapi API requests.
+// If adding a new header here (before this method is removed), make sure 
to duplicate it
+// in the Retrofit header list 
(OkHttpConnectionFactory#CommonHeaderInterceptor).
+@Deprecated
 private Map buildCustomHeadersMap(String acceptLanguage) {
 Map headers = new HashMap<>();
 headers.put("User-Agent", getUserAgent());
diff --git a/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java 
b/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
index a956ad7..fdadd1b 100644
--- a/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
+++ b/app/src/main/java/org/wikipedia/analytics/EventLoggingEvent.java
@@ -25,7 +25,6 @@
 ? EVENTLOG_URL_DEV : EVENTLOG_URL_PROD;
 
 private final JSONObject data;
-private final String userAgent;
 
 /**
  * Create an EventLoggingEvent that logs to a given revision of a given 
schema with
@@ -34,11 +33,10 @@
  * @param schema Schema name (as specified on meta.wikimedia.org)
  * @param revID Revision of 

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Make sure daily recurring tasks are executed when MainActivi...

[jenkins-bot (Code Review)]

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

Change subject: Make sure daily recurring tasks are executed when MainActivity 
is run.
..


Make sure daily recurring tasks are executed when MainActivity is run.

Right now our recurring tasks are triggered only when PageActivity is
started, which was acceptable in the previous incarnation of the app.
However, we now have MainActivity, with which the user can interact
without ever launching PageActivity, meaning that the recurring tasks
might not get executed.

This can actually mess with our engagement/retention metrics, since one of
the recurring tasks is DailyEventTask, which sends an event that we use to
measure retention.

This patch moves the execution of recurring tasks to the base activity
class, so that the tasks are executed when *any* of our activities is
started, not just PageActivity.

Change-Id: Ic9d41817740a65aac4ade0840efe784b32603b87
---
M app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java 
b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
index 776b349..0135bea 100644
--- a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
@@ -13,6 +13,7 @@
 import org.wikipedia.R;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.auth.AccountUtil;
+import org.wikipedia.recurring.RecurringTasksExecutor;
 import org.wikipedia.settings.Prefs;
 
 import java.lang.reflect.Field;
@@ -33,6 +34,9 @@
 getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 }
 forceOverflowMenuIcon(this);
+
+// Conditionally execute all recurring tasks
+new RecurringTasksExecutor(WikipediaApp.getInstance()).run();
 }
 
 @Override
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index f702af3..458dcc5 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -58,7 +58,6 @@
 import org.wikipedia.page.tabs.TabsProvider;
 import org.wikipedia.page.tabs.TabsProvider.TabPosition;
 import org.wikipedia.readinglist.AddToReadingListDialog;
-import org.wikipedia.recurring.RecurringTasksExecutor;
 import org.wikipedia.search.SearchFragment;
 import org.wikipedia.search.SearchInvokeSource;
 import org.wikipedia.search.SearchResultsFragment;
@@ -183,9 +182,6 @@
 // then we must have been launched with an Intent, so... handle it!
 handleIntent(getIntent());
 }
-
-// Conditionally execute all recurring tasks
-new RecurringTasksExecutor(app).run();
 
 UserOptionContentResolver.requestManualSync();
 }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Correctly handle Site language when instantiating Retrofit c...

[jenkins-bot (Code Review)]

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

Change subject: Correctly handle Site language when instantiating Retrofit 
clients.
..


Correctly handle Site language when instantiating Retrofit clients.

The switch to using a single instance of OkHttpClient left out a crucial
bit of information: the Site object contains a languageCode field that is
used to determine custom headers (for language variants) that are sent
with each request, whereas the new single-instance OkHttpClient was simply
using the subdomain name of the Url as the language code.

This restores the Site object as a parameter for making new Retrofit
instances, and preserves the Site for use by the Interceptor that adds
custom headers.

Change-Id: Ic40d795746d9722c490407813228273fb2c13ced
---
M app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
M 
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/server/restbase/RbPageEndpointsCache.java
5 files changed, 31 insertions(+), 23 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java 
b/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
index 3742860..82a9026 100644
--- a/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
+++ b/app/src/main/java/org/wikipedia/OkHttpConnectionFactory.java
@@ -13,12 +13,9 @@
 
 import okhttp3.Cache;
 import okhttp3.CookieJar;
-import okhttp3.Interceptor;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
 import okhttp3.OkUrlFactory;
-import okhttp3.Request;
-import okhttp3.Response;
 import okhttp3.logging.HttpLoggingInterceptor;
 
 public class OkHttpConnectionFactory implements HttpRequest.ConnectionFactory {
@@ -55,18 +52,6 @@
 .cookieJar(cookieJar)
 .cache(HTTP_CACHE)
 .addInterceptor(loggingInterceptor)
-.addInterceptor(new CustomHeaderInterceptor())
 .build();
-}
-
-private static class CustomHeaderInterceptor implements Interceptor {
-@Override
-public Response intercept(Interceptor.Chain chain) throws IOException {
-Request request = chain.request();
-request = request.newBuilder()
-
.headers(WikipediaApp.getInstance().buildCustomHeaders(request))
-.build();
-return chain.proceed(request);
-}
 }
 }
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java 
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index 5ca6353..e456aee 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -528,9 +528,8 @@
 }
 
 /** For Retrofit requests. Keep in sync with #buildCustomHeadersMap */
-public Headers buildCustomHeaders(Request request) {
-Map toSetHeaders
-= buildCustomHeadersMap(getAcceptLanguage(new 
Site(request.url().host(;
+public Headers buildCustomHeaders(Request request, Site site) {
+Map toSetHeaders = 
buildCustomHeadersMap(getAcceptLanguage(site));
 
 Headers.Builder moreHeaders = request.headers().newBuilder();
 for (String key : toSetHeaders.keySet()) {
diff --git 
a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java 
b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
index deb98b6..b6d7887 100644
--- a/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
+++ b/app/src/main/java/org/wikipedia/dataclient/retrofit/RetrofitFactory.java
@@ -4,23 +4,47 @@
 
 import org.wikipedia.OkHttpConnectionFactory;
 import org.wikipedia.Site;
+import org.wikipedia.WikipediaApp;
 import org.wikipedia.json.GsonUtil;
 
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 public final class RetrofitFactory {
 public static Retrofit newInstance(@NonNull Site site) {
-return newInstance(site.url() + "/");
+return newInstance(site.url() + "/", site);
 }
 
-public static Retrofit newInstance(@NonNull String endpoint) {
+public static Retrofit newInstance(@NonNull String endpoint, @NonNull Site 
site) {
 return new Retrofit.Builder()
-.client(OkHttpConnectionFactory.getClient())
+.client(OkHttpConnectionFactory.getClient().newBuilder()
+.addInterceptor(new 
CustomHeaderInterceptor(site)).build())
 .baseUrl(endpoint)
  

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Refactor timeline browsertests

[jenkins-bot (Code Review)]

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

Change subject: Refactor timeline browsertests
..


Refactor timeline browsertests

- Applied the Given-When-Then rule
- Added separate accessors for disabled arrow elements

Bug: T146276
Change-Id: I0278ef607f96851ed69e7373b952f5d02139cb0c
---
M tests/browser/features/support/pages/diff_page.rb
M tests/browser/features/support/step_definitions/timeline.rb
M tests/browser/features/timeline.feature
3 files changed, 14 insertions(+), 20 deletions(-)

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



diff --git a/tests/browser/features/support/pages/diff_page.rb 
b/tests/browser/features/support/pages/diff_page.rb
index b483c2f..6fb52b7 100644
--- a/tests/browser/features/support/pages/diff_page.rb
+++ b/tests/browser/features/support/pages/diff_page.rb
@@ -14,8 +14,11 @@
   a(:revisionslider_help_close_start, css: '.revisionslider-help-close-start > 
a')
   a(:revisionslider_help_close_end, css: '.revisionslider-help-close-end > a')
 
-  div(:revisionslider_timeline_backwards, css: 
'.mw-revslider-arrow.mw-revslider-arrow-backwards')
-  div(:revisionslider_timeline_forwards, css: 
'.mw-revslider-arrow.mw-revslider-arrow-forwards')
+  div(:revisionslider_timeline_backwards, css: 
'.mw-revslider-arrow.mw-revslider-arrow-backwards:not(.oo-ui-widget-disabled)')
+  div(:revisionslider_timeline_forwards, css: 
'.mw-revslider-arrow.mw-revslider-arrow-forwards:not(.oo-ui-widget-disabled)')
+
+  div(:revisionslider_timeline_backwards_disabled, css: 
'.mw-revslider-arrow.mw-revslider-arrow-backwards.oo-ui-widget-disabled')
+  div(:revisionslider_timeline_forwards_disabled, css: 
'.mw-revslider-arrow.mw-revslider-arrow-forwards.oo-ui-widget-disabled')
 
   div(:revisionslider_pointer_lower, css: '.mw-revslider-pointer-lower')
   div(:revisionslider_pointer_upper, css: '.mw-revslider-pointer-upper')
diff --git a/tests/browser/features/support/step_definitions/timeline.rb 
b/tests/browser/features/support/step_definitions/timeline.rb
index 2873a9c..c334de2 100644
--- a/tests/browser/features/support/step_definitions/timeline.rb
+++ b/tests/browser/features/support/step_definitions/timeline.rb
@@ -1,17 +1,17 @@
 Then(/^The forward arrow should be disabled/) do
-  expect(on(DiffPage).revisionslider_timeline_forwards_element.class_name).to 
match 'oo-ui-widget-disabled'
+  expect(on(DiffPage).revisionslider_timeline_forwards_disabled_element).to 
be_visible
   end
 
 Then(/^The backward arrow should be disabled/) do
-  expect(on(DiffPage).revisionslider_timeline_backwards_element.class_name).to 
match 'oo-ui-widget-disabled'
+  expect(on(DiffPage).revisionslider_timeline_backwards_disabled_element).to 
be_visible
 end
 
 Then(/^The forward arrow should be enabled/) do
-  
expect(on(DiffPage).revisionslider_timeline_forwards_element.class_name).not_to 
match 'oo-ui-widget-disabled'
+  expect(on(DiffPage).revisionslider_timeline_forwards_element).to be_visible
 end
 
 Then(/^The backward arrow should be enabled/) do
-  
expect(on(DiffPage).revisionslider_timeline_backwards_element.class_name).not_to
 match 'oo-ui-widget-disabled'
+  expect(on(DiffPage).revisionslider_timeline_backwards_element).to be_visible
 end
 
 Given(/^I click on the forward arrow$/) do
@@ -20,4 +20,4 @@
 
 Given(/^I click on the backward arrow$/) do
   on(DiffPage).revisionslider_timeline_backwards_element.when_visible.click
-end
\ No newline at end of file
+end
diff --git a/tests/browser/features/timeline.feature 
b/tests/browser/features/timeline.feature
index 94df85b..16f8f9a 100644
--- a/tests/browser/features/timeline.feature
+++ b/tests/browser/features/timeline.feature
@@ -8,9 +8,7 @@
   Scenario: RevisionSlider timeline arrows to be disabled with 3 revisions
 Given a page with 3 revision(s) exists
 And I am on the diff page
-And I click on the expand button
-And The RevisionSlider has loaded
-And I have dismissed the help dialog
+When I have loaded the RevisionSlider and dismissed the help dialog
 Then The backward arrow should be disabled
 And The forward arrow should be disabled
 
@@ -18,15 +16,8 @@
 Given a page with 30 revision(s) exists
 And The window size is 800 by 600
 And I am on the diff page
-And I click on the expand button
-And The RevisionSlider has loaded
-And I have dismissed the help dialog
-And The help dialog is hidden
+When I have loaded the RevisionSlider and dismissed the help dialog
+And I click on the backward arrow
+And I click on the forward arrow
 Then The backward arrow should be enabled
 And The forward arrow should be disabled
-Given I click on the backward arrow
-Then The backward arrow should be disabled
-And The forward arrow should be enabled
-Given I click on the forward arrow
-Then The backward arrow should be enabled
-And The forward arrow should be 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove hard-coded supportedEntityTypesForEntitiesWithoutTerm...

[WMDE]

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

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

Change subject: Remove hard-coded 
supportedEntityTypesForEntitiesWithoutTermListings default
..

Remove hard-coded supportedEntityTypesForEntitiesWithoutTermListings default

Bug: T140891
Change-Id: I2c0e918a5c175237e3cc46fba300a4ece7405026
---
M repo/config/Wikibase.default.php
M repo/includes/Specials/SpecialEntitiesWithoutPageFactory.php
2 files changed, 9 insertions(+), 5 deletions(-)


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

diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index f3967ff..478eecf 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -195,8 +195,6 @@
'wb-claims' => [ 'name' => 'statements', 'type' => 'integer' ],
],
 
-   'supportedEntityTypesForEntitiesWithoutTermListings' => [
-   'item',
-   'property'
-   ]
+   // List of entity types for Special:EntitiesWithoutLabel and 
…Description, or null for all.
+   'supportedEntityTypesForEntitiesWithoutTermListings' => null,
 ];
diff --git a/repo/includes/Specials/SpecialEntitiesWithoutPageFactory.php 
b/repo/includes/Specials/SpecialEntitiesWithoutPageFactory.php
index 29e6d06..e2dc69f 100644
--- a/repo/includes/Specials/SpecialEntitiesWithoutPageFactory.php
+++ b/repo/includes/Specials/SpecialEntitiesWithoutPageFactory.php
@@ -20,7 +20,13 @@
 
private static function newFromGlobalState() {
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
-   $entityTypes = $wikibaseRepo->getSettings()->getSetting( 
'supportedEntityTypesForEntitiesWithoutTermListings' );
+   $entityTypes = $wikibaseRepo->getSettings()->getSetting(
+   'supportedEntityTypesForEntitiesWithoutTermListings'
+   );
+
+   if ( $entityTypes === null ) {
+   $entityTypes = $wikibaseRepo->getEnabledEntityTypes();
+   }
 
return new self(

$wikibaseRepo->getStore()->newEntitiesWithoutTermFinder(),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c0e918a5c175237e3cc46fba300a4ece7405026
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] mediawiki/event-schemas[master]: Don't require performer in properties-change event.

[jenkins-bot (Code Review)]

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

Change subject: Don't require performer in properties-change event.
..


Don't require performer in properties-change event.

The page-properties-change event is emitted from
LinksUpdateComplete hook, and in that hook the
information about the performer might not be available.

So, don't require the property.

Change-Id: I139f12ae3f592dcf690617f9dd95a4df828c4a70
---
M jsonschema/mediawiki/page/properties-change/1.yaml
M test/jsonschema/index.js
M test/jsonschema/mediawiki/mediawiki_common_schema.yaml
3 files changed, 6 insertions(+), 32 deletions(-)

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



diff --git a/jsonschema/mediawiki/page/properties-change/1.yaml 
b/jsonschema/mediawiki/page/properties-change/1.yaml
index 729231f..5c938c9 100644
--- a/jsonschema/mediawiki/page/properties-change/1.yaml
+++ b/jsonschema/mediawiki/page/properties-change/1.yaml
@@ -49,35 +49,6 @@
 description: The name of the wiki database this event belongs to.
 type: string
 
-  performer:
-description: Represents the user that performed this change.
-type: object
-properties:
-  user_id:
-description: >
-  The user id that performed this change.  This is optional, and
-  will not be present for anonymous users.
-type: integer
-  user_text:
-description: The text representation of the user that performed this 
change.
-type: string
-  user_groups:
-description: A list of the groups this user belongs to.  E.g. bot, 
sysop etc.
-type: array
-items:
-  type: string
-  user_is_bot:
-description: >
-  True if this user is considered to be a bot.  This is checked
-  via the $user->isBot() method, which considers both user_groups
-  and user permissions.
-type: boolean
-required:
-  - user_text
-  - user_groups
-  - user_is_bot
-
-
   ### page entity fields - all page related events should have these.
   page_id:
 description: The page ID of the page which properties has been changed.
@@ -128,7 +99,6 @@
 required:
   - meta
   - database
-  - performer
   - page_id
   - page_title
   - page_namespace
diff --git a/test/jsonschema/index.js b/test/jsonschema/index.js
index c3d1e07..4b33a85 100644
--- a/test/jsonschema/index.js
+++ b/test/jsonschema/index.js
@@ -35,7 +35,12 @@
 // Go recursively
 return Object.keys(example)
 .filter((key) => key !== 'title' && key !== 'description')
-.forEach((key) => assert.isSuperSchema(schema[key], example[key], path 
+ '.' + key));
+.forEach((key) => {
+if (example.required.indexOf(key) !== -1
+|| schema.required.indexOf(key) !== -1) {
+assert.isSuperSchema(schema[key], example[key], path + '.' + 
key)
+}
+});
 } else if (schema !== example) {
 throw new assert.AssertionError({
 message: `Error at path: ${path}`,
diff --git a/test/jsonschema/mediawiki/mediawiki_common_schema.yaml 
b/test/jsonschema/mediawiki/mediawiki_common_schema.yaml
index 220837c..08c0418 100644
--- a/test/jsonschema/mediawiki/mediawiki_common_schema.yaml
+++ b/test/jsonschema/mediawiki/mediawiki_common_schema.yaml
@@ -27,4 +27,3 @@
 
 required:
   - database
-  - performer

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I139f12ae3f592dcf690617f9dd95a4df828c4a70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Simplify en:TFA retrieval

[jenkins-bot (Code Review)]

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

Change subject: Simplify en:TFA retrieval
..


Simplify en:TFA retrieval

RB only uses the title. So there's no need to request
summary data in MCS for this.

The etag is now in a different format. But I don't think it
matters much since the TFA endpoint is not exposed yet.

Change-Id: I9cb4f2a4837678fef2c4b24522860ccde4999d1e
---
M lib/feed/featured.js
M spec.yaml
M test/features/featured/pagecontent.js
3 files changed, 5 insertions(+), 27 deletions(-)

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



diff --git a/lib/feed/featured.js b/lib/feed/featured.js
index 12ddf0b..11c05c4 100644
--- a/lib/feed/featured.js
+++ b/lib/feed/featured.js
@@ -101,21 +101,13 @@
 mwapi.checkForQueryPagesInResponse(req, response);
 tfaPageObj = getPageObject(response);
 pageTitle = removeEllipsis(tfaPageObj.extract);
-req.params.title = pageTitle;
-return mwapi.requestExtractAndDescription(app, req);
-}).then(function (extractResponse) {
-mwapi.checkForQueryPagesInResponse(req, extractResponse);
-var extractPageObj = getPageObject(extractResponse, true);
 return BBPromise.props({
-page: extractPageObj,
-dbTitle: mwapi.getDbTitle(app, req, extractPageObj.title)
+dbTitle: mwapi.getDbTitle(app, req, pageTitle)
 });
 }).then(function (res) {
 return {
-payload: mwapi.buildSummaryResponse(res.page, res.dbTitle),
-meta: {
-etag: tfaPageObj.pageid + '/' + 
mwapi.getRevisionFromExtract(res.page)
-}
+payload: { title: res.dbTitle },
+meta: { etag: tfaPageObj.pageid }
 };
 });
 }
diff --git a/spec.yaml b/spec.yaml
index 1520400..8510a91 100644
--- a/spec.yaml
+++ b/spec.yaml
@@ -98,12 +98,6 @@
   content-type: application/json
 body:
   title: /.+/
-  description: /.+/
-  extract: /.+/
-  thumbnail:
-source: /.+/
-width: /.+/
-height: /.+/
 - title: retrieve featured article info for unsupported site (with 
aggregated=true)
   request:
 params:
diff --git a/test/features/featured/pagecontent.js 
b/test/features/featured/pagecontent.js
index 1cdb8ae..e07afb6 100644
--- a/test/features/featured/pagecontent.js
+++ b/test/features/featured/pagecontent.js
@@ -18,12 +18,8 @@
 return preq.get({ uri: server.config.uri + 
'en.wikipedia.org/v1/page/featured/2016/04/15' })
 .then(function(res) {
 assert.status(res, 200);
-// the page id should be stable but not the revision:
-assert.ok(res.headers.etag.indexOf('50089449/') == 0);
+assert.ok(res.headers.etag.indexOf('50089449') == 0);
 assert.equal(res.body.title, 
'Cosmic_Stories_and_Stirring_Science_Stories');
-assert.equal(res.body.normalizedtitle, 'Cosmic Stories and 
Stirring Science Stories');
-assert.equal(res.body.thumbnail.source, 
'https://upload.wikimedia.org/wikipedia/commons/1/19/Cosmic_Science-Fiction_May_1941.jpg');
-assert.ok(res.body.extract.indexOf('Cosmic Stories ') >= 0);
 });
 });
 
@@ -31,12 +27,8 @@
 return preq.get({ uri: server.config.uri + 
'en.wikipedia.org/v1/page/featured/2016/04/29' })
 .then(function(res) {
 assert.status(res, 200);
-// the page id should be stable but not the revision:
-assert.ok(res.headers.etag.indexOf('50282338/') == 0);
+assert.ok(res.headers.etag.indexOf('50282338') == 0);
 assert.equal(res.body.title, 'Lightning_(Final_Fantasy)');
-assert.equal(res.body.normalizedtitle, 'Lightning (Final 
Fantasy)');
-assert.ok(res.body.description.indexOf('Final Fantasy') >= 0);
-assert.ok(res.body.extract.indexOf('Lightning ') >= 0);
 });
 });
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9cb4f2a4837678fef2c4b24522860ccde4999d1e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jhernandez 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Niedzielski 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] operations/dns[master]: Moving db1053 to row A, updating dns entries(T147774), at sa...

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

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

Change subject: Moving db1053 to row A, updating dns entries(T147774), at same 
time removing dns entries for decom host db1010 (T129395)
..

Moving db1053 to row A, updating dns entries(T147774), at same time removing 
dns entries for decom host db1010 (T129395)

Change-Id: Ia195f19deeca6c2666f342bda1a95b8a97186363
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 5 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/90/315690/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index c7e377c..6ccfef2 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -248,7 +248,7 @@
 11  1H IN PTR   kafka1001.eqiad.wmnet.
 12  1H IN PTR   pc1004.eqiad.wmnet.
 13  1H IN PTR   db1009.eqiad.wmnet.
-14  1H IN PTR   db1010.eqiad.wmnet.
+
 15  1H IN PTR   db1011.eqiad.wmnet.
 16  1H IN PTR   scb1001.eqiad.wmnet.
 17  1H IN PTR   rcs1002.eqiad.wmnet.
@@ -320,7 +320,7 @@
 84  1H IN PTR   mc1023.eqiad.wmnet.
 85  1H IN PTR   elastic1044.eqiad.wmnet.
 86  1H IN PTR   elastic1045.eqiad.wmnet.
-
+87  1H IN PTR   db1053.eqiad.wmnet.
 91  1H IN PTR   db1079.eqiad.wmnet.
 92  1H IN PTR   db1080.eqiad.wmnet.
 93  1H IN PTR   db1081.eqiad.wmnet.
@@ -694,7 +694,7 @@
 20  1H IN PTR   neodymium.eqiad.wmnet.
 21  1H IN PTR   db1051.eqiad.wmnet.
 22  1H IN PTR   db1052.eqiad.wmnet.
-23  1H IN PTR   db1053.eqiad.wmnet.
+
 24  1H IN PTR   db1054.eqiad.wmnet.
 25  1H IN PTR   db1055.eqiad.wmnet.
 26  1H IN PTR   db1056.eqiad.wmnet.
@@ -2181,8 +2181,7 @@
 8   1H IN PTR   wmf3083.mgmt.eqiad.wmnet.
 9   1H IN PTR   db1009.mgmt.eqiad.wmnet.
 9   1H IN PTR   wmf3082.mgmt.eqiad.wmnet.
-10  1H IN PTR   db1010.mgmt.eqiad.wmnet.
-10  1H IN PTR   wmf3081.mgmt.eqiad.wmnet.
+
 11  1H IN PTR   db1011.mgmt.eqiad.wmnet.
 11  1H IN PTR   wmf3080.mgmt.eqiad.wmnet.
 12  1H IN PTR   stat1002.mgmt.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index a815531..898c1fc 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -254,7 +254,6 @@
 db1029  1H  IN A10.64.16.18
 db1030  1H  IN A10.64.16.19
 db1031  1H  IN A10.64.16.20
-
 db1033  1H  IN A10.64.16.22
 db1034  1H  IN A10.64.16.23
 db1035  1H  IN A10.64.16.24
@@ -275,7 +274,7 @@
 db1050  1H  IN A10.64.16.145
 db1051  1H  IN A10.64.32.21
 db1052  1H  IN A10.64.32.22
-db1053  1H  IN A10.64.32.23
+db1053  1H  IN A10.64.0.87
 db1054  1H  IN A10.64.32.24
 db1055  1H  IN A10.64.32.25
 db1056  1H  IN A10.64.32.26
@@ -1148,8 +1147,6 @@
 WMF3083 1H  IN A10.65.6.8
 db1009  1H  IN A10.65.6.9
 WMF3082 1H  IN A10.65.6.9
-db1010  1H  IN A10.65.6.10
-WMF3081 1H  IN A10.65.6.10
 db1011  1H  IN A10.65.6.11
 WMF3080 1H  IN A10.65.6.11
 stat10021H  IN A10.65.6.12

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Cleanup backwards-compatibility code

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Cleanup backwards-compatibility code
..

Cleanup backwards-compatibility code

https://www.mediawiki.org/wiki/Extension:Scribunto says that master
requires 1.25+, so let's remove checks for stuff that was added before
that.

* PPFrame::getTTL() was in 1.24.
* PPFrame::setTTL() was in 1.24.
* PPFrame::isVolatile() was in 1.24.
* Parser::fetchCurrentRevisionOfTitle() was in 1.24.
* ObjectCache::getLocalServerInstance() was added in 1.27, so restore the call 
to ObjectCache::newAccelerator() as BC.

This also removes BC with the php-luasandbox extension older than 1.6, which
was released before MediaWiki 1.22.

Bug: T148012
Change-Id: I36e37f3b65d0f167e1d28b00e0842d9721feee31
---
D Scribunto.i18n.php
M Scribunto.php
M common/ApiScribuntoConsole.php
M common/Hooks.php
M common/ScribuntoContent.php
M engines/LuaCommon/LuaCommon.php
M engines/LuaCommon/LuaInterpreter.php
M engines/LuaCommon/TitleLibrary.php
M engines/LuaSandbox/Engine.php
M engines/LuaStandalone/LuaStandaloneEngine.php
M tests/engines/LuaCommon/CommonTest.php
M tests/engines/LuaCommon/LanguageLibraryTest.php
M tests/engines/LuaSandbox/SandboxTest.php
13 files changed, 57 insertions(+), 134 deletions(-)


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

diff --git a/Scribunto.i18n.php b/Scribunto.i18n.php
deleted file mode 100644
index 838da4e..000
--- a/Scribunto.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimc5d9278c8d74fbc1' ) ) {
-   function wfJsonI18nShimc5d9278c8d74fbc1( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = __DIR__ . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimc5d9278c8d74fbc1';
-}
diff --git a/Scribunto.php b/Scribunto.php
index 883b663..9e4f09f 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -51,6 +51,8 @@
 $wgAutoloadClasses['Scribunto_LuaError'] = __DIR__ . 
'/engines/LuaCommon/LuaCommon.php';
 $wgAutoloadClasses['Scribunto_LuaInterpreterNotFoundError'] =
__DIR__ . '/engines/LuaCommon/LuaInterpreter.php';
+$wgAutoloadClasses['Scribunto_LuaInterpreterBadVersionError'] =
+   __DIR__ . '/engines/LuaCommon/LuaInterpreter.php';
 $wgAutoloadClasses['Scribunto_LuaSandboxInterpreter'] = __DIR__ . 
'/engines/LuaSandbox/Engine.php';
 $wgAutoloadClasses['Scribunto_LuaSandboxCallback'] = __DIR__ . 
'/engines/LuaSandbox/Engine.php';
 $wgAutoloadClasses['Scribunto_LuaStandaloneInterpreterFunction'] =
diff --git a/common/ApiScribuntoConsole.php b/common/ApiScribuntoConsole.php
index 7276b3c..56ecd5f 100644
--- a/common/ApiScribuntoConsole.php
+++ b/common/ApiScribuntoConsole.php
@@ -149,23 +149,4 @@
),
);
}
-
-   /**
-* @deprecated since MediaWiki core 1.25
-*/
-   public function getParamDescription() {
-   return array(
-   'title' => 'The module title to test',
-   'content' => 'The new content of the module',
-   'question' => 'The next line to evaluate as a script',
-   'clear' => 'Set this to true to clear the current 
session state',
-   );
-   }
-
-   /**
-* @deprecated since MediaWiki core 1.25
-*/
-   public function getDescription() {
-   return 'Internal module for servicing XHR requests from the 

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSPageAssignments: Added Helpdesk url

[Pwirth (Code Review)]

Pwirth has uploaded a new change for review.

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

Change subject: BSPageAssignments: Added Helpdesk url
..

BSPageAssignments: Added Helpdesk url

Change-Id: I8d73f224c63ffb4979789249947d526050bccda6
---
M PageAssignments/extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/PageAssignments/extension.json b/PageAssignments/extension.json
index a4f854c..ea5da96 100644
--- a/PageAssignments/extension.json
+++ b/PageAssignments/extension.json
@@ -4,7 +4,7 @@
"Robert Vogel",
"Patric Wirth"
],
-   "url": "https://www.hallowelt.com;,
+   "url": "https://help.bluespice.com/index.php/PageAssignments;,
"type": "bluespice",
"version": "2.27.0",
"descriptionmsg": "bs-pageassignments-desc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d73f224c63ffb4979789249947d526050bccda6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Update beta feature screenshots to use proper layout and col...

[jenkins-bot (Code Review)]

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

Change subject: Update beta feature screenshots to use proper layout and colours
..


Update beta feature screenshots to use proper layout and colours

Bug: T144428
Change-Id: I60e90436a6e99f7d5131b4cfe0ff4d9e956bcb94
---
M RevisionSlider.hooks.php
D resources/RevisionSlider-beta-features-ltr.png
A resources/RevisionSlider-beta-features-ltr.svg
D resources/RevisionSlider-beta-features-rtl.png
A resources/RevisionSlider-beta-features-rtl.svg
5 files changed, 112 insertions(+), 2 deletions(-)

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



diff --git a/RevisionSlider.hooks.php b/RevisionSlider.hooks.php
index 96fbd00..fc49f61 100644
--- a/RevisionSlider.hooks.php
+++ b/RevisionSlider.hooks.php
@@ -120,8 +120,8 @@
'label-message' => 
'revisionslider-beta-feature-message',
'desc-message' => 
'revisionslider-beta-feature-description',
'screenshot' => [
-   'ltr' => 
"$wgExtensionAssetsPath/RevisionSlider/resources/RevisionSlider-beta-features-ltr.png",
-   'rtl' => 
"$wgExtensionAssetsPath/RevisionSlider/resources/RevisionSlider-beta-features-rtl.png",
+   'ltr' => 
"$wgExtensionAssetsPath/RevisionSlider/resources/RevisionSlider-beta-features-ltr.svg",
+   'rtl' => 
"$wgExtensionAssetsPath/RevisionSlider/resources/RevisionSlider-beta-features-rtl.svg",
],
'info-link' => 
'https://www.mediawiki.org/wiki/Extension:RevisionSlider',
'discussion-link' => 
'https://www.mediawiki.org/wiki/Extension_talk:RevisionSlider',
diff --git a/resources/RevisionSlider-beta-features-ltr.png 
b/resources/RevisionSlider-beta-features-ltr.png
deleted file mode 100644
index ed4c2d8..000
--- a/resources/RevisionSlider-beta-features-ltr.png
+++ /dev/null
Binary files differ
diff --git a/resources/RevisionSlider-beta-features-ltr.svg 
b/resources/RevisionSlider-beta-features-ltr.svg
new file mode 100644
index 000..82696ca
--- /dev/null
+++ b/resources/RevisionSlider-beta-features-ltr.svg
@@ -0,0 +1,55 @@
+
+http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162" id="svg2">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/RevisionSlider-beta-features-rtl.png 
b/resources/RevisionSlider-beta-features-rtl.png
deleted file mode 100644
index 5be6ab5..000
--- a/resources/RevisionSlider-beta-features-rtl.png
+++ /dev/null
Binary files differ
diff --git a/resources/RevisionSlider-beta-features-rtl.svg 
b/resources/RevisionSlider-beta-features-rtl.svg
new file mode 100644
index 000..15a9c44
--- /dev/null
+++ b/resources/RevisionSlider-beta-features-rtl.svg
@@ -0,0 +1,55 @@
+
+http://www.w3.org/2000/svg; width="264" height="162" viewBox="0 0 
264 162" id="svg2">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60e90436a6e99f7d5131b4cfe0ff4d9e956bcb94
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Change way to get title from links

[jenkins-bot (Code Review)]

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

Change subject: Change way to get title from links
..


Change way to get title from links

For the mobileview/MW API case we can simply use the title
attribute instead of decoding the href attribute.

For the Parsoid/MCS case newer revisions of pages and once we get
all pages re-rendered after Icae4b83278791ed09284bb73c3ba80363cac9202
gets deployed will also have a title attribute.
For older pages the title attribute doesn't exists.
But we can derive it in JavaScript code from the href attribute by
removing a starting "/wiki/" or "./" and running decodeURIComponent on it.

That way the JS code always returns a title property, which the Java
side can just take as is.

The onUrlClick() method gets a new parameter titleString.
Instead of using getSite().titleForInternalLink(href) we now create the
PageTitle directly using titleString.

In the case of the gallery we don't get the link data from native code
instead of JS. The parsing of the HTML there is done using Html.fromHtml()
which doesn't preserve the title attribute of the link. In that one case
the Java code will derive the title from the href attribute like it did before.
This case is OK since the gallery data is not coming from Parsoid.

Introducing one factory method to create a PageTitle with a potential
fragment passed in separately. There was already a constructor with three
String parameters.

Related: Icae4b83278791ed09284bb73c3ba80363cac9202
Bug: T136223
Change-Id: Iedbe1ae611f4d433d4c6bcac3cce3935333753e0
---
M app/src/main/assets/bundle.js
M app/src/main/assets/preview.js
M app/src/main/java/org/wikipedia/editing/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
M app/src/main/java/org/wikipedia/page/LinkHandler.java
M app/src/main/java/org/wikipedia/page/LinkMovementMethodExt.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/PageTitle.java
M app/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/util/UriUtil.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
A app/src/test/java/org/wikipedia/util/UriUtilTest.java
M www/js/actions.js
13 files changed, 155 insertions(+), 18 deletions(-)

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



diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index 2a21e83..f757c6d 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -39,6 +39,19 @@
 }
 }
 
+/**
+ * Either gets the title from the title attribute (for mobileview case and 
newer MCS pages) or,
+ * if that doesn't not exists try to derive it from the href attribute value.
+ * In the latter case it also unescapes HTML entities to get the correct title 
string.
+ */
+function getTitle( sourceNode, href ) {
+if (sourceNode.hasAttribute( "title" )) {
+return sourceNode.getAttribute( "title" );
+} else {
+return href.replace(/^\/wiki\//, '').replace(/^\.\//, 
'').replace(/#.*$/, '');
+}
+}
+
 document.onclick = function() {
 var sourceNode = null;
 var curNode = event.target;
@@ -69,7 +82,7 @@
 } else if (sourceNode.classList.contains( 'image' )) {
 bridge.sendMessage( 'imageClicked', { "href": href } );
 } else {
-bridge.sendMessage( 'linkClicked', { "href": href } );
+bridge.sendMessage( 'linkClicked', { "href": href, "title": 
getTitle(sourceNode, href) } );
 }
 event.preventDefault();
 }
diff --git a/app/src/main/assets/preview.js b/app/src/main/assets/preview.js
index a8c2235..49c7fb1 100644
--- a/app/src/main/assets/preview.js
+++ b/app/src/main/assets/preview.js
@@ -39,6 +39,19 @@
 }
 }
 
+/**
+ * Either gets the title from the title attribute (for mobileview case and 
newer MCS pages) or,
+ * if that doesn't not exists try to derive it from the href attribute value.
+ * In the latter case it also unescapes HTML entities to get the correct title 
string.
+ */
+function getTitle( sourceNode, href ) {
+if (sourceNode.hasAttribute( "title" )) {
+return sourceNode.getAttribute( "title" );
+} else {
+return href.replace(/^\/wiki\//, '').replace(/^\.\//, 
'').replace(/#.*$/, '');
+}
+}
+
 document.onclick = function() {
 var sourceNode = null;
 var curNode = event.target;
@@ -69,7 +82,7 @@
 } else if (sourceNode.classList.contains( 'image' )) {
 bridge.sendMessage( 'imageClicked', { "href": href } );
 } else {
-bridge.sendMessage( 'linkClicked', { "href": href } );
+bridge.sendMessage( 'linkClicked', { "href": href, "title": 
getTitle(sourceNode, href) } );
 }
 event.preventDefault();
 }
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Don't set the performer property if the user is not available.

[jenkins-bot (Code Review)]

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

Change subject: Don't set the performer property if the user is not available.
..


Don't set the performer property if the user is not available.

Change-Id: I71eff9099652f7819da0506f2220521f1f1707d2
Depends-On: I139f12ae3f592dcf690617f9dd95a4df828c4a70
---
M EventBus.hooks.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index ee3a733..3a8b25f 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -641,12 +641,12 @@
 
$title = $linksUpdate->getTitle();
$revision = $linksUpdate->getRevision();
+   $user = $linksUpdate->getTriggeringUser();
 
// Create a mediawiki page delete event.
$attrs = [
// Common Mediawiki entity fields
'database'   => $wgDBname,
-   'performer'  => self::createPerformerAttrs( 
$linksUpdate->getTriggeringUser() ),
 
// page entity fields
'page_id'=> $title->getArticleID(),
@@ -656,6 +656,10 @@
'rev_id' =>$revision->getId()
];
 
+   if ( !is_null( $user ) ) {
+   $attrs[ 'performer' ] = self::createPerformerAttrs( 
$user );
+   }
+
if ( !empty( $addedProps ) ) {
$attrs[ 'added_properties' ] = $addedProps;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71eff9099652f7819da0506f2220521f1f1707d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Make sure daily recurring tasks are executed when MainActivi...

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Make sure daily recurring tasks are executed when MainActivity 
is run.
..

Make sure daily recurring tasks are executed when MainActivity is run.

Right now our recurring tasks are triggered only when PageActivity is
started, which was acceptable in the previous incarnation of the app.
However, we now have MainActivity, with which the user can interact
without ever launching PageActivity, meaning that the recurring tasks
might not get executed.

This can actually mess with our engagement/retention metrics, since one of
the recurring tasks is DailyEventTask, which sends an event that we use to
measure retention.

This patch ensures that these tasks are executed when MainActivity is
started, in addition to PageActivity.

Change-Id: Ic9d41817740a65aac4ade0840efe784b32603b87
---
M app/src/main/java/org/wikipedia/main/MainFragment.java
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java 
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index fe23388..90f314d 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -46,6 +46,7 @@
 import org.wikipedia.page.linkpreview.LinkPreviewDialog;
 import org.wikipedia.readinglist.AddToReadingListDialog;
 import org.wikipedia.readinglist.ReadingListsFragment;
+import org.wikipedia.recurring.RecurringTasksExecutor;
 import org.wikipedia.search.SearchFragment;
 import org.wikipedia.search.SearchInvokeSource;
 import org.wikipedia.search.SearchResultsFragment;
@@ -107,6 +108,10 @@
 if (savedInstanceState == null) {
 handleIntent(getActivity().getIntent());
 }
+
+// Conditionally execute all recurring tasks
+new RecurringTasksExecutor(WikipediaApp.getInstance()).run();
+
 return view;
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Refactor tooltips browsertests

[jenkins-bot (Code Review)]

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

Change subject: Refactor tooltips browsertests
..


Refactor tooltips browsertests

- Applied the Given-When-Then rule

Bug: T146276
Change-Id: Ie9eb48cafd85ef7a00c9d9f9fd626fab5f128824
---
M tests/browser/features/tooltips.feature
1 file changed, 10 insertions(+), 12 deletions(-)

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



diff --git a/tests/browser/features/tooltips.feature 
b/tests/browser/features/tooltips.feature
index a7491a4..b35e394 100644
--- a/tests/browser/features/tooltips.feature
+++ b/tests/browser/features/tooltips.feature
@@ -5,23 +5,21 @@
 And I have reset my preferences
 And RevisionSlider is enabled as a beta feature
 And a page with 4 revision(s) exists
-And I am on the diff page
-And I click on the expand button
-And The RevisionSlider has loaded
-And I have dismissed the help dialog
 
   Scenario: RevisionSlider revision tooltip appears on hover
-Given I hover over revision 1
-Then a tooltip should be present for revision 1
-Given I hover over revision 2
+Given I am on the diff page
+When I have loaded the RevisionSlider and dismissed the help dialog
+And I hover over revision 1
+And I hover over revision 2
 Then a tooltip should be present for revision 2
 And no tooltip should be present for revision 1
 
   Scenario: RevisionSlider revision tooltip appears and remains on hover
-Given I hover over revision 1
-Then a tooltip should be present for revision 1
-Given I hover over the revision 1 tooltip
-Then a tooltip should be present for revision 1
-Given I hover over revision 2
+Given I am on the diff page
+When I have loaded the RevisionSlider and dismissed the help dialog
+And I hover over revision 1
+And I hover over the revision 1 tooltip
+And I hover over revision 2
+And I hover over the revision 2 tooltip
 Then a tooltip should be present for revision 2
 And no tooltip should be present for revision 1
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9eb48cafd85ef7a00c9d9f9fd626fab5f128824
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Bump versionCode

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Bump versionCode
..

Bump versionCode

Change-Id: I1b3de532775dbaf07ecb7a8c3f485a96cd8a3c0d
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 729410d..0951c8d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 15
 targetSdkVersion 23
-versionCode 157
+versionCode 158
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b3de532775dbaf07ecb7a8c3f485a96cd8a3c0d
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] apps...wikipedia[master]: Bump versionCode

[jenkins-bot (Code Review)]

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

Change subject: Bump versionCode
..


Bump versionCode

Change-Id: I1b3de532775dbaf07ecb7a8c3f485a96cd8a3c0d
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/build.gradle b/app/build.gradle
index 729410d..0951c8d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@
 applicationId 'org.wikipedia'
 minSdkVersion 15
 targetSdkVersion 23
-versionCode 157
+versionCode 158
 testApplicationId 'org.wikipedia.test'
 testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
 vectorDrawables.useSupportLibrary = true

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker: Build a trusty image as well

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: docker: Build a trusty image as well
..

docker: Build a trusty image as well

Bug: T148054
Change-Id: Ie6e1a452a448dc3db77c868d63a21c0943d8b5ce
---
M modules/docker/templates/images/build-base-images.erb
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/315699/1

diff --git a/modules/docker/templates/images/build-base-images.erb 
b/modules/docker/templates/images/build-base-images.erb
index 9ade74d..b808c0a 100644
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -7,3 +7,9 @@
 
 # Push it to the repository
 docker push <%= @docker_registry %>/wikimedia-jessie
+
+# Build ubuntu trusty base image!
+/usr/share/docker-engine/contrib/mkimage-debootstrap.sh <%= @docker_registry 
%>/wikimedia-trusty trusty  http://ubuntu.wikimedia.org/ubuntu/
+
+# Push it to the repo
+docker push <%= @docker_registry %>/wikimedia-trusty

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 66f3831

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Update restbase to 66f3831
..

Update restbase to 66f3831

List of changes:
xxx Update node module dependencies

Change-Id: Ie4c8e3e319d50f0619a7cb6d545bbd6d282cb90b
---
M node_modules/content-type/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M node_modules/hyperswitch/node_modules/preq/index.js
M 
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/aws4/aws4.js
M 
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/aws4/package.json
M node_modules/hyperswitch/node_modules/preq/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M node_modules/json-stable-stringify/package.json
M 
node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
M node_modules/mediawiki-title/lib/index.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/lib/connection.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/lib/request-handler.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/lib/writers.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
M 
node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/inflight.js
M 
node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/string_decoder/package.json
27 files changed, 262 insertions(+), 155 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/14/315714/1

diff --git a/node_modules/content-type/package.json 
b/node_modules/content-type/package.json
index 0526ef9..3fce6d9 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -44,7 +44,7 @@
   },
   "homepage": "https://github.com/jshttp/content-type#readme;,
   "_id": "content-type@1.0.1",
-  "_shasum": "ad8c9483a48c242604b4ec7602123ea3f270fa73",
+  "_shasum": "8e9159d35ab9f2a064a52b91cb279a9f4bcee022",
   "_from": "git+https://github.com/wikimedia/content-type.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b;
 }
diff --git a/node_modules/heapdump/build/Makefile 
b/node_modules/heapdump/build/Makefile
index 71b2b2b..c9d9d51 100644
--- a/node_modules/heapdump/build/Makefile
+++ b/node_modules/heapdump/build/Makefile
@@ -57,7 +57,7 @@
 CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
 CXX.host ?= g++
 CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
-LINK.host ?= $(CXX.host)
+LINK.host ?= g++
 LDFLAGS.host ?=
 AR.host ?= ar
 
@@ -308,8 +308,8 @@
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment "--toplevel-dir=." 
-I/opt/service/node_modules/heapdump/build/config.gypi 
-I/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 -I/home/runuser/.node-gyp/4.4.6/include/node/common.gypi "--depth=." 
"-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" 
"-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/4.4.6" 
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp"
 "-Dnode_lib_file=node.lib" 
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
-Makefile: 
$(srcdir)/../../../../usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 $(srcdir)/build/config.gypi $(srcdir)/binding.gyp 
$(srcdir)/../../../../home/runuser/.node-gyp/4.4.6/include/node/common.gypi
+cmd_regen_makefile = cd $(srcdir); 

[MediaWiki-commits] [Gerrit] pywikibot...FLOSSbot[master]: plugin: make sure - _ are treated as space

[Dachary (Code Review)]

Dachary has uploaded a new change for review.

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

Change subject: plugin: make sure - _ are treated as space
..

plugin: make sure - _ are treated as space

When used as attributes self.P_* or self.Q_*

Change-Id: I0968477939d7226a35ba27f2c29e39b358a84976
Signed-off-by: Loic Dachary 
---
M FLOSSbot/plugin.py
M tests/test_plugin.py
2 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/bots/FLOSSbot 
refs/changes/97/315697/1

diff --git a/FLOSSbot/plugin.py b/FLOSSbot/plugin.py
index 6f86d7b..4ea4402 100644
--- a/FLOSSbot/plugin.py
+++ b/FLOSSbot/plugin.py
@@ -104,6 +104,10 @@
 },
 }
 
+@staticmethod
+def normalize_name(name):
+return re.sub('[-_]', ' ', name)
+
 def search_entity(self, site, name, **kwargs):
 if name in Plugin.authoritative[site.code]:
 candidate = pywikibot.ItemPage(
@@ -113,7 +117,8 @@
 candidates = []
 for p in site.search_entities(name, 'en', **kwargs):
 log.debug("looking for entity " + name + ", found " + str(p))
-if p.get('label') == name:
+if (Plugin.normalize_name(p.get('label')) ==
+Plugin.normalize_name(name)):
 if kwargs['type'] == 'property':
 candidates.append(p)
 else:
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index 90a0e9e..1a45398 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -112,9 +112,11 @@
 bot = Bot.factory([
 '--test',
 '--user=FLOSSbotCI',
+'--verbose',
 ])
 plugin = Plugin(bot, bot.args)
-name = WikidataHelper.random_name()
+# ensure space, - and _ are accepted
+name = WikidataHelper.random_name() + "-some thing_else"
 entity = {
 "labels": {
 "en": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0968477939d7226a35ba27f2c29e39b358a84976
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/bots/FLOSSbot
Gerrit-Branch: master
Gerrit-Owner: Dachary 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add dataCubes description to pivot config template

[Elukey (Code Review)]

Elukey has submitted this change and it was merged.

Change subject: Add dataCubes description to pivot config template
..


Add dataCubes description to pivot config template

Pivot provides a description for datacubes, we want to use that.
3 dataCubes described, pageview_hourly, pageview_daily, edit-history-test.

Change-Id: Ia68dedf8524d498ce2bf8a3e68b419fb7684d4be
---
M modules/pivot/templates/config.yaml.erb
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/modules/pivot/templates/config.yaml.erb 
b/modules/pivot/templates/config.yaml.erb
index 6459038..1c5fcc5 100644
--- a/modules/pivot/templates/config.yaml.erb
+++ b/modules/pivot/templates/config.yaml.erb
@@ -39,6 +39,7 @@
 dataCubes:
   - name: pageviews-daily
 title: Pageviews Daily
+description: Small dataset - Starting July 2015 - Daily resolution - 
Monthly loading
 clusterName: druid
 source: pageviews-daily
 # The refresh rule describes how often the data cube looks for new data. 
Default: 'query'/PT1M (every minute)
@@ -70,6 +71,7 @@
 
   - name: edit-history-test
 title: Edit History test
+description: WIP - Don't use for now (probably broken anyway)
 clusterName: druid
 source: edit-history-test
 # The refresh rule describes how often the data cube looks for new data.
@@ -102,6 +104,7 @@
 
   - name: pageviews-hourly
 title: Pageviews Hourly
+description: Large dataset - Last 3 months - Hourly resolution - Daily 
loading
 clusterName: druid
 source: pageviews-hourly
 # The refresh rule describes how often the data cube looks for new data.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia68dedf8524d498ce2bf8a3e68b419fb7684d4be
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Joal 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Joal 
Gerrit-Reviewer: Mforns 
Gerrit-Reviewer: Milimetric 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make TransactionProfiler::setSilenced() calls handle nesting

[jenkins-bot (Code Review)]

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

Change subject: Make TransactionProfiler::setSilenced() calls handle nesting
..


Make TransactionProfiler::setSilenced() calls handle nesting

Change-Id: I6511a72a0fb921468a8a19ceb4d0a8ae669aa6e4
---
M includes/auth/AuthManager.php
M includes/libs/rdbms/TransactionProfiler.php
M includes/libs/rdbms/loadbalancer/LoadBalancer.php
M includes/specials/SpecialConfirmemail.php
M includes/specials/SpecialEmailInvalidate.php
5 files changed, 14 insertions(+), 10 deletions(-)

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



diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index e223e16..eeb233e 100644
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -1678,7 +1678,7 @@
 
// Ignore warnings about master connections/writes...hard to 
avoid here
$trxProfiler = \Profiler::instance()->getTransactionProfiler();
-   $trxProfiler->setSilenced( true );
+   $old = $trxProfiler->setSilenced( true );
try {
$status = $user->addToDatabase();
if ( !$status->isOK() ) {
@@ -1704,7 +1704,7 @@
return $status;
}
} catch ( \Exception $ex ) {
-   $trxProfiler->setSilenced( false );
+   $trxProfiler->setSilenced( $old );
$this->logger->error( __METHOD__ . ': {username} failed 
with exception {exception}', [
'username' => $username,
'exception' => $ex,
@@ -1743,7 +1743,7 @@
$logEntry->insert();
}
 
-   $trxProfiler->setSilenced( false );
+   $trxProfiler->setSilenced( $old );
 
if ( $login ) {
$this->setSessionDataForUser( $user );
diff --git a/includes/libs/rdbms/TransactionProfiler.php 
b/includes/libs/rdbms/TransactionProfiler.php
index 12f6df5..bf5e299 100644
--- a/includes/libs/rdbms/TransactionProfiler.php
+++ b/includes/libs/rdbms/TransactionProfiler.php
@@ -80,11 +80,15 @@
}
 
/**
-* @param bool $value
+* @param bool $value New value
+* @return bool Old value
 * @since 1.28
 */
public function setSilenced( $value ) {
+   $old = $this->silenced;
$this->silenced = $value;
+
+   return $old;
}
 
/**
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php 
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 083dcd6..32df19d 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -1324,7 +1324,7 @@
$cache->makeGlobalKey( __CLASS__, 'server-read-only', 
$masterServer ),
self::TTL_CACHE_READONLY,
function () use ( $domain, $conn ) {
-   $this->trxProfiler->setSilenced( true );
+   $old = $this->trxProfiler->setSilenced( true );
try {
$dbw = $conn ?: $this->getConnection( 
self::DB_MASTER, [], $domain );
$readOnly = 
(int)$dbw->serverIsReadOnly();
@@ -1334,7 +1334,7 @@
} catch ( DBError $e ) {
$readOnly = 0;
}
-   $this->trxProfiler->setSilenced( false );
+   $this->trxProfiler->setSilenced( $old );
return $readOnly;
},
[ 'pcTTL' => $cache::TTL_PROC_LONG, 'busyValue' => 0 ]
diff --git a/includes/specials/SpecialConfirmemail.php 
b/includes/specials/SpecialConfirmemail.php
index 7b4e9db..f494b9d 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -69,9 +69,9 @@
$this->getOutput()->addWikiMsg( 
'confirmemail_noemail' );
}
} else {
-   $trxProfiler->setSilenced( true );
+   $old = $trxProfiler->setSilenced( true );
$this->attemptConfirm( $code );
-   $trxProfiler->setSilenced( false );
+   $trxProfiler->setSilenced( $old );
}
}
 
diff --git a/includes/specials/SpecialEmailInvalidate.php 
b/includes/specials/SpecialEmailInvalidate.php
index d2e3e7f..c54abad 100644
--- a/includes/specials/SpecialEmailInvalidate.php
+++ b/includes/specials/SpecialEmailInvalidate.php
@@ -45,9 +45,9 @@
   

[MediaWiki-commits] [Gerrit] operations/dns[master]: Fixing typo on kubernetes1004.mgmt in wment file

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

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

Change subject: Fixing typo on kubernetes1004.mgmt in wment file
..

Fixing typo on kubernetes1004.mgmt in wment file

Change-Id: I03fbbba210e3b034244f5c56f54295311332b075
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/13/315713/1

diff --git a/templates/wmnet b/templates/wmnet
index 898c1fc..8100959 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1066,7 +1066,7 @@
 wmf6994 1H  IN A10.65.4.78
 kubernetes1003  1H  IN A10.65.4.79
 wmf6995 1H  IN A10.65.4.79
-kubernets1004   1H  IN A10.65.4.80
+kubernetes1004  1H  IN A10.65.4.80
 wmf6996 1H  IN A10.65.4.80
 conf10011H  IN A10.65.3.112
 conf10021H  IN A10.65.3.113

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: Fixing typo on kubernetes1004.mgmt in wment file

[Cmjohnson (Code Review)]

Cmjohnson has submitted this change and it was merged.

Change subject: Fixing typo on kubernetes1004.mgmt in wment file
..


Fixing typo on kubernetes1004.mgmt in wment file

Change-Id: I03fbbba210e3b034244f5c56f54295311332b075
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index 898c1fc..8100959 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1066,7 +1066,7 @@
 wmf6994 1H  IN A10.65.4.78
 kubernetes1003  1H  IN A10.65.4.79
 wmf6995 1H  IN A10.65.4.79
-kubernets1004   1H  IN A10.65.4.80
+kubernetes1004  1H  IN A10.65.4.80
 wmf6996 1H  IN A10.65.4.80
 conf10011H  IN A10.65.3.112
 conf10021H  IN A10.65.3.113

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[wmf/1.28.0-wmf.22]: Don't set the performer property if the user is not available.

[jenkins-bot (Code Review)]

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

Change subject: Don't set the performer property if the user is not available.
..


Don't set the performer property if the user is not available.

Bug: T147977
Change-Id: I71eff9099652f7819da0506f2220521f1f1707d2
Depends-On: I139f12ae3f592dcf690617f9dd95a4df828c4a70
---
M EventBus.hooks.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index ee3a733..3a8b25f 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -641,12 +641,12 @@
 
$title = $linksUpdate->getTitle();
$revision = $linksUpdate->getRevision();
+   $user = $linksUpdate->getTriggeringUser();
 
// Create a mediawiki page delete event.
$attrs = [
// Common Mediawiki entity fields
'database'   => $wgDBname,
-   'performer'  => self::createPerformerAttrs( 
$linksUpdate->getTriggeringUser() ),
 
// page entity fields
'page_id'=> $title->getArticleID(),
@@ -656,6 +656,10 @@
'rev_id' =>$revision->getId()
];
 
+   if ( !is_null( $user ) ) {
+   $attrs[ 'performer' ] = self::createPerformerAttrs( 
$user );
+   }
+
if ( !empty( $addedProps ) ) {
$attrs[ 'added_properties' ] = $addedProps;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71eff9099652f7819da0506f2220521f1f1707d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Return back the possibility to have a performer

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review.

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

Change subject: Return back the possibility to have a performer
..

Return back the possibility to have a performer

Change-Id: Ibda1387dd8591f66044c89a561ec3eb8336f8e8e
---
M jsonschema/mediawiki/page/properties-change/1.yaml
1 file changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/event-schemas 
refs/changes/16/315716/1

diff --git a/jsonschema/mediawiki/page/properties-change/1.yaml 
b/jsonschema/mediawiki/page/properties-change/1.yaml
index 5c938c9..6701b55 100644
--- a/jsonschema/mediawiki/page/properties-change/1.yaml
+++ b/jsonschema/mediawiki/page/properties-change/1.yaml
@@ -49,6 +49,34 @@
 description: The name of the wiki database this event belongs to.
 type: string
 
+  performer:
+description: Represents the user that performed this change.
+type: object
+properties:
+  user_id:
+description: >
+  The user id that performed this change.  This is optional, and
+  will not be present for anonymous users.
+type: integer
+  user_text:
+description: The text representation of the user that performed this 
change.
+type: string
+  user_groups:
+description: A list of the groups this user belongs to.  E.g. bot, 
sysop etc.
+type: array
+items:
+  type: string
+  user_is_bot:
+description: >
+  True if this user is considered to be a bot.  This is checked
+  via the $user->isBot() method, which considers both user_groups
+  and user permissions.
+type: boolean
+required:
+  - user_text
+  - user_groups
+  - user_is_bot
+
   ### page entity fields - all page related events should have these.
   page_id:
 description: The page ID of the page which properties has been changed.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibda1387dd8591f66044c89a561ec3eb8336f8e8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid blowing up inside Parser::extensionSubstitution() when...

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Avoid blowing up inside Parser::extensionSubstitution() when PP 
limits are exceeded
..

Avoid blowing up inside Parser::extensionSubstitution() when PP limits are 
exceeded

The most critical one is if the marker name is bad, since that causes
StripState to throw an exception since I798d31af. But we may as well
check the other expand calls in this function too to avoid outputting
broken wikitext.

Bug: T136401
Change-Id: I1cb353d74f9a46168055e1abeb22cf569fe9354a
---
M includes/parser/Parser.php
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/04/315704/1

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index a32acc2..f0898ba 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3784,9 +3784,28 @@
 * @return string
 */
public function extensionSubstitution( $params, $frame ) {
+   static $errorStr = '';
+   static $errorLen = 20;
+
$name = $frame->expand( $params['name'] );
+   if ( substr( $name, 0, $errorLen ) === $errorStr ) {
+   // Probably expansion depth or node count exceeded. 
Just punt the
+   // error up.
+   return $name;
+   }
+
$attrText = !isset( $params['attr'] ) ? null : $frame->expand( 
$params['attr'] );
+   if ( substr( $attrText, 0, $errorLen ) === $errorStr ) {
+   // See above
+   return $attrText;
+   }
+
$content = !isset( $params['inner'] ) ? null : $frame->expand( 
$params['inner'] );
+   if ( substr( $content, 0, $errorLen ) === $errorStr ) {
+   // See above
+   return $content;
+   }
+
$marker = self::MARKER_PREFIX . "-$name-"
. sprintf( '%08X', $this->mMarkerIndex++ ) . 
self::MARKER_SUFFIX;
 
@@ -3844,6 +3863,10 @@
$output = "<$name$attrText/>";
} else {
$close = is_null( $params['close'] ) ? '' : 
$frame->expand( $params['close'] );
+   if ( substr( $close, 0, $errorLen ) === 
$errorStr ) {
+   // See above
+   return $close;
+   }
$output = "<$name$attrText>$content$close";
}
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Populate lu_local_id and lu_global_id on new user attach

[Kaldari (Code Review)]

Kaldari has submitted this change and it was merged.

Change subject: Populate lu_local_id and lu_global_id on new user attach
..


Populate lu_local_id and lu_global_id on new user attach

Bug: T142507
Change-Id: I36d6fb4ee95b97dada7fc80dcbe7126f42e97249
---
M includes/CentralAuthPrimaryAuthenticationProvider.php
M includes/CentralAuthUser.php
M includes/GlobalRename/GlobalUserMerge.php
M includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
4 files changed, 66 insertions(+), 11 deletions(-)

Approvals:
  Kaldari: Looks good to me, approved
  Gergő Tisza: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php 
b/includes/CentralAuthPrimaryAuthenticationProvider.php
index 802cae2..1f5d158 100644
--- a/includes/CentralAuthPrimaryAuthenticationProvider.php
+++ b/includes/CentralAuthPrimaryAuthenticationProvider.php
@@ -440,17 +440,23 @@
// Wha?
return AuthenticationResponse::newFail( 
wfMessage( 'userexists' ) );
}
-   $centralUser->attach( wfWikiID(), 'new' );
-   
CentralAuthUtils::getCentralDB()->onTransactionIdle( function () use ( 
$centralUser ) {
-   CentralAuthUtils::scheduleCreationJobs( 
$centralUser );
-   } );
return AuthenticationResponse::newPass( 
$user->getName() );
}
}
-
return AuthenticationResponse::newAbstain();
}
 
+   public function finishAccountCreation( $user, $creator, 
AuthenticationResponse $response ) {
+   $centralUser = CentralAuthUser::getMasterInstance( $user );
+   // Do the attach in finishAccountCreation instead of begin 
because now the user has been added
+   // to database and local ID exists (which is needed in attach)
+   $centralUser->attach( wfWikiID(), 'new' );
+   CentralAuthUtils::getCentralDB()->onTransactionIdle( function 
() use ( $centralUser ) {
+   CentralAuthUtils::scheduleCreationJobs( $centralUser );
+   } );
+   return null;
+   }
+
public function autoCreatedAccount( $user, $source ) {
$centralUser = CentralAuthUser::getMasterInstance( $user );
if ( !$centralUser->exists() ) {
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 3d0d179..7a7b836 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -534,6 +534,28 @@
}
 
/**
+   * Return the local user account ID of the user with the same name on 
given wiki,
+   * irrespective of whether it is attached or not
+   * @param string $wikiId ID for the local database to connect to
+   * @return int|null Local user ID for given $wikiID. Null if $wikiID is 
invalid or local user doesn't exist
+   */
+   public function getLocalId( $wikiId ) {
+   // Make sure the wiki ID is valid. (This prevents 
DBConnectionError in unit tests)
+   $validWikis = self::getWikiList();
+   if ( !in_array( $wikiId, $validWikis ) ) {
+   return null;
+   }
+   // Retrieve the local user ID from the specified database.
+   $db = $this->getLocalDB( $wikiId );
+   $id = $db->selectField( 'user', 'user_id', array( 'user_name' 
=> $this->mName ), __METHOD__ );
+   // If user doesn't exist, return null instead of false
+   if ( $id === false ) {
+   return null;
+   }
+   return $id;
+   }
+
+   /**
 * Generate a valid memcached key for caching the object's data.
 * @return String
 */
@@ -1773,7 +1795,9 @@
'lu_wiki'   => $wikiID,
'lu_name'   => $this->mName,
'lu_attached_timestamp' => $dbw->timestamp( $ts 
),
-   'lu_attached_method'=> $method ),
+   'lu_attached_method'=> $method,
+   'lu_local_id'   => $this->getLocalId( 
$wikiID ),
+   'lu_global_id'  => $this->getId() ),
__METHOD__,
array( 'IGNORE' )
);
diff --git a/includes/GlobalRename/GlobalUserMerge.php 
b/includes/GlobalRename/GlobalUserMerge.php
index 49a99c4..10495bd 100644
--- a/includes/GlobalRename/GlobalUserMerge.php
+++ b/includes/GlobalRename/GlobalUserMerge.php
@@ -126,7 +126,7 @@
'attached' => 

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Deployment: Switch from tin to mira

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Deployment: Switch from tin to mira
..

Deployment: Switch from tin to mira

Bug: T144578
Change-Id: I626318ae08b91da66d9ad82209bdcea4040bf9c3
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid/deploy 
refs/changes/10/315710/1

diff --git a/scap/scap.cfg b/scap/scap.cfg
index 0bf7834..989aa46 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -13,7 +13,7 @@
 config_deploy: True
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 [deployment-prep.eqiad.wmflabs]
 git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I626318ae08b91da66d9ad82209bdcea4040bf9c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
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] operations/puppet[production]: contint: Install php7.0-ast for phan

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: contint: Install php7.0-ast for phan
..

contint: Install php7.0-ast for phan

Bug: T132636
Change-Id: I6764d083adfba7fa7d21009f2d2baab65a550043
---
M modules/contint/manifests/packages/php.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/315711/1

diff --git a/modules/contint/manifests/packages/php.pp 
b/modules/contint/manifests/packages/php.pp
index 305050a..ec4f805 100644
--- a/modules/contint/manifests/packages/php.pp
+++ b/modules/contint/manifests/packages/php.pp
@@ -43,6 +43,8 @@
 'php7.0-bcmath',
 'php7.0-mbstring',
 'php7.0-xml',
+# for phan (T132636)
+'php7.0-ast',
 ]:
 ensure  => latest,
 require => Apt::Repository['sury-php'],

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

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

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

[MediaWiki-commits] [Gerrit] maps...deploy[master]: Update kartotherian to cb3f22c

[Yurik (Code Review)]

Yurik has submitted this change and it was merged.

Change subject: Update kartotherian to cb3f22c
..


Update kartotherian to cb3f22c

List of changes:
xxx Update node module dependencies

Change-Id: I7b1a574f56da082ba5711f2ae5d32c6ddaf7f7aa
---
C node_modules/.bin/semver
A node_modules/bunyan-prettystream/.coveralls.yml
A node_modules/bunyan-prettystream/.npmignore
A node_modules/bunyan-prettystream/.travis.yml
A node_modules/bunyan-prettystream/lib/prettystream.js
A node_modules/bunyan-prettystream/makefile
A node_modules/bunyan-prettystream/package.json
A node_modules/bunyan-prettystream/test/prettystream.test.js
R node_modules/extend/.eslintrc
R node_modules/extend/.jscs.json
R node_modules/extend/.npmignore
R node_modules/extend/.travis.yml
R node_modules/extend/LICENSE
R node_modules/extend/component.json
R node_modules/extend/index.js
R node_modules/extend/package.json
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/lib/core.js
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
D 
node_modules/kartotherian-geoshapes/node_modules/pg-connection-string/package.json
D node_modules/kartotherian-geoshapes/node_modules/pg-types/package.json
D 
node_modules/kartotherian-geoshapes/node_modules/pg.js/node_modules/buffer-writer/package.json
D 
node_modules/kartotherian-geoshapes/node_modules/pg.js/node_modules/generic-pool/package.json
D node_modules/kartotherian-geoshapes/node_modules/pgpass/package.json
M node_modules/kartotherian-geoshapes/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-maki/package.json
M node_modules/kartotherian-overzoom/package.json
C node_modules/kartotherian-postgres/.npmignore
A node_modules/kartotherian-postgres/LICENSE
A node_modules/kartotherian-postgres/Postgres.js
C node_modules/kartotherian-postgres/node_modules/pg-query-stream/.npmignore
A node_modules/kartotherian-postgres/node_modules/pg-query-stream/.travis.yml
C node_modules/kartotherian-postgres/node_modules/pg-query-stream/Makefile
A node_modules/kartotherian-postgres/node_modules/pg-query-stream/index.js
C 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/.npmignore
C 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/.travis.yml
C 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/Makefile
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/index.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/package.json
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/pg.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/close.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/error-handling.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/index.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/mocha.opts
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/no-data-handling.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/.npmignore
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/.travis.yml
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/LICENSE
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/duplex.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_duplex.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_passthrough.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_readable.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_transform.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_writable.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/internal/streams/BufferList.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/buffer-shims/index.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/buffer-shims/package.json
A 

[MediaWiki-commits] [Gerrit] analytics...source[master]: Update casssandra loading classes for new AQS

[Nuria (Code Review)]

Nuria has submitted this change and it was merged.

Change subject: Update casssandra loading classes for new AQS
..


Update casssandra loading classes for new AQS

Bug: T147841

Change-Id: Ic3653201fbb8fdf095ad99329ba1a3d01387b2a8
---
M refinery-cassandra/pom.xml
M 
refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
M 
refinery-cassandra/src/test/java/org/wikimedia/analytics/refinery/cassandra/TestCassandraXSVLoader.java
3 files changed, 18 insertions(+), 8 deletions(-)

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



diff --git a/refinery-cassandra/pom.xml b/refinery-cassandra/pom.xml
index e875015..8a87da5 100644
--- a/refinery-cassandra/pom.xml
+++ b/refinery-cassandra/pom.xml
@@ -23,6 +23,10 @@
 com.google.guava
 guava
 
+
+com.google.collections
+google-collections
+
 
 provided
 
@@ -35,6 +39,10 @@
 
 com.google.guava
 guava
+
+
+com.google.collections
+google-collections
 
 
 provided
@@ -55,7 +63,7 @@
 
 org.apache.cassandra
 cassandra-all
-2.2.2
+2.2.6
 
 
 
diff --git 
a/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
 
b/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
index 5dfc5af..ee2bf83 100644
--- 
a/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
+++ 
b/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
@@ -41,10 +41,12 @@
  * Map-Reduce job loading data into a Cassandra cluster from separated-value 
files.
  *
  * Usage:
- * hadoop jar /path/to/refinery-job.jar 
org.wikimedia.analytics.refinery.job.CassandraXSVLoader \
+ * hadoop jar /path/to/refinery-job.jar 
org.wikimedia.analytics.refinery.cassandra.CassandraXSVLoader \
+ *-D mapreduce.job.user.classpath.first=true \
+ *-D mapreduce.job.reduces=X \
  *-D cassandra_host=your_host \
- *-D cassandra_user=cassandra \
- *-D cassandra_passwd=cassandra \
+ *-D cassandra_username=aqsloader \
+ *-D cassandra_password=cassandra \
  *-D input_path=/path/to/xsv/file/or/folder \
  *-D input_separator=, \
  *-D input_fields=text_field,,int_field,double_field \
@@ -280,6 +282,9 @@
 job.setOutputKeyClass(Map.class);
 job.setOutputValueClass(List.class);
 
+// Use cassandra cql output format
+// This is where the actual connection and data push
+// to cassandra is made
 job.setOutputFormatClass(CqlOutputFormat.class);
 
 ConfigHelper.setOutputColumnFamily(
diff --git 
a/refinery-cassandra/src/test/java/org/wikimedia/analytics/refinery/cassandra/TestCassandraXSVLoader.java
 
b/refinery-cassandra/src/test/java/org/wikimedia/analytics/refinery/cassandra/TestCassandraXSVLoader.java
index 29081ab..7e40052 100644
--- 
a/refinery-cassandra/src/test/java/org/wikimedia/analytics/refinery/cassandra/TestCassandraXSVLoader.java
+++ 
b/refinery-cassandra/src/test/java/org/wikimedia/analytics/refinery/cassandra/TestCassandraXSVLoader.java
@@ -10,11 +10,8 @@
 import java.io.IOException;
 
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.when;
 
-/**
- * Created by jo on 8/5/15.
- */
+
 public class TestCassandraXSVLoader {
 
 private Configuration configurationMock = 
Mockito.mock(Configuration.class);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3653201fbb8fdf095ad99329ba1a3d01387b2a8
Gerrit-PatchSet: 5
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Joal 
Gerrit-Reviewer: Nuria 
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] mediawiki/core[master]: Change documentation of formatTimePeriod

[jenkins-bot (Code Review)]

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

Change subject: Change documentation of formatTimePeriod
..


Change documentation of formatTimePeriod

Currently, the function formatTimePeriod does not have a very descriptive
documentation and has a TODO tag on it to change the documentation
Change the documentation to be more descriptive and remove the TODO

Change-Id: Idde711f1d3d6cbe0ecab0c3b49c68a4876d9e8b2
---
M languages/Language.php
1 file changed, 6 insertions(+), 5 deletions(-)

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



diff --git a/languages/Language.php b/languages/Language.php
index 7354155..7ef2eff 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -4461,14 +4461,15 @@
}
 
/**
-* @todo Document
+* Formats a time given in seconds into a string representation of that 
time.
+*
 * @param int|float $seconds
-* @param array $format Optional
-*   If $format['avoid'] === 'avoidseconds': don't mention seconds if 
$seconds >= 1 hour.
-*   If $format['avoid'] === 'avoidminutes': don't mention 
seconds/minutes if $seconds > 48 hours.
+* @param array $format An optional argument that formats the returned 
string in different ways:
+*   If $format['avoid'] === 'avoidseconds': don't show seconds if 
$seconds >= 1 hour,
+*   If $format['avoid'] === 'avoidminutes': don't show seconds/minutes 
if $seconds > 48 hours,
 *   If $format['noabbrevs'] is true: use 'seconds' and friends instead 
of 'seconds-abbrev'
 * and friends.
-*   For backwards compatibility, $format may also be one of the 
strings 'avoidseconds'
+* @note For backwards compatibility, $format may also be one of the 
strings 'avoidseconds'
 * or 'avoidminutes'.
 * @return string
 */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idde711f1d3d6cbe0ecab0c3b49c68a4876d9e8b2
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: AndyTechGuy 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Only set memcache hash when saving messages to memcache

[Ejegg (Code Review)]

Ejegg has uploaded a new change for review.

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

Change subject: Only set memcache hash when saving messages to memcache
..

Only set memcache hash when saving messages to memcache

Shouldn't need to change the memcache hash unless we're changing the
memcache value.

Bug: T144952
Change-Id: I8e5cc29bfa0372f0071914e534e0b80cc4d34286
---
M includes/cache/MessageCache.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index f393acd..6834ac0 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -631,11 +631,11 @@
if ( $dest === 'all' ) {
$cacheKey = wfMemcKey( 'messages', $code );
$success = $this->mMemc->set( $cacheKey, $cache );
+   $this->setValidationHash( $code, $cache );
} else {
$success = true;
}
 
-   $this->setValidationHash( $code, $cache );
$this->saveToLocalCache( $code, $cache );
 
return $success;

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 66f3831

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Update restbase to 66f3831
..


Update restbase to 66f3831

List of changes:
xxx Update node module dependencies

Change-Id: Ie4c8e3e319d50f0619a7cb6d545bbd6d282cb90b
---
M node_modules/content-type/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M node_modules/hyperswitch/node_modules/preq/index.js
M 
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/aws4/aws4.js
M 
node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/aws4/package.json
M node_modules/hyperswitch/node_modules/preq/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M node_modules/json-stable-stringify/package.json
M 
node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/jsonwebtoken/node_modules/jws/node_modules/base64url/node_modules/concat-stream/node_modules/readable-stream/node_modules/string_decoder/package.json
M node_modules/mediawiki-title/lib/index.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/lib/connection.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/lib/request-handler.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/lib/writers.js
M 
node_modules/restbase-mod-table-cassandra/node_modules/cassandra-driver/package.json
M 
node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json
M 
node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/inflight.js
M 
node_modules/service-runner/node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/core-util-is/package.json
M 
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/string_decoder/package.json
27 files changed, 262 insertions(+), 155 deletions(-)

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



diff --git a/node_modules/content-type/package.json 
b/node_modules/content-type/package.json
index 0526ef9..3fce6d9 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -44,7 +44,7 @@
   },
   "homepage": "https://github.com/jshttp/content-type#readme;,
   "_id": "content-type@1.0.1",
-  "_shasum": "ad8c9483a48c242604b4ec7602123ea3f270fa73",
+  "_shasum": "8e9159d35ab9f2a064a52b91cb279a9f4bcee022",
   "_from": "git+https://github.com/wikimedia/content-type.git#master;,
   "_resolved": 
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b;
 }
diff --git a/node_modules/heapdump/build/Makefile 
b/node_modules/heapdump/build/Makefile
index 71b2b2b..c9d9d51 100644
--- a/node_modules/heapdump/build/Makefile
+++ b/node_modules/heapdump/build/Makefile
@@ -57,7 +57,7 @@
 CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
 CXX.host ?= g++
 CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
-LINK.host ?= $(CXX.host)
+LINK.host ?= g++
 LDFLAGS.host ?=
 AR.host ?= ar
 
@@ -308,8 +308,8 @@
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment "--toplevel-dir=." 
-I/opt/service/node_modules/heapdump/build/config.gypi 
-I/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 -I/home/runuser/.node-gyp/4.4.6/include/node/common.gypi "--depth=." 
"-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" 
"-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/4.4.6" 
"-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp"
 "-Dnode_lib_file=node.lib" 
"-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp
-Makefile: 
$(srcdir)/../../../../usr/local/nvm/versions/node/v4.4.6/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 $(srcdir)/build/config.gypi $(srcdir)/binding.gyp 
$(srcdir)/../../../../home/runuser/.node-gyp/4.4.6/include/node/common.gypi
+cmd_regen_makefile = cd $(srcdir); 
/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py
 -fmake --ignore-environment 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps - make sure tilerator notification does not run concurr...

[Gehel (Code Review)]

Gehel has uploaded a new change for review.

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

Change subject: maps - make sure tilerator notification does not run 
concurrently
..

maps - make sure tilerator notification does not run concurrently

Tilerator notification does not have an internal mechanism to ensure
that notifications are not running concurrently. This mechanism needs
to be external at the moment, so let's implement it with a simple flock.

Change-Id: Id433e773708035abcaa500084db2a0ee7f46b067
---
M modules/tilerator/manifests/ui.pp
M modules/tilerator/templates/notify-tilerator.erb
2 files changed, 15 insertions(+), 10 deletions(-)


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

diff --git a/modules/tilerator/manifests/ui.pp 
b/modules/tilerator/manifests/ui.pp
index 77241e7..dbcbe48 100644
--- a/modules/tilerator/manifests/ui.pp
+++ b/modules/tilerator/manifests/ui.pp
@@ -59,6 +59,9 @@
 #   if tile is empty, make sure we don't store it, if it was there before
 #   used in Tilerator notification
 #
+# [*osmosis_dir*]
+#   directory in which osmosis keeps its state
+#
 class tilerator::ui(
 $port   = 6535,
 $conf_sources   = 'sources.prod.yaml',
@@ -69,6 +72,7 @@
 $generator_id   = 'gen',
 $storage_id = 'v3',
 $delete_empty   = true,
+$osmosis_dir= '/srv/osmosis',
 $expire_dir = '/srv/osm_expire/',
 ) {
 $statefile = "${statefile_dir}/expire.state"
diff --git a/modules/tilerator/templates/notify-tilerator.erb 
b/modules/tilerator/templates/notify-tilerator.erb
index cece890..13b5e40 100644
--- a/modules/tilerator/templates/notify-tilerator.erb
+++ b/modules/tilerator/templates/notify-tilerator.erb
@@ -1,17 +1,18 @@
 #!/bin/bash
 
-/usr/bin/nodejs /srv/deployment/tilerator/deploy/src/scripts/tileshell.js \
---config /etc/tileratorui/config.yaml \
--j.fromZoom <%= @from_zoom %> \
--j.beforeZoom <%= @before_zoom %> \
--j.generatorId <%= @generator_id %> \
--j.storageId <%= @storage_id %> \
+/usr/bin/flock -xn <%= @osmosis_dir %>/replicate-osm.lck \
+/usr/bin/nodejs /srv/deployment/tilerator/deploy/src/scripts/tileshell.js \
+--config /etc/tileratorui/config.yaml \
+-j.fromZoom <%= @from_zoom %> \
+-j.beforeZoom <%= @before_zoom %> \
+-j.generatorId <%= @generator_id %> \
+-j.storageId <%= @storage_id %> \
 <%- if @delete_empty -%>
--j.deleteEmpty \
+-j.deleteEmpty \
 <%- end -%>
--j.expdirpath <%= @expire_dir %> \
--j.expmask 'expire\.list\.*' \
--j.statefile <%= @statefile %>
+-j.expdirpath <%= @expire_dir %> \
+-j.expmask 'expire\.list\.*' \
+-j.statefile <%= @statefile %>
 
 notification_code=$?
 

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: GlobalSign G2 intermediate, signed by R3

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: GlobalSign G2 intermediate, signed by R3
..

GlobalSign G2 intermediate, signed by R3

Bug: T148045
Change-Id: I773bad181f5657c982bcbcc7ab6ddaafb7c3e2c6
---
M modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
1 file changed, 24 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/315705/1

diff --git 
a/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt 
b/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
index c846c09..6a590b1 100644
--- 
a/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
+++ 
b/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
@@ -1,26 +1,26 @@
 -BEGIN CERTIFICATE-
-MIIEaTCCA1GgAwIBAgILBAABRE7wQkcwDQYJKoZIhvcNAQELBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw0xNDAyMjAxMDAw
-MDBaFw0yNDAyMjAxMDAwMDBaMGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBW
-YWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHDmw/I5N/zHClnSDDDlM/fsBOwphJykfVI+8DNIV0yKMCLkZc
-C33JiJ1Pi/D4nGyMVTXbv/Kz6vvjVudKRtkTIso21ZvBqOOWQ5PyDLzm+ebomchj
-SHh/VzZpGhkdWtHUfcKc1H/hgBKueuqI6lfYygoKOhJJomIZeg0k9zfrtHOSewUj
-mxK1zusp36QUArkBpdSmnENkiN74fv7j9R7l/tyjqORmMdlMJekYuYlZCa7pnRxt
-Nw9KHjUgKOKv1CGLAcRFrW4rY6uSa2EKTSDtc7p8zv4WtdufgPDWi2zZCHlKT3hl
-2pK8vjX5s8T5J4BO/5ZS5gIg4Qdz6V0rvbLxAgMBAAGjggElMIIBITAOBgNVHQ8B
-Af8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUlt5h8b0cFilT
-HMDMfTuDAEDmGnwwRwYDVR0gBEAwPjA8BgRVHSAAMDQwMgYIKwYBBQUHAgEWJmh0
-dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMDMGA1UdHwQsMCow
-KKAmoCSGImh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvcm9vdC5jcmwwPQYIKwYB
-BQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwOi8vb2NzcC5nbG9iYWxzaWduLmNv
-bS9yb290cjEwHwYDVR0jBBgwFoAUYHtmGkUNl8qJUC99BM00qP/8/UswDQYJKoZI
-hvcNAQELBQADggEBAEYq7l69rgFgNzERhnF0tkZJyBAW/i9iIxerH4f4gu3K3w4s
-32R1juUYcqeMOovJrKV3UPfvnqTgoI8UV6MqX+x+bRDmuo2wCId2Dkyy2VG7EQLy
-XN0cvfNVlg/UBsD84iOKJHDTu/B5GqdhcIOKrwbFINihY9Bsrk8y1658GEV1BSl3
-30JAZGSGvip2CTFvHST0mdCF/vIhCPnG9vHQWe3WVjwIKANnuvD58ZAWR65n5ryA
-SOlCdjSXVWkkDoPWoC209fN5ikkodBpBocLTJIg1MGCUF7ThBCIxPTsvFwayuJ2G
-K1pp74P1S8SqtCr4fKGxhZSM9AyHDPSsQPhZSZg=
+MIIEYjCCA0qgAwIBAgILBAABMYnGRMkwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTEwODAyMTAwMDAwWhcNMjIwODAy
+MTAwMDAwWjBmMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1z
+YTE8MDoGA1UEAxMzR2xvYmFsU2lnbiBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBD
+QSAtIFNIQTI1NiAtIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+xw5sPyOTf8xwpZ0gww5TP37ATsKYScpH1SPvAzSFdMijAi5GXAt9yYidT4vw+Jxs
+jFU127/ys+r741bnSkbZEyLKNtWbwajjlkOT8gy85vnm6JnIY0h4f1c2aRoZHVrR
+1H3CnNR/4YASrnrqiOpX2MoKCjoSSaJiGXoNJPc367RzknsFI5sStc7rKd+kFAK5
+AaXUppxDZIje+H7+4/Ue5f7co6jkZjHZTCXpGLmJWQmu6Z0cbTcPSh41ICjir9Qh
+iwHERa1uK2OrkmthCk0g7XO6fM7+FrXbn4Dw1ots2Qh5Sk94ZdqSvL41+bPE+SeA
+Tv+WUuYCIOEHc+ldK72y8QIDAQABo4IBKTCCASUwDgYDVR0PAQH/BAQDAgEGMBIG
+A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFJbeYfG9HBYpUxzAzH07gwBA5hp8
+MEcGA1UdIARAMD4wPAYEVR0gADA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5n
+bG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA2BgNVHR8ELzAtMCugKaAnhiVodHRw
+Oi8vY3JsLmdsb2JhbHNpZ24ubmV0L3Jvb3QtcjMuY3JsMD4GCCsGAQUFBwEBBDIw
+MDAuBggrBgEFBQcwAYYiaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL3Jvb3Ry
+MzAfBgNVHSMEGDAWgBSP8Et/qC5FJK5NUPpjmove4t0bvDANBgkqhkiG9w0BAQsF
+AAOCAQEAugYpwLQZjCERwJQRnrs91NVDQPafuyULI2i1Gvf6VGTMKxP5IfBEreHo
+FVjb7v3bok3MGI8Nmm3DawGhMfCNvABAzDlfh2FRbfSV6uoVNT5AhcBi1aE0/niq
+qLJaOfM3Qfuc6D5xSlvr+GlYoeDGk3fpumeS62VYkHBzQn2v9CMmeReq+qS7meVE
+b2WB58rrVcj0ticRIXSUvGu3dGIpxM2uR/LmQlt4hgVhy5CqeYnfBH6xJnBLjUAf
+hHvA+wfmyLdOkfQ1A+3o60EQF0m0YsinLPLhTI8DLPMWN11n8aQ5eUmjwF3MVfkh
+gA/7zuIpalhQ6abX6xwyNrVip8H65g==
 -END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] operations...toollabs-images[master]: Add legacy trusty container

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Add legacy trusty container
..

Add legacy trusty container

Bug: T148054
Change-Id: Iadb312b7ef693002dfdd47df042a421ad8fd133c
---
M build.py
A trusty-legacy/.dockerignore
A trusty-legacy/Dockerfile.template
A trusty-legacy/nsswitch.conf
A trusty-legacy/tools.list
5 files changed, 39 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/docker-images/toollabs-images 
refs/changes/06/315706/1

diff --git a/build.py b/build.py
index 0ee1749..92d58e4 100755
--- a/build.py
+++ b/build.py
@@ -44,6 +44,7 @@
 'golang/web',
 ]
 },
+'legacy-trusty': {}
 }
 
 
diff --git a/trusty-legacy/.dockerignore b/trusty-legacy/.dockerignore
new file mode 100644
index 000..689cf97
--- /dev/null
+++ b/trusty-legacy/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/trusty-legacy/Dockerfile.template 
b/trusty-legacy/Dockerfile.template
new file mode 100644
index 000..b508ec1
--- /dev/null
+++ b/trusty-legacy/Dockerfile.template
@@ -0,0 +1,22 @@
+# Base toollabs user image
+# Name: docker-registry.tools.wmflabs.org/toollabs-trusty-legacy
+# Source image: Ubuntu Trusty
+# Sets up:
+#   Extra Apt repo: Tools repo
+#   Users and Groups from labs LDAP (with mount required for nslcd)
+FROM docker-registry.tools.wmflabs.org/wikimedia-trusty
+
+# Add tools debian repo to this container
+ADD tools.list /etc/apt/sources.list.d/tools.list
+
+RUN apt-get update
+
+# Setup NSS with LDAP. This requires that we mount /var/run/nslcd/socket from 
the
+# underlying labs host to the container. If not mounted, it will fallback 
gracefully
+# and just not use LDAP for NSS.
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes 
--no-install-recommends libnss-ldapd locales
+ADD nsswitch.conf /etc/nsswitch.conf
+
+# Setup the C.UTF-8 Locale, since otherwise it defaults to the C one (which 
sucks!)
+RUN locale-gen C.UTF-8
+ENV LC_ALL C.UTF-8
diff --git a/trusty-legacy/nsswitch.conf b/trusty-legacy/nsswitch.conf
new file mode 100644
index 000..61304f3
--- /dev/null
+++ b/trusty-legacy/nsswitch.conf
@@ -0,0 +1,14 @@
+passwd: compat ldap
+group:  compat ldap
+shadow: compat
+gshadow:files
+
+hosts:  files dns
+networks:   files
+
+protocols:  db files
+services:   db files
+ethers: db files ldap
+rpc:db files
+
+netgroup:   nis
diff --git a/trusty-legacy/tools.list b/trusty-legacy/tools.list
new file mode 100644
index 000..2f1c56f
--- /dev/null
+++ b/trusty-legacy/tools.list
@@ -0,0 +1 @@
+deb [trusted=yes] http://deb.tools.wmflabs.org/repo trusty-tools main

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadb312b7ef693002dfdd47df042a421ad8fd133c
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] maps...deploy[master]: Update tilerator to 8b90117

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Update tilerator to 8b90117
..

Update tilerator to 8b90117

also switched to mira.codfw for git server

List of changes:
8b90117 optionally include bunyan-prettystream for dbg
xxx Update node module dependencies

Change-Id: I745a31321c7c715e220595b3906f48f6619b0079
---
A node_modules/bunyan-prettystream/.coveralls.yml
A node_modules/bunyan-prettystream/.npmignore
A node_modules/bunyan-prettystream/.travis.yml
A node_modules/bunyan-prettystream/lib/prettystream.js
A node_modules/bunyan-prettystream/makefile
A node_modules/bunyan-prettystream/package.json
A node_modules/bunyan-prettystream/test/prettystream.test.js
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/lib/core.js
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-overzoom/package.json
M node_modules/kartotherian-postgres/Postgres.js
M node_modules/kartotherian-postgres/package.json
M node_modules/kartotherian-server/package.json
M node_modules/kartotherian-substantial/package.json
M node_modules/kue-ui/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/aws4/aws4.js
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/aws4/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/request/node_modules/qs/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/common.js
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/glob.js
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/node_modules/inflight/inflight.js
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/package.json
M 
node_modules/mapnik/node_modules/node-pre-gyp/node_modules/rimraf/node_modules/glob/sync.js
M node_modules/osm-bright-source/data.xml
M node_modules/osm-bright-source/data.yml
M node_modules/osm-bright-source/node_modules/postgis-vt-util/package.json
M node_modules/osm-bright-source/package.json
M node_modules/osm-bright-style/node_modules/osm-bright-fonts/package.json
M node_modules/osm-bright-style/package.json
M node_modules/preq/index.js
M node_modules/preq/node_modules/request/node_modules/aws4/aws4.js
M node_modules/preq/node_modules/request/node_modules/aws4/package.json
D 
node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/LICENSE
D 
node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/inherits.js
D 
node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/inherits_browser.js
D 
node_modules/preq/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/inherits/package.json
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/.travis.yml
A 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/benchmark.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/jsonpointer.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/test.js
M 
node_modules/preq/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
D 
node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/bcrypt-pbkdf/node_modules/tweetnacl/.npmignore
D 

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Avoid blowing up inside Parser::extensionSubstitution() when...

[jenkins-bot (Code Review)]

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

Change subject: Avoid blowing up inside Parser::extensionSubstitution() when PP 
limits are exceeded
..


Avoid blowing up inside Parser::extensionSubstitution() when PP limits are 
exceeded

The most critical one is if the marker name is bad, since that causes
StripState to throw an exception since I798d31af. But we may as well
check the other expand calls in this function too to avoid outputting
broken wikitext.

Bug: T136401
Change-Id: I1cb353d74f9a46168055e1abeb22cf569fe9354a
---
M includes/parser/Parser.php
1 file changed, 23 insertions(+), 0 deletions(-)

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



diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index a32acc2..f0898ba 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3784,9 +3784,28 @@
 * @return string
 */
public function extensionSubstitution( $params, $frame ) {
+   static $errorStr = '';
+   static $errorLen = 20;
+
$name = $frame->expand( $params['name'] );
+   if ( substr( $name, 0, $errorLen ) === $errorStr ) {
+   // Probably expansion depth or node count exceeded. 
Just punt the
+   // error up.
+   return $name;
+   }
+
$attrText = !isset( $params['attr'] ) ? null : $frame->expand( 
$params['attr'] );
+   if ( substr( $attrText, 0, $errorLen ) === $errorStr ) {
+   // See above
+   return $attrText;
+   }
+
$content = !isset( $params['inner'] ) ? null : $frame->expand( 
$params['inner'] );
+   if ( substr( $content, 0, $errorLen ) === $errorStr ) {
+   // See above
+   return $content;
+   }
+
$marker = self::MARKER_PREFIX . "-$name-"
. sprintf( '%08X', $this->mMarkerIndex++ ) . 
self::MARKER_SUFFIX;
 
@@ -3844,6 +3863,10 @@
$output = "<$name$attrText/>";
} else {
$close = is_null( $params['close'] ) ? '' : 
$frame->expand( $params['close'] );
+   if ( substr( $close, 0, $errorLen ) === 
$errorStr ) {
+   // See above
+   return $close;
+   }
$output = "<$name$attrText>$content$close";
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1cb353d74f9a46168055e1abeb22cf569fe9354a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Deployment: use mira instead of tin

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Deployment: use mira instead of tin
..

Deployment: use mira instead of tin

Bug: T144578
Change-Id: I9de7ac07945e008ac09e5890fb8570e7650ec292
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/09/315709/1

diff --git a/scap/scap.cfg b/scap/scap.cfg
index 87f1381..4c14651 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -13,7 +13,7 @@
 config_deploy: True
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 [deployment-prep.eqiad.wmflabs]
 git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9de7ac07945e008ac09e5890fb8570e7650ec292
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
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] mediawiki/core[master]: Add self to credits (Ed Sanders)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Add self to credits (Ed Sanders)
..

Add self to credits (Ed Sanders)

Change-Id: Ia72f0702651fda95449ec08b18b2bca98e047a69
---
M CREDITS
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/00/315700/1

diff --git a/CREDITS b/CREDITS
index dca597e..92f5552 100644
--- a/CREDITS
+++ b/CREDITS
@@ -33,6 +33,7 @@
 * David McCabe
 * Derk-Jan Hartman
 * Domas Mituzas
+* Ed Sanders
 * Emufarmers
 * Fran Rogers
 * Greg Sabino Mullane

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia72f0702651fda95449ec08b18b2bca98e047a69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] operations...toollabs-images[master]: Switch jessie continer locale to en_US too

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: Switch jessie continer locale to en_US too
..

Switch jessie continer locale to en_US too

To match trusty

Change-Id: I47daf8650b1c9e9d2fc67a74555ec1c90524de11
---
M base/Dockerfile.template
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/docker-images/toollabs-images 
refs/changes/08/315708/1

diff --git a/base/Dockerfile.template b/base/Dockerfile.template
index c5cd319..22da4fa 100644
--- a/base/Dockerfile.template
+++ b/base/Dockerfile.template
@@ -17,6 +17,7 @@
 RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes 
--no-install-recommends libnss-ldapd locales
 ADD nsswitch.conf /etc/nsswitch.conf
 
-# Setup the C.UTF-8 Locale, since otherwise it defaults to the C one (which 
sucks!)
-RUN locale-gen C.UTF-8
-ENV LC_ALL C.UTF-8
+# Setup the en_US.UTF-8 Locale, since otherwise it defaults to the C one 
(which sucks!)
+# Cultural imperialism, etc
+RUN locale-gen en_US.UTF-8
+ENV LC_ALL en_US.UTF-8

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47daf8650b1c9e9d2fc67a74555ec1c90524de11
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: maps - make sure tilerator notification does not run concurr...

[Gehel (Code Review)]

Gehel has submitted this change and it was merged.

Change subject: maps - make sure tilerator notification does not run 
concurrently
..


maps - make sure tilerator notification does not run concurrently

Tilerator notification does not have an internal mechanism to ensure
that notifications are not running concurrently. This mechanism needs
to be external at the moment, so let's implement it with a simple flock.

Change-Id: Id433e773708035abcaa500084db2a0ee7f46b067
---
M modules/tilerator/manifests/ui.pp
M modules/tilerator/templates/notify-tilerator.erb
2 files changed, 15 insertions(+), 10 deletions(-)

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



diff --git a/modules/tilerator/manifests/ui.pp 
b/modules/tilerator/manifests/ui.pp
index 77241e7..dbcbe48 100644
--- a/modules/tilerator/manifests/ui.pp
+++ b/modules/tilerator/manifests/ui.pp
@@ -59,6 +59,9 @@
 #   if tile is empty, make sure we don't store it, if it was there before
 #   used in Tilerator notification
 #
+# [*osmosis_dir*]
+#   directory in which osmosis keeps its state
+#
 class tilerator::ui(
 $port   = 6535,
 $conf_sources   = 'sources.prod.yaml',
@@ -69,6 +72,7 @@
 $generator_id   = 'gen',
 $storage_id = 'v3',
 $delete_empty   = true,
+$osmosis_dir= '/srv/osmosis',
 $expire_dir = '/srv/osm_expire/',
 ) {
 $statefile = "${statefile_dir}/expire.state"
diff --git a/modules/tilerator/templates/notify-tilerator.erb 
b/modules/tilerator/templates/notify-tilerator.erb
index cece890..13b5e40 100644
--- a/modules/tilerator/templates/notify-tilerator.erb
+++ b/modules/tilerator/templates/notify-tilerator.erb
@@ -1,17 +1,18 @@
 #!/bin/bash
 
-/usr/bin/nodejs /srv/deployment/tilerator/deploy/src/scripts/tileshell.js \
---config /etc/tileratorui/config.yaml \
--j.fromZoom <%= @from_zoom %> \
--j.beforeZoom <%= @before_zoom %> \
--j.generatorId <%= @generator_id %> \
--j.storageId <%= @storage_id %> \
+/usr/bin/flock -xn <%= @osmosis_dir %>/replicate-osm.lck \
+/usr/bin/nodejs /srv/deployment/tilerator/deploy/src/scripts/tileshell.js \
+--config /etc/tileratorui/config.yaml \
+-j.fromZoom <%= @from_zoom %> \
+-j.beforeZoom <%= @before_zoom %> \
+-j.generatorId <%= @generator_id %> \
+-j.storageId <%= @storage_id %> \
 <%- if @delete_empty -%>
--j.deleteEmpty \
+-j.deleteEmpty \
 <%- end -%>
--j.expdirpath <%= @expire_dir %> \
--j.expmask 'expire\.list\.*' \
--j.statefile <%= @statefile %>
+-j.expdirpath <%= @expire_dir %> \
+-j.expmask 'expire\.list\.*' \
+-j.statefile <%= @statefile %>
 
 notification_code=$?
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id433e773708035abcaa500084db2a0ee7f46b067
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Drilldown wording change

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Drilldown wording change
..


Drilldown wording change

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

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



diff --git a/i18n/en.json b/i18n/en.json
index db13549..807c321 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -57,7 +57,7 @@
"cargo-pagevalues-tablevalues": "\"$1\" values",
"drilldown": "Drilldown",
"cargo-drilldown-choosetable": "Choose a table",
-   "cargo-drilldown-docu": "Click on the filter values below to narrow 
your results.",
+   "cargo-drilldown-docu": "Use the filters below to narrow your results.",
"cargo-drilldown-filterbyvalue": "Filter by this value",
"cargo-drilldown-or": "or",
"cargo-drilldown-removefilter": "Remove this filter",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I52cb3b2ab456cd0948e8caa69bf0ecc7eb7d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Enable APISandbox code on mobile

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Enable APISandbox code on mobile
..

Enable APISandbox code on mobile

It's a special page and only uses mobile vetted code
so completely fine to load this on mobile

That said the visual display needs a lot of work but that
can be remedied in a follow up.

Bug: T148049
Change-Id: I2a8424e7c348bd5283aba99d1a81bb259d7e54c5
---
M resources/Resources.php
A resources/lib/jquery@3/jquery.js
2 files changed, 10,222 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/98/315698/1


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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker: Build a trusty image as well

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: docker: Build a trusty image as well
..


docker: Build a trusty image as well

Bug: T148054
Change-Id: Ie6e1a452a448dc3db77c868d63a21c0943d8b5ce
---
M modules/docker/templates/images/build-base-images.erb
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/modules/docker/templates/images/build-base-images.erb 
b/modules/docker/templates/images/build-base-images.erb
index 9ade74d..b808c0a 100644
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -7,3 +7,9 @@
 
 # Push it to the repository
 docker push <%= @docker_registry %>/wikimedia-jessie
+
+# Build ubuntu trusty base image!
+/usr/share/docker-engine/contrib/mkimage-debootstrap.sh <%= @docker_registry 
%>/wikimedia-trusty trusty  http://ubuntu.wikimedia.org/ubuntu/
+
+# Push it to the repo
+docker push <%= @docker_registry %>/wikimedia-trusty

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

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

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

[MediaWiki-commits] [Gerrit] maps...deploy[master]: Update kartotherian to cb3f22c

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Update kartotherian to cb3f22c
..

Update kartotherian to cb3f22c

List of changes:
xxx Update node module dependencies

Change-Id: I7b1a574f56da082ba5711f2ae5d32c6ddaf7f7aa
---
C node_modules/.bin/semver
A node_modules/bunyan-prettystream/.coveralls.yml
A node_modules/bunyan-prettystream/.npmignore
A node_modules/bunyan-prettystream/.travis.yml
A node_modules/bunyan-prettystream/lib/prettystream.js
A node_modules/bunyan-prettystream/makefile
A node_modules/bunyan-prettystream/package.json
A node_modules/bunyan-prettystream/test/prettystream.test.js
R node_modules/extend/.eslintrc
R node_modules/extend/.jscs.json
R node_modules/extend/.npmignore
R node_modules/extend/.travis.yml
R node_modules/extend/LICENSE
R node_modules/extend/component.json
R node_modules/extend/index.js
R node_modules/extend/package.json
M node_modules/kartotherian-autogen/package.json
M node_modules/kartotherian-cassandra/package.json
M node_modules/kartotherian-core/lib/core.js
M node_modules/kartotherian-core/node_modules/xmldoc/package.json
M node_modules/kartotherian-core/package.json
M node_modules/kartotherian-demultiplexer/package.json
D 
node_modules/kartotherian-geoshapes/node_modules/pg-connection-string/package.json
D node_modules/kartotherian-geoshapes/node_modules/pg-types/package.json
D 
node_modules/kartotherian-geoshapes/node_modules/pg.js/node_modules/buffer-writer/package.json
D 
node_modules/kartotherian-geoshapes/node_modules/pg.js/node_modules/generic-pool/package.json
D node_modules/kartotherian-geoshapes/node_modules/pgpass/package.json
M node_modules/kartotherian-geoshapes/package.json
M node_modules/kartotherian-layermixer/package.json
M node_modules/kartotherian-maki/package.json
M node_modules/kartotherian-overzoom/package.json
C node_modules/kartotherian-postgres/.npmignore
A node_modules/kartotherian-postgres/LICENSE
A node_modules/kartotherian-postgres/Postgres.js
C node_modules/kartotherian-postgres/node_modules/pg-query-stream/.npmignore
A node_modules/kartotherian-postgres/node_modules/pg-query-stream/.travis.yml
C node_modules/kartotherian-postgres/node_modules/pg-query-stream/Makefile
A node_modules/kartotherian-postgres/node_modules/pg-query-stream/index.js
C 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/.npmignore
C 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/.travis.yml
C 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/Makefile
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/index.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/package.json
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/pg.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/close.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/error-handling.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/index.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/mocha.opts
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/pg-cursor/test/no-data-handling.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/.npmignore
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/.travis.yml
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/LICENSE
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/duplex.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_duplex.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_passthrough.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_readable.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_transform.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/_stream_writable.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/lib/internal/streams/BufferList.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/buffer-shims/index.js
A 
node_modules/kartotherian-postgres/node_modules/pg-query-stream/node_modules/readable-stream/node_modules/buffer-shims/package.json
A 

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: [WIP] phpunit API tests for get notifications

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review.

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

Change subject: [WIP] phpunit API tests for get notifications
..

[WIP] phpunit API tests for get notifications

Change-Id: Ie3a79b4158b20736d8932582d9698f93213b07d0
---
M tests/phpunit/api/ApiEchoNotificationsTest.php
1 file changed, 123 insertions(+), 47 deletions(-)


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

diff --git a/tests/phpunit/api/ApiEchoNotificationsTest.php 
b/tests/phpunit/api/ApiEchoNotificationsTest.php
index 3ce3726..7114c73 100644
--- a/tests/phpunit/api/ApiEchoNotificationsTest.php
+++ b/tests/phpunit/api/ApiEchoNotificationsTest.php
@@ -7,62 +7,138 @@
  */
 class ApiEchoNotificationsTest extends ApiTestCase {
 
-   public function testWithSectionGrouping() {
-   // Grouping by section
-   $data = $this->doApiRequest( array(
-   'action' => 'query',
-   'meta' => 'notifications',
-   'notsections' => 'alert|message',
-   'notgroupbysection' => 1,
-   'notlimit' => 10,
-   'notprop' => 'list|count' ) );
+   protected $notifications = [];
 
-   $this->assertArrayHasKey( 'query', $data[0] );
-   $this->assertArrayHasKey( 'notifications', $data[0]['query'] );
+   public function setUp() {
+   parent::setUp();
 
-   $result = $data[0]['query']['notifications'];
+   $this->tablesUsed = [ 'echo_event', 'echo_notification' ];
 
-   // General count
-   $this->assertArrayHasKey( 'count', $result );
-   $this->assertArrayHasKey( 'rawcount', $result );
+   self::$users['NotifUser'] = $notifUser = new TestUser( 
'NotifUser' );
+   RequestContext::getMain()->setTitle( Title::newFromText( 
'Whatever' ) );
 
-   // Alert
-   $this->assertArrayHasKey( 'alert', $result );
-   $alert = $result['alert'];
-   $this->assertArrayHasKey( 'list', $alert );
-   $this->assertArrayHasKey( 'continue', $alert );
-   $this->assertArrayHasKey( 'rawcount', $alert );
-   $this->assertArrayHasKey( 'count', $alert );
+   global $wgEchoNotifications;
+   $wgEchoNotifications['unit-test'] = [
+   'section' => 'alert',
+   'user-locators' => [
+   function () use ( $notifUser ) { return [ 
$notifUser->getUser() ]; }
+   ]
+   ];
 
-   // Message
-   $this->assertArrayHasKey( 'message', $result );
-   $message = $result['message'];
-   $this->assertArrayHasKey( 'list', $message );
-   $this->assertArrayHasKey( 'continue', $message );
-   $this->assertArrayHasKey( 'rawcount', $message );
-   $this->assertArrayHasKey( 'count', $message );
+   $this->doLogin( 'NotifUser' );
+
+   $this->notifications['read1'] = EchoEvent::create( [
+   'type' => 'unit-test',
+   'agent' => self::$users['sysop']->getUser(),
+   ] );
+
+   $this->notifications['read2'] = EchoEvent::create( [
+   'type' => 'unit-test',
+   'agent' => self::$users['sysop']->getUser(),
+   ] );
+
+   $this->doApiRequestWithToken( [
+   'action' => 'echomarkread',
+   'all' => true,
+   ], [ 'wsToken' => 'token' ] );
+
+   $this->notifications['unread1'] = EchoEvent::create( [
+   'type' => 'unit-test',
+   'agent' => self::$users['sysop']->getUser(),
+   ] );
}
 
-   public function testWithoutSectionGrouping() {
-   $data = $this->doApiRequest( array(
+   public function testUnreadCount() {
+   // unread alert count should be 1
+   $response = $this->getNotifications( [
+   'notsections' => 'alert',
+   'notprop' => 'count',
+   ] );
+   $this->assertEquals( 1, $response['count'] );
+   $this->assertEquals( 1, $response['rawcount'] );
+
+   // unread message count should be 0
+   $response = $this->getNotifications( [
+   'notsections' => 'message',
+   'notprop' => 'count',
+   ] );
+   $this->assertEquals( 0, $response['count'] );
+   $this->assertEquals( 0, $response['rawcount'] );
+
+   // unread count for both with section grouping
+   $response = $this->getNotifications( [
+   

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Update wgMinervaBottomLanguageButton default value

[jenkins-bot (Code Review)]

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

Change subject: Update wgMinervaBottomLanguageButton default value
..


Update wgMinervaBottomLanguageButton default value

$wgMinervaBottomLanguageButton was set to `false` in I1ac60838 and
Ie9dafeb3, which caused the nightly build to fail [0] while local builds
still passed.

Changes:
* Set the default value of $wgMinervaBottomLanguageButton to `false`.
* Remove browser tests that make assertions about the presence of the
  language switcher secondary page action.

[0]: https://integration.wikimedia.org/ci/job/selenium-MobileFrontend/191/

Bug: T143829
Change-Id: Ie576870b5fae213eacef1f80c3d1d087141cadab
---
M extension.json
M tests/browser/features/editor_wikitext_saving.feature
M tests/browser/features/step_definitions/editor_steps.rb
M tests/browser/features/step_definitions/language_steps.rb
M tests/browser/features/support/pages/article_page.rb
5 files changed, 1 insertion(+), 16 deletions(-)

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



diff --git a/extension.json b/extension.json
index 1eb0a0a..724ba7c 100644
--- a/extension.json
+++ b/extension.json
@@ -2048,7 +2048,7 @@
"MFSchemaEditSampleRate": 0.0625,
"MFAllowNonJavaScriptEditing": false,
"MinervaAlwaysShowLanguageButton": true,
-   "MinervaBottomLanguageButton": true,
+   "MinervaBottomLanguageButton": false,
"MinervaUseFooterV2": true,
"MFStripResponsiveImages": true,
"MFResponsiveImageWhitelist": [
diff --git a/tests/browser/features/editor_wikitext_saving.feature 
b/tests/browser/features/editor_wikitext_saving.feature
index 35e7627..d425651 100644
--- a/tests/browser/features/editor_wikitext_saving.feature
+++ b/tests/browser/features/editor_wikitext_saving.feature
@@ -14,7 +14,6 @@
   And I click submit
 Then I should see a toast notification
   And the text of the first heading should be "Selenium no languages test 
page"
-  And I should not see the read in another language button
 
   @editing
   Scenario: Successful edit reloads language button
@@ -25,7 +24,6 @@
   And I click continue
   And I click submit
 Then I should see a toast notification
-  And I should see the read in another language button
 
   @editing
   Scenario: Redirects
diff --git a/tests/browser/features/step_definitions/editor_steps.rb 
b/tests/browser/features/step_definitions/editor_steps.rb
index fff8809..4551c69 100644
--- a/tests/browser/features/step_definitions/editor_steps.rb
+++ b/tests/browser/features/step_definitions/editor_steps.rb
@@ -39,18 +39,10 @@
   on(ArticlePage).editor_textarea_element.when_present.send_keys(text)
 end
 
-Then(/^I should not see the read in another language button$/) do
-  expect(on(ArticlePage).language_button_element).not_to be_visible
-end
-
 Then(/^I should not see the wikitext editor overlay$/) do
   expect(on(ArticlePage).editor_overlay_element).not_to be_visible
 end
 
 Then(/^I see the anonymous editor warning$/) do
   expect(on(ArticlePage).anon_editor_warning_element.when_present).to 
be_visible
-end
-
-Then /^I should see the read in another language button$/ do
-  expect(on(ArticlePage).language_button_element.when_present).to be_visible
 end
diff --git a/tests/browser/features/step_definitions/language_steps.rb 
b/tests/browser/features/step_definitions/language_steps.rb
index ed279fc..2b8eb30 100644
--- a/tests/browser/features/step_definitions/language_steps.rb
+++ b/tests/browser/features/step_definitions/language_steps.rb
@@ -1,7 +1,3 @@
-When /^I click the language button$/ do
-  on(ArticlePage).language_button_element.when_present.click
-end
-
 When(/^I click the language overlay close button$/) do
   on(ArticlePage).overlay_languages_element.when_present.button_element(class: 
'cancel').click
 end
diff --git a/tests/browser/features/support/pages/article_page.rb 
b/tests/browser/features/support/pages/article_page.rb
index 1af42d3..42fdcbc 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -143,7 +143,6 @@
 
   # secondary menu
   ## languages
-  a(:language_button, css: '#page-secondary-actions .language-selector')
   a(:switch_language_page_action, css: '#page-actions .language-selector')
   a(:disabled_switch_langage_page_action, css: '#page-actions 
.language-selector.disabled')
   # Can't use generic overlay class as this will match with the LoadingOverlay 
that shows before loading the language overlay

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie576870b5fae213eacef1f80c3d1d087141cadab
Gerrit-PatchSet: 1
Gerrit-Project: 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: GlobalSign G2 intermediate, signed by R3

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: GlobalSign G2 intermediate, signed by R3
..


GlobalSign G2 intermediate, signed by R3

Bug: T148045
Change-Id: I773bad181f5657c982bcbcc7ab6ddaafb7c3e2c6
---
M modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
1 file changed, 24 insertions(+), 24 deletions(-)

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



diff --git 
a/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt 
b/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
index c846c09..6a590b1 100644
--- 
a/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
+++ 
b/modules/base/files/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt
@@ -1,26 +1,26 @@
 -BEGIN CERTIFICATE-
-MIIEaTCCA1GgAwIBAgILBAABRE7wQkcwDQYJKoZIhvcNAQELBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw0xNDAyMjAxMDAw
-MDBaFw0yNDAyMjAxMDAwMDBaMGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMTwwOgYDVQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBW
-YWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHDmw/I5N/zHClnSDDDlM/fsBOwphJykfVI+8DNIV0yKMCLkZc
-C33JiJ1Pi/D4nGyMVTXbv/Kz6vvjVudKRtkTIso21ZvBqOOWQ5PyDLzm+ebomchj
-SHh/VzZpGhkdWtHUfcKc1H/hgBKueuqI6lfYygoKOhJJomIZeg0k9zfrtHOSewUj
-mxK1zusp36QUArkBpdSmnENkiN74fv7j9R7l/tyjqORmMdlMJekYuYlZCa7pnRxt
-Nw9KHjUgKOKv1CGLAcRFrW4rY6uSa2EKTSDtc7p8zv4WtdufgPDWi2zZCHlKT3hl
-2pK8vjX5s8T5J4BO/5ZS5gIg4Qdz6V0rvbLxAgMBAAGjggElMIIBITAOBgNVHQ8B
-Af8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUlt5h8b0cFilT
-HMDMfTuDAEDmGnwwRwYDVR0gBEAwPjA8BgRVHSAAMDQwMgYIKwYBBQUHAgEWJmh0
-dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMDMGA1UdHwQsMCow
-KKAmoCSGImh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvcm9vdC5jcmwwPQYIKwYB
-BQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwOi8vb2NzcC5nbG9iYWxzaWduLmNv
-bS9yb290cjEwHwYDVR0jBBgwFoAUYHtmGkUNl8qJUC99BM00qP/8/UswDQYJKoZI
-hvcNAQELBQADggEBAEYq7l69rgFgNzERhnF0tkZJyBAW/i9iIxerH4f4gu3K3w4s
-32R1juUYcqeMOovJrKV3UPfvnqTgoI8UV6MqX+x+bRDmuo2wCId2Dkyy2VG7EQLy
-XN0cvfNVlg/UBsD84iOKJHDTu/B5GqdhcIOKrwbFINihY9Bsrk8y1658GEV1BSl3
-30JAZGSGvip2CTFvHST0mdCF/vIhCPnG9vHQWe3WVjwIKANnuvD58ZAWR65n5ryA
-SOlCdjSXVWkkDoPWoC209fN5ikkodBpBocLTJIg1MGCUF7ThBCIxPTsvFwayuJ2G
-K1pp74P1S8SqtCr4fKGxhZSM9AyHDPSsQPhZSZg=
+MIIEYjCCA0qgAwIBAgILBAABMYnGRMkwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTEwODAyMTAwMDAwWhcNMjIwODAy
+MTAwMDAwWjBmMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1z
+YTE8MDoGA1UEAxMzR2xvYmFsU2lnbiBPcmdhbml6YXRpb24gVmFsaWRhdGlvbiBD
+QSAtIFNIQTI1NiAtIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+xw5sPyOTf8xwpZ0gww5TP37ATsKYScpH1SPvAzSFdMijAi5GXAt9yYidT4vw+Jxs
+jFU127/ys+r741bnSkbZEyLKNtWbwajjlkOT8gy85vnm6JnIY0h4f1c2aRoZHVrR
+1H3CnNR/4YASrnrqiOpX2MoKCjoSSaJiGXoNJPc367RzknsFI5sStc7rKd+kFAK5
+AaXUppxDZIje+H7+4/Ue5f7co6jkZjHZTCXpGLmJWQmu6Z0cbTcPSh41ICjir9Qh
+iwHERa1uK2OrkmthCk0g7XO6fM7+FrXbn4Dw1ots2Qh5Sk94ZdqSvL41+bPE+SeA
+Tv+WUuYCIOEHc+ldK72y8QIDAQABo4IBKTCCASUwDgYDVR0PAQH/BAQDAgEGMBIG
+A1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFJbeYfG9HBYpUxzAzH07gwBA5hp8
+MEcGA1UdIARAMD4wPAYEVR0gADA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5n
+bG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA2BgNVHR8ELzAtMCugKaAnhiVodHRw
+Oi8vY3JsLmdsb2JhbHNpZ24ubmV0L3Jvb3QtcjMuY3JsMD4GCCsGAQUFBwEBBDIw
+MDAuBggrBgEFBQcwAYYiaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL3Jvb3Ry
+MzAfBgNVHSMEGDAWgBSP8Et/qC5FJK5NUPpjmove4t0bvDANBgkqhkiG9w0BAQsF
+AAOCAQEAugYpwLQZjCERwJQRnrs91NVDQPafuyULI2i1Gvf6VGTMKxP5IfBEreHo
+FVjb7v3bok3MGI8Nmm3DawGhMfCNvABAzDlfh2FRbfSV6uoVNT5AhcBi1aE0/niq
+qLJaOfM3Qfuc6D5xSlvr+GlYoeDGk3fpumeS62VYkHBzQn2v9CMmeReq+qS7meVE
+b2WB58rrVcj0ticRIXSUvGu3dGIpxM2uR/LmQlt4hgVhy5CqeYnfBH6xJnBLjUAf
+hHvA+wfmyLdOkfQ1A+3o60EQF0m0YsinLPLhTI8DLPMWN11n8aQ5eUmjwF3MVfkh
+gA/7zuIpalhQ6abX6xwyNrVip8H65g==
 -END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Drilldown wording change

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Drilldown wording change
..

Drilldown wording change

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/15/315715/2

diff --git a/i18n/en.json b/i18n/en.json
index db13549..807c321 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -57,7 +57,7 @@
"cargo-pagevalues-tablevalues": "\"$1\" values",
"drilldown": "Drilldown",
"cargo-drilldown-choosetable": "Choose a table",
-   "cargo-drilldown-docu": "Click on the filter values below to narrow 
your results.",
+   "cargo-drilldown-docu": "Use the filters below to narrow your results.",
"cargo-drilldown-filterbyvalue": "Filter by this value",
"cargo-drilldown-or": "or",
"cargo-drilldown-removefilter": "Remove this filter",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52cb3b2ab456cd0948e8caa69bf0ecc7eb7d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Deployment: Switch to mira

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Deployment: Switch to mira
..

Deployment: Switch to mira

While deployment.eqiad works now, once we switch back its certificate
won't match any more, so spell out the exact server we want to use.

Bug: T144578
Change-Id: I8c8afa27ab072fe1554019007b6d9b028a402a6d
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/scap/scap.cfg b/scap/scap.cfg
index 5a25891..9b71f38 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -12,7 +12,7 @@
 lock_file: /tmp/scap.cxserver.lock
 
 [wmnet]
-git_server: deployment.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 [deployment-prep.eqiad.wmflabs]
 git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c8afa27ab072fe1554019007b6d9b028a402a6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
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] mediawiki...deploy[master]: Deployment: Switch from tin to mira

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Deployment: Switch from tin to mira
..

Deployment: Switch from tin to mira

Bug: T144578
Change-Id: I7bb1d952202368eff354ee56bc4d72e6f598b587
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/scap/scap.cfg b/scap/scap.cfg
index 484687e..ea890ce 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -13,7 +13,7 @@
 lock_file: /tmp/scap.parsoid.lock
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 [deployment-prep.eqiad.wmflabs]
 git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb1d952202368eff354ee56bc4d72e6f598b587
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
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] mediawiki...Cargo[master]: Removed duplicate retrieval of filters in drilldown

[jenkins-bot (Code Review)]

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

Change subject: Removed duplicate retrieval of filters in drilldown
..


Removed duplicate retrieval of filters in drilldown

Change-Id: Id6d9cc640aacd8ce83241046b85c1a54a628
---
M drilldown/CargoSpecialDrilldown.php
1 file changed, 14 insertions(+), 24 deletions(-)

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



diff --git a/drilldown/CargoSpecialDrilldown.php 
b/drilldown/CargoSpecialDrilldown.php
index 42930a6..c766e50 100644
--- a/drilldown/CargoSpecialDrilldown.php
+++ b/drilldown/CargoSpecialDrilldown.php
@@ -62,15 +62,15 @@
}
 
$tableSchemas = CargoUtils::getTableSchemas( array( $tableName 
) );
-   $filters = array();
+   $all_filters = array();
foreach ( $tableSchemas[$tableName]->mFieldDescriptions as 
$fieldName => $fieldDescription ) {
// Skip "hidden" fields.
if ( $fieldDescription->mIsHidden ) {
continue;
}
 
-   // Skip coordinate fields.
-   if ( $fieldDescription->mType == 'Coordinates' ) {
+   // Some field types shouldn't get a filter at all.
+   if ( in_array( $fieldDescription->mType, array( 'Text', 
'File', 'Coordinates', 'URL', 'Email', 'Wikitext', 'Searchtext' ) ) ) {
continue;
}
 
@@ -78,16 +78,16 @@
$curFilter->setName( $fieldName );
$curFilter->setTableName( $tableName );
$curFilter->setFieldDescription( $fieldDescription );
-   $filters[] = $curFilter;
+   $all_filters[] = $curFilter;
}
 
$filter_used = array();
-   foreach ( $filters as $i => $filter ) {
+   foreach ( $all_filters as $i => $filter ) {
$filter_used[] = false;
}
$applied_filters = array();
$remaining_filters = array();
-   foreach ( $filters as $i => $filter ) {
+   foreach ( $all_filters as $i => $filter ) {
$filter_name = str_replace( array( ' ', "'" ), array( 
'_', "\'" ), $filter->name );
$search_terms = $request->getArray( '_search_' . 
$filter_name );
$lower_date = $request->getArray( '_lower_' . 
$filter_name );
@@ -107,9 +107,9 @@
$filter_used[$i] = true;
}
}
-   // add every unused filter to the $remaining_filters array,
-   // unless it requires some other filter that hasn't been applied
-   foreach ( $filters as $i => $filter ) {
+   // Add every unused filter to the $remaining_filters array,
+   // unless it requires some other filter that hasn't been 
applied.
+   foreach ( $all_filters as $i => $filter ) {
$matched_all_required_filters = true;
foreach ( $filter->required_filters as $required_filter 
) {
$found_match = false;
@@ -130,7 +130,7 @@
 
$out->addHTML( "\n\t\t\t\t\n" 
);
$rep = new CargoDrilldownPage(
-   $tableName, $applied_filters, $remaining_filters, 
$offset, $limit );
+   $tableName, $all_filters, $applied_filters, 
$remaining_filters, $offset, $limit );
$num = $rep->execute( $query );
$out->addHTML( "\n\t\t\t \n" );
 
@@ -148,6 +148,7 @@
 
 class CargoDrilldownPage extends QueryPage {
public $tableName = "";
+   public $all_filters = array();
public $applied_filters = array();
public $remaining_filters = array();
public $showSingleTable = false;
@@ -161,10 +162,11 @@
 * @param int $offset
 * @param int $limit
 */
-   function __construct( $tableName, $applied_filters, $remaining_filters, 
$offset, $limit ) {
+   function __construct( $tableName, $all_filters, $applied_filters, 
$remaining_filters, $offset, $limit ) {
parent::__construct( 'Drilldown' );
 
$this->tableName = $tableName;
+   $this->all_filters = $all_filters;
$this->applied_filters = $applied_filters;
$this->remaining_filters = $remaining_filters;
$this->offset = $offset;
@@ -977,20 +979,8 @@
$filtersHTML = "\n";
$cur_url = $this->makeBrowseURL( $this->tableName, 
$this->applied_filters );
$cur_url .= ( strpos( $cur_url, '?' ) ) ? '&' : '?';
-   

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Deployment: Switch from tin to mira

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Deployment: Switch from tin to mira
..


Deployment: Switch from tin to mira

Bug: T144578
Change-Id: I7bb1d952202368eff354ee56bc4d72e6f598b587
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/scap.cfg b/scap/scap.cfg
index 484687e..ea890ce 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -13,7 +13,7 @@
 lock_file: /tmp/scap.parsoid.lock
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 [deployment-prep.eqiad.wmflabs]
 git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bb1d952202368eff354ee56bc4d72e6f598b587
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Deployment: Switch from tin to mira

[jenkins-bot (Code Review)]

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

Change subject: Deployment: Switch from tin to mira
..


Deployment: Switch from tin to mira

Bug: T144578
Change-Id: I65d15fa685621f191349c27bfaf29a7b195cb8ca
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/scap.cfg b/scap/scap.cfg
index baff8bb..11ec8ab 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -12,7 +12,7 @@
 lock_file: /tmp/scap.graphoid.lock
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 # [deployment-prep.eqiad.wmflabs]
 # git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65d15fa685621f191349c27bfaf29a7b195cb8ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Show orange alert when message is posted on flow

[Kmuthu (Code Review)]

Kmuthu has uploaded a new change for review.

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

Change subject: Show orange alert when message is posted on flow
..

Show orange alert when message is posted on flow

Bug: T137954
Change-Id: I0b49c3a5eb0a027f8839ab86e77c527357907dd0
---
M Hooks.php
M includes/NotifUser.php
M includes/model/Notification.php
3 files changed, 18 insertions(+), 8 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index 3caf0bc..0d88108 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -957,9 +957,11 @@
if ( $wgEchoNewMsgAlert && $user->getOption( 'echo-show-alert' )
&& $user->getNewtalk() && 
!$user->getTalkPage()->equals( $title )
) {
-   $personal_urls['mytalk']['text'] = $sk->msg( 
'echo-new-messages' )->text();
-   $personal_urls['mytalk']['class'] = array( 
'mw-echo-alert' );
-   $sk->getOutput()->addModuleStyles( 
'ext.echo.styles.alert' );
+   if ( Hooks::run( 'AbortOrangeAlert', array( $user, 
$title ) ) ) {
+   $personal_urls['mytalk']['text'] = 
$sk->msg('echo-new-messages')->text();
+   $personal_urls['mytalk']['class'] = 
array('mw-echo-alert');
+   
$sk->getOutput()->addModuleStyles('ext.echo.styles.alert');
+   }
}
 
return true;
diff --git a/includes/NotifUser.php b/includes/NotifUser.php
index e7d6ded..405b70b 100644
--- a/includes/NotifUser.php
+++ b/includes/NotifUser.php
@@ -134,6 +134,7 @@
 */
public function flagCacheWithNewTalkNotification() {
$this->cache->set( $this->getTalkNotificationCacheKey(), '1', 
86400 );
+   $this->mUser->setNewTalk( true );
}
 
/**
@@ -148,7 +149,6 @@
 */
public function getTalkNotificationCacheKey() {
global $wgEchoConfig;
-
return wfMemcKey( 'echo-new-talk-notification', 
$this->mUser->getId(), $wgEchoConfig['version'] );
}
 
@@ -365,7 +365,10 @@
// After this 'mark read', is there any unread 
edit-user-talk
// remaining?  If not, we should clear the newtalk flag.
if ( $this->mUser->getNewtalk() ) {
-   $unreadEditUserTalk = 
$this->notifMapper->fetchUnreadByUser( $this->mUser, 1, null, array( 
'edit-user-talk' ), null, DB_MASTER );
+   $attributeManager = 
EchoAttributeManager::newFromGlobalVars();
+   $categoryMap = 
$attributeManager->getEventsByCategory();
+   $usertalkTypes = $categoryMap['edit-user-talk'];
+   $unreadEditUserTalk = 
$this->notifMapper->fetchUnreadByUser( $this->mUser, 1, null, $usertalkTypes, 
null, DB_MASTER );
if ( count( $unreadEditUserTalk ) === 0 ) {
$this->mUser->setNewtalk( false );
}
@@ -394,7 +397,10 @@
// After this 'mark unread', is there any unread 
edit-user-talk?
// If so, we should add the edit-user-talk flag
if ( !$this->mUser->getNewtalk() ) {
-   $unreadEditUserTalk = 
$this->notifMapper->fetchUnreadByUser( $this->mUser, 1, null, array( 
'edit-user-talk' ), null, DB_MASTER );
+   $attributeManager = 
EchoAttributeManager::newFromGlobalVars();
+   $categoryMap = 
$attributeManager->getEventsByCategory();
+   $usertalkTypes = $categoryMap['edit-user-talk'];
+   $unreadEditUserTalk = 
$this->notifMapper->fetchUnreadByUser( $this->mUser, 1, null, $usertalkTypes, 
null, DB_MASTER );
if ( count( $unreadEditUserTalk ) > 0 ) {
$this->mUser->setNewtalk( true );
}
diff --git a/includes/model/Notification.php b/includes/model/Notification.php
index 3114969..cef07c2 100644
--- a/includes/model/Notification.php
+++ b/includes/model/Notification.php
@@ -142,8 +142,10 @@
 
$notifMapper->insert( $this );
 
-   if ( $this->event->getType() === 'edit-user-talk' ) {
-   $notifUser->flagCacheWithNewTalkNotification();
+   if ( $this->event->getCategory() === 'edit-user-talk' ) {
+   if ( !$this->user->getNewtalk() ) {
+   $notifUser->flagCacheWithNewTalkNotification();
+   }
}
Hooks::run( 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nfs: Fix drbd monitoring param name typo

[Madhuvishy (Code Review)]

Madhuvishy has uploaded a new change for review.

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

Change subject: nfs: Fix drbd monitoring param name typo
..

nfs: Fix drbd monitoring param name typo

Change-Id: Ibd6ee4a1d01a825d37bfa80f8f8d2eef91be0747
---
M modules/role/manifests/labs/nfs/secondary.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/315733/1

diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index cd0b8c5..e6208bb 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -62,6 +62,6 @@
 }
 
 class { 'labstore::monitoring::drbd':
-role  => $drbd_role,
+drbd_role  => $drbd_role,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: wmnet: Set db1048 as the new s3-slave after failover

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: wmnet: Set db1048 as the new s3-slave after failover
..


wmnet: Set db1048 as the new s3-slave after failover

Bug: T146673
Change-Id: I2b73bd0c2af5a3d41f69e82ba4c518d1f4b0a515
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index ecaecbd..8617b57 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -46,7 +46,7 @@
 m2-master   5M  IN CNAMEdbproxy1002.eqiad.wmnet.
 m2-slave5M  IN CNAMEdb2011.codfw.wmnet.
 m3-master   5M  IN CNAMEdbproxy1003.eqiad.wmnet.
-m3-slave5M  IN CNAMEdb1043.eqiad.wmnet.
+m3-slave5M  IN CNAMEdb1048.eqiad.wmnet.
 m4-master   5M  IN CNAMEdbproxy1004.eqiad.wmnet.
 m5-master   5M  IN CNAMEdb1009.eqiad.wmnet.
 m5-slave5M  IN CNAMEdb2030.codfw.wmnet.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b73bd0c2af5a3d41f69e82ba4c518d1f4b0a515
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
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] mediawiki...Flow[master]: Show orange alert when the message is posted on flow

[Kmuthu (Code Review)]

Kmuthu has uploaded a new change for review.

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

Change subject: Show orange alert when the message is posted on flow
..

Show orange alert when the message is posted on flow

Bug: T137954
Change-Id: Ie742b2d0ecfa8dfc48e820923516f2ca4f90ffa5
---
M Flow.php
M Hooks.php
2 files changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/Flow.php b/Flow.php
index 813f92c..108df88 100644
--- a/Flow.php
+++ b/Flow.php
@@ -126,6 +126,7 @@
 $wgHooks['ApiFeedContributions::feedItem'][] = 
'FlowHooks::onContributionsFeedItem';
 $wgHooks['AbuseFilter-computeVariable'][] = 
'FlowHooks::onAbuseFilterComputeVariable';
 $wgHooks['AbortEmailNotification'][] = 'FlowHooks::onAbortEmailNotification';
+$wgHooks['AbortOrangeAlert'][] = 'FlowHooks::onAbortOrangeAlert';
 $wgHooks['EchoAbortEmailNotification'][] = 
'FlowHooks::onEchoAbortEmailNotification';
 $wgHooks['BeforeEchoEventInsert'][] = 'FlowHooks::onBeforeEchoEventInsert';
 $wgHooks['ArticleEditUpdateNewTalk'][] = 
'FlowHooks::onArticleEditUpdateNewTalk';
diff --git a/Hooks.php b/Hooks.php
index 1345ac0..9550ccb 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1015,6 +1015,19 @@
return true;
}
 
+   public static function onAbortOrangeAlert( $user, $title ) {
+   if( $title->getNamespace() === NS_TOPIC ) {
+   $storage = Container::get( 'storage.workflow' );
+   $uuid = WorkflowLoaderFactory::uuidFromTitle( $title );
+   $workflow = $storage->get( $uuid );
+   if ( $workflow ) {
+   $boardTitle = $workflow->getOwnerTitle();
+   }
+   if ( $user->getTalkPage()->equals($boardTitle) ) {
+   return false;
+   }
+   }
+   }
 
public static function onInfoAction( IContextSource $ctx, &$pageinfo ) {
if ( $ctx->getTitle()->getContentModel() !== 
CONTENT_MODEL_FLOW_BOARD ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Extract extra device detection from MobileContext

[jenkins-bot (Code Review)]

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

Change subject: Extract extra device detection from MobileContext
..


Extract extra device detection from MobileContext

... and break it into discrete units.

Additional device detection logic exists in MobileContext#getAMF and
whether the request is sent from a mobile or tablet device: in the case
of #getAMF, environment variables set by the Apache Mobile Filter
module; in the case of #getDevice, a configurable request header.

Patrick Reilly's IDeviceDetector interface is a good start for a
boundary for all device detection code. However, in order to support the
cases above, it needs to be extended to accept more application state.

Changes:
* Create MobileFrontend\Devices\DeviceDetector from IDeviceDetector.
* Create DeviceProperties, a simple DTO, from IDeviceProperties.
* Add MobileFrontend\Devices\AMFDeviceDetector and
  CustomHeaderDeviceDetector, which cover the above cases.
* Create UADeviceDetector from IDeviceProperties, which covers the
  existing case

Bug: T143891
Change-Id: I8f5df2b8af407c2ec6763f2c2d7d99d3342065c1
---
M extension.json
A includes/devices/AMFDeviceDetector.php
A includes/devices/CustomHeaderDeviceDetector.php
A includes/devices/DeviceDetector.php
A includes/devices/DeviceProperties.php
A includes/devices/UADeviceDetector.php
A tests/phpunit/devices/AMFDeviceDetectorTest.php
A tests/phpunit/devices/CustomHeaderDeviceDetectorTest.php
A tests/phpunit/devices/UADeviceDetectorTest.php
9 files changed, 675 insertions(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 1eb0a0a..0bd1aad 100644
--- a/extension.json
+++ b/extension.json
@@ -91,7 +91,12 @@
"SkinMinerva": "includes/skins/SkinMinerva.php",
"SkinMinervaBeta": "includes/skins/SkinMinervaBeta.php",
"MobileFrontend\\MenuBuilder": "includes/MenuBuilder.php",
-   "MobileFrontend\\MenuEntry": "includes/MenuBuilder.php"
+   "MobileFrontend\\MenuEntry": "includes/MenuBuilder.php",
+   "MobileFrontend\\Devices\\DeviceDetector": 
"includes/devices/DeviceDetector.php",
+   "MobileFrontend\\Devices\\DeviceProperties": 
"includes/devices/DeviceProperties.php",
+   "MobileFrontend\\Devices\\AMFDeviceDetector": 
"includes/devices/AMFDeviceDetector.php",
+   "MobileFrontend\\Devices\\CustomHeaderDeviceDetector": 
"includes/devices/CustomHeaderDeviceDetector.php",
+   "MobileFrontend\\Devices\\UADeviceDetector": 
"includes/devices/UADeviceDetector.php"
},
"ResourceModules": {
"skins.minerva.base.reset": {
diff --git a/includes/devices/AMFDeviceDetector.php 
b/includes/devices/AMFDeviceDetector.php
new file mode 100644
index 000..4c5c822
--- /dev/null
+++ b/includes/devices/AMFDeviceDetector.php
@@ -0,0 +1,30 @@
+http://wiki.apachemobilefilter.org/index.php/Main_Page
+ */
+class AMFDeviceDetector implements DeviceDetector {
+   public function detectDeviceProperties( WebRequest $request, array 
$server ) {
+   $hasIsMobile = isset( $server['AMF_DEVICE_IS_MOBILE'] );
+   $hasIsTablet = isset( $server['AMF_DEVICE_IS_TABLET'] );
+
+   if ( !$hasIsMobile && !$hasIsTablet ) {
+   return null;
+   }
+
+   $isMobileDevice = $hasIsMobile
+   && $server['AMF_DEVICE_IS_MOBILE'] === 'true';
+
+   $isTabletDevice = $hasIsTablet
+   && $server['AMF_DEVICE_IS_TABLET'] === 'true';
+
+   return new DeviceProperties( $isMobileDevice, $isTabletDevice );
+   }
+}
diff --git a/includes/devices/CustomHeaderDeviceDetector.php 
b/includes/devices/CustomHeaderDeviceDetector.php
new file mode 100644
index 000..403c5cc
--- /dev/null
+++ b/includes/devices/CustomHeaderDeviceDetector.php
@@ -0,0 +1,52 @@
+get( 'MFMobileHeader' )
+*   === $mobileFrontendConfig->get( 'MobileHeader' )
+* );
+* ```
+*/
+   public function __construct( Config $config ) {
+   $this->customHeaderName = $config->get( 'MFMobileHeader' );
+   }
+
+   public function detectDeviceProperties( WebRequest $request, array 
$server ) {
+   if (
+   $this->customHeaderName
+   && $request->getHeader( $this->customHeaderName ) !== 
false
+   ) {
+   return new DeviceProperties( true, false );
+   }
+   }
+}
diff --git a/includes/devices/DeviceDetector.php 
b/includes/devices/DeviceDetector.php
new file mode 100644
index 000..5ef72b4
--- /dev/null
+++ b/includes/devices/DeviceDetector.php
@@ -0,0 +1,49 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+namespace MobileFrontend\Devices;
+
+use 

[MediaWiki-commits] [Gerrit] integration/config[master]: Move composer-hhvm/php5 jobs back to Nodepool

[jenkins-bot (Code Review)]

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

Change subject: Move composer-hhvm/php5 jobs back to Nodepool
..


Move composer-hhvm/php5 jobs back to Nodepool

This finish the revert serie of commit
66856c5347f21791186056eb22dd8825de7bc8e3

Bug: T143938
Change-Id: I8a3abb50cdae3706a3cefe071d823386e7336a10
---
M zuul/layout.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4ca934c..e6e9fdd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1141,12 +1141,12 @@
   - composer-validate
 test:
   - composer-php53
-  - composer-php55
-  - composer-hhvm
+  - composer-php55-trusty
+  - composer-hhvm-trusty
 gate-and-submit:
   - composer-php53
-  - composer-php55
-  - composer-hhvm
+  - composer-php55-trusty
+  - composer-hhvm-trusty
 experimental:
   - composer-php70-jessie
   - composer-hhvm-jessie

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a3abb50cdae3706a3cefe071d823386e7336a10
Gerrit-PatchSet: 8
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "all wikis to 1.28.0-wmf.22"

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Revert "all wikis to 1.28.0-wmf.22"
..

Revert "all wikis to 1.28.0-wmf.22"

This reverts commit 843914276c8e236091ca42434ccb2b262c223da5.

Change-Id: Ic3d122916770604a75fec091a8cdf2fa6fadde4e
---
M wikiversions.json
1 file changed, 299 insertions(+), 299 deletions(-)


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

diff --git a/wikiversions.json b/wikiversions.json
index 9860bc5..f6b6c64 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,39 +1,39 @@
 {
-"aawiki": "php-1.28.0-wmf.22",
+"aawiki": "php-1.28.0-wmf.21",
 "aawikibooks": "php-1.28.0-wmf.22",
 "aawiktionary": "php-1.28.0-wmf.22",
-"abwiki": "php-1.28.0-wmf.22",
+"abwiki": "php-1.28.0-wmf.21",
 "abwiktionary": "php-1.28.0-wmf.22",
-"acewiki": "php-1.28.0-wmf.22",
+"acewiki": "php-1.28.0-wmf.21",
 "advisorywiki": "php-1.28.0-wmf.22",
-"adywiki": "php-1.28.0-wmf.22",
-"afwiki": "php-1.28.0-wmf.22",
+"adywiki": "php-1.28.0-wmf.21",
+"afwiki": "php-1.28.0-wmf.21",
 "afwikibooks": "php-1.28.0-wmf.22",
 "afwikiquote": "php-1.28.0-wmf.22",
 "afwiktionary": "php-1.28.0-wmf.22",
-"akwiki": "php-1.28.0-wmf.22",
+"akwiki": "php-1.28.0-wmf.21",
 "akwikibooks": "php-1.28.0-wmf.22",
 "akwiktionary": "php-1.28.0-wmf.22",
-"alswiki": "php-1.28.0-wmf.22",
+"alswiki": "php-1.28.0-wmf.21",
 "alswikibooks": "php-1.28.0-wmf.22",
 "alswikiquote": "php-1.28.0-wmf.22",
 "alswiktionary": "php-1.28.0-wmf.22",
-"amwiki": "php-1.28.0-wmf.22",
+"amwiki": "php-1.28.0-wmf.21",
 "amwikiquote": "php-1.28.0-wmf.22",
 "amwiktionary": "php-1.28.0-wmf.22",
-"angwiki": "php-1.28.0-wmf.22",
+"angwiki": "php-1.28.0-wmf.21",
 "angwikibooks": "php-1.28.0-wmf.22",
 "angwikiquote": "php-1.28.0-wmf.22",
 "angwikisource": "php-1.28.0-wmf.22",
 "angwiktionary": "php-1.28.0-wmf.22",
-"anwiki": "php-1.28.0-wmf.22",
+"anwiki": "php-1.28.0-wmf.21",
 "anwiktionary": "php-1.28.0-wmf.22",
-"arbcom_dewiki": "php-1.28.0-wmf.22",
-"arbcom_enwiki": "php-1.28.0-wmf.22",
-"arbcom_fiwiki": "php-1.28.0-wmf.22",
-"arbcom_nlwiki": "php-1.28.0-wmf.22",
-"arcwiki": "php-1.28.0-wmf.22",
-"arwiki": "php-1.28.0-wmf.22",
+"arbcom_dewiki": "php-1.28.0-wmf.21",
+"arbcom_enwiki": "php-1.28.0-wmf.21",
+"arbcom_fiwiki": "php-1.28.0-wmf.21",
+"arbcom_nlwiki": "php-1.28.0-wmf.21",
+"arcwiki": "php-1.28.0-wmf.21",
+"arwiki": "php-1.28.0-wmf.21",
 "arwikibooks": "php-1.28.0-wmf.22",
 "arwikimedia": "php-1.28.0-wmf.22",
 "arwikinews": "php-1.28.0-wmf.22",
@@ -41,80 +41,80 @@
 "arwikisource": "php-1.28.0-wmf.22",
 "arwikiversity": "php-1.28.0-wmf.22",
 "arwiktionary": "php-1.28.0-wmf.22",
-"arzwiki": "php-1.28.0-wmf.22",
-"astwiki": "php-1.28.0-wmf.22",
+"arzwiki": "php-1.28.0-wmf.21",
+"astwiki": "php-1.28.0-wmf.21",
 "astwikibooks": "php-1.28.0-wmf.22",
 "astwikiquote": "php-1.28.0-wmf.22",
 "astwiktionary": "php-1.28.0-wmf.22",
-"aswiki": "php-1.28.0-wmf.22",
+"aswiki": "php-1.28.0-wmf.21",
 "aswikibooks": "php-1.28.0-wmf.22",
 "aswikisource": "php-1.28.0-wmf.22",
 "aswiktionary": "php-1.28.0-wmf.22",
 "auditcomwiki": "php-1.28.0-wmf.22",
-"avwiki": "php-1.28.0-wmf.22",
+"avwiki": "php-1.28.0-wmf.21",
 "avwiktionary": "php-1.28.0-wmf.22",
-"aywiki": "php-1.28.0-wmf.22",
+"aywiki": "php-1.28.0-wmf.21",
 "aywikibooks": "php-1.28.0-wmf.22",
 "aywiktionary": "php-1.28.0-wmf.22",
-"azbwiki": "php-1.28.0-wmf.22",
-"azwiki": "php-1.28.0-wmf.22",
+"azbwiki": "php-1.28.0-wmf.21",
+"azwiki": "php-1.28.0-wmf.21",
 "azwikibooks": "php-1.28.0-wmf.22",
 "azwikiquote": "php-1.28.0-wmf.22",
 "azwikisource": "php-1.28.0-wmf.22",
 "azwiktionary": "php-1.28.0-wmf.22",
-"barwiki": "php-1.28.0-wmf.22",
-"bat_smgwiki": "php-1.28.0-wmf.22",
-"bawiki": "php-1.28.0-wmf.22",
+"barwiki": "php-1.28.0-wmf.21",
+"bat_smgwiki": "php-1.28.0-wmf.21",
+"bawiki": "php-1.28.0-wmf.21",
 "bawikibooks": "php-1.28.0-wmf.22",
-"bclwiki": "php-1.28.0-wmf.22",
+"bclwiki": "php-1.28.0-wmf.21",
 "bdwikimedia": "php-1.28.0-wmf.22",
-"be_x_oldwiki": "php-1.28.0-wmf.22",
+"be_x_oldwiki": "php-1.28.0-wmf.21",
 "betawikiversity": "php-1.28.0-wmf.22",
-"bewiki": "php-1.28.0-wmf.22",
+"bewiki": "php-1.28.0-wmf.21",
 "bewikibooks": "php-1.28.0-wmf.22",
 "bewikimedia": "php-1.28.0-wmf.22",
 "bewikiquote": "php-1.28.0-wmf.22",
 "bewikisource": "php-1.28.0-wmf.22",
 "bewiktionary": "php-1.28.0-wmf.22",
-"bgwiki": "php-1.28.0-wmf.22",
+"bgwiki": "php-1.28.0-wmf.21",
 "bgwikibooks": "php-1.28.0-wmf.22",
 "bgwikinews": 

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Return back the possibility to have a performer

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Return back the possibility to have a performer
..


Return back the possibility to have a performer

Change-Id: Ibda1387dd8591f66044c89a561ec3eb8336f8e8e
---
M jsonschema/mediawiki/page/properties-change/1.yaml
1 file changed, 28 insertions(+), 0 deletions(-)

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



diff --git a/jsonschema/mediawiki/page/properties-change/1.yaml 
b/jsonschema/mediawiki/page/properties-change/1.yaml
index 5c938c9..6701b55 100644
--- a/jsonschema/mediawiki/page/properties-change/1.yaml
+++ b/jsonschema/mediawiki/page/properties-change/1.yaml
@@ -49,6 +49,34 @@
 description: The name of the wiki database this event belongs to.
 type: string
 
+  performer:
+description: Represents the user that performed this change.
+type: object
+properties:
+  user_id:
+description: >
+  The user id that performed this change.  This is optional, and
+  will not be present for anonymous users.
+type: integer
+  user_text:
+description: The text representation of the user that performed this 
change.
+type: string
+  user_groups:
+description: A list of the groups this user belongs to.  E.g. bot, 
sysop etc.
+type: array
+items:
+  type: string
+  user_is_bot:
+description: >
+  True if this user is considered to be a bot.  This is checked
+  via the $user->isBot() method, which considers both user_groups
+  and user permissions.
+type: boolean
+required:
+  - user_text
+  - user_groups
+  - user_is_bot
+
   ### page entity fields - all page related events should have these.
   page_id:
 description: The page ID of the page which properties has been changed.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibda1387dd8591f66044c89a561ec3eb8336f8e8e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/event-schemas
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Deployment: Switch from tin to mira

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Deployment: Switch from tin to mira
..

Deployment: Switch from tin to mira

Bug: T144578
Change-Id: Ic999b238e36b273d47ae54beac317466292f7d6a
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy 
refs/changes/26/315726/1

diff --git a/scap/scap.cfg b/scap/scap.cfg
index 3ce993a..d9a697d 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -13,7 +13,7 @@
 config_deploy: True
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 [deployment-prep.eqiad.wmflabs]
 git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic999b238e36b273d47ae54beac317466292f7d6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
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] mediawiki...deploy[master]: Deployment: Switch from tin to mira

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Deployment: Switch from tin to mira
..


Deployment: Switch from tin to mira

Bug: T144578
Change-Id: I626318ae08b91da66d9ad82209bdcea4040bf9c3
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/scap.cfg b/scap/scap.cfg
index 0bf7834..989aa46 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -13,7 +13,7 @@
 config_deploy: True
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 [deployment-prep.eqiad.wmflabs]
 git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I626318ae08b91da66d9ad82209bdcea4040bf9c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
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] mediawiki...VisualEditor[master]: Fix another case where we need to pass the section

[jenkins-bot (Code Review)]

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

Change subject: Fix another case where we need to pass the section
..


Fix another case where we need to pass the section

Bug: T144654
Change-Id: I5f91b9329525ceaeb971d02f93c959d908d748f7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index d50c7d1..869d294 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -849,7 +849,7 @@
mechanism: 'url'
} );
if ( isViewPage && uri.query.veaction 
in editModes ) {
-   activateTarget( editModes[ 
uri.query.veaction ] );
+   activateTarget( editModes[ 
uri.query.veaction ], section );
} else {
if (
conf.enableWikitext &&

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f91b9329525ceaeb971d02f93c959d908d748f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: 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] mediawiki/core[master]: Fix WANObjectCache doc typo

[jenkins-bot (Code Review)]

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

Change subject: Fix WANObjectCache doc typo
..


Fix WANObjectCache doc typo

Change-Id: I74ef6598d86bdf43ae35f776878cfbb8e9695907
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index d7db732..b0a3109 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1046,7 +1046,7 @@
 * Example usage:
 * @code
 * $rows = $cache->getMultiWithSetCallback(
-* // Map of cache keys to entitiy IDs
+* // Map of cache keys to entity IDs
 * $cache->makeMultiKeys(
 * $this->fileVersionIds(),
 * function ( $id, WANObjectCache $cache ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I74ef6598d86bdf43ae35f776878cfbb8e9695907
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Deployment: Switch from tin to mira

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Deployment: Switch from tin to mira
..

Deployment: Switch from tin to mira

Bug: T144578
Change-Id: I65d15fa685621f191349c27bfaf29a7b195cb8ca
---
M scap/scap.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/graphoid/deploy 
refs/changes/25/315725/1

diff --git a/scap/scap.cfg b/scap/scap.cfg
index baff8bb..11ec8ab 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -12,7 +12,7 @@
 lock_file: /tmp/scap.graphoid.lock
 
 [wmnet]
-git_server: tin.eqiad.wmnet
+git_server: mira.codfw.wmnet
 
 # [deployment-prep.eqiad.wmflabs]
 # git_server: deployment-tin.deployment-prep.eqiad.wmflabs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65d15fa685621f191349c27bfaf29a7b195cb8ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid/deploy
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] mediawiki...Cargo[master]: Removed duplicate retrieval of filters in drilldown

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Removed duplicate retrieval of filters in drilldown
..

Removed duplicate retrieval of filters in drilldown

Change-Id: Id6d9cc640aacd8ce83241046b85c1a54a628
---
M drilldown/CargoSpecialDrilldown.php
1 file changed, 14 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/20/315720/2

diff --git a/drilldown/CargoSpecialDrilldown.php 
b/drilldown/CargoSpecialDrilldown.php
index 42930a6..c766e50 100644
--- a/drilldown/CargoSpecialDrilldown.php
+++ b/drilldown/CargoSpecialDrilldown.php
@@ -62,15 +62,15 @@
}
 
$tableSchemas = CargoUtils::getTableSchemas( array( $tableName 
) );
-   $filters = array();
+   $all_filters = array();
foreach ( $tableSchemas[$tableName]->mFieldDescriptions as 
$fieldName => $fieldDescription ) {
// Skip "hidden" fields.
if ( $fieldDescription->mIsHidden ) {
continue;
}
 
-   // Skip coordinate fields.
-   if ( $fieldDescription->mType == 'Coordinates' ) {
+   // Some field types shouldn't get a filter at all.
+   if ( in_array( $fieldDescription->mType, array( 'Text', 
'File', 'Coordinates', 'URL', 'Email', 'Wikitext', 'Searchtext' ) ) ) {
continue;
}
 
@@ -78,16 +78,16 @@
$curFilter->setName( $fieldName );
$curFilter->setTableName( $tableName );
$curFilter->setFieldDescription( $fieldDescription );
-   $filters[] = $curFilter;
+   $all_filters[] = $curFilter;
}
 
$filter_used = array();
-   foreach ( $filters as $i => $filter ) {
+   foreach ( $all_filters as $i => $filter ) {
$filter_used[] = false;
}
$applied_filters = array();
$remaining_filters = array();
-   foreach ( $filters as $i => $filter ) {
+   foreach ( $all_filters as $i => $filter ) {
$filter_name = str_replace( array( ' ', "'" ), array( 
'_', "\'" ), $filter->name );
$search_terms = $request->getArray( '_search_' . 
$filter_name );
$lower_date = $request->getArray( '_lower_' . 
$filter_name );
@@ -107,9 +107,9 @@
$filter_used[$i] = true;
}
}
-   // add every unused filter to the $remaining_filters array,
-   // unless it requires some other filter that hasn't been applied
-   foreach ( $filters as $i => $filter ) {
+   // Add every unused filter to the $remaining_filters array,
+   // unless it requires some other filter that hasn't been 
applied.
+   foreach ( $all_filters as $i => $filter ) {
$matched_all_required_filters = true;
foreach ( $filter->required_filters as $required_filter 
) {
$found_match = false;
@@ -130,7 +130,7 @@
 
$out->addHTML( "\n\t\t\t\t\n" 
);
$rep = new CargoDrilldownPage(
-   $tableName, $applied_filters, $remaining_filters, 
$offset, $limit );
+   $tableName, $all_filters, $applied_filters, 
$remaining_filters, $offset, $limit );
$num = $rep->execute( $query );
$out->addHTML( "\n\t\t\t \n" );
 
@@ -148,6 +148,7 @@
 
 class CargoDrilldownPage extends QueryPage {
public $tableName = "";
+   public $all_filters = array();
public $applied_filters = array();
public $remaining_filters = array();
public $showSingleTable = false;
@@ -161,10 +162,11 @@
 * @param int $offset
 * @param int $limit
 */
-   function __construct( $tableName, $applied_filters, $remaining_filters, 
$offset, $limit ) {
+   function __construct( $tableName, $all_filters, $applied_filters, 
$remaining_filters, $offset, $limit ) {
parent::__construct( 'Drilldown' );
 
$this->tableName = $tableName;
+   $this->all_filters = $all_filters;
$this->applied_filters = $applied_filters;
$this->remaining_filters = $remaining_filters;
$this->offset = $offset;
@@ -977,20 +979,8 @@
$filtersHTML = "\n";
$cur_url = $this->makeBrowseURL( $this->tableName, 
$this->applied_filters );
$cur_url .= ( strpos( 

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Avoid parseInt

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Avoid parseInt
..

Avoid parseInt

Where we know the number contains only numerals, just cast
straight to a number using '+' operator. When getting computed
css from jQuery, use more suitable position methods instead.

Change-Id: Ia58b41a4522a1ef5a1516852821573c47e8dc9c9
---
M modules/ext.RevisionSlider.RevisionListView.js
M modules/ext.RevisionSlider.SliderView.js
2 files changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/31/315731/1

diff --git a/modules/ext.RevisionSlider.RevisionListView.js 
b/modules/ext.RevisionSlider.RevisionListView.js
index e7fce2a..58d1947 100644
--- a/modules/ext.RevisionSlider.RevisionListView.js
+++ b/modules/ext.RevisionSlider.RevisionListView.js
@@ -132,9 +132,9 @@
 * @param {jQuery} $rev
 */
showTooltip: function ( $rev ) {
-   var pos = parseInt( $rev.find( '.mw-revslider-revision' 
).attr( 'data-pos' ), 10 ),
-   revId = parseInt( $rev.find( 
'.mw-revslider-revision' ).attr( 'data-revid' ), 10 ),
-   revision =  this.getRevisionWithId( revId ),
+   var pos = +$rev.find( '.mw-revslider-revision' ).attr( 
'data-pos' ),
+   revId = +$rev.find( '.mw-revslider-revision' 
).attr( 'data-revid' ),
+   revision = this.getRevisionWithId( revId ),
tooltip;
if ( revision === null ) {
return;
diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index 5b49fe8..88acf9b 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -206,10 +206,11 @@
stop: function () {
var $p = $( this ),
pointer = self.whichPointer( $p 
),
-   pos = parseInt( $p.css( 'left' 
), 10 ),
+   pos = $p.position().left,
adjustedPos = self.dir === 
'rtl' ? pointer.getView().getAdjustedLeftPositionWhenRtl( pos ) : pos,
relativeIndex = Math.ceil( ( 
adjustedPos + self.revisionWidth / 2 ) / self.revisionWidth ),
revId1, revId2;
+
mw.track( 
'counter.MediaWiki.RevisionSlider.event.pointerMove' );
pointer.setPosition( 
self.slider.getFirstVisibleRevisionIndex() + relativeIndex );

self.resetPointerStylesBasedOnPosition();
@@ -312,14 +313,14 @@
pNew = view.getNewRevPointer();
 
if ( hasClickedTop ) {
-   pNew.setPosition( parseInt( $clickedRev.attr( 
'data-pos' ), 10 ) );
+   pNew.setPosition( +$clickedRev.attr( 'data-pos' 
) );
view.updatePointerPositionAttributes();
view.refreshRevisions(
view.getRevElementAtPosition( 
$revisions, pOld.getPosition() ).data( 'revid' ),
$clickedRev.data( 'revid' )
);
} else {
-   pOld.setPosition( parseInt( $clickedRev.attr( 
'data-pos' ), 10 ) );
+   pOld.setPosition( +$clickedRev.attr( 'data-pos' 
) );
view.updatePointerPositionAttributes();
view.refreshRevisions(
$clickedRev.data( 'revid' ),
@@ -809,7 +810,7 @@
 * @return {boolean}
 */
shouldExpandSlider: function ( $slider ) {
-   var sliderWidth = parseInt( $slider.css( 'width' ), 10 
),
+   var sliderWidth = $slider.width(),
maxAvailableWidth = 
this.calculateSliderContainerWidth() + this.containerMargin;
 
return !( this.noMoreNewerRevisions && 
this.noMoreOlderRevisions ) && sliderWidth < maxAvailableWidth;

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Removed deprecated rule about page image

[Ppchelko (Code Review)]

Ppchelko has uploaded a new change for review.

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

Change subject: Removed deprecated rule about page image
..

Removed deprecated rule about page image

Bug: T147516
Change-Id: I2c1b81b2fa256cce671d0121c249e79c9c5daa07
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 22 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/44/315744/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index fd6a321..002ac37 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -586,46 +586,26 @@
 redirect: false
 
 # Rerender summary when pageimages page property change
-# This is a temporary workaround until we get a complete 
page properties change event.
 page_images:
-  topic: resource_change
-  match:
-meta:
-  uri: '/^https?:\/\/[^\/]+\/wiki\/(?.+)$/'
-tags:
-  - page_image
-  exec:
-method: get
-uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{{match.meta.uri.title}}'
-headers:
-  cache-control: no-cache
-query:
-  redirect: false
-# the rule replacing the one above, to be phased out
-page_images_change:
   topic: mediawiki.page-properties-change
   # We don't support 'OR' in the match section, so 
workaround it by 2 cases with identical exec
   cases:
 - match:
-meta:
-  uri: '/^https?:\/\/[^\/]+\/wiki\/(?.+)$/'
 added_properties:
   page_image: '/.+/' # Regex that matches anything 
just to check the prop is set
   exec:
 method: get
-uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{{match.meta.uri.title}}'
+uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{message.page_title}'
 headers:
   cache-control: no-cache
 query:
   redirect: false
 - match:
-meta:
-  uri: '/^https?:\/\/[^\/]+\/wiki\/(?.+)$/'
 removed_properties:
   page_image: '/.+/' # Regex that matches anything 
just to check the prop is set
   exec:
 method: get
-uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{{match.meta.uri.title}}'
+uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{message.page_title}'
 headers:
   cache-control: no-cache
 query:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c1b81b2fa256cce671d0121c249e79c9c5daa07
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable AbuseFilterCachingParser on testwiki and mediawikiwiki

[jenkins-bot (Code Review)]

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

Change subject: Enable AbuseFilterCachingParser on testwiki and mediawikiwiki
..


Enable AbuseFilterCachingParser on testwiki and mediawikiwiki

Set AbuseFilterParserClass to 'AbuseFilterCachingParser' on testwiki and
mediawiki.org. This parser implementation was introduced in I4aea5f00 and is
slotted to replace the default implementation. Follows If794eb, which enabled
the parser on Labs.

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

Approvals:
  Ori.livneh: Looks good to me, approved
  Aaron Schulz: 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 65f8f63..bf14539 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12207,6 +12207,12 @@
'default' => 86400,
],
 ],
+
+'wgAbuseFilterParserClass' => [
+   'default' => 'AbuseFilterParser',
+   'mediawikiwiki' => 'AbuseFilterCachingParser',
+   'testwiki' => 'AbuseFilterCachingParser',
+],
 # @}
 
 'wgThumbLimits' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f6eb9f6afec8f1f6b4a3109e653aba7dd58c56c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: EditPage: Show EditFilterMergedContent hook errors in an err...

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: EditPage: Show EditFilterMergedContent hook errors in an 
errorbox
..

EditPage: Show EditFilterMergedContent hook errors in an errorbox

Errors that go through the Status object of the EditFilterMergedContent
hook have less control over how their errors are displayed, compared to
the legacy EditFilterMerged hook. Notably, Scribunto wrapped its errors
in an errorbox for increased visibility. That was a good idea in
general, so let's do that for all errors.

Change-Id: I1f0e463841298b8c59ed8bd898c8a4661c5e3aa4
---
M includes/EditPage.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 28 insertions(+), 4 deletions(-)


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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8226da5..95d11c4 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1639,7 +1639,7 @@
// being set. This is used by ConfirmEdit to 
display a captcha
// without any error message cruft.
} else {
-   $this->hookError = $status->getWikiText();
+   $this->hookError = $this->formatStatusErrors( 
$status );
}
// Use the existing $status->value if the hook set it
if ( !$status->value ) {
@@ -1649,7 +1649,7 @@
} elseif ( !$status->isOK() ) {
# ...or the hook could be expecting us to produce an 
error
// FIXME this sucks, we should just use the Status 
object throughout
-   $this->hookError = $status->getWikiText();
+   $this->hookError = $this->formatStatusErrors( $status );
$status->fatal( 'hookaborted' );
$status->value = self::AS_HOOK_ERROR_EXPECTED;
return false;
@@ -1659,6 +1659,26 @@
}
 
/**
+* Wrap status errors in an errorbox for increased visiblity
+*
+* @param Status $status
+* @return string
+*/
+   private function formatStatusErrors( Status $status ) {
+   $errmsg = $status->getHTML(
+   'edit-error-short',
+   'edit-error-long',
+   $this->context->getLanguage()
+   );
+   return <<
+{$errmsg}
+
+
+ERROR;
+   }
+
+   /**
 * Return the summary to be used for a new section.
 *
 * @param string $sectionanchor Set to the section anchor text
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 30adf58..4107b9e 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4227,5 +4227,7 @@
"usercssispublic": "Please note: CSS subpages should not contain 
confidential data as they are viewable by other users.",
"restrictionsfield-badip": "Invalid IP address or range: $1",
"restrictionsfield-label": "Allowed IP ranges:",
-   "restrictionsfield-help": "One IP address or CIDR range per line. To 
enable everything, use0.0.0.0/0::/0"
+   "restrictionsfield-help": "One IP address or CIDR range per line. To 
enable everything, use0.0.0.0/0::/0",
+   "edit-error-short": "Error: $1",
+   "edit-error-long": "Errors:\n\n$1"
 }
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 235bf1e..6c0cd57 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -4411,5 +4411,7 @@
"usercssispublic": "A reminder to users that CSS subpages are not 
preferences but normal pages, and thus can be viewed by other users and the 
general public. This message is shown to a user whenever they are editing a 
subpage in their own user-space that ends in .css. See also 
{{msg-mw|userjsispublic}}",
"restrictionsfield-badip": "An error message shown when one entered an 
invalid IP address or range in a restrictions field (such as 
Special:BotPassword). $1 is the IP address.",
"restrictionsfield-label": "Field label shown for restriction fields 
(e.g. on Special:BotPassword).",
-   "restrictionsfield-help": "Placeholder text displayed in restriction 
fields (e.g. on Special:BotPassword)."
+   "restrictionsfield-help": "Placeholder text displayed in restriction 
fields (e.g. on Special:BotPassword).",
+   "edit-error-short": "Error message. Parameters:\n* $1 - the error 
details\nSee also:\n* {{msg-mw|edit-error-long}}",
+   "edit-error-long": "Error message. Parameters:\n* $1 - the error 
details\nSee also:\n* {{msg-mw|edit-error-short}}",
 }

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

Gerrit-MessageType: 

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Bumped to the new wikimedia-mapdata

[jenkins-bot (Code Review)]

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

Change subject: Bumped to the new wikimedia-mapdata
..


Bumped to the new wikimedia-mapdata

Change-Id: I73c8c1247781dec7e420a81fe6bb75cf3dd0f7d7
---
M lib/wikimedia-mapdata.js
M modules/box/data.js
2 files changed, 403 insertions(+), 385 deletions(-)

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



diff --git a/lib/wikimedia-mapdata.js b/lib/wikimedia-mapdata.js
index 924167b..18fa0bf 100644
--- a/lib/wikimedia-mapdata.js
+++ b/lib/wikimedia-mapdata.js
@@ -8,102 +8,103 @@
  */
 var DataLoader = function ( createPromise, createResolvedPromise, mwApi, 
clientStore, title, debounce, bind ) {
 
-   var DataLoader = function () {
-   /**
-* @type {Object} Hash of group ids and associated promises.
-* @private
-*/
-   this.promiseByGroup = {};
-   /**
-* @type {string[]} List of group ids to fetch next time
-*   {@link #fetch} is called.
-*
-* @private
-*/
-   this.nextFetch = [];
+  var DataLoader = function () {
+/**
+ * @type {Object} Hash of group ids and associated promises.
+ * @private
+ */
+this.promiseByGroup = {};
+/**
+ * @type {string[]} List of group ids to fetch next time
+ *   {@link #fetch} is called.
+ *
+ * @private
+ */
+this.nextFetch = [];
 
-   if ( debounce && bind ) {
-   this.fetch = debounce( 100, bind( this.fetch, this ) );
-   }
-   };
+if ( debounce && bind ) {
+  this.fetch = debounce( 100, bind( this.fetch, this ) );
+}
+  };
 
-   clientStore = clientStore || {};
+  clientStore = clientStore || {};
 
-   /**
-* @param {string} groupId
-* @return {Promise}
-*/
-   DataLoader.prototype.fetchGroup = function ( groupId ) {
-   var promise = this.promiseByGroup[ groupId ],
-   resolveFunc, rejectFunc;
-   if ( !promise ) {
-   if ( clientStore[groupId] ) {
-   promise = createResolvedPromise( 
clientStore[groupId] );
-   } else {
-   // FIXME: this is a horrible hack
-   // The resolve and reject functions are 
attached to the promise object's instance
-   // so that they can be called from the fetch 
function later
-   this.nextFetch.push( groupId );
-   promise = createPromise( function ( resolve, 
reject ) {
-   resolveFunc = resolve;
-   rejectFunc = reject;
-   } );
-   promise.mwResolve = resolveFunc;
-   promise.mwReject = rejectFunc;
-   }
+  /**
+   * @param {string} groupId
+   * @return {Promise}
+   */
+  DataLoader.prototype.fetchGroup = function ( groupId ) {
+var promise = this.promiseByGroup[ groupId ],
+resolveFunc, rejectFunc;
+if ( !promise ) {
+  if ( clientStore[ groupId ] ) {
+promise = createResolvedPromise( clientStore[ groupId ] );
+  } else {
+// FIXME: this is a horrible hack
+// The resolve and reject functions are attached to the promise 
object's instance
+// so that they can be called from the fetch function later
+this.nextFetch.push( groupId );
+promise = createPromise( function ( resolve, reject ) {
+  resolveFunc = resolve;
+  rejectFunc = reject;
+} );
+promise.mwResolve = resolveFunc;
+promise.mwReject = rejectFunc;
+  }
 
-   this.promiseByGroup[groupId] = promise;
-   }
-   return promise;
-   };
+  this.promiseByGroup[ groupId ] = promise;
+}
+return promise;
+  };
 
-   /**
-* @return {Promise}
-*/
-   DataLoader.prototype.fetch = function () {
-   var loader = this,
-   groupsToLoad = loader.nextFetch;
+  /**
+   * @return {Promise}
+   */
+  DataLoader.prototype.fetch = function () {
+var loader = this,
+groupsToLoad = loader.nextFetch;
 
-   if ( !groupsToLoad.length ) {
-   return createResolvedPromise();
-   }
+if ( !groupsToLoad.length ) {
+  return createResolvedPromise();
+}
 
-   loader.nextFetch = [];
+loader.nextFetch = [];
 
-   // FIXME: we need to fix this horrid hack
-   // 
http://stackoverflow.com/questions/39970101/combine-multiple-debounce-promises-in-js
-   function setPromises( 

[MediaWiki-commits] [Gerrit] operations/dns[master]: wmnet: Set db1048 as the new s3-slave after failover

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review.

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

Change subject: wmnet: Set db1048 as the new s3-slave after failover
..

wmnet: Set db1048 as the new s3-slave after failover

Bug: T146673
Change-Id: I2b73bd0c2af5a3d41f69e82ba4c518d1f4b0a515
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/32/315732/1

diff --git a/templates/wmnet b/templates/wmnet
index ecaecbd..8617b57 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -46,7 +46,7 @@
 m2-master   5M  IN CNAMEdbproxy1002.eqiad.wmnet.
 m2-slave5M  IN CNAMEdb2011.codfw.wmnet.
 m3-master   5M  IN CNAMEdbproxy1003.eqiad.wmnet.
-m3-slave5M  IN CNAMEdb1043.eqiad.wmnet.
+m3-slave5M  IN CNAMEdb1048.eqiad.wmnet.
 m4-master   5M  IN CNAMEdbproxy1004.eqiad.wmnet.
 m5-master   5M  IN CNAMEdb1009.eqiad.wmnet.
 m5-slave5M  IN CNAMEdb2030.codfw.wmnet.

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: wmnet: remove labsdb1002.eqiad.wmnet

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged.

Change subject: wmnet: remove labsdb1002.eqiad.wmnet
..


wmnet: remove labsdb1002.eqiad.wmnet

Management entries stay.

Bug: T146455
Change-Id: Iac60578e3b70eb4d4116ae231c5c55b346209937
---
M templates/wmnet
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/templates/wmnet b/templates/wmnet
index 8100959..ecaecbd 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -401,7 +401,6 @@
 labnet1002  1H  IN A10.64.20.25
 labnodepool1001 1H  IN A10.64.20.18
 labsdb1001  1H  IN A10.64.4.11
-labsdb1002  1H  IN A10.64.37.4
 labsdb1003  1H  IN A10.64.37.5
 labstore10011H  IN A10.64.37.6
 labstore10021H  IN A10.64.37.7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac60578e3b70eb4d4116ae231c5c55b346209937
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
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] mediawiki...RevisionSlider[master]: Update linters and remove redundant ones

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

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

Change subject: Update linters and remove redundant ones
..

Update linters and remove redundant ones

eslint covers jshint and jscs rules.

Change-Id: Ieff7a050021e504575a774c7c9ba987b23380294
---
D .csslintrc
M Gruntfile.js
M package.json
3 files changed, 4 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/37/315737/1

diff --git a/.csslintrc b/.csslintrc
deleted file mode 100644
index ec188a9..000
--- a/.csslintrc
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-   "adjoining-classes": false,
-   "box-model": false,
-   "box-sizing": false,
-   "fallback-colors": false,
-   "ids": false,
-   "important": false,
-   "outline-none": false,
-   "overqualified-elements": false,
-   "qualified-headings": false,
-   "universal-selector": false,
-   "unqualified-attributes": false
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 10f2ac6..05a2d46 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,9 +1,7 @@
 /* jshint node:true */
 module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-banana-checker' );
-   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-eslint' );
-   grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-stylelint' );
 
@@ -14,19 +12,6 @@
'tests/**/*.js',
'modules/**/*.js'
]
-   },
-   jshint: {
-   options: {
-   jshintrc: true
-   },
-   all: [
-   '*.js',
-   'tests/**/*.js',
-   'modules/**/*.js'
-   ]
-   },
-   jscs: {
-   src: '<%= jshint.all %>'
},
stylelint: {
all: [
@@ -46,6 +31,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'eslint', 'jshint', 'jscs', 'jsonlint', 
'stylelint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'stylelint', 
'banana' ] );
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 8bd5cf4..8facbfe 100644
--- a/package.json
+++ b/package.json
@@ -14,11 +14,9 @@
 "eslint-config-wikimedia": "0.1.0",
 "grunt": "1.0.1",
 "grunt-banana-checker": "0.5.0",
-"grunt-contrib-jshint": "1.0.0",
 "grunt-eslint": "19.0.0",
-"grunt-jscs": "3.0.0",
-"grunt-jsonlint": "1.0.8",
-"grunt-stylelint": "0.4.0",
-"stylelint-config-wikimedia": "0.2.2"
+"grunt-jsonlint": "1.1.0",
+"grunt-stylelint": "0.6.0",
+"stylelint-config-wikimedia": "0.3.0"
   }
 }
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieff7a050021e504575a774c7c9ba987b23380294
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
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] operations/puppet[production]: nfs: Fix drbd monitoring param name typo

[Madhuvishy (Code Review)]

Madhuvishy has submitted this change and it was merged.

Change subject: nfs: Fix drbd monitoring param name typo
..


nfs: Fix drbd monitoring param name typo

Change-Id: Ibd6ee4a1d01a825d37bfa80f8f8d2eef91be0747
---
M modules/role/manifests/labs/nfs/secondary.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/labs/nfs/secondary.pp 
b/modules/role/manifests/labs/nfs/secondary.pp
index cd0b8c5..e6208bb 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -62,6 +62,6 @@
 }
 
 class { 'labstore::monitoring::drbd':
-role  => $drbd_role,
+drbd_role  => $drbd_role,
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd6ee4a1d01a825d37bfa80f8f8d2eef91be0747
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: jenkins-bot <>

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