[MediaWiki-commits] [Gerrit] Plugin: hook destroy regardless of provider - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Plugin: hook destroy regardless of provider
..


Plugin: hook destroy regardless of provider

Change the `:machine_action_destroy` hook in mediawiki-vagrant plugin so
that it fires for all providers. The previous implementation only fired
when the VM provider was VirtualBox. This meant that the cleanup of
puppet provisioned files on the host computer did not occur of LXC and
other providers.

Change-Id: Ie9044dadac3e619754a11d582afe8e38bbda9923
---
M lib/mediawiki-vagrant.rb
M lib/mediawiki-vagrant/version.rb
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb
index 2dca567..fc1e2db 100644
--- a/lib/mediawiki-vagrant.rb
+++ b/lib/mediawiki-vagrant.rb
@@ -86,7 +86,7 @@
 
 action_hook(:mediawiki, :machine_action_destroy) do |hook|
   require 'mediawiki-vagrant/destroy'
-  hook.before(VagrantPlugins::ProviderVirtualBox::Action::Destroy, Destroy)
+  hook.prepend(Destroy)
 end
 
 provisioner 'mediawiki_reload' do
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index e699811..93797c0 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
 module MediaWikiVagrant
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9044dadac3e619754a11d582afe8e38bbda9923
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Switch to Jessie and Node 4.2 - change (mediawiki...citoid)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Switch to Jessie and Node 4.2
..

Switch to Jessie and Node 4.2

Bug: T107304
Change-Id: I8fb207f93746159dce0395fae2abd2c4c00765bd
---
M package.json
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/package.json b/package.json
index bd81e86..22d896f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
 "swagger-router": "^0.3.4"
   },
   "deploy": {
-"target": "ubuntu",
+"node": "4.2",
+"target": "debian",
 "dependencies": {
   "_all": []
 }

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

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

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

[MediaWiki-commits] [Gerrit] Preprocessor: Don't allow unclosed extension tags (matching ... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Preprocessor: Don't allow unclosed extension tags (matching 
until end of input)
..


Preprocessor: Don't allow unclosed extension tags (matching until end of input)

I think it's saner to treat this as invalid syntax, and output the
mismatched tag code verbatim. The current behavior is particularly
annoying for  tags, which often swallow everything afterwards.

This does not affect HTML tags, though. Assuming Tidy is enabled, they
are still auto-closed at the end of the page content.

Related to T17712 and T58306. I think this brings the PHP parser closer
to Parsoid's interpretation.

It reduces performance somewhat in the worst case, though. Testing with
https://phabricator.wikimedia.org/F3245989 (a 1 MB page starting with
3000 opening tags of 15 different types), parsing time rises from
~0.2 seconds to ~1.1 seconds on my setup. We go from O(N) to O(kN),
where N is bytes of input and k is the number of types of tags present
on the page. Maximum k shouldn't exceed 30 or so in reasonable setups
(depends on installed extensions, it's 20 on English Wikipedia).

To consider:
* Should we keep previous behavior for unclosed  /
  ? This would be particularly disruptive for these if
  someone relied on the old behavior, and they're already
  special-cased in places.
* Unclosed  tags are now treated as HTML tags, and are still
  displayed as preformatted text, but without suppressing wikitext
  formatting.

Change-Id: Ia2f24dbfb3567c4b0778761585e6c0303d11ddd0
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
M tests/phpunit/includes/parser/PreprocessorTest.php
4 files changed, 31 insertions(+), 13 deletions(-)

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



diff --git a/includes/parser/Preprocessor_DOM.php 
b/includes/parser/Preprocessor_DOM.php
index 4ca3a87..817f153 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -237,6 +237,8 @@
$inHeading = false;
// True if there are no more greater-than (>) signs right of $i
$noMoreGT = false;
+   // Map of tag name => true if there are no more closing tags of 
given type right of $i
+   $noMoreClosingTag = array();
// True to ignore all input up to the next 
$findOnlyinclude = $enableOnlyinclude;
// Do a line-start run without outputting an LF character
@@ -457,17 +459,21 @@
} else {
$attrEnd = $tagEndPos;
// Find closing tag
-   if ( preg_match( "/<\/" . preg_quote( 
$name, '/' ) . "\s*>/i",
+   if (
+   !isset( 
$noMoreClosingTag[$name] ) &&
+   preg_match( "/<\/" . 
preg_quote( $name, '/' ) . "\s*>/i",
$text, $matches, 
PREG_OFFSET_CAPTURE, $tagEndPos + 1 )
) {
$inner = substr( $text, 
$tagEndPos + 1, $matches[0][1] - $tagEndPos - 1 );
$i = $matches[0][1] + strlen( 
$matches[0][0] );
$close = '' . 
htmlspecialchars( $matches[0][0] ) . '';
} else {
-   // No end tag -- let it run out 
to the end of the text.
-   $inner = substr( $text, 
$tagEndPos + 1 );
-   $i = $lengthText;
-   $close = '';
+   // No end tag -- don't match 
the tag, treat opening tag as literal and resume parsing.
+   $i = $tagEndPos + 1;
+   $accum .= htmlspecialchars( 
substr( $text, $tagStartPos, $tagEndPos + 1 - $tagStartPos ) );
+   // Cache results, otherwise we 
have O(N^2) performance for input like ...
+   $noMoreClosingTag[$name] = true;
+   continue;
}
}
//  and  just become 
 tags
diff --git a/includes/parser/Preprocessor_Hash.php 
b/includes/parser/Preprocessor_Hash.php
index 50eaefb..28c49fd 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -160,6 +160,8 @@
  

[MediaWiki-commits] [Gerrit] Beta: Set ContentTranslationCorpora to true - change (operations/mediawiki-config)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: Beta: Set ContentTranslationCorpora to true
..

Beta: Set ContentTranslationCorpora to true

Bug: T119617
Change-Id: I7d4bc8db37d39baa5e8c2ef13a1d44eb45cbec8d
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index d4835e1..38165a4 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -417,6 +417,10 @@
'default' => true,
),
 
+   'wmgContentTranslationCorpora' => array(
+   'default' => true,
+   ),
+
'wmgUseNavigationTiming' => array(
'default' => true,
),

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

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

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

[MediaWiki-commits] [Gerrit] Enable ContentTranslationCorpora - change (operations/mediawiki-config)

[KartikMistry (Code Review)]

KartikMistry has uploaded a new change for review.

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

Change subject: Enable ContentTranslationCorpora
..

Enable ContentTranslationCorpora

Bug: T119617
Change-Id: Iecf4a4a565da368e69217a89c86608ffc66fcf97
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index eea2061..eb007cb 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15203,6 +15203,11 @@
'wikipedia' => true,
 ),
 
+//Parallel Corpora
+'wmgContentTranslationCorpora' => array(
+   'default' => false,
+),
+
 'wmgUseMapSources' => array(
'default' => false,
'wikivoyage' => true,

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

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

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

[MediaWiki-commits] [Gerrit] Remove partial submodule. - change (mediawiki...SpellingDictionary)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Remove partial submodule.
..

Remove partial submodule.

It seems this was not properly removed. It causes problem when checking out
submodules recursively.

Change-Id: I89e50002f659a2fabbde82dc07d86ef9c34fdc84
---
D modules/jquery.uls
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpellingDictionary 
refs/changes/37/265437/1

diff --git a/modules/jquery.uls b/modules/jquery.uls
deleted file mode 16
index 10777bb..000
--- a/modules/jquery.uls
+++ /dev/null
-Subproject commit 10777bb25ea23dc5609a1109a27e901711cc264b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89e50002f659a2fabbde82dc07d86ef9c34fdc84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpellingDictionary
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 

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

[MediaWiki-commits] [Gerrit] In refreshLinks.php don't clear tag hooks - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: In refreshLinks.php don't clear tag hooks
..


In refreshLinks.php don't clear tag hooks

It made perfect sense when I introduced this line in June 2005, but now
that we have  etc., we need to use the normal parser configuration.

Change-Id: I5a32e4e38badff85fe6d7d63c3fa158dc6fd5336
---
M maintenance/refreshLinks.php
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index a0cd6a9..1159e53 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -73,8 +73,6 @@
private function doRefreshLinks( $start, $newOnly = false,
$end = null, $redirectsOnly = false, $oldRedirectsOnly = false
) {
-   global $wgParser;
-
$reportingInterval = 100;
$dbr = $this->getDB( DB_SLAVE );
 
@@ -84,9 +82,6 @@
 
// Give extensions a chance to optimize settings
Hooks::run( 'MaintenanceRefreshLinksInit', array( $this ) );
-
-   # Don't generate extension images (e.g. Timeline)
-   $wgParser->clearTagHooks();
 
$what = $redirectsOnly ? "redirects" : "links";
 

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

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

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

[MediaWiki-commits] [Gerrit] graphite doesn't allow spaces in stat names - change (mediawiki...GeoData)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: graphite doesn't allow spaces in stat names
..

graphite doesn't allow spaces in stat names

Change-Id: I5d023bc203b36d3cb1373f92463962b202615d69
---
M includes/api/ApiQueryGeoSearchElastic.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index 4436ac9..aa8dabf 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -90,7 +90,7 @@
 
$searcher = new Searcher( $this->getUser() );
 
-   $resultSet = $searcher->performSearch( $query, 'GeoData spatial 
search' );
+   $resultSet = $searcher->performSearch( $query, 
'GeoData_spatial_search' );
 
if ( isset( $params['debug'] ) && $params['debug'] ) {
$this->addDebugInfo( $resultSet );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d023bc203b36d3cb1373f92463962b202615d69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Add notes on dashboard why data is missing - change (wikimedia...rainbow)

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Add notes on dashboard why data is missing
..

Add notes on dashboard why data is missing

Bug: T124072
Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow 
refs/changes/45/265445/1

diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index fd18ad9..308a8a3 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -11,7 +11,8 @@
 
 Outages and inaccuracies
 --
-* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index df37405..a407a3c 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,6 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index 32de6d0..fa0494b 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,8 +5,7 @@
 
 Outages and inaccuracies
 --
-
-* None so far!
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Mark ApiULSLocalization internal - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

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

Change subject: Mark ApiULSLocalization internal
..


Mark ApiULSLocalization internal

Per suggestion in T91457#1944256

Change-Id: I27956c3f14188b3ae9f1c21e3f5c0e02ecb9e8f7
---
M api/ApiULSLocalization.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index 2699a4d..8bcbe3e 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -91,4 +91,9 @@
=> 'apihelp-ulslocalization-example-2',
);
}
+
+   // Try to scare people away from using this externally
+   public function isInternal() {
+   return true;
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27956c3f14188b3ae9f1c21e3f5c0e02ecb9e8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Deploy missing data notes in Metrics dash - change (wikimedia...dashboard)

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Deploy missing data notes in Metrics dash
..

Deploy missing data notes in Metrics dash

Bug: T124072
Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/46/265446/1

diff --git a/shiny-server/metrics b/shiny-server/metrics
index c75f31b..d4fdf41 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit c75f31b30857867ccda27bdb49e43151d4810eb3
+Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Add notes on dashboard why data is missing - change (wikimedia...rainbow)

[Bearloga (Code Review)]

Bearloga has submitted this change and it was merged.

Change subject: Add notes on dashboard why data is missing
..


Add notes on dashboard why data is missing

Bug: T124072
Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index fd18ad9..308a8a3 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -11,7 +11,8 @@
 
 Outages and inaccuracies
 --
-* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index df37405..a407a3c 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,6 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index 32de6d0..fa0494b 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,8 +5,7 @@
 
 Outages and inaccuracies
 --
-
-* None so far!
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6f22b32b982f365ab9bd4fa82114ffba7ccce8e1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Add wikibase rights to $wgGrantPermissions - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Add wikibase rights to $wgGrantPermissions
..

Add wikibase rights to $wgGrantPermissions

grant restrictions are being moved from OAuth to core,
and these now need to be set for authentication changes
coming.

see Ida2b686 and
https://lists.wikimedia.org/pipermail/wikitech-l/2016-January/084501.html

Bug: T124269
Change-Id: I549c07f99168c9bd47fc968e10b8545a578e656b
---
M repo/Wikibase.php
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 8c9d642..182f5a2 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -124,6 +124,12 @@
$wgAvailableRights[] = 'item-redirect';
$wgAvailableRights[] = 'property-create';
 
+   $wgGrantPermissions['edit-page']['item-term'];
+   $wgGrantPermissions['edit-page']['item-redirect'];
+   $wgGrantPermissions['edit-page']['item-merge'];
+   $wgGrantPermissions['edit-page']['property-term'];
+   $wgGrantPermissions['createeditmovepage']['property-create'];
+
// i18n
$wgMessagesDirs['Wikibase'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['WikibaseAlias'] = __DIR__ . 
'/Wikibase.i18n.alias.php';

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

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

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

[MediaWiki-commits] [Gerrit] Test body_only since that's preferred - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: Test body_only since that's preferred
..


Test body_only since that's preferred

Change-Id: Ib01f955a949eca7f633c5ab926a9042ae77f2e7c
---
M tests/mocha/api.js
1 file changed, 27 insertions(+), 1 deletion(-)

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



diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 89a1e5b..4435ce9 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -462,7 +462,33 @@
.end(done);
});
 
-   it("should respect body parameter", function(done) {
+   it("should respect body parameter (body_only)", 
function(done) {
+   request(api)
+   .post(version === 3 ?
+   mockDomain + 
'/v3/transform/wikitext/to/html/' :
+   'v2/' + mockDomain + '/html/')
+   .send(version === 3 ? {
+   wikitext: "''foo''",
+   body_only: 1,
+   } : {
+   wikitext: "''foo''",
+   body: 1,
+   })
+   .expect(validHtmlResponse())
+   .expect(function(res) {
+   if (version === 3) {
+   // v3 only returns children of 

+   
res.text.should.not.match(/https://gerrit.wikimedia.org/r/265414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib01f955a949eca7f633c5ab926a9042ae77f2e7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Cscott 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixup contenttype stuff in UserMailer - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Fixup contenttype stuff in UserMailer
..

Fixup contenttype stuff in UserMailer

Change-Id: I9e251962fe731fa78f6867a14e2e91783288dd61
---
M includes/mail/UserMailer.php
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/265434/1

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 85595f1..ded5dec 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -116,7 +116,7 @@
 */
public static function send( $to, $from, $subject, $body, $options = 
array() ) {
global $wgAllowHTMLEmail;
-   $contentType = 'text/plain; charset=UTF-8';
+
if ( !is_array( $options ) ) {
// Old calling style
wfDeprecated( __METHOD__ . ' with $replyto as 5th 
parameter', '1.26' );
@@ -124,6 +124,9 @@
if ( func_num_args() === 6 ) {
$options['contentType'] = func_get_arg( 5 );
}
+   }
+   if ( !isset( $options['contentType'] ) ) {
+   $options['contentType'] = 'text/plain; charset=UTF-8';
}
 
if ( !is_array( $to ) ) {
@@ -327,8 +330,7 @@
$body = str_replace( "\n", "\r\n", $body );
}
$headers['MIME-Version'] = '1.0';
-   $headers['Content-type'] = ( is_null( $contentType ) ?
-   'text/plain; charset=UTF-8' : $contentType );
+   $headers['Content-type'] = $contentType;
$headers['Content-transfer-encoding'] = '8bit';
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Update citoid to cf4df7e - change (mediawiki...deploy)

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review.

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

Change subject: Update citoid to cf4df7e
..

Update citoid to cf4df7e

List of changes:
cf4df7e Switch to Jessie and Node 4.2
xxx Update node module dependencies

Change-Id: Id279f70cf1f6a3b4041e6f55a47b206e97dab5d3
---
A node_modules/ansi-regex/license
M node_modules/ansi-regex/package.json
M node_modules/bluebird/package.json
M node_modules/body-parser/node_modules/bytes/package.json
M node_modules/body-parser/node_modules/depd/package.json
R node_modules/body-parser/node_modules/http-errors/LICENSE
R node_modules/body-parser/node_modules/http-errors/index.js
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/LICENSE
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits.js
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/inherits_browser.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/package.json
R 
node_modules/body-parser/node_modules/http-errors/node_modules/inherits/test.js
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/LICENSE
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/codes.json
C 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/index.js
A 
node_modules/body-parser/node_modules/http-errors/node_modules/statuses/package.json
A node_modules/body-parser/node_modules/http-errors/package.json
M node_modules/body-parser/node_modules/qs/package.json
M node_modules/body-parser/node_modules/raw-body/package.json
M node_modules/body-parser/package.json
M node_modules/bunyan/node_modules/dtrace-provider/node_modules/nan/package.json
M node_modules/bunyan/node_modules/dtrace-provider/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
M node_modules/bunyan/node_modules/mv/node_modules/ncp/package.json
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/LICENSE
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inflight/package.json
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/LICENSE
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/inherits.js
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/inherits_browser.js
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/package.json
C 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/inherits/test.js
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/LICENSE
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/minimatch/package.json
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/LICENSE
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/once/package.json
A 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/license
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/path-is-absolute/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/node_modules/wrappy/package.json
M 
node_modules/bunyan/node_modules/mv/node_modules/rimraf/node_modules/glob/package.json
M node_modules/bunyan/node_modules/mv/node_modules/rimraf/package.json
M node_modules/bunyan/node_modules/mv/package.json
M node_modules/bunyan/node_modules/safe-json-stringify/package.json
M node_modules/bunyan/package.json
M node_modules/cassandra-uuid/node_modules/long/package.json
M node_modules/cassandra-uuid/package.json
C node_modules/cheerio/node_modules/css-select/LICENSE
M 
node_modules/cheerio/node_modules/css-select/node_modules/boolbase/package.json
C node_modules/cheerio/node_modules/css-select/node_modules/css-what/LICENSE
M 
node_modules/cheerio/node_modules/css-select/node_modules/css-what/package.json
C 
node_modules/cheerio/node_modules/css-select/node_modules/domutils/node_modules/domelementtype/LICENSE
A 

[MediaWiki-commits] [Gerrit] Actively remove use of webproxy.eqiad.wmnet on labs - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Actively remove use of webproxy.eqiad.wmnet on labs
..

Actively remove use of webproxy.eqiad.wmnet on labs

These files are still lingering on a lot of old instances.

Change-Id: Ibaba3be71e1acf8a098c478993f8bfe720209872
---
M modules/apt/manifests/init.pp
1 file changed, 20 insertions(+), 0 deletions(-)


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

diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index e7161db..b195d08 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -84,6 +84,26 @@
 } else {
 fail("Unknown operating system '${::operatingsystem}'.")
 }
+} else {
+if $::operatingsystem == 'Debian' {
+apt::conf { 'security-debian-proxy':
+ensure   => absent,
+}
+} elsif $::operatingsystem == 'Ubuntu' {
+apt::conf { 'security-ubuntu-proxy':
+ensure   => absent,
+}
+
+apt::conf { 'ubuntu-cloud-archive-proxy':
+ensure   => absent,
+}
+
+apt::conf { 'old-releases-proxy':
+ensure   => absent,
+}
+} else {
+fail("Unknown operating system '${::operatingsystem}'.")
+}
 }
 
 if $::operatingsystem == 'ubuntu' {

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

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

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

[MediaWiki-commits] [Gerrit] Use TitleSquidURLs hook to purge mobile URLs directly - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Use TitleSquidURLs hook to purge mobile URLs directly
..


Use TitleSquidURLs hook to purge mobile URLs directly

Bug: T124165
Change-Id: I08cdf37a139249a57447c1c4b9d3573dad8fe485
---
M MobileFrontend.php
M includes/MobileFrontend.hooks.php
M tests/phpunit/MobileFrontend.hooksTest.php
3 files changed, 44 insertions(+), 0 deletions(-)

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



diff --git a/MobileFrontend.php b/MobileFrontend.php
index 1a366ff..8d0dafb 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -153,6 +153,7 @@
 $wgHooks['PageRenderingHash'][] = 'MobileFrontendHooks::onPageRenderingHash';
 $wgHooks['AfterBuildFeedLinks'][] = 
'MobileFrontendHooks::onAfterBuildFeedLinks';
 $wgHooks['MakeGlobalVariablesScript'][] = 
'MobileFrontendHooks::onMakeGlobalVariablesScript';
+$wgHooks['TitleSquidURLs'][] = 'MobileFrontendHooks::onTitleSquidURLs';
 
 $wgSpecialPages += array(
'History' => 'SpecialMobileHistory',
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index a949fb5..c2aac13 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1206,4 +1206,23 @@
}
return true;
}
+
+   /**
+* Handler for TitleSquidURLs hook to add copies of the cache purge
+* URLs which are transformed according to the wgMobileUrlTemplate, so
+* that both mobile and non-mobile URL variants get purged.
+*
+* @see * http://www.mediawiki.org/wiki/Manual:Hooks/TitleSquidURLs
+* @param Title $title the article title
+* @param array &$urls the set of URLs to purge
+*/
+   public static function onTitleSquidURLs( Title $title, array &$urls ) {
+   $context = MobileContext::singleton();
+   foreach ( $urls as $url ) {
+   $newUrl = $context->getMobileUrl( $url );
+   if ( $newUrl !== false && $newUrl !== $url ) {
+   $urls[] = $newUrl;
+   }
+   }
+   }
 }
diff --git a/tests/phpunit/MobileFrontend.hooksTest.php 
b/tests/phpunit/MobileFrontend.hooksTest.php
index 19a7088..064f69c 100644
--- a/tests/phpunit/MobileFrontend.hooksTest.php
+++ b/tests/phpunit/MobileFrontend.hooksTest.php
@@ -132,4 +132,28 @@
array( false, false, false, array(), 0, false ),
);
}
+
+   public function testOnTitleSquidURLs() {
+   $this->setMwGlobals( array(
+   'wgMobileUrlTemplate' => '%h0.m.%h1.%h2',
+   'wgServer' => 'http://en.wikipedia.org',
+   'wgArticlePath' => '/wiki/$1',
+   'wgScriptPath' => '/w',
+   'wgScript' => '/w/index.php',
+   ) );
+   MobileContext::setInstance( null );
+
+   $title = Title::newFromText( 'PurgeTest' );
+
+   $urls = $title->getCdnUrls();
+
+   $expected = array(
+   'http://en.wikipedia.org/wiki/PurgeTest',
+   
'http://en.wikipedia.org/w/index.php?title=PurgeTest=history',
+   
'http://en.m.wikipedia.org/w/index.php?title=PurgeTest=history',
+   'http://en.m.wikipedia.org/wiki/PurgeTest',
+   );
+
+   $this->assertArrayEquals( $expected, $urls );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08cdf37a139249a57447c1c4b9d3573dad8fe485
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove old unneeded URL exclusion rules - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: Remove old unneeded URL exclusion rules
..

Remove old unneeded URL exclusion rules

No problems are experienced now accessing these URLs.

Bug: T124015
Change-Id: I1f33969058fc67f8437f2f92325faba636a9c81c
---
M scripts/weblinkchecker.py
1 file changed, 3 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/42/265442/1

diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py
index d1f0834..7aa40b0 100755
--- a/scripts/weblinkchecker.py
+++ b/scripts/weblinkchecker.py
@@ -162,19 +162,13 @@
 
 # Other special cases
 # bot somehow can't handle their redirects:
+# TODO: T124140
 re.compile(r'.*[\./@]gso\.gbv\.de(/.*)?'),
+
 re.compile(r'.*[\./@]berlinonline\.de(/.*)?'),
 # above entry to be manually fixed per request at 
[[de:Benutzer:BLueFiSH.as/BZ]]
 # bot can't handle their redirects:
-re.compile(r'.*[\./@]bodo\.kommune\.no(/.*)?'),
-re.compile(r'.*[\./@]jpl\.nasa\.gov(/.*)?'),  # bot rejected on the site
-re.compile(r'.*[\./@]itis\.gov(/.*)?'),  # bot rejected on the site
-re.compile(r'.*[\./@]cev\.lu(/.*)?'),  # bot rejected on the site
-# very slow response resulting in bot error:
-re.compile(r'.*[\./@]science\.ksc\.nasa\.gov(/.*)?'),
-re.compile(r'.*[\./@]britannica\.com(/.*)?'),  # HTTP redirect loop
-# bot rejected on the site:
-re.compile(r'.*[\./@]quickfacts\.census\.gov(/.*)?'),
+
 # bot rejected on the site, already archived
 re.compile(r'.*[\./@]web\.archive\.org(/.*)?'),
 ]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f33969058fc67f8437f2f92325faba636a9c81c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Switch to Jessie and Node 4.2 - change (mediawiki...citoid)

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged.

Change subject: Switch to Jessie and Node 4.2
..


Switch to Jessie and Node 4.2

Bug: T107304
Change-Id: I8fb207f93746159dce0395fae2abd2c4c00765bd
---
M package.json
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/package.json b/package.json
index bd81e86..22d896f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
 "swagger-router": "^0.3.4"
   },
   "deploy": {
-"target": "ubuntu",
+"node": "4.2",
+"target": "debian",
 "dependencies": {
   "_all": []
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8fb207f93746159dce0395fae2abd2c4c00765bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Mvolz 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Use CentralIdLookup instead of hardcoding CentralAuth - change (mediawiki...ContentTranslation)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Use CentralIdLookup instead of hardcoding CentralAuth
..

Use CentralIdLookup instead of hardcoding CentralAuth

Bug: T123919
Change-Id: If06b94f230a5af68e1b05ccbc975c27f181cbdc3
---
M api/ApiQueryContentTranslation.php
M extension.json
D includes/GlobalUser.php
M includes/Translator.php
M scripts/fix-stats.php
5 files changed, 20 insertions(+), 61 deletions(-)


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

diff --git a/api/ApiQueryContentTranslation.php 
b/api/ApiQueryContentTranslation.php
index 9ab7f22..7c81557 100644
--- a/api/ApiQueryContentTranslation.php
+++ b/api/ApiQueryContentTranslation.php
@@ -107,8 +107,9 @@
);
if ( $translation !== null ) {
$translator = 
$translation->translation['lastUpdatedTranslator'];
+   $centralIdLookup = CentralIdLookup::factory();
$translation->translation['translatorName'] =
-   ContentTranslation\GlobalUser::newFromId( 
$translator )->getName();
+   $centralIdLookup->nameFromCentralId( 
$translator );
$result->addValue(
array( 'query', 'contenttranslation' ),
'translation', $translation->translation
diff --git a/extension.json b/extension.json
index 7825485..5dc965b 100644
--- a/extension.json
+++ b/extension.json
@@ -78,7 +78,6 @@
"ContentTranslation\\Database": "includes/Database.php",
"ContentTranslation\\Draft": "includes/Draft.php",
"ContentTranslation\\EchoNotificationPresentationModel": 
"includes/EchoNotificationPresentationModel.php",
-   "ContentTranslation\\GlobalUser": "includes/GlobalUser.php",
"ContentTranslation\\Notification": "includes/Notification.php",
"ContentTranslation\\SiteMapper": "includes/SiteMapper.php",
"ContentTranslation\\Stats": "includes/Stats.php",
diff --git a/includes/GlobalUser.php b/includes/GlobalUser.php
deleted file mode 100644
index 1192b7b..000
--- a/includes/GlobalUser.php
+++ /dev/null
@@ -1,53 +0,0 @@
-user = $user;
-   }
-
-   public static function newFromUser( \User $user ) {
-   // Use CentralAuth if available. Use local user to ease testing.
-   if ( class_exists( '\CentralAuthUser' ) ) {
-   $user = \CentralAuthUser::getInstance( $user );
-   }
-
-   if ( $user === null ) {
-   throw new \MWException( "Unable to find global user 
for" );
-   }
-
-   return new GlobalUser( $user );
-   }
-
-   /**
-* Get a GlobalUser object from a user's global id
-*
-* @param int $id
-* @return GlobalUser
-*/
-   public static function newFromId( $id ) {
-   // Use CentralAuth if available. Use local user to ease testing.
-   if ( class_exists( '\CentralAuthUser' ) ) {
-   $user = \CentralAuthUser::newFromId( $id );
-   } else {
-   $user = \User::newFromId( $id );
-   }
-
-   if ( $user === null ) {
-   throw new \MWException( "Unable to find global user 
for" );
-   }
-
-   return new GlobalUser( $user );
-   }
-
-
-   public function getId() {
-   return $this->user->getId();
-   }
-
-   public function getName() {
-   return $this->user->getName();
-   }
-}
diff --git a/includes/Translator.php b/includes/Translator.php
index 52a9d35..c1b85ef 100644
--- a/includes/Translator.php
+++ b/includes/Translator.php
@@ -5,13 +5,22 @@
 namespace ContentTranslation;
 
 class Translator {
-   function __construct( \User $user ) {
-   // GlobalUser::newFromUser must be used so CentralAuth checks 
are done
-   $this->globalUser = GlobalUser::newFromUser( $user );
+
+   /**
+* @var \User
+*/
+   private $user;
+
+   public function __construct( \User $user ) {
+   $this->user = $user;
}
 
public function getGlobalUserId() {
-   return $this->globalUser->getId();
+   $centralIdLookup = \CentralIdLookup::factory();
+   return $centralIdLookup->centralIdFromName(
+   $this->user->getName(),
+   \CentralIdLookup::AUDIENCE_RAW
+   );
}
 
public function addTranslation( $translationId ) {
diff --git a/scripts/fix-stats.php b/scripts/fix-stats.php
index db96981..8adac5e 100644
--- a/scripts/fix-stats.php
+++ 

[MediaWiki-commits] [Gerrit] Raise Virtualbox clock sync frequency - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Raise Virtualbox clock sync frequency
..


Raise Virtualbox clock sync frequency

This should cause Virtualbox to sync host and guest clock every
ten seconds. An accurate guest clock is required for time-based
or time-limited authentication methods such as OATH or OAuth.

Bug: T116507
Change-Id: Ie8706494abea6c56fd3fad160389628aa4b2a83b
---
M Vagrantfile
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/Vagrantfile b/Vagrantfile
index e666014..f63770d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -173,6 +173,9 @@
 vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
 vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
 
+# Prevent clock drift, see http://stackoverflow.com/a/19492466/323407
+vb.customize ['guestproperty', 'set', :id, 
'/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold', 1]
+
 # To boot the VM in graphical mode, uncomment the following line:
 # vb.gui = true
   end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8706494abea6c56fd3fad160389628aa4b2a83b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] elasticsearch: Add ferm rule for labtestweb2001 - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: elasticsearch: Add ferm rule for labtestweb2001
..

elasticsearch: Add ferm rule for labtestweb2001

Testlabs box for running wikitech clone

Change-Id: I28b5515de2ee2ec3708115ad52e87f660ffac2ca
---
M modules/role/manifests/elasticsearch/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/role/manifests/elasticsearch/server.pp 
b/modules/role/manifests/elasticsearch/server.pp
index ca91d93..0ef61e9 100644
--- a/modules/role/manifests/elasticsearch/server.pp
+++ b/modules/role/manifests/elasticsearch/server.pp
@@ -22,7 +22,7 @@
 proto   => 'tcp',
 port=> '9200',
 notrack => true,
-srange  => '(($INTERNAL @resolve(silver.wikimedia.org)))',
+srange  => '(($INTERNAL @resolve(silver.wikimedia.org) 
@resolve(labtestweb2001.wikimedia.org)))',
 }
 
 $elastic_nodes = hiera('elasticsearch::cluster_hosts')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I28b5515de2ee2ec3708115ad52e87f660ffac2ca
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] Job runners: Add a dedicated htmlCacheUpdate runner - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has uploaded a new change for review.

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

Change subject: Job runners: Add a dedicated htmlCacheUpdate runner
..

Job runners: Add a dedicated htmlCacheUpdate runner

The bulk of the jobs in the queue are Wikidata / enwiki / Commons
htmlCacheUpdate jobs, which use $wgJobBackoffThrottling. Adding a dedicated
runner would help ensure that these jobs get processed as soon as the backoff
expires, and would support Aaron's theory that the de facto throttle rate is
far lower than what we set it to.

Bug: T123815
Bug: T124194
Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
---
M hieradata/role/common/mediawiki/jobrunner.yaml
M modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
2 files changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index f5c4dea..93bd460 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -7,6 +7,7 @@
 mediawiki::jobrunner::runners_restbase: 3
 mediawiki::jobrunner::runners_translate: 1
 mediawiki::jobrunner::runners_upload: 7
+mediawiki::jobrunner::runners_html: 1
 nutcracker::verbosity: "4"
 hhvm::extra::fcgi:
   max_execution_time: 1200
diff --git a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb 
b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
index 365fd6b..58a0665 100644
--- a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
@@ -25,6 +25,12 @@
 "refreshLinks"
 ]
 },
+"html": {
+"runners": <%=  @runners_html  %>,
+"include": [
+"htmlCacheUpdate"
+]
+},
 "gwt": {
 "runners": <%=  @runners_gwt  %>,
 "include": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] History merge API support - change (pywikibot/core)

[Sn1per (Code Review)]

Sn1per has uploaded a new change for review.

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

Change subject: History merge API support
..

History merge API support

Page history merging API support.
- Site.merge_history and Page.merge_history added
- Unit tests for above

Bug: T123198
Change-Id: I52694309483451aed3b8c57ac025f0d3e965c23e
---
M pywikibot/page.py
M pywikibot/site.py
M tests/site_tests.py
3 files changed, 202 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/48/265448/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 82a9028..97c2210 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1703,6 +1703,23 @@
 return [{'user': rev.user, 'timestamp': 
unicode(rev.timestamp.isoformat())}
 for rev in self.revisions(total=total)]
 
+def merge_history(self, dest, timestamp=False, reason=False):
+"""
+Merge revisions from this page into another page.
+See L{APISite.merge_history} for details.
+
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.Page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type timestamp: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+return self.site.merge_history(self, dest, timestamp, reason)
+
+
 @deprecate_arg("throttle", None)
 def move(self, newtitle, reason=None, movetalkpage=True, sysop=False,
  deleteAndMove=False, safe=True):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 369972c..ba3ac46 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4874,6 +4874,99 @@
 return False
 
 OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page')
+
+# catalog of merge history errors for use in error messages
+_mh_errors = {
+"noapiwrite": "API editing not enabled on %(site)s wiki",
+"writeapidenied":
+"User %(user)s is not authorized to edit on %(site)s wiki",
+"mergehistory-fail-invalid-source": "Source %(source)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-invalid-dest": "Destination %(dest)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-no-change":
+"History merge did not merge any revisions. "
+"Please recheck the page and timestamp parameters.",
+"mergehistory-fail-permission":
+"User %(user)s has insufficient permissions to merge history.",
+"mergehistory-fail-timestamps-overlap":
+"Source revisions overlap or come after destination revisions."
+}
+@must_be(right='mergehistory')
+def merge_history(self, source, dest, timestamp=False, reason=False):
+"""Merge revisions from one page into another.
+
+Revisions dating up to the given timestamp in the source will be
+moved into the destination page history. History merge fails if
+the timestamps of source and dest revisions overlap (all source
+revisions must be dated before the earliest dest revision).
+
+@param source: Source page from which revisions will be merged
+@type source: pywikibot.Page
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type dest: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+# Check if pages exist before continuing
+if not source.exists():
+raise NoPage(source,
+ "Cannot merge revisions from source $(page)s because"
+ "it does not exist on $(site)s")
+if not dest.exists():
+raise NoPage(dest,
+ "Cannot merge revisions to destination $(page)s"
+ "because it does not exist on $(site)s")
+
+source_title = source.title(withSection=False)
+dest_title = source.title(withSection=False)
+if source_title == dest_title: # Equal titles
+raise Error("Cannot merge revisions of %s to itself."
+% source_title)
+
+# Send the merge API request
+token = self.tokens['csrf']
+self.lock_page(source)
+self.lock_page(dest)
+req = self._simple_request(action='mergehistory',
+ 

[MediaWiki-commits] [Gerrit] History merge API support - change (pywikibot/core)

[Sn1per (Code Review)]

Sn1per has uploaded a new change for review.

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

Change subject: History merge API support
..

History merge API support

Page history merging API support.
- Site.merge_history and Page.merge_history added
- Unit tests for above

Depends-on: Ic5078307dae78a2b3687e34a5d0a584988d483a1

Bug: T123198
Change-Id: I1a10700081a17583e10bc48bcab4e31d09be99bc
---
M pywikibot/page.py
M pywikibot/site.py
M tests/site_tests.py
3 files changed, 202 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/52/265452/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 82a9028..db0a199 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1703,6 +1703,23 @@
 return [{'user': rev.user, 'timestamp': 
unicode(rev.timestamp.isoformat())}
 for rev in self.revisions(total=total)]
 
+def merge_history(self, dest, timestamp=False, reason=False):
+"""
+Merge revisions from this page into another page.
+
+See L{APISite.merge_history} for details.
+
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.Page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type timestamp: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+return self.site.merge_history(self, dest, timestamp, reason)
+
 @deprecate_arg("throttle", None)
 def move(self, newtitle, reason=None, movetalkpage=True, sysop=False,
  deleteAndMove=False, safe=True):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 369972c..b33288a 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4874,6 +4874,100 @@
 return False
 
 OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page')
+
+# catalog of merge history errors for use in error messages
+_mh_errors = {
+"noapiwrite": "API editing not enabled on %(site)s wiki",
+"writeapidenied":
+"User %(user)s is not authorized to edit on %(site)s wiki",
+"mergehistory-fail-invalid-source": "Source %(source)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-invalid-dest": "Destination %(dest)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-no-change":
+"History merge did not merge any revisions. "
+"Please recheck the page and timestamp parameters.",
+"mergehistory-fail-permission":
+"User %(user)s has insufficient permissions to merge history.",
+"mergehistory-fail-timestamps-overlap":
+"Source revisions overlap or come after destination revisions."
+}
+
+@must_be(right='mergehistory')
+def merge_history(self, source, dest, timestamp=False, reason=False):
+"""Merge revisions from one page into another.
+
+Revisions dating up to the given timestamp in the source will be
+moved into the destination page history. History merge fails if
+the timestamps of source and dest revisions overlap (all source
+revisions must be dated before the earliest dest revision).
+
+@param source: Source page from which revisions will be merged
+@type source: pywikibot.Page
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type dest: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+# Check if pages exist before continuing
+if not source.exists():
+raise NoPage(source,
+ "Cannot merge revisions from source $(page)s because"
+ "it does not exist on $(site)s")
+if not dest.exists():
+raise NoPage(dest,
+ "Cannot merge revisions to destination $(page)s"
+ "because it does not exist on $(site)s")
+
+source_title = source.title(withSection=False)
+dest_title = source.title(withSection=False)
+if source_title == dest_title:  # Equal titles
+raise Error("Cannot merge revisions of %s to itself."
+% source_title)
+
+# Send the merge API request
+token = self.tokens['csrf']
+self.lock_page(source)
+self.lock_page(dest)
+req = 

[MediaWiki-commits] [Gerrit] In refreshLinks.php don't clear tag hooks - change (mediawiki/core)

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review.

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

Change subject: In refreshLinks.php don't clear tag hooks
..

In refreshLinks.php don't clear tag hooks

It made perfect sense when I introduced this line in June 2005, but now
that we have  etc., we need to use the normal parser configuration.

Change-Id: I5a32e4e38badff85fe6d7d63c3fa158dc6fd5336
---
M maintenance/refreshLinks.php
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/55/265455/1

diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index a0cd6a9..1159e53 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -73,8 +73,6 @@
private function doRefreshLinks( $start, $newOnly = false,
$end = null, $redirectsOnly = false, $oldRedirectsOnly = false
) {
-   global $wgParser;
-
$reportingInterval = 100;
$dbr = $this->getDB( DB_SLAVE );
 
@@ -84,9 +82,6 @@
 
// Give extensions a chance to optimize settings
Hooks::run( 'MaintenanceRefreshLinksInit', array( $this ) );
-
-   # Don't generate extension images (e.g. Timeline)
-   $wgParser->clearTagHooks();
 
$what = $redirectsOnly ? "redirects" : "links";
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a32e4e38badff85fe6d7d63c3fa158dc6fd5336
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 

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

[MediaWiki-commits] [Gerrit] Use load_composer_autoloader - change (mediawiki...ContentTranslation)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Use load_composer_autoloader
..

Use load_composer_autoloader

See Ib031bef17c8a7d708a5c7878e74967d19217bbc8

Change-Id: I7c2a30058244dc89c71fee9356278b72740b67e6
---
M ContentTranslation.hooks.php
M extension.json
2 files changed, 1 insertion(+), 10 deletions(-)


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

diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 9711584..231c71e 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -10,16 +10,6 @@
 
 class ContentTranslationHooks {
/**
-* Extra setup in addition to extension.json.
-*/
-   public static function onSetup() {
-   // Composer support
-   if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-   require_once __DIR__ . '/vendor/autoload.php';
-   }
-   }
-
-   /**
 * Utility function that checks whether CX is enabled for a given user.
 * Currently it checks that if CX is a beta feature, whether the user 
has
 * enabled it. Otherwise it is always enabled.
diff --git a/extension.json b/extension.json
index 7825485..b59edcd 100644
--- a/extension.json
+++ b/extension.json
@@ -1081,5 +1081,6 @@
"localBasePath": "modules",
"remoteExtPath": "ContentTranslation/modules"
},
+   "load_composer_autoloader": true,
"manifest_version": 1
 }

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

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

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

[MediaWiki-commits] [Gerrit] updateCollation.php: Switch back to using cl_from index for now - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: updateCollation.php: Switch back to using cl_from index for now
..


updateCollation.php: Switch back to using cl_from index for now

Using the cl_sortkey index instead (to reduce disruption to a live
site), as currently implemented, seems to have two serious problems:

* MySQL / MariaDB filesorts all rows that "sort above the given row
  [the last row of the previous batch]", not just a single category
  at a time until the row limit is reached.
* The current approach to pagination is broken in that it does not
  work with ENUM columns such as cl_type, causing 'file' rows to be
  skipped, or rows of any type to be repeated. See T119173.

This reverts part of commit a43f751cf6b6849e.

Bug: T58041
Change-Id: I619564e85b2122f249bdacc45d547b9ce1b3beb5
---
M maintenance/updateCollation.php
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index bb75314..bd75b3b 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -86,7 +86,7 @@
 
$options = array(
'LIMIT' => self::BATCH_SIZE,
-   'ORDER BY' => 'cl_to, cl_type, cl_from',
+   'ORDER BY' => 'cl_from, cl_to',
'STRAIGHT_JOIN',
);
 
@@ -132,7 +132,7 @@
$res = $dbw->select(
array( 'categorylinks', 'page' ),
array( 'cl_from', 'cl_to', 'cl_sortkey_prefix', 
'cl_collation',
-   'cl_sortkey', 'cl_type', 
'page_namespace', 'page_title'
+   'cl_sortkey', 'page_namespace', 
'page_title'
),
array_merge( $collationConds, $batchConds, 
array( 'cl_from = page_id' ) ),
__METHOD__,
@@ -216,13 +216,13 @@
 
/**
 * Return an SQL expression selecting rows which sort above the given 
row,
-* assuming an ordering of cl_to, cl_type, cl_from
+* assuming an ordering of cl_from, cl_to
 * @param stdClass $row
 * @param DatabaseBase $dbw
 * @return string
 */
function getBatchCondition( $row, $dbw ) {
-   $fields = array( 'cl_to', 'cl_type', 'cl_from' );
+   $fields = array( 'cl_from', 'cl_to' );
$first = true;
$cond = false;
$prefix = false;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I619564e85b2122f249bdacc45d547b9ce1b3beb5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: PleaseStand 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Deploy new dashboards - Metrics dash more robust to bad data... - change (wikimedia...dashboard)

[OliverKeyes (Code Review)]

OliverKeyes has submitted this change and it was merged.

Change subject: Deploy new dashboards - Metrics dash more robust to bad data - 
Maps dash has new annotations
..


Deploy new dashboards
- Metrics dash more robust to bad data
- Maps dash has new annotations

Bug: T124099
Change-Id: Ifef00c37c6ab78ebeaeb6b34b3123003bde305a0
---
M CHANGELOG.md
M shiny-server/external
M shiny-server/maps
M shiny-server/metrics
4 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3adea1..0dc80e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log (Patch Notes)
 All notable changes to the *Discovery Dashboards* project will be documented 
in this file.
 
+## 2016/01/20
+- Deployed new, more robust Metrics dashboard version
+- Deployed Maps dashboard with new annotations
+
+## 2016/01/19
+- Deployed Portal dashboard that includes geo graphs
+
 ## 2015/12/14
 - Deploying WDQS dashboard that includes bot filtering for usage data
 - Deploying URL updaters across all dashboards
diff --git a/shiny-server/external b/shiny-server/external
index 2ea5ca8..887d5e5 16
--- a/shiny-server/external
+++ b/shiny-server/external
-Subproject commit 2ea5ca8e9dfe5b53fd6e8c70af8e5c283be18c4a
+Subproject commit 887d5e532ef32ad260d2a99b30ab7017e2020412
diff --git a/shiny-server/maps b/shiny-server/maps
index 9530f23..989bd9b 16
--- a/shiny-server/maps
+++ b/shiny-server/maps
-Subproject commit 9530f2328bf52495e1548cc85a28ab842e1a923c
+Subproject commit 989bd9b6892664afd7388edd0cff572a24a4c891
diff --git a/shiny-server/metrics b/shiny-server/metrics
index 6031782..c75f31b 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit 6031782c388fa26c7dbb511f775ff9c94d6410a7
+Subproject commit c75f31b30857867ccda27bdb49e43151d4810eb3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef00c37c6ab78ebeaeb6b34b3123003bde305a0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: OliverKeyes 

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

[MediaWiki-commits] [Gerrit] elasticsearch: Add ferm rule for labtestweb2001 - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: elasticsearch: Add ferm rule for labtestweb2001
..


elasticsearch: Add ferm rule for labtestweb2001

Testlabs box for running wikitech clone

Change-Id: I28b5515de2ee2ec3708115ad52e87f660ffac2ca
---
M modules/role/manifests/elasticsearch/server.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/elasticsearch/server.pp 
b/modules/role/manifests/elasticsearch/server.pp
index ca91d93..0ef61e9 100644
--- a/modules/role/manifests/elasticsearch/server.pp
+++ b/modules/role/manifests/elasticsearch/server.pp
@@ -22,7 +22,7 @@
 proto   => 'tcp',
 port=> '9200',
 notrack => true,
-srange  => '(($INTERNAL @resolve(silver.wikimedia.org)))',
+srange  => '(($INTERNAL @resolve(silver.wikimedia.org) 
@resolve(labtestweb2001.wikimedia.org)))',
 }
 
 $elastic_nodes = hiera('elasticsearch::cluster_hosts')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I28b5515de2ee2ec3708115ad52e87f660ffac2ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: EBernhardson 
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] History merge API support - change (pywikibot/core)

[Sn1per (Code Review)]

Sn1per has uploaded a new change for review.

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

Change subject: History merge API support
..

History merge API support

Page history merging API support.
- Site.merge_history and Page.merge_history added
- Unit tests for above

Bug: T123198
Change-Id: Idcb421fc4df80545a95f6751082cd1be9602541e
---
M pywikibot/page.py
M pywikibot/site.py
M tests/site_tests.py
3 files changed, 202 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/50/265450/1

diff --git a/pywikibot/page.py b/pywikibot/page.py
index 82a9028..db0a199 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1703,6 +1703,23 @@
 return [{'user': rev.user, 'timestamp': 
unicode(rev.timestamp.isoformat())}
 for rev in self.revisions(total=total)]
 
+def merge_history(self, dest, timestamp=False, reason=False):
+"""
+Merge revisions from this page into another page.
+
+See L{APISite.merge_history} for details.
+
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.Page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type timestamp: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+return self.site.merge_history(self, dest, timestamp, reason)
+
 @deprecate_arg("throttle", None)
 def move(self, newtitle, reason=None, movetalkpage=True, sysop=False,
  deleteAndMove=False, safe=True):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 369972c..b33288a 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4874,6 +4874,100 @@
 return False
 
 OnErrorExc = namedtuple('OnErrorExc', 'exception on_new_page')
+
+# catalog of merge history errors for use in error messages
+_mh_errors = {
+"noapiwrite": "API editing not enabled on %(site)s wiki",
+"writeapidenied":
+"User %(user)s is not authorized to edit on %(site)s wiki",
+"mergehistory-fail-invalid-source": "Source %(source)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-invalid-dest": "Destination %(dest)s is invalid. "
+"This may be caused by an invalid page ID in the database.",
+"mergehistory-fail-no-change":
+"History merge did not merge any revisions. "
+"Please recheck the page and timestamp parameters.",
+"mergehistory-fail-permission":
+"User %(user)s has insufficient permissions to merge history.",
+"mergehistory-fail-timestamps-overlap":
+"Source revisions overlap or come after destination revisions."
+}
+
+@must_be(right='mergehistory')
+def merge_history(self, source, dest, timestamp=False, reason=False):
+"""Merge revisions from one page into another.
+
+Revisions dating up to the given timestamp in the source will be
+moved into the destination page history. History merge fails if
+the timestamps of source and dest revisions overlap (all source
+revisions must be dated before the earliest dest revision).
+
+@param source: Source page from which revisions will be merged
+@type source: pywikibot.Page
+@param dest: Destination page to which revisions will be merged
+@type dest: pywikibot.page
+@param timestamp: Revisions from this page dating up to this timestamp
+will be merged into the destination page (if not given or False,
+all revisions will be merged)
+@type dest: pywikibot.Timestamp
+@param reason: Optional reason for the history merge
+@type reason: str
+"""
+# Check if pages exist before continuing
+if not source.exists():
+raise NoPage(source,
+ "Cannot merge revisions from source $(page)s because"
+ "it does not exist on $(site)s")
+if not dest.exists():
+raise NoPage(dest,
+ "Cannot merge revisions to destination $(page)s"
+ "because it does not exist on $(site)s")
+
+source_title = source.title(withSection=False)
+dest_title = source.title(withSection=False)
+if source_title == dest_title:  # Equal titles
+raise Error("Cannot merge revisions of %s to itself."
+% source_title)
+
+# Send the merge API request
+token = self.tokens['csrf']
+self.lock_page(source)
+self.lock_page(dest)
+req = self._simple_request(action='mergehistory',
+ 

[MediaWiki-commits] [Gerrit] Move remaining usage of EchoGetDefaultNotifiedUsers into Use... - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: Move remaining usage of EchoGetDefaultNotifiedUsers into 
UserLocator
..

Move remaining usage of EchoGetDefaultNotifiedUsers into UserLocator

Change-Id: Ib321dfbd993d7e5fd22a189d7f46bf3d9fa6b409
---
M Flow.php
M includes/Import/Postprocessor/LqtNotifications.php
M includes/Notifications/Controller.php
M includes/Notifications/Notifications.php
M includes/Notifications/UserLocator.php
5 files changed, 114 insertions(+), 111 deletions(-)


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

diff --git a/Flow.php b/Flow.php
index 8c0308c..63d77ab 100644
--- a/Flow.php
+++ b/Flow.php
@@ -166,7 +166,6 @@
 
 // Echo integration
 $wgHooks['BeforeCreateEchoEvent'][] = 
'Flow\NotificationController::onBeforeCreateEchoEvent';
-$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'Flow\NotificationController::getDefaultNotifiedUsers';
 $wgHooks['EchoGetBundleRules'][] = 
'Flow\NotificationController::onEchoGetBundleRules';
 
 // Beta feature Flow on user talk page
diff --git a/includes/Import/Postprocessor/LqtNotifications.php 
b/includes/Import/Postprocessor/LqtNotifications.php
index 896d2ae..fabb203 100644
--- a/includes/Import/Postprocessor/LqtNotifications.php
+++ b/includes/Import/Postprocessor/LqtNotifications.php
@@ -49,17 +49,7 @@
 * of determining users to notify so they can be replaced with this 
class during imports.
 */
protected function overrideUsersToNotify() {
-   global $wgHooks, $wgEchoNotifications;
-
-   // Remove the hook subscriber that chooses users for some 
notifications
-   $idx = array_search(
-   'Flow\NotificationController::getDefaultNotifiedUsers',
-   $wgHooks['EchoGetDefaultNotifiedUsers']
-   );
-   if ( $idx !== false ) {
-   unset( $wgHooks['EchoGetDefaultNotifiedUsers'][$idx] );
-   }
-
+   global $wgEchoNotifications;
 
// Remove the user-locators that choose on a per-notification 
basis who
// should be notified.
diff --git a/includes/Notifications/Controller.php 
b/includes/Notifications/Controller.php
index 365f010..8a55dde 100644
--- a/includes/Notifications/Controller.php
+++ b/includes/Notifications/Controller.php
@@ -165,7 +165,7 @@
 * @throws FlowException When $params contains unexpected types/values
 */
public function notifyNewTopic( $params ) {
-   if ( ! class_exists( 'EchoEvent' ) ) {
+   if ( !class_exists( 'EchoEvent' ) ) {
// Nothing to do here.
return array();
}
@@ -411,104 +411,6 @@
break;
}
return true;
-   }
-
-   /**
-* Handler for EchoGetDefaultNotifiedUsers hook
-*  Returns a list of User objects in the second param
-*
-* @param $event EchoEvent being triggered
-* @param &$users Array of User objects.
-* @return bool
-*/
-   public static function getDefaultNotifiedUsers( EchoEvent $event, 
&$users ) {
-   $extra = $event->getExtra();
-   switch ( $event->getType() ) {
-   case 'flow-mention':
-   $mentionedUsers = $extra['mentioned-users'];
-
-   // Ignore mention if the user gets another notification
-   // already from the same flow event
-   $ids = array();
-   $topic = $extra['topic-workflow'];
-   if ( $topic instanceof UUID ) {
-   $ids[$topic->getAlphadecimal()] = $topic;
-   }
-   if ( isset( $extra['reply-to'] ) ) {
-   if ( $extra['reply-to'] instanceof UUID ) {
-   
$ids[$extra['reply-to']->getAlphadecimal()] = $extra['reply-to'];
-   } else {
-   wfDebugLog( 'Flow', __METHOD__ . ': 
Expected UUID but received ' . get_class( $extra['reply-to'] ) );
-   }
-   }
-   $notifiedUsers = self::getCreatorsFromPostIDs( $ids );
-
-   foreach( $mentionedUsers as $uid ) {
-   if ( !isset( $notifiedUsers[$uid] ) ) {
-   $users[$uid] = User::newFromId( $uid );
-   }
-   }
-   break;
-   case 'flow-topic-renamed':
-   $users += self::getCreatorsFromPostIDs( array( 
$extra['topic-workflow'] ) );
-   

[MediaWiki-commits] [Gerrit] [WIP] Engage full surveillance mode for Flow talk pages - change (mediawiki...Flow)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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

Change subject: [WIP] Engage full surveillance mode for Flow talk pages
..

[WIP] Engage full surveillance mode for Flow talk pages

WIP because icons are still missing. Rest is done.

Bug: T121663
Change-Id: I63b7489c3a391af16461fe47ca9523256f990f69
---
M i18n/en.json
M i18n/qqq.json
M includes/Notifications/FlowPresentationModel.php
M includes/Notifications/NewTopicPresentationModel.php
M includes/Notifications/Notifications.php
M includes/Notifications/PostEditedPresentationModel.php
M includes/Notifications/PostReplyPresentationModel.php
M includes/Notifications/TopicRenamedPresentationModel.php
8 files changed, 92 insertions(+), 11 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index f48de9b..f3ed2b2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -272,14 +272,24 @@
"flow-notification-edit-bundle": "$1 and $5 {{PLURAL:$6|other|others}} 
{{GENDER:$1|edited}} a [$4 post] in \"$2\" on 
\"$3\".",
"notification-header-flow-new-topic-v2": "New topic created on $3: 
\"$4\".",
"notification-bundle-header-flow-new-topic": "$1 new 
{{PLURAL:$2|topic|topics}} on $3.",
+   "notification-body-flow-new-topic-v2": "$1",
+   "notification-header-flow-new-topic-user-talk": "A new topic was 
created on your talk page: \"$4\"",
+   "notification-bundle-header-flow-new-topic-user-talk": "$1 new 
{{PLURAL:$2|topic|topics}} on your talk page.",
+   "notification-body-flow-new-topic-user-talk": "$1",
"notification-header-flow-post-reply": "$1 {{GENDER:$2|replied}} in 
\"$4\".",
"notification-bundle-header-flow-post-reply": "$1 new replies in 
\"$2\".",
-   "notification-body-flow-new-topic-v2": "$1",
"notification-body-flow-post-reply-v2": "$1",
+   "notification-header-flow-post-reply-user-talk": "$1 
{{GENDER:$2|posted}} a reply on your talk page in \"$4\".",
+   "notification-bundle-header-flow-post-reply-user-talk": "$1 new replies 
on your talk page in \"$2\".",
+   "notification-body-flow-post-reply-user-talk": "$1",
"notification-header-flow-post-edited-v2": "Your post on \"$1\" was 
edited.",
"notification-bundle-header-flow-post-edited-v2": "Your post on \"$1\" 
was edited multiple times.",
"notification-body-flow-post-edited-v2": "$1",
+   "notification-header-flow-post-edited-user-talk": "A post on \"$1\" was 
edited on your talk page.",
+   "notification-bundle-header-flow-post-edited-user-talk": "A post on 
\"$1\" was edited multiple times on your talk page.",
+   "notification-body-flow-post-edited-user-talk": "$1",
"notification-header-flow-topic-renamed-v2": "The topic \"$1\" was 
renamed to \"$2\".",
+   "notification-header-flow-topic-renamed-user-talk": "The topic \"$1\" 
was renamed to \"$2\" on your talk page.",
"notification-header-flow-mention": "$1 {{GENDER:$2|mentioned}} 
{{GENDER:$5|you}} in \"$3\".",
"notification-body-flow-mention": "$1",
"notification-header-flow-enabled-on-talkpage": "New discussion system 
enabled for {{GENDER:$2|your}} user talk page.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b098e88..2af9e15 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -282,13 +282,23 @@
"notification-header-flow-new-topic-v2": "Notification header text for 
when a new topic is created. Parameters:\n$1 - the formatted username of the 
user who created the topic\n* $2 - the username for gender purposes\n* $3 - 
title of the Flow board\n* $4 - title of the 
topic.\n{{Related|Flow-notification}}",
"notification-body-flow-new-topic-v2": "Notification body text for when 
a new topic is created. Parameters:\n$1 - a snippet of the content of the new 
topic.\n{{Related|Flow-notification}} {{notranslate}}",
"notification-bundle-header-flow-new-topic": "Notification text for 
when multiple new topics are created on the same page. Parameters:\n* $1 - The 
number of topics that were created for display purposes. This can be a number 
or '99+' if it is 99 or more\n* $2 - The number of new topics created for 
PLURAL purposes\n* $3 - The title of the page the topics were created 
on\n{{Related|Notification-bundle}}",
+   "notification-header-flow-new-topic-user-talk": "Notification header 
text for when a new topic is created on a user's talk page. Parameters:\n$1 - 
the formatted username of the user who created the topic\n* $2 - the username 
for gender purposes\n* $3 - title of the Flow board\n* $4 - title of the 
topic.\n{{Related|Flow-notification}}",
+   "notification-body-flow-new-topic-user-talk": "Notification body text 
for when a new topic is created on a user's talk page. Parameters:\n$1 - a 
snippet of the content of the new 

[MediaWiki-commits] [Gerrit] Remove unused/no longer existing item-create oauth grant - change (operations/mediawiki-config)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Remove unused/no longer existing item-create oauth grant
..

Remove unused/no longer existing item-create oauth grant

this was removed from wikibase back in 2014. (Ibec11b1)

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


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 31e4ae3..802e227 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -557,7 +557,6 @@
 $wgGrantPermissionGroups['checkuser'] = 'administration';
 
 // Rights needed to interact with wikibase
-$wgGrantPermissions['createeditmovepage']['item-create'] = true;
 $wgGrantPermissions['createeditmovepage']['property-create'] = true;
 $wgGrantPermissions['editpage']['item-term'] = true;
 $wgGrantPermissions['editpage']['item-merge'] = true;

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

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

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

[MediaWiki-commits] [Gerrit] Add links to the report on estimating zero results rate - change (wikimedia...rainbow)

[Bearloga (Code Review)]

Bearloga has submitted this change and it was merged.

Change subject: Add links to the report on estimating zero results rate
..


Add links to the report on estimating zero results rate

Bug: T124072
Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index 308a8a3..a357106 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -12,7 +12,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index a407a3c..0b37d29 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,7 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index fa0494b..1b566e9 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,7 +5,7 @@
 
 Outages and inaccuracies
 --
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

[MediaWiki-commits] [Gerrit] Minor documentation changes - change (wikimedia...dashboard)

[Bearloga (Code Review)]

Bearloga has submitted this change and it was merged.

Change subject: Minor documentation changes
..


Minor documentation changes

Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/shiny-server/metrics b/shiny-server/metrics
index d4fdf41..193ac4d 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9
+Subproject commit 193ac4d38411f16820a336397a7220e5c8c3536d

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Minor documentation changes - change (wikimedia...dashboard)

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Minor documentation changes
..

Minor documentation changes

Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/dashboard 
refs/changes/54/265454/1

diff --git a/shiny-server/metrics b/shiny-server/metrics
index d4fdf41..193ac4d 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9
+Subproject commit 193ac4d38411f16820a336397a7220e5c8c3536d

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e6765d7ba80829595d7456abadbe1f520228cfa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Improve wfTempDir() fallback sequence - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Improve wfTempDir() fallback sequence
..


Improve wfTempDir() fallback sequence

Validate the return value of sys_get_temp_dir(), and use upload_tmp_dir
if that is not writable. If nothing is writable, throw an exception.

Bug: T119934
Change-Id: I27d784f55c47277bbab1192853e2e04a9d8bd39a
---
M includes/GlobalFunctions.php
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index f797e5b..928066b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2162,8 +2162,8 @@
 /**
  * Tries to get the system directory for temporary files. First
  * $wgTmpDirectory is checked, and then the TMPDIR, TMP, and TEMP
- * environment variables are then checked in sequence, and if none are
- * set try sys_get_temp_dir().
+ * environment variables are then checked in sequence, then
+ * sys_get_temp_dir(), then upload_tmp_dir from php.ini.
  *
  * NOTE: When possible, use instead the tmpfile() function to create
  * temporary files to avoid race conditions on file creation, etc.
@@ -2178,13 +2178,16 @@
}
 
$tmpDir = array_map( "getenv", array( 'TMPDIR', 'TMP', 'TEMP' ) );
+   $tmpDir[] = sys_get_temp_dir();
+   $tmpDir[] = ini_get( 'upload_tmp_dir' );
 
foreach ( $tmpDir as $tmp ) {
if ( $tmp && file_exists( $tmp ) && is_dir( $tmp ) && 
is_writable( $tmp ) ) {
return $tmp;
}
}
-   return sys_get_temp_dir();
+   throw new MWException( 'No writable temporary directory could be found. 
' .
+   'Please set $wgTmpDirectory to a writable directory.' );
 }
 
 /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I27d784f55c47277bbab1192853e2e04a9d8bd39a
Gerrit-PatchSet: 12
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ananay 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Ananay 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: L10n-bot 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove deprecated calling style of UserMailer::send() - change (mediawiki/core)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Remove deprecated calling style of UserMailer::send()
..

Remove deprecated calling style of UserMailer::send()

Change-Id: I475932f37a579dd86bfd98e6b14509d6ba86f128
---
M includes/mail/UserMailer.php
1 file changed, 0 insertions(+), 11 deletions(-)


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

diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index ded5dec..17a3f82 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -107,9 +107,6 @@
 *  'contentType' string default 'text/plain; charset=UTF-8'
 *  'headers' array Extra headers to set
 *
-* Previous versions of this function had $replyto as the 5th argument 
and $contentType
-* as the 6th. These are still supported for backwards compatability, 
but deprecated.
-*
 * @throws MWException
 * @throws Exception
 * @return Status
@@ -117,14 +114,6 @@
public static function send( $to, $from, $subject, $body, $options = 
array() ) {
global $wgAllowHTMLEmail;
 
-   if ( !is_array( $options ) ) {
-   // Old calling style
-   wfDeprecated( __METHOD__ . ' with $replyto as 5th 
parameter', '1.26' );
-   $options = array( 'replyTo' => $options );
-   if ( func_num_args() === 6 ) {
-   $options['contentType'] = func_get_arg( 5 );
-   }
-   }
if ( !isset( $options['contentType'] ) ) {
$options['contentType'] = 'text/plain; charset=UTF-8';
}

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

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

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

[MediaWiki-commits] [Gerrit] Job runners: Add a dedicated htmlCacheUpdate runner - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Job runners: Add a dedicated htmlCacheUpdate runner
..


Job runners: Add a dedicated htmlCacheUpdate runner

The bulk of the jobs in the queue are Wikidata / enwiki / Commons
htmlCacheUpdate jobs, which use $wgJobBackoffThrottling. Adding a dedicated
runner would help ensure that these jobs get processed as soon as the backoff
expires, and would support Aaron's theory that the de facto throttle rate is
far lower than what we set it to.

Bug: T123815
Bug: T124194
Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
---
M hieradata/role/common/mediawiki/jobrunner.yaml
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
3 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index f5c4dea..93bd460 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -7,6 +7,7 @@
 mediawiki::jobrunner::runners_restbase: 3
 mediawiki::jobrunner::runners_translate: 1
 mediawiki::jobrunner::runners_upload: 7
+mediawiki::jobrunner::runners_html: 1
 nutcracker::verbosity: "4"
 hhvm::extra::fcgi:
   max_execution_time: 1200
diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index 13f9329..cd65bda 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -7,6 +7,7 @@
 $queue_servers,
 $aggr_servers  = $queue_servers,
 $runners_basic = 0,
+$runners_html  = 0,
 $runners_upload= 0,
 $runners_gwt   = 0,
 $runners_restbase  = 0,
diff --git a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb 
b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
index 365fd6b..58a0665 100644
--- a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
@@ -25,6 +25,12 @@
 "refreshLinks"
 ]
 },
+"html": {
+"runners": <%=  @runners_html  %>,
+"include": [
+"htmlCacheUpdate"
+]
+},
 "gwt": {
 "runners": <%=  @runners_gwt  %>,
 "include": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I180856917b5c74437e10e4c9b45e4e0a2ea1e381
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Aaron Schulz 
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] graphite doesn't allow spaces in stat names - change (mediawiki...GeoData)

[jenkins-bot (Code Review)]

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

Change subject: graphite doesn't allow spaces in stat names
..


graphite doesn't allow spaces in stat names

Change-Id: I5d023bc203b36d3cb1373f92463962b202615d69
---
M includes/api/ApiQueryGeoSearchElastic.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index 4436ac9..aa8dabf 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -90,7 +90,7 @@
 
$searcher = new Searcher( $this->getUser() );
 
-   $resultSet = $searcher->performSearch( $query, 'GeoData spatial 
search' );
+   $resultSet = $searcher->performSearch( $query, 
'GeoData_spatial_search' );
 
if ( isset( $params['debug'] ) && $params['debug'] ) {
$this->addDebugInfo( $resultSet );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d023bc203b36d3cb1373f92463962b202615d69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GeoData
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Deploy missing data notes in Metrics dash - change (wikimedia...dashboard)

[Bearloga (Code Review)]

Bearloga has submitted this change and it was merged.

Change subject: Deploy missing data notes in Metrics dash
..


Deploy missing data notes in Metrics dash

Bug: T124072
Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
---
M shiny-server/metrics
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/shiny-server/metrics b/shiny-server/metrics
index c75f31b..d4fdf41 16
--- a/shiny-server/metrics
+++ b/shiny-server/metrics
-Subproject commit c75f31b30857867ccda27bdb49e43151d4810eb3
+Subproject commit d4fdf41233ded844eb4cf7ebc2d0fe137beb6ac9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14551b095c7ef7544e1924d11d67ccd407148387
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/dashboard
Gerrit-Branch: master
Gerrit-Owner: Bearloga 
Gerrit-Reviewer: Bearloga 

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

[MediaWiki-commits] [Gerrit] Add links to the report on estimating zero results rate - change (wikimedia...rainbow)

[Bearloga (Code Review)]

Bearloga has uploaded a new change for review.

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

Change subject: Add links to the report on estimating zero results rate
..

Add links to the report on estimating zero results rate

Bug: T124072
Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
---
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_rate.md
M tab_documentation/kpi_zero_results.md
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow 
refs/changes/53/265453/1

diff --git a/tab_documentation/failure_breakdown.md 
b/tab_documentation/failure_breakdown.md
index 308a8a3..a357106 100644
--- a/tab_documentation/failure_breakdown.md
+++ b/tab_documentation/failure_breakdown.md
@@ -12,7 +12,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/failure_rate.md 
b/tab_documentation/failure_rate.md
index a407a3c..0b37d29 100644
--- a/tab_documentation/failure_rate.md
+++ b/tab_documentation/failure_rate.md
@@ -13,7 +13,7 @@
 Outages and inaccuracies
 --
 * On 15 July 2015 we updated our heuristics to avoid counting maintenance 
tasks as search requests. The historic data on the dashboards is being 
backfilled to reflect this - until it's done, the dashboards may look somewhat 
strange.
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/kpi_zero_results.md 
b/tab_documentation/kpi_zero_results.md
index fa0494b..1b566e9 100644
--- a/tab_documentation/kpi_zero_results.md
+++ b/tab_documentation/kpi_zero_results.md
@@ -5,7 +5,7 @@
 
 Outages and inaccuracies
 --
-* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/18. 
The values you may see on those dates are estimates computed with statistical 
models.
+* On 15 January 2016 there was an 
[issue](https://phabricator.wikimedia.org/T123541) with Avro serialization that 
prevented data from entering the Hadoop cluster. A 
[patch](https://gerrit.wikimedia.org/r/#/c/264989/) was deployed on 19 January 
2016. As a result, there are no recorded zero results rates for 01/15-01/19. 
The values you may see on those dates are estimates computed with [statistical 
models](https://github.com/bearloga/branch/blob/master/zero%20results%20rate%20estimation/report.pdf).
 
 Questions, bug reports, and feature suggestions
 --

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32b5007beb984d83f94a46d8b98f328bcb351d99
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: 

[MediaWiki-commits] [Gerrit] Use load_composer_autoloader - change (mediawiki...ContentTranslation)

[jenkins-bot (Code Review)]

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

Change subject: Use load_composer_autoloader
..


Use load_composer_autoloader

See Ib031bef17c8a7d708a5c7878e74967d19217bbc8

Change-Id: I7c2a30058244dc89c71fee9356278b72740b67e6
---
M ContentTranslation.hooks.php
M extension.json
2 files changed, 1 insertion(+), 13 deletions(-)

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



diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index 9711584..231c71e 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -10,16 +10,6 @@
 
 class ContentTranslationHooks {
/**
-* Extra setup in addition to extension.json.
-*/
-   public static function onSetup() {
-   // Composer support
-   if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-   require_once __DIR__ . '/vendor/autoload.php';
-   }
-   }
-
-   /**
 * Utility function that checks whether CX is enabled for a given user.
 * Currently it checks that if CX is a beta feature, whether the user 
has
 * enabled it. Otherwise it is always enabled.
diff --git a/extension.json b/extension.json
index 7825485..0d4bebd 100644
--- a/extension.json
+++ b/extension.json
@@ -16,9 +16,6 @@
"descriptionmsg": "cx-desc",
"license-name": "GPL-2.0+",
"type": "specialpage",
-   "ExtensionFunctions": [
-   "ContentTranslationHooks::onSetup"
-   ],
"ExtensionMessagesFiles": {
"ContentTranslationAliases": "ContentTranslation.alias.php"
},
@@ -1081,5 +1078,6 @@
"localBasePath": "modules",
"remoteExtPath": "ContentTranslation/modules"
},
+   "load_composer_autoloader": true,
"manifest_version": 1
 }

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

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

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

[MediaWiki-commits] [Gerrit] color logging fixes - change (pywikibot/core)

[John Vandenberg (Code Review)]

John Vandenberg has uploaded a new change for review.

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

Change subject: color logging fixes
..

color logging fixes

afe2555d7 implemented color_format, which uses str.format {} syntax,
but two messages in reflinks were not converted from %s syntax to {}.

Bug: T123887
Change-Id: I8e6916153428689dc4c6410bebfc9c771d8813d8
---
M scripts/reflinks.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/62/265462/1

diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 0474deb..814e1ce 100755
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -38,7 +38,7 @@
   one from i18n/reflinks.py
 """
 # (C) Nicolas Dumazet (NicDumZ), 2008
-# (C) Pywikibot team, 2008-2015
+# (C) Pywikibot team, 2008-2016
 #
 # Distributed under the terms of the MIT license.
 #
@@ -587,7 +587,7 @@
 # example : 
http://www.adminet.com/jo/20010615¦/ECOC0100037D.html
 # in [[fr:Cyanure]]
 pywikibot.output(color_format(
-'{lightred}Bad link{default} : %s in %s',
+'{lightred}Bad link{default} : {0} in {1}',
 ref.url, page.title(asLink=True)))
 continue
 except (URLError,
@@ -638,7 +638,7 @@
 continue
 elif not self.MIME.search(contentType):
 pywikibot.output(color_format(
-'{lightyellow}WARNING{default} : media : %s ',
+'{lightyellow}WARNING{default} : media : {0} ',
 ref.link))
 repl = ref.refLink()
 new_text = new_text.replace(match.group(), repl)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e6916153428689dc4c6410bebfc9c771d8813d8
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Use intermediary for searching - change (mediawiki...GeoData)

[jenkins-bot (Code Review)]

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

Change subject: Use intermediary for searching
..


Use intermediary for searching

Bug: T124102
Change-Id: I21ac36cf9a691168119be563d33ac9c671368c53
(cherry picked from commit 2237357be9f6a716ed2e17ec4607d590bcc4263d)
---
M GeoData.php
A includes/Searcher.php
M includes/api/ApiQueryGeoSearchElastic.php
3 files changed, 185 insertions(+), 161 deletions(-)

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



diff --git a/GeoData.php b/GeoData.php
index be5d7e9..c0e21a9 100644
--- a/GeoData.php
+++ b/GeoData.php
@@ -28,6 +28,7 @@
 $wgAutoloadClasses['GeoData\GeoData'] = "$dir/includes/GeoData.body.php";
 $wgAutoloadClasses['GeoData\Hooks'] = "$dir/includes/Hooks.php";
 $wgAutoloadClasses['GeoData\Math'] = "$dir/includes/Math.php";
+$wgAutoloadClasses['GeoData\Searcher'] = "$dir/includes/Searcher.php";
 
 $wgMessagesDirs['GeoData'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['GeoData'] = "$dir/GeoData.i18n.php";
diff --git a/includes/Searcher.php b/includes/Searcher.php
new file mode 100644
index 000..cee6e8a
--- /dev/null
+++ b/includes/Searcher.php
@@ -0,0 +1,47 @@
+makeConfig( 
'CirrusSearch' );
+   $connection = new \CirrusSearch\Connection( $config );
+
+   parent::__construct( $connection, $user, 0 );
+   }
+
+   /**
+* Perform search
+*
+* @param \Elastica\Query $query
+* @param string $queryType Query description for logging
+* @return \Elastica\ResultSet
+* @throws ExceptionInterface
+*/
+   public function performSearch( \Elastica\Query $query, $queryType ) {
+   $pageType = $this->connection->getPageType( wfWikiID() );
+   $search = $pageType->createSearch( $query );
+
+   try {
+   $this->start( "performing $queryType", array( 
'queryType' => $queryType ) );
+   $result = $search->search();
+   $this->success();
+   } catch ( ExceptionInterface $ex ) {
+   $this->failure( $ex );
+   throw $ex;
+   }
+
+   return $result;
+   }
+}
\ No newline at end of file
diff --git a/includes/api/ApiQueryGeoSearchElastic.php 
b/includes/api/ApiQueryGeoSearchElastic.php
index d06196c..4436ac9 100644
--- a/includes/api/ApiQueryGeoSearchElastic.php
+++ b/includes/api/ApiQueryGeoSearchElastic.php
@@ -3,8 +3,6 @@
 namespace GeoData;
 
 use ApiPageSet;
-use ConfigFactory;
-use MWException;
 use MWNamespace;
 use Title;
 
@@ -24,185 +22,163 @@
parent::run( $resultPageSet );
$this->resetQueryParams(); //@fixme: refactor to make this 
unnecessary
 
-   try {
-   $params = $this->params = $this->extractRequestParams();
+   $params = $this->params = $this->extractRequestParams();
 
-   $bools = new \Elastica\Filter\BoolFilter();
-   if ( $this->idToExclude ) {
-   $bools->addMustNot(
-   new \Elastica\Filter\Term( array( '_id' 
=> $this->idToExclude ) )
-   );
-   }
-   // Only Earth is supported
-   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
-   if ( isset( $params['maxdim'] ) ) {
-   $bools->addMust( new \Elastica\Filter\Range(
-   'coordinates.dim',
-   array( 'to' => $params['maxdim'] ) )
-   );
-   }
+   $bools = new \Elastica\Filter\BoolFilter();
+   if ( $this->idToExclude ) {
+   $bools->addMustNot( new \Elastica\Filter\Term( array( 
'_id' => $this->idToExclude ) ) );
+   }
+   // Only Earth is supported
+   $bools->addMust( new \Elastica\Filter\Term( array( 
'coordinates.globe' => 'earth' ) ) );
+   if ( isset( $params['maxdim'] ) ) {
+   $bools->addMust( new \Elastica\Filter\Range( 
'coordinates.dim',
+   array( 'to' => $params['maxdim'] ) ) );
+   }
 
-   $primary = $params['primary'];
-   if ( $primary !== 'all' ) {
-   $bools->addMust( new \Elastica\Filter\Term(
-   array( 'coordinates.primary' => intval( 
$primary === 'primary' ) )
+   $primary = $params['primary'];
+   if ( $primary !== 'all' ) {
+   $bools->addMust( new \Elastica\Filter\Term( array(
+   'coordinates.primary' => 

[MediaWiki-commits] [Gerrit] Update Vagrant links in README-lxc - change (mediawiki/vagrant)

[jenkins-bot (Code Review)]

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

Change subject: Update Vagrant links in README-lxc
..


Update Vagrant links in README-lxc

Link to the currently released version.

Change-Id: I31157bcb6b190296fd0af450e3aaca4285b3f4a1
---
M support/README-lxc.md
1 file changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/support/README-lxc.md b/support/README-lxc.md
index cda200d..bf6 100644
--- a/support/README-lxc.md
+++ b/support/README-lxc.md
@@ -32,8 +32,8 @@
 official PPA.
 Check https://www.vagrantup.com/downloads.html for current version URL.
 
-wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb
-sudo dpkg -i vagrant_1.7.2_x86_64.deb
+wget https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.deb
+sudo dpkg -i vagrant_1.8.1_x86_64.deb
 
 Install the Vagrant LXC provider plugin:
 
@@ -74,8 +74,8 @@
 at vagrantup.com. Check https://www.vagrantup.com/downloads.html for the
 most up to date download URL.
 
-wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4_x86_64.deb
-sudo dpkg -i vagrant_1.7.4_x86_64.deb
+wget https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.deb
+sudo dpkg -i vagrant_1.8.1_x86_64.deb
 
 Install the Vagrant LXC provider plugin:
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31157bcb6b190296fd0af450e3aaca4285b3f4a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Allow UserInputWidget on mobile - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Allow UserInputWidget on mobile
..


Allow UserInputWidget on mobile

Change-Id: I87699a93ca1b34c6d248456fcc060f584623d158
---
M resources/Resources.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index cd9810c..60c3175 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2160,6 +2160,7 @@
'dependencies' => array(
'oojs-ui',
),
+   'targets' => array( 'desktop', 'mobile' ),
),
 
/* es5-shim */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I87699a93ca1b34c6d248456fcc060f584623d158
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...EmailCapture)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Call UserMailer::send() with reply to address correctly
..

Call UserMailer::send() with reply to address correctly

Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
---
M api/ApiEmailCapture.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/api/ApiEmailCapture.php b/api/ApiEmailCapture.php
index b501b05..e0d5406 100644
--- a/api/ApiEmailCapture.php
+++ b/api/ApiEmailCapture.php
@@ -44,8 +44,10 @@
),
$this->msg( 
$wgEmailCaptureAutoResponse['subject-msg'] )->text(),
$this->msg( 
$wgEmailCaptureAutoResponse['body-msg'], $fullLink, $link, $code )->text(),
-   $wgEmailCaptureAutoResponse['reply-to'],
-   
$wgEmailCaptureAutoResponse['content-type']
+   array(
+   'replyTo' => 
$wgEmailCaptureAutoResponse['reply-to'],
+   'contentType' => 
$wgEmailCaptureAutoResponse['content-type']
+   )
);
}
$r = array( 'result' => 'Success' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailCapture
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Enable Echo cross-wiki tracking table on all wikis with Cent... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Enable Echo cross-wiki tracking table on all wikis with 
CentralAuth
..


Enable Echo cross-wiki tracking table on all wikis with CentralAuth

Remove wmgEchoUseCrossWikiTrackingTable and replace with
a check for CentralAuth.

Bug: T124232
Change-Id: I20537a01365333a9694e18f0bf9b20a3377adc83
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 5 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 8e21034..90e0ce3 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -346,8 +346,10 @@
$wgEventServiceUrl = 
'http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events';
 }
 
-if ( $wmgUseEcho ) {
+if ( $wmgUseEcho && $wmgUseCentralAuth ) {
$wgEchoSharedTrackingDB = 'wikishared';
+   // Set cluster back to false, to override CommonSettings.php setting it 
to 'extension1'
+   $wgEchoSharedTrackingCluster = false;
 }
 
 // Experimental
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d5a9cea..31e4ae3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2492,7 +2492,8 @@
// Whether to make the cross-wiki notifications beta feature available
$wgEchoUseCrossWikiBetaFeature = $wmgEchoUseCrossWikiBetaFeature;
 
-   if ( $wmgEchoUseCrossWikiTrackingTable ) {
+   // Enable tracking table only on SULed wikis
+   if ( $wmgUseCentralAuth ) {
$wgEchoSharedTrackingDB = 'wikishared';
// Explicitly set this to 'extension1', because some wikis have 
$wgEchoCluster set to false
$wgEchoSharedTrackingCluster = 'extension1';
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d12bebc..c5e06d8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14982,12 +14982,6 @@
'mediawikiwiki' => true,
 ),
 
-'wmgEchoUseCrossWikiTrackingTable' => array(
-   'default' => false,
-   'testwiki' => true,
-   'test2wiki' => true,
-),
-
 // Thanks should be enabled for wikis with Echo
 'wmgUseThanks' => array(
'default' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I20537a01365333a9694e18f0bf9b20a3377adc83
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Luke081515 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...Echo)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Call UserMailer::send() with reply to address correctly
..

Call UserMailer::send() with reply to address correctly

Change-Id: I240c61a154af591e852cd9ddc537365bc22d2855
---
M includes/EmailBundler.php
1 file changed, 7 insertions(+), 1 deletion(-)


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

diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php
index 514f9a7..438580a 100644
--- a/includes/EmailBundler.php
+++ b/includes/EmailBundler.php
@@ -252,7 +252,13 @@
$replyAddress = new MailAddress( $wgNotificationSender, 
$wgNotificationReplyName );
 
// Schedule a email job or just send the email directly?
-   UserMailer::send( $toAddress, $fromAddress, 
$content['subject'], $content['body'], $replyAddress );
+   UserMailer::send(
+   $toAddress,
+   $fromAddress,
+   $content['subject'],
+   $content['body'],
+   array( 'replyTo' => $replyAddress )
+   );
MWEchoEventLogging::logSchemaEchoMail( $this->mUser, 'bundle' );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...SemanticWatchlist)

[Reedy (Code Review)]

Reedy has uploaded a new change for review.

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

Change subject: Call UserMailer::send() with reply to address correctly
..

Call UserMailer::send() with reply to address correctly

Change-Id: I3fce6c666e2c878a221e2e4c6acacfd0254d173a
---
M includes/SWL_Emailer.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/includes/SWL_Emailer.php b/includes/SWL_Emailer.php
index 34b0e18..e8328c3 100644
--- a/includes/SWL_Emailer.php
+++ b/includes/SWL_Emailer.php
@@ -56,8 +56,7 @@
new MailAddress( $wgPasswordSender, 
$wgPasswordSenderName ),
$title,
$emailText,
-   null,
-   'text/html; charset=ISO-8859-1'
+   array( 'contentType' => 'text/html; charset=ISO-8859-1' 
)
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fce6c666e2c878a221e2e4c6acacfd0254d173a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticWatchlist
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Call UserMailer::send() with reply to address correctly
..


Call UserMailer::send() with reply to address correctly

Change-Id: I240c61a154af591e852cd9ddc537365bc22d2855
---
M includes/EmailBundler.php
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php
index 514f9a7..438580a 100644
--- a/includes/EmailBundler.php
+++ b/includes/EmailBundler.php
@@ -252,7 +252,13 @@
$replyAddress = new MailAddress( $wgNotificationSender, 
$wgNotificationReplyName );
 
// Schedule a email job or just send the email directly?
-   UserMailer::send( $toAddress, $fromAddress, 
$content['subject'], $content['body'], $replyAddress );
+   UserMailer::send(
+   $toAddress,
+   $fromAddress,
+   $content['subject'],
+   $content['body'],
+   array( 'replyTo' => $replyAddress )
+   );
MWEchoEventLogging::logSchemaEchoMail( $this->mUser, 'bundle' );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I240c61a154af591e852cd9ddc537365bc22d2855
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Call UserMailer::send() with reply to address correctly - change (mediawiki...EmailCapture)

[jenkins-bot (Code Review)]

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

Change subject: Call UserMailer::send() with reply to address correctly
..


Call UserMailer::send() with reply to address correctly

Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
---
M api/ApiEmailCapture.php
1 file changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/api/ApiEmailCapture.php b/api/ApiEmailCapture.php
index b501b05..e0d5406 100644
--- a/api/ApiEmailCapture.php
+++ b/api/ApiEmailCapture.php
@@ -44,8 +44,10 @@
),
$this->msg( 
$wgEmailCaptureAutoResponse['subject-msg'] )->text(),
$this->msg( 
$wgEmailCaptureAutoResponse['body-msg'], $fullLink, $link, $code )->text(),
-   $wgEmailCaptureAutoResponse['reply-to'],
-   
$wgEmailCaptureAutoResponse['content-type']
+   array(
+   'replyTo' => 
$wgEmailCaptureAutoResponse['reply-to'],
+   'contentType' => 
$wgEmailCaptureAutoResponse['content-type']
+   )
);
}
$r = array( 'result' => 'Success' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10fc6674514d9ccfb0df75d5e7d4f0fe046c0ea0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EmailCapture
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add puppet/tox to kafkatee/varnishkafka puppet modules - change (integration/config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Add puppet/tox to kafkatee/varnishkafka puppet modules
..

Add puppet/tox to kafkatee/varnishkafka puppet modules

Puppet since they are holding puppet repositories.
Tox is to eventually bring up flake8 on both repos since they have
python scripts.

Change-Id: I37565511dcfd8a36a7b6ab55c6421c60f3738d5d
---
M zuul/layout.yaml
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/76/265276/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index adaa0b0..da78b01 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2218,6 +2218,12 @@
 template:
   - name: puppet
 
+  - name: operations/puppet/kafkatee
+template:
+  - name: puppet
+experimental:
+  - tox-jessie
+
   - name: operations/puppet/mariadb
 template:
   - name: puppet
@@ -2226,6 +2232,12 @@
 template:
   - name: puppet
 
+  - name: operations/puppet/varnishkafka
+template:
+  - name: puppet
+experimental:
+  - tox-jessie
+
   - name: operations/puppet/wikimetrics
 template:
   - name: puppet

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

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

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

[MediaWiki-commits] [Gerrit] Add puppet/tox to kafkatee/varnishkafka puppet modules - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Add puppet/tox to kafkatee/varnishkafka puppet modules
..


Add puppet/tox to kafkatee/varnishkafka puppet modules

Puppet since they are holding puppet repositories.
Tox is to eventually bring up flake8 on both repos since they have
python scripts.

Change-Id: I37565511dcfd8a36a7b6ab55c6421c60f3738d5d
---
M zuul/layout.yaml
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index adaa0b0..da78b01 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2218,6 +2218,12 @@
 template:
   - name: puppet
 
+  - name: operations/puppet/kafkatee
+template:
+  - name: puppet
+experimental:
+  - tox-jessie
+
   - name: operations/puppet/mariadb
 template:
   - name: puppet
@@ -2226,6 +2232,12 @@
 template:
   - name: puppet
 
+  - name: operations/puppet/varnishkafka
+template:
+  - name: puppet
+experimental:
+  - tox-jessie
+
   - name: operations/puppet/wikimetrics
 template:
   - name: puppet

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

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

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

[MediaWiki-commits] [Gerrit] Make redlink tooltip be content language to stop cache pollu... - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Make redlink tooltip be content language to stop cache 
pollution.
..


Make redlink tooltip be content language to stop cache pollution.

Redlink tooltips end up in parser cache!

This is not ideal, as ideally it would be in the page's language,
not the content language and it would be user language for things
outside of pages, but that's not easy to do the way the code is
structured, and this is much better than the alternative.

Other possibilities include:
* Splitting parser cache (Previously been reverted, and doesn't
seem worth it given the feature in question)
* Post-processing step after parsing (Really complicated. Doesn't
seem worth it)

Bug: T34686
Change-Id: Id632f8ef59d1c762aed1867a708c569cbff5f0dd
---
M includes/Linker.php
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/includes/Linker.php b/includes/Linker.php
index 0dd4c47..3ba472ba 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -346,7 +346,10 @@
} elseif ( in_array( 'known', $options ) ) {
$defaults['title'] = $target->getPrefixedText();
} else {
-   $defaults['title'] = wfMessage( 'red-link-title', 
$target->getPrefixedText() )->text();
+   // This ends up in parser cache!
+   $defaults['title'] = wfMessage( 'red-link-title', 
$target->getPrefixedText() )
+   ->inContentLanguage()
+   ->text();
}
 
# Finally, merge the custom attribs with the default ones, and 
iterate

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id632f8ef59d1c762aed1867a708c569cbff5f0dd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Prefix Lua module names - change (mediawiki...ArticlePlaceholder)

[Lucie Kaffee (Code Review)]

Lucie Kaffee has uploaded a new change for review.

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

Change subject: Prefix Lua module names
..

Prefix Lua module names

Bug: T120373
Change-Id: I3610e548a0bf4e3a1716433b5350887e8399bc55
---
M includes/Hooks.php
R includes/Lua/ArticlePlaceholderEntityRenderer.lua
M includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
M includes/Template/aboutTopic-template-module.xml
4 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/includes/Hooks.php b/includes/Hooks.php
index c8f40f2..70f1c44 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -23,7 +23,7 @@
array &$extraLibraries
) {
if ( $engine === 'lua' ) {
-   $extraLibraries['EntityRenderer'] = array(
+   $extraLibraries['ArticlePlaceholderEntityRenderer'] = 
array(
'class' => 
'ArticlePlaceholder\Lua\Scribunto_LuaArticlePlaceholderLibrary',
'deferLoad' => true,
);
diff --git a/includes/Lua/EntityRenderer.lua 
b/includes/Lua/ArticlePlaceholderEntityRenderer.lua
similarity index 100%
rename from includes/Lua/EntityRenderer.lua
rename to includes/Lua/ArticlePlaceholderEntityRenderer.lua
diff --git a/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php 
b/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
index e1970c1..15ac2e4 100644
--- a/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
+++ b/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
@@ -39,7 +39,7 @@
);
 
return $this->getEngine()->registerInterface(
-   __DIR__ . '/EntityRenderer.lua', $lib, array()
+   __DIR__ . '/ArticlePlaceholderEntityRenderer.lua', 
$lib, array()
);
}
 }
diff --git a/includes/Template/aboutTopic-template-module.xml 
b/includes/Template/aboutTopic-template-module.xml
index afc2477..4efc581 100644
--- a/includes/Template/aboutTopic-template-module.xml
+++ b/includes/Template/aboutTopic-template-module.xml
@@ -49,7 +49,7 @@
 
 -- get the label of the local entity
 p.showData = function(frame)
- entityRenderer = require( 'EntityRenderer' )
+ entityRenderer = require( 'ArticlePlaceholderEntityRenderer' )
  return entityRenderer.render( frame )
 end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3610e548a0bf4e3a1716433b5350887e8399bc55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Lucie Kaffee 

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

[MediaWiki-commits] [Gerrit] [RandomRootPage] Archived extension - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: [RandomRootPage] Archived extension
..


[RandomRootPage] Archived extension

Archived at https://gerrit.wikimedia.org/r/#/c/264878/

Bug: T109809
Change-Id: I2cbfc7101ec460f774f757c39669d1248e9a6aa3
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 5 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index da78b01..b9aca00 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6477,11 +6477,7 @@
 
   - name: mediawiki/extensions/RandomRootPage
 template:
-  - name: jshint
-  - name: extension-unittests-generic
-  - name: npm
-check:
-  - jsonlint
+  - name: archived
 
   - name: mediawiki/extensions/ReaderFeedback
 template:

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

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

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

[MediaWiki-commits] [Gerrit] Fixed php7cc errors - change (mediawiki...Translate)

[Mhutti1 (Code Review)]

Mhutti1 has uploaded a new change for review.

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

Change subject: Fixed php7cc errors
..

Fixed php7cc errors

Renamed duplicated parameter name $_ to $_1 and $_2

https://www.mediawiki.org/wiki/Topic:Sw9zx5f0flndzb2r

Change-Id: Iad06993f2856f8abd0ff4dc99935d3477bccebdb
---
M TranslateEditAddons.php
M tag/PageTranslationHooks.php
2 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/TranslateEditAddons.php b/TranslateEditAddons.php
index f3ca88a..148ad4d 100644
--- a/TranslateEditAddons.php
+++ b/TranslateEditAddons.php
@@ -142,7 +142,7 @@
 * Hook: PageContentSaveComplete
 */
public static function onSave( WikiPage $wikiPage, $user, $content, 
$summary,
-   $minor, $_, $_, $flags, $revision
+   $minor, $_1, $_2, $flags, $revision
) {
 
if ( $content instanceof TextContent ) {
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 10d2335..9ca 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -100,7 +100,7 @@
 * Hook: PageContentSaveComplete
 */
public static function onSectionSave( WikiPage $wikiPage, User $user, 
$content, $summary,
-   $minor, $_, $_, $flags, $revision
+   $minor, $_1, $_2, $flags, $revision
) {
$title = $wikiPage->getTitle();
 
@@ -389,7 +389,7 @@
 * Hook: PageContentSave
 */
public static function tpSyntaxCheck( $wikiPage, $user, $content, 
$summary,
-   $minor, $_, $_, $flags, $status
+   $minor, $_1, $_2, $flags, $status
) {
if ( $content instanceof TextContent ) {
$text = $content->getNativeData();
@@ -419,7 +419,7 @@
 * Hook: PageContentSaveComplete
 */
public static function addTranstag( $wikiPage, $user, $content, 
$summary,
-   $minor, $_, $_, $flags, $revision
+   $minor, $_1, $_2, $flags, $revision
) {
// We are not interested in null revisions
if ( $revision === null ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad06993f2856f8abd0ff4dc99935d3477bccebdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Mhutti1 

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

[MediaWiki-commits] [Gerrit] Add mobrovac to mobileapps-admin group - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: Add mobrovac to mobileapps-admin group
..


Add mobrovac to mobileapps-admin group

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

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index e0dc591..2facf96 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -391,7 +391,7 @@
   mobileapps-admin:
 description: Group of mobileapps admins
 gid: 759
-members: [bsitzmann, mholloway-shell]
+members: [bsitzmann, mholloway-shell, mobrovac]
 privileges: ['ALL = NOPASSWD: /usr/sbin/service mobileapps *',
  'ALL = (mobileapps) NOPASSWD: ALL']
   mw-log-readers:

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

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

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

[MediaWiki-commits] [Gerrit] Define doesWrites() for SpecialPage classes - change (mediawiki...SpellingDictionary)

[Krinkle (Code Review)]

Krinkle has submitted this change and it was merged.

Change subject: Define doesWrites() for SpecialPage classes
..


Define doesWrites() for SpecialPage classes

Bug: T123591
Change-Id: Idb953610468846186b8bdb1f34bff9e1f5537ff0
---
M specials/SpecialSpellingDictionary.php
M specials/SpecialSpellingDictionaryAdmin.php
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Krinkle: Verified; Looks good to me, approved
  Ori.livneh: Looks good to me, approved



diff --git a/specials/SpecialSpellingDictionary.php 
b/specials/SpecialSpellingDictionary.php
index a7f0b95..50929be 100644
--- a/specials/SpecialSpellingDictionary.php
+++ b/specials/SpecialSpellingDictionary.php
@@ -18,6 +18,10 @@
parent::__construct( 'SpellingDictionary' );
}
 
+   public function doesWrites() {
+   return true;
+   }
+
/**
 * Shows the page to the user.
 * @param string $sub: The subpage string argument (if any).
diff --git a/specials/SpecialSpellingDictionaryAdmin.php 
b/specials/SpecialSpellingDictionaryAdmin.php
index e6d3b15..bf5a087 100644
--- a/specials/SpecialSpellingDictionaryAdmin.php
+++ b/specials/SpecialSpellingDictionaryAdmin.php
@@ -15,6 +15,10 @@
parent::__construct( 'SpellingDictionaryAdmin', 'spelladmin' );
}
 
+   public function doesWrites() {
+   return true;
+   }
+
public function initializeTree() {
$tree = new SDTree();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb953610468846186b8bdb1f34bff9e1f5537ff0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpellingDictionary
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5b95d6c..3bc62ba - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 5b95d6c..3bc62ba
..

Syncronize VisualEditor: 5b95d6c..3bc62ba

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


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

diff --git a/VisualEditor b/VisualEditor
index 5b95d6c..3bc62ba 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 5b95d6c1e65e212248aab0c6da109ea6ba57be9e
+Subproject commit 3bc62ba61d42ed642d58ad2a3930eef8e65f28e2

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5b95d6c..3bc62ba - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 5b95d6c..3bc62ba
..


Syncronize VisualEditor: 5b95d6c..3bc62ba

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

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



diff --git a/VisualEditor b/VisualEditor
index 5b95d6c..3bc62ba 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 5b95d6c1e65e212248aab0c6da109ea6ba57be9e
+Subproject commit 3bc62ba61d42ed642d58ad2a3930eef8e65f28e2

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

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

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

[MediaWiki-commits] [Gerrit] SaveDialog: Fix alignment of checkboxes - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: SaveDialog: Fix alignment of checkboxes
..


SaveDialog: Fix alignment of checkboxes

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7718e7cebe7c533a76533dc82bcf93f8da49d15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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] Add npm and composer.json tests - change (mediawiki...SiteSettings)

[jenkins-bot (Code Review)]

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

Change subject: Add npm and composer.json tests
..


Add npm and composer.json tests

Run jsonlint and banana checker tests
Run phplint through composer-test.

Adjust .gitignore

Change-Id: Ib442172e9567efcd3ea5ddcb0a8c3e8cbd8bb267
---
A .gitignore
A Gruntfile.js
A composer.json
A package.json
4 files changed, 44 insertions(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..47e36d5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/node_modules/
+/vendor/
+/composer.lock
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..7756e75
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+   grunt.initConfig( {
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..1c63f9e
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2"
+   },
+   "scripts": {
+   "test": [
+   "parallel-lint . --exclude vendor"
+   ]
+   }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..41cecca
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "scripts": {
+"test": "grunt test"
+  },
+  "devDependencies": {
+"grunt": "0.4.5",
+"grunt-cli": "0.1.13",
+"grunt-banana-checker": "0.4.0",
+"grunt-jsonlint": "1.0.7"
+  }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib442172e9567efcd3ea5ddcb0a8c3e8cbd8bb267
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SiteSettings
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Umherirrender 
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] Add *.archives.gov to wgCopyUploadsDomains - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Add *.archives.gov to wgCopyUploadsDomains
..


Add *.archives.gov to wgCopyUploadsDomains

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 082e5bc..ce9bf59 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11789,6 +11789,7 @@
'digital.slub-dresden.de',
'grossstadtgeschichten-berlin.de',
'content.staatsbibliothek-berlin.de',
+   '*.archives.gov',   // US National Archives - 
T124080
),
 ),
 

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

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

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

[MediaWiki-commits] [Gerrit] add traffic channel - change (labs...wikibugs2)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: add traffic channel
..

add traffic channel

Change-Id: Ic2e5b6868fbc99d67333757e891b674aed1e5110
---
M channels.yaml
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/81/265281/1

diff --git a/channels.yaml b/channels.yaml
index bfc4dcd..d6e8123 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -184,6 +184,10 @@
 - puppet
 - Blocked-on-Operations
 
+"#wikimedia-traffic":
+- traffic
+- netops
+
 "#wikimedia-teampractices":
 - team-practices
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2e5b6868fbc99d67333757e891b674aed1e5110
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: BBlack 

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

[MediaWiki-commits] [Gerrit] Improve MathSearch system messages - change (mediawiki...MathSearch)

[IoannisKydonis (Code Review)]

IoannisKydonis has uploaded a new change for review.

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

Change subject: Improve MathSearch system messages
..

Improve MathSearch system messages

Threads:
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Math-search-relation-label/ksh
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Math-search-term/es

Change-Id: I4d8b44ef02002c87cbd91d537f162c08bb399be9
---
M i18n/qqq.json
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2544290..d9f423f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -139,15 +139,15 @@
"math-wmc-display-formulae-label": "Checkbox label",
"math-wmc-display-formulae-help": "Checkbox help",
"action-mathwmcsubmit": "{{doc-action|mathwmcsubmit}}",
-   "math-search-term": "Wiki text that repeates the user input with 
parameters:\n* term number\n* expression \n* relation type 
{{msg-mw|math-search-relation-0}} or {{msg-mw|math-search-relation-1}} or 
{{msg-mw|math-search-relation-2}} or empty \n* type of serach 
{{msg-mw|math-search-type-0}} or {{msg-mw|math-search-type-1}} \n* numer of 
search results",
-   "math-search-relation-label": "Selection form 
label\n{{Identical|Relation}}",
+   "math-search-term": "Wiki text that reports the user search input, 
search options and the number of results from the search. Parameters:\n* $1 - 
term number\n* $2 - expression \n* $3 - relation type 
{{msg-mw|math-search-relation-0}} or {{msg-mw|math-search-relation-1}} or 
{{msg-mw|math-search-relation-2}} or empty \n* $4 - type of search 
{{msg-mw|math-search-type-0}} or {{msg-mw|math-search-type-1}} \n* $5 - number 
of search results",
+   "math-search-relation-label": "Text for the label of the selection menu 
that includes relation search type options\n{{Identical|Relation}}",
"math-search-relation-0": "First option in relation selection menu and 
part of {{msg-mw|math-search-term}}\n{{Identical|And}}",
"math-search-relation-1": "Second option in relation selection menu and 
part of {{msg-mw|math-search-term}}\n{{Identical|Or}}",
"math-search-relation-2": "Third option in relation selection menu and 
part of {{msg-mw|math-search-term}}",
-   "math-search-type-label": "Selection form label\n{{Identical|Type}}",
+   "math-search-type-label": "Text for the label of the selection menu 
that includes search type options\n{{Identical|Type}}",
"math-search-type-0": "First option in type selection menu and part of 
{{msg-mw|math-search-term}}\n{{Identical|Keyword}}",
-   "math-search-type-1": "Section option in type selection menu and part 
of {{msg-mw|math-search-term}}",
-   "math-search-type-2": "Section option in type selection menu and part 
of {{msg-mw|math-search-term}}",
+   "math-search-type-1": "Second option in type selection menu and part of 
{{msg-mw|math-search-term}}",
+   "math-search-type-2": "Third option in type selection menu and part of 
{{msg-mw|math-search-term}}",
"math-search-expression-label": "Text form 
label\n{{Identical|Expression}}",
"math-tex2nb-header": "Header of the input-box for user-defined LaTeX 
input on the specialpage LaTeXTranslator.",
"math-tex2nb-intro": "Introductory text for the specialpage 
LaTeXTranslator.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d8b44ef02002c87cbd91d537f162c08bb399be9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis 

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

[MediaWiki-commits] [Gerrit] Change default graph version param - change (operations/mediawiki-config)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Change default graph version param
..

Change default graph version param

Set all s to be version 2 by default

Change-Id: I437fd59d99ea8d24d6196b8fc1f2a35d373c38af
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 85d7d94..d5a9cea 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2898,6 +2898,7 @@
require_once( "$IP/extensions/JsonConfig/JsonConfig.php" );
require_once( "$IP/extensions/Graph/Graph.php" );
 
+   $wgGraphDefaultVegaVer = $wmgGraphDefaultVegaVer;
$wgGraphIsTrusted = $wmgGraphIsTrusted;
$wgGraphEnableGZip = $wmgGraphEnableGZip;
$wgGraphImgServiceUrl = $wmgGraphImgServiceUrl;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3d1ba92..ccfa72b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13543,6 +13543,10 @@
'default' => true,
 ),
 
+'wmgGraphDefaultVegaVer' => array(
+   'default' => 2,
+),
+
 // All graph data requests should be trusted on these wikis
 'wmgGraphIsTrusted' => array(
'default' => false, // MUST BE FALSE for any untrusted wiki

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

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

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

[MediaWiki-commits] [Gerrit] Add info icon with commons link - change (mediawiki...Wikibase)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Add info icon with commons link
..

Add info icon with commons link

Change-Id: Ie6f262536524a4533f0fb4be62147635dbe96461
---
M view/resources/jquery/wikibase/jquery.wikibase.itemview.js
M view/resources/templates.php
M view/resources/wikibase/wikibase.PageImage.js
M view/resources/wikibase/wikibase.css
M view/src/ItemView.php
5 files changed, 52 insertions(+), 28 deletions(-)


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

diff --git a/view/resources/jquery/wikibase/jquery.wikibase.itemview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.itemview.js
index f15c70e..e989f9f 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.itemview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.itemview.js
@@ -60,19 +60,14 @@
 * @protected
 */
_createPageImage: function() {
+   var size = $( '.wikibase-entityview-side' ).outerWidth(),
+   pageImage = new wb.PageImage( size, size );
 
-// var size = $( '.wikibase-entityview-side' ).outerWidth(),
-// pageImage = new wb.PageImage( size, size );
-//
-// var div =  $( '' ).addClass( 'pageImage' );
-// var div =  $( '' ).addClass( 'pageImage' );
-//
-// $( '.wikibase-entityview-side' ).prepand( div );
-//
-// pageImage.getPageImage().done(function( element ){
-// div.append( element );
-// });
-
+   pageImage.getPageImage().done(function( element, url ){
+   $( '.wikibase-pageImage a.info' ).attr( 'href', url);
+   $( '.wikibase-pageImage' ).append( element );
+   $( '.wikibase-pageImage' ).show();
+   });
},
 
/**
diff --git a/view/resources/templates.php b/view/resources/templates.php
index 907ea49..472d222 100644
--- a/view/resources/templates.php
+++ b/view/resources/templates.php
@@ -322,5 +322,12 @@
 
 HTML;
 
+   $templates['wikibase-pageimage'] =
+<<
+   
+
+HTML;
+
return $templates;
 } );
diff --git a/view/resources/wikibase/wikibase.PageImage.js 
b/view/resources/wikibase/wikibase.PageImage.js
index 0db5f38..942dad3 100644
--- a/view/resources/wikibase/wikibase.PageImage.js
+++ b/view/resources/wikibase/wikibase.PageImage.js
@@ -43,6 +43,7 @@
SELF.prototype._thumbnailSize = 400;
SELF.prototype._minScale = 1;
SELF.prototype._crossOriginXmlUrl = 
'https://upload.wikimedia.org/crossdomain.xml';
+   SELF.prototype._referenceUrl = 
'https://commons.wikimedia.org/wiki/File:';
 
/**
 * Returns the page image as DOM element
@@ -57,7 +58,7 @@
self._loadImage( url ).done(
function( image ) {
self._getSmartCrop( image 
).done(function( crop ) {
-   
deferred.resolve(self._getMaskedImage( image, crop, referenceUrl ));
+   
deferred.resolve(self._getMaskedImage( image, crop ), referenceUrl);
});
});
} );
@@ -101,13 +102,9 @@
/**
 * @private
 **/
-   SELF.prototype._getMaskedImage = function( image, crop, ref ) {
+   SELF.prototype._getMaskedImage = function( image, crop ) {
 
var canvas = $('')[0], ctx = canvas.getContext('2d');
-
-   if( ref ){
-   $( canvas ).data( 'ref', ref );
-   }
 
canvas.width = this._width;
canvas.height = this._height;
@@ -135,7 +132,7 @@
var page = data.query.pages[Object.keys( 
data.query.pages )[0]];
if( page.thumbnail ){
deferred.resolve( page.thumbnail.source,
-   
page.pageprops.page_image );// jshint ignore:line
+   self._referenceUrl + 
page.pageprops.page_image );// jshint ignore:line
}
 
});
diff --git a/view/resources/wikibase/wikibase.css 
b/view/resources/wikibase/wikibase.css
index 34497d3..279fff2 100644
--- a/view/resources/wikibase/wikibase.css
+++ b/view/resources/wikibase/wikibase.css
@@ -616,18 +616,33 @@
 
 /** PAGE IMAGE **/
 
-.wikibase .pageImage > canvas {
+.wikibase-pageImage {
border: 1px solid #C9C9C9;
+   position: relative;
+   height: 300px;
+   width: 300px;
 }
 
-.wikibase .pageImage .overlay {
+.wikibase-pageImage .info {
position: absolute;
+   

[MediaWiki-commits] [Gerrit] admin: add Luca (elukey) to the ops group - change (operations/puppet)

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: admin: add Luca (elukey) to the ops group
..


admin: add Luca (elukey) to the ops group

Bug: T122925
Change-Id: I082b6cfad42a7351d4a09a35335db683f9bb7aa2
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 297e2a7..e0dc591 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -14,7 +14,7 @@
 description: include everywhere ops folks
 members: [filippo, jgreen, bblack, andrew, faidon, rush, oblivian, laner, 
yuvipanda,
   dzahn, akosiaris, springle, mark, ariel, cmjohnson, otto, robh, 
tstarling,
-  ori, midom, jmm, jynus, aaron, ema]
+  ori, midom, jmm, jynus, aaron, ema, elukey]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701
@@ -1775,4 +1775,4 @@
 name:  jdcc-berkman
 realname: Justin Clark
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCvfaLmde8biy5hfFR1fOnkfu8eitpGkyWuTXziVHEAFmeiuF87LdnkUDaM/Egom3/fNJKjrzLZPcaJxqa/BeJfWzoz6Ua0dsA/uG1D/l4eIXCEj2QhcvdQT8mbLmXqws3deISARUAIp9DnXG9BQ5LVq6ihwyDgQ9sQiAZsbryKRA5opgSJUE5ynNGBh0M8gIY0+1xBVG9CtrnnyWi7ufklOonzcOo9rssGtE8bHPKnHexKb8FIiVWHy1IrkKLwPBhmLesXTeGnQvAg3VOmeJT7mPG4hH7m5FLB3PvfcCSD27/o/VmVIXUj3ypu0+SBzmJd4uwANMUOuBuNKCXSYB+P
 jdcc-berkman@work]
-uid: 13978
\ No newline at end of file
+uid: 13978

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I082b6cfad42a7351d4a09a35335db683f9bb7aa2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 
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] Hide table of contents button when loading / error - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Hide table of contents button when loading / error
..


Hide table of contents button when loading / error

• The table of contents button was intentionally disabled while page
  contents loads. Now hide the button itself during page loads.

• Only show the table of contents button when page load completes
  successfully.

• Workaround FloatingActionButton.show() / hide() race condition.

Bug: T120391
Change-Id: Ib5e180e218322e45cad2396549340cdb12ef8ab4
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 38 insertions(+), 16 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 8a7f034..7522690 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -11,6 +11,7 @@
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.MenuItemCompat;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -162,8 +163,15 @@
 @Override
 public void onClick(View v) {
 hideSoftKeyboard(getActivity());
-setToCButtonFadedIn(true);
+showToCButton();
 toggleToC(TOC_ACTION_TOGGLE);
+}
+};
+
+@NonNull private final Runnable hideToCButtonRunnable = new Runnable() {
+@Override
+public void run() {
+tocButton.hide();
 }
 };
 
@@ -354,7 +362,7 @@
 @Override
 public void onUpOrCancelMotionEvent() {
 // queue the button to be hidden when the user stops scrolling.
-setToCButtonFadedIn(false);
+hideToCButton(true);
 // update our session, since it's possible for the user to 
remain on the page for
 // a long time, and we wouldn't want the session to time out.
 app.getSessionFunnel().touchSession();
@@ -364,11 +372,11 @@
 @Override
 public void onFastScroll() {
 // show the ToC button...
-setToCButtonFadedIn(true);
+showToCButton();
 // and immediately queue it to be hidden after a short delay, 
but only if we're
 // not at the top of the page.
 if (webView.getScrollY() > 0) {
-setToCButtonFadedIn(false);
+hideToCButton(true);
 }
 }
 });
@@ -377,7 +385,7 @@
 public void onScrollChanged(int oldScrollY, int scrollY, boolean 
isHumanScroll) {
 if (scrollY <= 0) {
 // always show the ToC button when we're at the top of the 
page.
-setToCButtonFadedIn(true);
+showToCButton();
 }
 if (pageScrollFunnel != null) {
 pageScrollFunnel.onPageScrolled(oldScrollY, scrollY, 
isHumanScroll);
@@ -549,7 +557,7 @@
  boolean pushBackStack, int stagedScrollY, boolean 
pageRefreshed) {
 // disable sliding of the ToC while sections are loading
 tocHandler.setEnabled(false);
-setToCButtonFadedIn(true);
+hideToCButton(false);
 
 errorState = false;
 errorView.setVisibility(View.GONE);
@@ -704,7 +712,7 @@
 findInPageActionMode = mode;
 MenuItem menuItem = menu.add(R.string.menu_page_find_in_page);
 MenuItemCompat.setActionProvider(menuItem, 
findInPageActionProvider);
-setToCButtonFadedIn(false);
+hideToCButton(false);
 return true;
 }
 
@@ -726,7 +734,7 @@
 funnel.logDone();
 webView.clearMatches();
 pageActivity.showToolbar();
-setToCButtonFadedIn(true);
+showToCButton();
 hideSoftKeyboard(pageActivity);
 }
 });
@@ -752,6 +760,7 @@
 }
 
 public void onPageLoadComplete() {
+showToCButton();
 refreshView.setEnabled(true);
 editHandler.setPage(model.getPage());
 initPageScrollFunnel();
@@ -1010,21 +1019,34 @@
 });
 }
 
-private void setToCButtonFadedIn(boolean shouldFadeIn) {
+private void showToCButton() {
 tocButton.removeCallbacks(hideToCButtonRunnable);
-if (shouldFadeIn) {
+
+if (!errorState) {
+// HACK: there 

[MediaWiki-commits] [Gerrit] Fixed vega version parsing - change (mediawiki...Graph)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Fixed vega version parsing
..

Fixed vega version parsing

Now, by default the vega spec becomes
whatever the default version is

Change-Id: I952070cf05ab787c9324f3459cfebdbd0258c455
---
M includes/Graph.body.php
1 file changed, 4 insertions(+), 14 deletions(-)


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

diff --git a/includes/Graph.body.php b/includes/Graph.body.php
index d8bef00..e80be12 100644
--- a/includes/Graph.body.php
+++ b/includes/Graph.body.php
@@ -161,22 +161,12 @@
 
// Figure out which vega version to use
global $wgGraphDefaultVegaVer;
-   $useVega2 = false;
-   if ( property_exists( $data, 'version' ) ) {
-   $ver = is_numeric( $data->version ) ? $data->version : 
0;
+   if ( property_exists( $data, 'version' ) && is_numeric( 
$data->version ) ) {
+   $data->version = $data->version < 2 ? 1 : 2;
} else {
-   $ver = false;
+   $data->version = $wgGraphDefaultVegaVer;
}
-   if ( $wgGraphDefaultVegaVer > 1 || $isInteractive ) {
-   if ( $ver === false ) {
-   // If version is not set, but we need to force 
vega2, insert it automatically
-   $data->version = 2;
-   }
-   $useVega2 = true;
-   } elseif ( $ver !== false ) {
-   $useVega2 = $ver > 1;
-   }
-   if ( $useVega2 ) {
+   if ( $data->version === 2 ) {
$parserOutput->setExtensionData( 'graph_vega2', true );
} else {
$parserOutput->setExtensionData( 
'graph_specs_obsolete', true );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I952070cf05ab787c9324f3459cfebdbd0258c455
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Fix php7cc errors - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

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

Change subject: Fix php7cc errors
..


Fix php7cc errors

Renamed duplicated parameter name $_ to $_1 and $_2

https://www.mediawiki.org/wiki/Topic:Sw9zx5f0flndzb2r

Change-Id: Iad06993f2856f8abd0ff4dc99935d3477bccebdb
---
M TranslateEditAddons.php
M tag/PageTranslationHooks.php
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/TranslateEditAddons.php b/TranslateEditAddons.php
index f3ca88a..148ad4d 100644
--- a/TranslateEditAddons.php
+++ b/TranslateEditAddons.php
@@ -142,7 +142,7 @@
 * Hook: PageContentSaveComplete
 */
public static function onSave( WikiPage $wikiPage, $user, $content, 
$summary,
-   $minor, $_, $_, $flags, $revision
+   $minor, $_1, $_2, $flags, $revision
) {
 
if ( $content instanceof TextContent ) {
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 10d2335..9ca 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -100,7 +100,7 @@
 * Hook: PageContentSaveComplete
 */
public static function onSectionSave( WikiPage $wikiPage, User $user, 
$content, $summary,
-   $minor, $_, $_, $flags, $revision
+   $minor, $_1, $_2, $flags, $revision
) {
$title = $wikiPage->getTitle();
 
@@ -389,7 +389,7 @@
 * Hook: PageContentSave
 */
public static function tpSyntaxCheck( $wikiPage, $user, $content, 
$summary,
-   $minor, $_, $_, $flags, $status
+   $minor, $_1, $_2, $flags, $status
) {
if ( $content instanceof TextContent ) {
$text = $content->getNativeData();
@@ -419,7 +419,7 @@
 * Hook: PageContentSaveComplete
 */
public static function addTranstag( $wikiPage, $user, $content, 
$summary,
-   $minor, $_, $_, $flags, $revision
+   $minor, $_1, $_2, $flags, $revision
) {
// We are not interested in null revisions
if ( $revision === null ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad06993f2856f8abd0ff4dc99935d3477bccebdb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Mhutti1 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Include cluster name in all cirrussearch stats collection - change (mediawiki...CirrusSearch)

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

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

Change subject: Include cluster name in all cirrussearch stats collection
..

Include cluster name in all cirrussearch stats collection

Change-Id: I1f0a51d51e2ce5b1ec2325c610cd2aab1c0ca1be
---
M includes/DataSender.php
M includes/ElasticsearchIntermediary.php
2 files changed, 8 insertions(+), 7 deletions(-)


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

diff --git a/includes/DataSender.php b/includes/DataSender.php
index 223e026..14f687e 100644
--- a/includes/DataSender.php
+++ b/includes/DataSender.php
@@ -161,7 +161,7 @@
$this->start( "sending {numBulk} documents to the 
{indexType} index", array(
'numBulk' => $documentCount,
'indexType' => $indexType,
-   'queryType' => 'send_data_write_' . 
$this->connection->getClusterName(),
+   'queryType' => 'send_data_write',
) );
$bulk = new \Elastica\Bulk( 
$this->connection->getClient() );
if ( $shardTimeout ) {
@@ -228,7 +228,7 @@
$this->start( "deleting {numIds} from 
{indexType}", array(
'numIds' => $idCount,
'indexType' => $indexType,
-   'queryType' => 'send_deletes_' 
. $this->connection->getClusterName(),
+   'queryType' => 'send_deletes',
) );
$this->connection->getPageType( 
wfWikiId(), $indexType )->deleteIds( $ids );
$this->success();
@@ -288,7 +288,7 @@
try {
$this->start( "updating {numBulk} documents in 
other indexes", array(
'numBulk' => count( $updates ),
-   'queryType' => 
'send_data_other_idx_write_' . $this->connection->getClusterName(),
+   'queryType' => 
'send_data_other_idx_write',
) );
$bulk->send();
} catch ( \Elastica\Exception\Bulk\ResponseException $e 
) {
diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index be2008f..502123a 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -318,7 +318,8 @@
 
$stats = RequestContext::getMain()->getStats();
$type = self::classifyErrorMessage( $message );
-   $stats->increment( "CirrusSearch.backend_failure.$type" );
+   $clusterName = $this->connection->getClusterName();
+   $stats->increment( 
"CirrusSearch.$clusterName.backend_failure.$type" );
 
LoggerFactory::getInstance( 'CirrusSearch' )->warning(
"Search backend error during {$this->description} after 
{took}: {message}",
@@ -424,13 +425,13 @@
}
$endTime = microtime( true );
$took = round( ( $endTime - $this->requestStart ) * 1000 );
-
-   RequestContext::getMain()->getStats()->timing( 
'CirrusSearch.requestTime', $took );
+   $clusterName = $this->connection->getClusterName();
+   RequestContext::getMain()->getStats()->timing( 
"CirrusSearch.$clusterName.requestTime", $took );
$this->searchMetrics['wgCirrusStartTime'] = $this->requestStart;
$this->searchMetrics['wgCirrusEndTime'] = $endTime;
$logContext = $this->buildLogContext( $took );
$type = isset( $logContext['queryType'] ) ? 
$logContext['queryType'] : 'unknown';
-   RequestContext::getMain()->getStats()->timing( 
"CirrusSearch.requestTimeMs.$type", $took );
+   RequestContext::getMain()->getStats()->timing( 
"CirrusSearch.$clusterName.requestTimeMs.$type", $took );
if ( isset( $logContext['elasticTookMs'] ) ) {
$this->searchMetrics['wgCirrusElasticTime'] = 
$logContext['elasticTookMs'];
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f0a51d51e2ce5b1ec2325c610cd2aab1c0ca1be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Apex theme: Fix FieldLayout padding in inline mode - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Apex theme: Fix FieldLayout padding in inline mode
..


Apex theme: Fix FieldLayout padding in inline mode

Change-Id: I6337ef3da3beab8bc0dd291e3151999ba90e3019
---
M src/themes/apex/layouts.less
1 file changed, 3 insertions(+), 5 deletions(-)

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



diff --git a/src/themes/apex/layouts.less b/src/themes/apex/layouts.less
index 2dd94ae..6be3f8f 100644
--- a/src/themes/apex/layouts.less
+++ b/src/themes/apex/layouts.less
@@ -47,12 +47,10 @@
}
 
&.oo-ui-fieldLayout-align-inline {
-   &.oo-ui-labelElement > .oo-ui-fieldLayout-body > 
.oo-ui-labelElement-label {
-   padding: 0.5em;
-   }
+   margin-bottom: 1.25em;
 
-   > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field {
-   padding: 0.5em 0;
+   &.oo-ui-labelElement > .oo-ui-fieldLayout-body > 
.oo-ui-labelElement-label {
+   padding: 0.25em 0.25em 0.25em 0.5em;
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6337ef3da3beab8bc0dd291e3151999ba90e3019
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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] Add davidabian.com to wgCopyUploadsDomains - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Add davidabian.com to wgCopyUploadsDomains
..


Add davidabian.com to wgCopyUploadsDomains

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c05c600..ff697e6 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11802,6 +11802,7 @@
'content.staatsbibliothek-berlin.de',
'*.archives.gov',   // US National Archives - 
T124080
'*.bodleian.ox.ac.uk',  // Bodleian Libraries - 
T121779
+   '*.davidabian.com', // Trusted user website, 
used by Museo del Romanticismo - T121383
),
 ),
 

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

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

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

[MediaWiki-commits] [Gerrit] Use production RESTBase URI for empty dev inputs - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Use production RESTBase URI for empty dev inputs
..


Use production RESTBase URI for empty dev inputs

It's very inconvenient to type the production Content Service URI if
previously testing with a different instance. Previously, if an empty
URI was specified, the app would crash. Now we check for a blank input
and use the production value in that case.

Change-Id: I06a87481cf7d1b4eac8e06f33927ee180e806881
---
M app/src/main/java/org/wikipedia/settings/Prefs.java
M app/src/main/java/org/wikipedia/util/StringUtil.java
2 files changed, 12 insertions(+), 1 deletion(-)

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



diff --git a/app/src/main/java/org/wikipedia/settings/Prefs.java 
b/app/src/main/java/org/wikipedia/settings/Prefs.java
index 9395574..ba72355 100644
--- a/app/src/main/java/org/wikipedia/settings/Prefs.java
+++ b/app/src/main/java/org/wikipedia/settings/Prefs.java
@@ -9,6 +9,7 @@
 import org.wikipedia.data.TabUnmarshaller;
 import org.wikipedia.page.tabs.Tab;
 import org.wikipedia.theme.Theme;
+import org.wikipedia.util.StringUtil;
 
 import retrofit.RestAdapter;
 
@@ -293,8 +294,10 @@
 }
 }
 
+@NonNull
 public static String getRestbaseUriFormat() {
-return getString(R.string.preference_key_restbase_uri_format, 
"%1$s://%2$s/api/rest_v1");
+return 
StringUtil.defaultIfBlank(getString(R.string.preference_key_restbase_uri_format,
 null),
+"%1$s://%2$s/api/rest_v1");
 }
 
 public static long getLastRunTime(@NonNull String task) {
diff --git a/app/src/main/java/org/wikipedia/util/StringUtil.java 
b/app/src/main/java/org/wikipedia/util/StringUtil.java
index 9985916..4cd3fa5 100644
--- a/app/src/main/java/org/wikipedia/util/StringUtil.java
+++ b/app/src/main/java/org/wikipedia/util/StringUtil.java
@@ -16,6 +16,14 @@
 public final class StringUtil {
 private static final String CSV_DELIMITER = ",";
 
+public static boolean isBlank(@Nullable String str) {
+return str == null || !TextUtils.isGraphic(str);
+}
+
+public static String defaultIfBlank(@Nullable String value, @Nullable 
String defaultValue) {
+return isBlank(value) ? defaultValue : value;
+}
+
 @NonNull
 public static String emptyIfNull(@Nullable String value) {
 return defaultIfNull(value, "");

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I06a87481cf7d1b4eac8e06f33927ee180e806881
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: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Set default graph vega version back to 1 - change (operations/mediawiki-config)

[Yurik (Code Review)]

Yurik has uploaded a new change for review.

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

Change subject: Set default graph vega version back to 1
..

Set default graph vega version back to 1

For now, keep it as 1 until graph handles default better

Change-Id: I578be3047268123e1c1c990a581c01041b708815
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 563494b..d12bebc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13548,7 +13548,7 @@
 ),
 
 'wmgGraphDefaultVegaVer' => array(
-   'default' => 2,
+   'default' => 1,
 ),
 
 // All graph data requests should be trusted on these wikis

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

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

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

[MediaWiki-commits] [Gerrit] Don't update the article header for the error page - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Don't update the article header for the error page
..


Don't update the article header for the error page

The article header should not be shown for the error page. The header
was mistakenly updated on configuration change which caused the page to
display as an odd hybrid of error page and the previous wiki page
visited. This patch amends that behavior to only update when not on the
error page.

Bug: T120279
Change-Id: I2b35a6880aca9eda6805d0af1824497b855e22ef
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 7522690..05415e6 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -498,7 +498,7 @@
 sendDecorOffsetMessage();
 // if the screen orientation changes, then re-layout the lead image 
container,
 // but only if we've finished fetching the page.
-if (!pageLoadStrategy.isLoading()) {
+if (!pageLoadStrategy.isLoading() && !errorState) {
 pageLoadStrategy.layoutLeadImage();
 }
 tabsProvider.onConfigurationChanged();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b35a6880aca9eda6805d0af1824497b855e22ef
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: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Migrate callers to waitForReplication() - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Migrate callers to waitForReplication()
..

Migrate callers to waitForReplication()

Change-Id: I7b2b13b9315891561d2d8cc04a12ecad2dc73d70
---
M includes/installer/DatabaseUpdater.php
M includes/installer/MysqlUpdater.php
M includes/jobqueue/JobRunner.php
M includes/jobqueue/jobs/CategoryMembershipChangeJob.php
M includes/jobqueue/jobs/HTMLCacheUpdateJob.php
M includes/jobqueue/jobs/RecentChangesUpdateJob.php
M includes/objectcache/SqlBagOStuff.php
M includes/utils/BatchRowWriter.php
8 files changed, 23 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/95/265295/1

diff --git a/includes/installer/DatabaseUpdater.php 
b/includes/installer/DatabaseUpdater.php
index 904fde8..61c3002 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -456,7 +456,7 @@
flush();
if ( $ret !== false ) {
$updatesDone[] = $origParams;
-   wfWaitForSlaves();
+   wfGetLBFactory()->waitForReplication();
} else {
$updatesSkipped[] = array( $func, $params, 
$origParams );
}
diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index 4813bea..10fed31 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -836,7 +836,7 @@
foreach ( $res as $row ) {
$count = ( $count + 1 ) % 100;
if ( $count == 0 ) {
-   wfWaitForSlaves();
+   wfGetLBFactory()->waitForReplication( 
array( 'wiki' => wfWikiID() ) );
}
$this->db->insert( 'templatelinks',
array(
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index 4ab9f5a..3919318 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -208,7 +208,12 @@
// other wikis in the farm (on different 
masters) get a chance.
$timePassed = microtime( true ) - 
$lastCheckTime;
if ( $timePassed >= self::LAG_CHECK_PERIOD || 
$timePassed < 0 ) {
-   if ( !wfWaitForSlaves( $lastCheckTime, 
false, '*', self::MAX_ALLOWED_LAG ) ) {
+   try {
+   
wfGetLBFactory()->waitForReplication( array(
+   'ifWritesSince' => 
$lastCheckTime,
+   'timeout' => 
self::MAX_ALLOWED_LAG
+   ) );
+   } catch ( DBReplicationWaitError $e ) {
$response['reached'] = 
'slave-lag-limit';
break;
}
diff --git a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php 
b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
index c9e20a9..98c87a5 100644
--- a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
+++ b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
@@ -169,7 +169,7 @@
$catMembChange->triggerCategoryAddedNotification( 
$categoryTitle );
if ( $insertCount++ && ( $insertCount % $batchSize ) == 
0 ) {
$dbw->commit( __METHOD__, 'flush' );
-   wfWaitForSlaves();
+   wfGetLBFactory()->waitForReplication();
}
}
 
@@ -178,7 +178,7 @@
$catMembChange->triggerCategoryRemovedNotification( 
$categoryTitle );
if ( $insertCount++ && ( $insertCount++ % $batchSize ) 
== 0 ) {
$dbw->commit( __METHOD__, 'flush' );
-   wfWaitForSlaves();
+   wfGetLBFactory()->waitForReplication();
}
}
}
diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php 
b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index df0a66e..0d48cb3 100644
--- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@ -120,7 +120,7 @@
// Check $wgUpdateRowsPerQuery for sanity; batch jobs are sized 
by that already.
foreach ( array_chunk( $pageIds, 

[MediaWiki-commits] [Gerrit] WIP: Fix Wikipedia logo on About page - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: WIP: Fix Wikipedia logo on About page
..

WIP: Fix Wikipedia logo on About page

Bug: T104491
Change-Id: I9991619a30ca7108cd26e3de6b54f7d23ba31572
---
D app/src/main/res/drawable-hdpi/about_logo.png
D app/src/main/res/drawable-mdpi/about_logo.png
D app/src/main/res/drawable-xhdpi/about_logo.png
D app/src/main/res/drawable-xxhdpi/about_logo.png
M app/src/main/res/drawable/splash_bg.xml
M app/src/main/res/layout/activity_about.xml
M app/src/main/res/layout/widget_featured_page.xml
M app/src/main/res/layout/widget_search.xml
8 files changed, 10 insertions(+), 13 deletions(-)


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

diff --git a/app/src/main/res/drawable-hdpi/about_logo.png 
b/app/src/main/res/drawable-hdpi/about_logo.png
deleted file mode 100644
index 60650cf..000
--- a/app/src/main/res/drawable-hdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/about_logo.png 
b/app/src/main/res/drawable-mdpi/about_logo.png
deleted file mode 100644
index 0283ef6..000
--- a/app/src/main/res/drawable-mdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/about_logo.png 
b/app/src/main/res/drawable-xhdpi/about_logo.png
deleted file mode 100644
index eb02956..000
--- a/app/src/main/res/drawable-xhdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/about_logo.png 
b/app/src/main/res/drawable-xxhdpi/about_logo.png
deleted file mode 100644
index 3628d4f..000
--- a/app/src/main/res/drawable-xxhdpi/about_logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/splash_bg.xml 
b/app/src/main/res/drawable/splash_bg.xml
index aeb694e..aa68da9 100644
--- a/app/src/main/res/drawable/splash_bg.xml
+++ b/app/src/main/res/drawable/splash_bg.xml
@@ -4,7 +4,7 @@
 
 
 
 
diff --git a/app/src/main/res/layout/activity_about.xml 
b/app/src/main/res/layout/activity_about.xml
index 9efd68a..21751f7 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -25,7 +25,7 @@
 android:id="@+id/about_logo_image"
 android:layout_width="96dp"
 android:layout_height="96dp"
-android:src="@drawable/about_logo"
+android:src="@drawable/w_nav_mark"
 android:contentDescription="@null"
 />
 
-
+
 
 
 https://gerrit.wikimedia.org/r/265294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9991619a30ca7108cd26e3de6b54f7d23ba31572
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] SessionManager: Change behavior of getSessionById() - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: SessionManager: Change behavior of getSessionById()
..

SessionManager: Change behavior of getSessionById()

It's easily possible for SessionManager::getSessionById() to not be
able to load the specified session and to not be able to create an empty
one by that ID, for example if the user's token changed. So change this
from an exceptional condition to an expected one, and adjust callers to
deal with it appropriately.

Let's also make the checks for invalid data structure when loading the
session from the store delete the bogus data entirely.

At the same time, let's change the silly "$noEmpty" parameter to
"$create" and make the default behavior be not to create an empty
session.

Bug: T124126
Change-Id: I085d2026d1b366b1af9fd0e8ca3d815fd8288030
---
M includes/WebRequest.php
M includes/context/RequestContext.php
M includes/jobqueue/jobs/UploadFromUrlJob.php
M includes/session/PHPSessionHandler.php
M includes/session/SessionManager.php
M includes/session/SessionManagerInterface.php
M tests/phpunit/includes/session/PHPSessionHandlerTest.php
M tests/phpunit/includes/session/SessionManagerTest.php
8 files changed, 67 insertions(+), 44 deletions(-)


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

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 7306105..2c14618 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -655,7 +655,10 @@
 */
public function getSession() {
if ( $this->sessionId !== null ) {
-   return SessionManager::singleton()->getSessionById( 
(string)$this->sessionId, false, $this );
+   $session = SessionManager::singleton()->getSessionById( 
(string)$this->sessionId, true, $this );
+   if ( $session ) {
+   return $session;
+   }
}
 
$session = SessionManager::singleton()->getSessionForRequest( 
$this );
diff --git a/includes/context/RequestContext.php 
b/includes/context/RequestContext.php
index 16f11ee..afb5704 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -576,8 +576,9 @@
// Get new session, if applicable
$session = null;
if ( strlen( $params['sessionId'] ) ) { // don't make a 
new random ID
-   $session = 
MediaWiki\Session\SessionManager::singleton()
-   ->getSessionById( $params['sessionId'] 
);
+   $manager = 
MediaWiki\Session\SessionManager::singleton();
+   $session = $manager->getSessionById( 
$params['sessionId'], true )
+   ?: $manager->getEmptySession();
}
 
// Remove any user IP or agent information, and attach 
the request
diff --git a/includes/jobqueue/jobs/UploadFromUrlJob.php 
b/includes/jobqueue/jobs/UploadFromUrlJob.php
index 28e3c40..0491e64 100644
--- a/includes/jobqueue/jobs/UploadFromUrlJob.php
+++ b/includes/jobqueue/jobs/UploadFromUrlJob.php
@@ -155,18 +155,22 @@
 * Store a result in the session data. Note that the caller is 
responsible
 * for appropriate session_start and session_write_close calls.
 *
-* @param MediaWiki\\Session\\Session $session Session to store result 
into
+* @param MediaWiki\\Session\\Session|null $session Session to store 
result into
 * @param string $result The result (Success|Warning|Failure)
 * @param string $dataKey The key of the extra data
 * @param mixed $dataValue The extra data itself
 */
protected function storeResultInSession(
-   MediaWiki\Session\Session $session, $result, $dataKey, 
$dataValue
+   MediaWiki\Session\Session $session = null, $result, $dataKey, 
$dataValue
) {
-   $data = self::getSessionData( $session, 
$this->params['sessionKey'] );
-   $data['result'] = $result;
-   $data[$dataKey] = $dataValue;
-   self::setSessionData( $session, $this->params['sessionKey'], 
$data );
+   if ( $session ) {
+   $data = self::getSessionData( $session, 
$this->params['sessionKey'] );
+   $data['result'] = $result;
+   $data[$dataKey] = $dataValue;
+   self::setSessionData( $session, 
$this->params['sessionKey'], $data );
+   } else {
+   wfDebug( __METHOD__ . ': Cannot store result in 
session, session does not exist' );
+   }
}
 
/**
diff --git a/includes/session/PHPSessionHandler.php 

[MediaWiki-commits] [Gerrit] Release v1.1.1 - change (mediawiki...QuickSurveys)

[Phuedx (Code Review)]

Phuedx has uploaded a new change for review.

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

Change subject: Release v1.1.1
..

Release v1.1.1

Change-Id: I6065cb7570dfb70e8158d5741f7d3eb27f8d2767
---
0 files changed, 0 insertions(+), 0 deletions(-)


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

[Octopus merge; cannot be formatted as a diff.]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6065cb7570dfb70e8158d5741f7d3eb27f8d2767
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: dev
Gerrit-Owner: Phuedx 

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

[MediaWiki-commits] [Gerrit] Remove last thumbor repos - change (integration/config)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Remove last thumbor repos
..

Remove last thumbor repos

They have been moved to phabricator

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/98/265298/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d101847..470f01c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1754,14 +1754,6 @@
 template:
   - name: npm
 
-  - name: thumbor/multi-handler
-template:
-  - name: tox-jessie
-
-  - name: thumbor/video-loader
-template:
-  - name: tox-jessie
-
   - name: integration/docroot
 test:
  - php-composer-test

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

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

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

[MediaWiki-commits] [Gerrit] Fix autoload.php order - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Fix autoload.php order
..

Fix autoload.php order

Someone maybe added it by hand :) It will add some noise to
other changes, where autoload.php is genereted with
maintenance/generateLocalAutoload.php

Change-Id: If064fcc1fe87165df72eaf368117e62a51b24e95
---
M autoload.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/99/265299/1

diff --git a/autoload.php b/autoload.php
index 24a4d72..592f9d4 100644
--- a/autoload.php
+++ b/autoload.php
@@ -72,7 +72,6 @@
'ApiQueryAllMessages' => __DIR__ . 
'/includes/api/ApiQueryAllMessages.php',
'ApiQueryAllPages' => __DIR__ . '/includes/api/ApiQueryAllPages.php',
'ApiQueryAllRevisions' => __DIR__ . 
'/includes/api/ApiQueryAllRevisions.php',
-   'ApiQueryMyStashedFiles' => __DIR__ . 
'/includes/api/ApiQueryMyStashedFiles.php',
'ApiQueryAllUsers' => __DIR__ . '/includes/api/ApiQueryAllUsers.php',
'ApiQueryBacklinks' => __DIR__ . '/includes/api/ApiQueryBacklinks.php',
'ApiQueryBacklinksprop' => __DIR__ . 
'/includes/api/ApiQueryBacklinksprop.php',
@@ -101,6 +100,7 @@
'ApiQueryLangLinks' => __DIR__ . '/includes/api/ApiQueryLangLinks.php',
'ApiQueryLinks' => __DIR__ . '/includes/api/ApiQueryLinks.php',
'ApiQueryLogEvents' => __DIR__ . '/includes/api/ApiQueryLogEvents.php',
+   'ApiQueryMyStashedFiles' => __DIR__ . 
'/includes/api/ApiQueryMyStashedFiles.php',
'ApiQueryPagePropNames' => __DIR__ . 
'/includes/api/ApiQueryPagePropNames.php',
'ApiQueryPageProps' => __DIR__ . '/includes/api/ApiQueryPageProps.php',
'ApiQueryPagesWithProp' => __DIR__ . 
'/includes/api/ApiQueryPagesWithProp.php',

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

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

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

[MediaWiki-commits] [Gerrit] Structure test: Add autoload.php order check - change (mediawiki/core)

[Florianschmidtwelzow (Code Review)]

Florianschmidtwelzow has uploaded a new change for review.

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

Change subject: Structure test: Add autoload.php order check
..

Structure test: Add autoload.php order check

If a class is added manually to the autoload.php another run of
the maintenance script will probably add unnecessary noise to
another change. The added structure test checks, if the output of
the maintenance script equals to the contents of the commited
autoload.php.

Change-Id: I3a426b92892f4c00cab33a13f6a717751120367c
---
M tests/phpunit/structure/AutoLoaderTest.php
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/265303/1

diff --git a/tests/phpunit/structure/AutoLoaderTest.php 
b/tests/phpunit/structure/AutoLoaderTest.php
index 8674329..3c8f94c 100644
--- a/tests/phpunit/structure/AutoLoaderTest.php
+++ b/tests/phpunit/structure/AutoLoaderTest.php
@@ -143,4 +143,19 @@
$this->assertFalse( $uncerealized instanceof 
__PHP_Incomplete_Class,
"unserialize() can load classes case-insensitively." );
}
+
+   function testAutoloadOrder() {
+   $path = __DIR__ . '/../../../autoload.php';
+
+   $oldAutoload = file_get_contents( $path );
+   // run the autoload generation script
+   require_once __DIR__ . 
'/../../../maintenance/generateLocalAutoload.php' ;
+   $newAutoload = file_get_contents( $path );
+
+   // restore old content
+   file_put_contents( $path, $oldAutoload );
+
+   $this->assertEquals( $oldAutoload, $newAutoload, 'Autoloader 
was generated with the' .
+   'maintenance script.' );
+   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Only check LoggedOut timestamp on the user loaded from session - change (mediawiki/core)

[Anomie (Code Review)]

Anomie has uploaded a new change for review.

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

Change subject: Only check LoggedOut timestamp on the user loaded from session
..

Only check LoggedOut timestamp on the user loaded from session

This avoids infinite loops when trying to load other User objects, and
should still preserve the intent of the timestamp (that being as an
invalidation date for client-side caching).

Bug: T124143
Change-Id: Ie304cc3839fdc36a1cb2895e26f7700f4b725159
---
M includes/user/User.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/includes/user/User.php b/includes/user/User.php
index 6ec0ff0..3a20f1f 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1085,8 +1085,7 @@
$this->mOptionOverrides = null;
$this->mOptionsLoaded = false;
 
-   $request = $this->getRequest();
-   $loggedOut = $request ? 
$request->getSession()->getLoggedOutTimestamp() : 0;
+   $loggedOut = $this->mRequest ? 
$this->mRequest->getSession()->getLoggedOutTimestamp() : 0;
if ( $loggedOut !== 0 ) {
$this->mTouched = wfTimestamp( TS_MW, $loggedOut );
} else {

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

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

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

[MediaWiki-commits] [Gerrit] Add subscribe config file for Kafka's Burrow service Bug: T1... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Add subscribe config file for Kafka's Burrow service Bug: 
T123942
..


Add subscribe config file for Kafka's Burrow service
Bug: T123942

Change-Id: Idb6ee301aefe0050332fef8929f4696c77c8c4c2
Signed-off-by: elukey 
---
M modules/burrow/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/burrow/manifests/init.pp b/modules/burrow/manifests/init.pp
index 64d52be..e0f6a37 100644
--- a/modules/burrow/manifests/init.pp
+++ b/modules/burrow/manifests/init.pp
@@ -40,5 +40,6 @@
 service { 'burrow':
 ensure => ensure_service($ensure),
 enable => true,
+subscribe => File['/etc/burrow/burrow.cfg'],
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb6ee301aefe0050332fef8929f4696c77c8c4c2
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
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] Fixed vega version parsing - change (mediawiki...Graph)

[jenkins-bot (Code Review)]

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

Change subject: Fixed vega version parsing
..


Fixed vega version parsing

Now, by default the vega spec becomes
whatever the default version is

Change-Id: I952070cf05ab787c9324f3459cfebdbd0258c455
---
M includes/Graph.body.php
1 file changed, 4 insertions(+), 14 deletions(-)

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



diff --git a/includes/Graph.body.php b/includes/Graph.body.php
index d8bef00..e80be12 100644
--- a/includes/Graph.body.php
+++ b/includes/Graph.body.php
@@ -161,22 +161,12 @@
 
// Figure out which vega version to use
global $wgGraphDefaultVegaVer;
-   $useVega2 = false;
-   if ( property_exists( $data, 'version' ) ) {
-   $ver = is_numeric( $data->version ) ? $data->version : 
0;
+   if ( property_exists( $data, 'version' ) && is_numeric( 
$data->version ) ) {
+   $data->version = $data->version < 2 ? 1 : 2;
} else {
-   $ver = false;
+   $data->version = $wgGraphDefaultVegaVer;
}
-   if ( $wgGraphDefaultVegaVer > 1 || $isInteractive ) {
-   if ( $ver === false ) {
-   // If version is not set, but we need to force 
vega2, insert it automatically
-   $data->version = 2;
-   }
-   $useVega2 = true;
-   } elseif ( $ver !== false ) {
-   $useVega2 = $ver > 1;
-   }
-   if ( $useVega2 ) {
+   if ( $data->version === 2 ) {
$parserOutput->setExtensionData( 'graph_vega2', true );
} else {
$parserOutput->setExtensionData( 
'graph_specs_obsolete', true );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I952070cf05ab787c9324f3459cfebdbd0258c455
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add comment to Template and Module - change (mediawiki...ArticlePlaceholder)

[Lucie Kaffee (Code Review)]

Lucie Kaffee has uploaded a new change for review.

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

Change subject: Add comment to Template and Module
..

Add comment to Template and Module

Bug: T117684
Change-Id: Ic10098dd9a24cdf1c307cc6abb6d2bd7dfca4719
---
M includes/Template/aboutTopic-template-module.xml
1 file changed, 30 insertions(+), 44 deletions(-)


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

diff --git a/includes/Template/aboutTopic-template-module.xml 
b/includes/Template/aboutTopic-template-module.xml
index afc2477..c0acc44 100644
--- a/includes/Template/aboutTopic-template-module.xml
+++ b/includes/Template/aboutTopic-template-module.xml
@@ -1,60 +1,44 @@
 http://www.mediawiki.org/xml/export-0.10/; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.10/ 
http://www.mediawiki.org/xml/export-0.10.xsd; version="0.10" xml:lang="en">
-  
-hey-hey-wiki
-my_wiki
-http://localhost/core/index.php/Main_Page
-MediaWiki 1.27alpha
-first-letter
-
-  Media
-  Special
-  
-  Talk
-  User
-  User talk
-  Hey-hey-wiki
-  Hey-hey-wiki talk
-  File
-  File talk
-  MediaWiki
-  MediaWiki talk
-  Template
-  Template talk
-  Help
-  Help talk
-  Category
-  Category talk
-  Item
-  Item talk
-  Property
-  Property talk
-  Module
-  Module talk
-
-  
   
 Module:AboutTopic
 828
 31
 
-  301
-  2015-10-30T23:00:23Z
+  338
+  301
+  2016-01-20T14:50:39Z
   
 127.0.0.1
   
-  Created page with local p = {}  -- get the label of the 
local entity p.showData = function(frame)  entityRenderer = require( 
'EntityRenderer' )  return entityRenderer.render( frame ) end  return 
p
   Scribunto
   text/plain
-  local p = {}
+  local p = {}
 
 -- get the label of the local entity
 p.showData = function(frame)
- entityRenderer = require( 'EntityRenderer' )
+ entityRenderer = require( 'ArticlePlaceholderEntityRenderer' )
  return entityRenderer.render( frame )
 end
 
 return p
-  raik6wqlcskycfu1y3hntowu9vyuu90
+  31mbtdk2s802qrkpxjj51zrp3oe8rsd
+
+  
+  
+Module:AboutTopic/doc
+828
+38
+
+  346
+  345
+  2016-01-20T15:02:01Z
+  
+127.0.0.1
+  
+  wikitext
+  text/x-wiki
+  This Module is part of the 
[https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder ArticlePlaceholder 
extension]. If you want to adjust it, please consider making your changes 
upstream.
+  7r1o4e4er1o8eb3pxvaloqapgpucfbw
 
   
   
@@ -62,16 +46,18 @@
 10
 30
 
-  300
-  2015-10-30T23:00:03Z
+  343
+  342
+  2016-01-20T15:00:09Z
   
 127.0.0.1
   
-  Created page with 
{{#invoke:AboutTopic|showData|{{{1}
   wikitext
   text/x-wiki
-  {{#invoke:AboutTopic|showData|{{{1}
-  hcui95310erytbs0eelk13obdz9xoga
+  This template is part of the 
[https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder ArticlePlaceholder 
extension]. If you want to adjust it, please consider making your changes 
upstream.
+
+{{#invoke:AboutTopic|showData|{{{1}
+  7kr01qp63fbrh55x1eepjg4xpce73hf
 
   
 
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic10098dd9a24cdf1c307cc6abb6d2bd7dfca4719
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Lucie Kaffee 

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

[MediaWiki-commits] [Gerrit] servermon: Increase HOST_TIMEOUT to 45 minutes - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: servermon: Increase HOST_TIMEOUT to 45 minutes
..

servermon: Increase HOST_TIMEOUT to 45 minutes

These days we got 30 min puppet run intervals so that HOST_TIMEOUT is
not enough. Update it to 45 minutes

Change-Id: I7a58280866debf14f918568b3073a411eb161514
---
M modules/servermon/templates/settings.py.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/servermon/templates/settings.py.erb 
b/modules/servermon/templates/settings.py.erb
index 10762fe..93487f6 100644
--- a/modules/servermon/templates/settings.py.erb
+++ b/modules/servermon/templates/settings.py.erb
@@ -144,7 +144,7 @@
 DATE_FORMAT = "d/m/Y H:i"
 DATETIME_FORMAT = "d/m/Y H:i"
 
-HOST_TIMEOUT = 1800
+HOST_TIMEOUT = 2700
 
 TICKETING_SYSTEM = 'dummy'  # dummy, comments, jira are possible values
 COMMENTS_TICKETING_URL = 'http://ticketing.example.com/'

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

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

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

[MediaWiki-commits] [Gerrit] Set default graph vega version back to 1 - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Set default graph vega version back to 1
..


Set default graph vega version back to 1

For now, keep it as 1 until graph handles default better

Change-Id: I578be3047268123e1c1c990a581c01041b708815
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 563494b..d12bebc 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13548,7 +13548,7 @@
 ),
 
 'wmgGraphDefaultVegaVer' => array(
-   'default' => 2,
+   'default' => 1,
 ),
 
 // All graph data requests should be trusted on these wikis

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I578be3047268123e1c1c990a581c01041b708815
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik 
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] Properly escape \n and \r in IRCColourfulRCFeedFormatter - change (mediawiki/core)

[Skizzerz (Code Review)]

Skizzerz has uploaded a new change for review.

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

Change subject: Properly escape \n and \r in IRCColourfulRCFeedFormatter
..

Properly escape \n and \r in IRCColourfulRCFeedFormatter

Right now it is possible to emit a raw \n or \r to the UDP feed by
encoding it as an HTML entity, e.g.  This could be used for
arbitrary IRC command execution in bots which do not subsequently
perform their own escaping. This commit changes it so that entities are
decoded first before \n and \r are stripped.

Change-Id: I3f7005abded3fbafb586754d763a00a4018f0954
---
M includes/rcfeed/IRCColourfulRCFeedFormatter.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/265291/1

diff --git a/includes/rcfeed/IRCColourfulRCFeedFormatter.php 
b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
index 30be343..0efcebf 100644
--- a/includes/rcfeed/IRCColourfulRCFeedFormatter.php
+++ b/includes/rcfeed/IRCColourfulRCFeedFormatter.php
@@ -123,10 +123,10 @@
 * @return string
 */
public static function cleanupForIRC( $text ) {
-   return Sanitizer::decodeCharReferences( str_replace(
+   return str_replace(
array( "\n", "\r" ),
array( " ", "" ),
-   $text
-   ) );
+   Sanitizer::decodeCharReferences( $text )
+   );
}
 }

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

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

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

[MediaWiki-commits] [Gerrit] servermon: Increase HOST_TIMEOUT to 45 minutes - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: servermon: Increase HOST_TIMEOUT to 45 minutes
..


servermon: Increase HOST_TIMEOUT to 45 minutes

These days we got 30 min puppet run intervals so that HOST_TIMEOUT is
not enough. Update it to 45 minutes

Change-Id: I7a58280866debf14f918568b3073a411eb161514
---
M modules/servermon/templates/settings.py.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/servermon/templates/settings.py.erb 
b/modules/servermon/templates/settings.py.erb
index 10762fe..93487f6 100644
--- a/modules/servermon/templates/settings.py.erb
+++ b/modules/servermon/templates/settings.py.erb
@@ -144,7 +144,7 @@
 DATE_FORMAT = "d/m/Y H:i"
 DATETIME_FORMAT = "d/m/Y H:i"
 
-HOST_TIMEOUT = 1800
+HOST_TIMEOUT = 2700
 
 TICKETING_SYSTEM = 'dummy'  # dummy, comments, jira are possible values
 COMMENTS_TICKETING_URL = 'http://ticketing.example.com/'

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

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

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

[MediaWiki-commits] [Gerrit] Disable active gadget user stats on enwiki since it takes to... - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Disable active gadget user stats on enwiki since it takes too 
long
..


Disable active gadget user stats on enwiki since it takes too long

Bug: T121949
Change-Id: I443933f39ad9acacf4a0d77a1ed8a2b51a8824a2
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3d1ba92..e8aa011 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10867,7 +10867,7 @@
 ),
 'wmgSpecialGadgetUsageActiveUsers' => array(
'default' => true,
-   'testwiki' => false,
+   'enwiki' => false, // T121949
 ),
 
 # @} end of EXTENSIONS

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I443933f39ad9acacf4a0d77a1ed8a2b51a8824a2
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't show the retry button for 404 errors - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Don't show the retry button for 404 errors
..


Don't show the retry button for 404 errors

Replace the retry button with a "go back" button for HTTP errors that
are unrecoverable by retrying. The ticket only describes removing the
retry button but the dead end experience of an error with no obvious
way out feels overwhelming.

Bug: T120280
Bug: T120393
Change-Id: I44145e1a521e1d5f4de9793b1b22f8903ac9fdd8
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/views/WikiErrorView.java
M app/src/main/res/layout/custom_error_view.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
5 files changed, 36 insertions(+), 15 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java 
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 28941e5..e235993 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -325,6 +325,12 @@
 loadPage(model.getTitleOriginal(), model.getCurEntry(), 
PageLoadStrategy.Cache.FALLBACK, false);
 }
 });
+errorView.setBackClickListener(new View.OnClickListener() {
+@Override
+public void onClick(View v) {
+onBackPressed();
+}
+});
 
 editHandler = new EditHandler(this, bridge);
 pageLoadStrategy.setEditHandler(editHandler);
diff --git a/app/src/main/java/org/wikipedia/views/WikiErrorView.java 
b/app/src/main/java/org/wikipedia/views/WikiErrorView.java
index c2d8eca..fa59c2b 100644
--- a/app/src/main/java/org/wikipedia/views/WikiErrorView.java
+++ b/app/src/main/java/org/wikipedia/views/WikiErrorView.java
@@ -4,17 +4,22 @@
 import org.wikipedia.util.ThrowableUtil;
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-public class WikiErrorView extends FrameLayout {
+import butterknife.Bind;
+import butterknife.ButterKnife;
 
-private TextView errorTextView;
-private Button retryButton;
-private TextView messageTextView;
+public class WikiErrorView extends FrameLayout {
+@Bind(R.id.error_text) TextView errorTextView;
+@Bind(R.id.retry_button) Button button;
+@Bind(R.id.server_message_text) TextView messageTextView;
+
+@Nullable private OnClickListener retryListener;
+@Nullable private OnClickListener backListener;
 
 public WikiErrorView(Context context) {
 this(context, null);
@@ -27,23 +32,32 @@
 public WikiErrorView(Context context, AttributeSet attrs, int defStyle) {
 super(context, attrs, defStyle);
 inflate(context, R.layout.custom_error_view, this);
-
-errorTextView = (TextView) findViewById(R.id.error_text);
-retryButton = (Button) findViewById(R.id.retry_button);
-messageTextView = (TextView) findViewById(R.id.server_message_text);
+ButterKnife.bind(this);
 }
 
-public void setRetryButtonVisible(boolean visible) {
-retryButton.setVisibility(visible ? View.VISIBLE : View.GONE);
+public void setRetryClickListener(@Nullable OnClickListener listener) {
+retryListener = listener;
 }
 
-public void setRetryClickListener(OnClickListener listener) {
-retryButton.setOnClickListener(listener);
+public void setBackClickListener(@Nullable OnClickListener listener) {
+backListener = listener;
 }
 
 public void setError(@NonNull Throwable e) {
 ThrowableUtil.AppError error = ThrowableUtil.getAppError(getContext(), 
e);
 errorTextView.setText(error.getError());
 messageTextView.setText(error.getDetail());
+updateButton(isErrorRetryable(error));
+}
+
+private void updateButton(boolean retryable) {
+OnClickListener listener = retryable ? retryListener : backListener;
+button.setVisibility(listener == null ? GONE : VISIBLE);
+button.setText(retryable ? R.string.page_error_retry : 
R.string.page_error_back_to_main);
+button.setOnClickListener(listener);
+}
+
+private boolean isErrorRetryable(@NonNull ThrowableUtil.AppError error) {
+return !error.getDetail().contains("404");
 }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_error_view.xml 
b/app/src/main/res/layout/custom_error_view.xml
index ffd69a2..0062f04 100644
--- a/app/src/main/res/layout/custom_error_view.xml
+++ b/app/src/main/res/layout/custom_error_view.xml
@@ -28,8 

[MediaWiki-commits] [Gerrit] bump version to 0.0.5 - change (operations...mwbzutils)

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

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

Change subject: bump version to 0.0.5
..

bump version to 0.0.5

Change-Id: Idf5a17c1edd2a439bcf424d63e9eca55d5829ad8
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/mwbzutils 
refs/changes/84/265284/1

diff --git a/debian/changelog b/debian/changelog
index ffb248c..66fff4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mwbzutils (0.0.5~wmf1+trusty) trusty-wikimedia; urgency=medium
+
+  * Fix for corrupt data at end of files produced by recompressxml
+
+ -- Ariel T. Glenn   Wed, 20 Jan 2016 12:56:34 +0200
+
 mwbzutils (0.0.4-0~wmf1+trusty) trusty-wikimedia; urgency=medium
 
   * Initial Trusty version.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf5a17c1edd2a439bcf424d63e9eca55d5829ad8
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/mwbzutils
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

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