[MediaWiki-commits] [Gerrit] toolschecker: Added an ldap test. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: toolschecker: Added an ldap test.
..


toolschecker: Added an ldap test.

Bug: T107454
Change-Id: Ie2b29bd2d4e29d3a510e31623b78621b2cf60347
---
M modules/toollabs/files/toolschecker.py
1 file changed, 15 insertions(+), 0 deletions(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 6633b66..5dd6436 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -1,4 +1,6 @@
 import flask
+import ldap
+import ldapsupportlib
 import os
 import redis
 import requests
@@ -57,6 +59,19 @@
 return False
 
 
+@check('/ldap')
+def ldap_query_check():
+# Run a simple known query and verify that ldap returns something
+ldapConn = ldapsupportlib.LDAPSupportLib().connect()
+
+query = '(cn=testlabss)'
+base = 'ou=projects,dc=wikimedia,dc=org'
+result = ldapConn.search_s(base, ldap.SCOPE_SUBTREE, query)
+if len(result) > 0:
+return True
+return False
+
+
 @check('/nfs/home')
 def nfs_home_check():
 content = str(uuid.uuid4())

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2b29bd2d4e29d3a510e31623b78621b2cf60347
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Turn puppet autosign back on beta/integration - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

Change subject: Turn puppet autosign back on beta/integration
..

Turn puppet autosign back on beta/integration

The crontab brute forcing puppet signature is gone. It is now using the
puppet master autosign feature.  Default to false, turn it to true with
hiera key 'puppetmaster::autosigner' for both beta cluster and
integration projects.

Bug: T112537
Change-Id: I0fafdc5df2ff3fe85b7ae85aa2e08df6a79262cd
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/labs/integration/common.yaml
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/238221/1

diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index b8d3fb9..425f8c4 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -8,6 +8,7 @@
 "ocg::redis_password": '%{::passwords::redis::main_password}'
 has_lvs: false
 "puppetmaster::scripts::keep_reports_minutes": 360
+puppetmaster::autosigner: true
 #service::configuration::http_proxy:
 service::configuration::statsd_host: labmon1001.eqiad.wmnet
 service::configuration::logstash_host: 
deployment-logstash2.deployment-prep.eqiad.wmflabs
diff --git a/hieradata/labs/integration/common.yaml 
b/hieradata/labs/integration/common.yaml
index 2d68cfe..f34d999 100644
--- a/hieradata/labs/integration/common.yaml
+++ b/hieradata/labs/integration/common.yaml
@@ -8,3 +8,4 @@
 contint::zuul_merger_hosts:
 - '::1'  # uses quotes for hiera
 - 127.0.0.1
+puppetmaster::autosigner: true

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

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

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

[MediaWiki-commits] [Gerrit] Add proxy script for testing header presence - change (wikimedia...automated-scanning)

[Dpatrick (Code Review)]

Dpatrick has uploaded a new change for review.

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

Change subject: Add proxy script for testing header presence
..

Add proxy script for testing header presence

Change-Id: Ia575250202a999854189dc45add913b661dab502
---
A bin/verify_x-wmf_set.pl
1 file changed, 20 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/security/automated-scanning 
refs/changes/20/238220/1

diff --git a/bin/verify_x-wmf_set.pl b/bin/verify_x-wmf_set.pl
new file mode 100755
index 000..371a010
--- /dev/null
+++ b/bin/verify_x-wmf_set.pl
@@ -0,0 +1,20 @@
+#!/usr/bin/env perl
+
+use perl5i::2;
+use HTTP::Proxy;
+use HTTP::Proxy::HeaderFilter::simple;
+
+func main {
+   my $proxy = HTTP::Proxy->new( port => 8091 );
+
+   $proxy->push_filter(
+   mime=> undef,
+   request => HTTP::Proxy::HeaderFilter::simple->new(
+   sub { say 'Header found.' if 
$_[1]->header('X-Wikimedia-Security-Audit'); },
+   ),
+   );
+
+   $proxy->start();
+}
+
+main();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia575250202a999854189dc45add913b661dab502
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/security/automated-scanning
Gerrit-Branch: master
Gerrit-Owner: Dpatrick 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)

[Cscott (Code Review)]

Cscott has submitted this change and it was merged.

Change subject: Merge branch 'master' into wmf-deploy
..


Merge branch 'master' into wmf-deploy

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9d220efbb2e4c561223f9bf7e2344da35427b2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 

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

[MediaWiki-commits] [Gerrit] Updating to latest masters - change (mediawiki...ocg-collection)

[Cscott (Code Review)]

Cscott has submitted this change and it was merged.

Change subject: Updating to latest masters
..


Updating to latest masters

Deployed new bundler (8d8cd3ec79367fa086a203768971e5aaa26811a8):
* Add User-Agent header to API requests.
* T110782: Add Parsoid v3 API support.
* Remove the (broken) --api option alias.

Deployed new texter (de5a441228dc6e6e8eafd68f198ea6fa33de6049):
* Support "standalone mode" for single-article conversion.

Change-Id: I39673945c3ce6e69230e81aec0275a1b0d0ea834
---
M mw-ocg-bundler
M mw-ocg-texter
2 files changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/mw-ocg-bundler b/mw-ocg-bundler
index fe21e6f..8d8cd3e 16
--- a/mw-ocg-bundler
+++ b/mw-ocg-bundler
-Subproject commit fe21e6f1577f571ea83226ba04dbe0285e50e710
+Subproject commit 8d8cd3ec79367fa086a203768971e5aaa26811a8
diff --git a/mw-ocg-texter b/mw-ocg-texter
index bb89780..de5a441 16
--- a/mw-ocg-texter
+++ b/mw-ocg-texter
-Subproject commit bb897807e5ffa62788f8036bc58d31bf78b079f5
+Subproject commit de5a441228dc6e6e8eafd68f198ea6fa33de6049

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39673945c3ce6e69230e81aec0275a1b0d0ea834
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: Cscott 

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

[MediaWiki-commits] [Gerrit] Don't fail horribly when invalid categories are passed - change (mediawiki...UploadWizard)

[Code Review]

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

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

Change subject: Don't fail horribly when invalid categories are passed
..

Don't fail horribly when invalid categories are passed

If a category name which is not a valid page title is given in the
'categories' URL parameter, it will now be silently ignored instead of
breaking the whole wizard.

Bug: T112417
Change-Id: I6354297bcd6f1ef4c7a530a33346c8d7c68f6555
---
M resources/jquery/jquery.mwCoolCats.js
1 file changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/resources/jquery/jquery.mwCoolCats.js 
b/resources/jquery/jquery.mwCoolCats.js
index 82177b3..11f3b9e 100644
--- a/resources/jquery/jquery.mwCoolCats.js
+++ b/resources/jquery/jquery.mwCoolCats.js
@@ -67,12 +67,15 @@
 
/**
 * Add a new category to the page
-* @param {mw.Title} title of category -- should already be in category 
namespace
+* @param {mw.Title|null} title of category -- should already be in 
category namespace
 * @param {boolean} whether this category is visible to the user
 */
function insertCat( title, isHidden ) {
var $li, $anchor;
 
+   if ( !title ) {
+   return;
+   }
if ( containsCat( title ) ) {
return;
}
@@ -276,8 +279,8 @@
this.getWikiText = getWikiText;
 
// initialize with some categories, if so configured
-   $.each( settings.cats, function ( i, cat ) { insertCat( new 
mw.Title( cat, catNsId ) ); } );
-   $.each( settings.hiddenCats, function ( i, cat ) { insertCat( 
new mw.Title( cat, catNsId ), true ); } );
+   $.each( settings.cats, function ( i, cat ) { insertCat( 
mw.Title.newFromText( cat, catNsId ) ); } );
+   $.each( settings.hiddenCats, function ( i, cat ) { insertCat( 
mw.Title.newFromText( cat, catNsId ), true ); } );
 
processInput();
 

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

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

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

[MediaWiki-commits] [Gerrit] Move the generic qunit-composer job to the qunit template - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Move the generic qunit-composer job to the qunit template
..


Move the generic qunit-composer job to the qunit template

It accidentally was in the generic phpunit template.

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3656e4b..2593c95 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1796,7 +1796,6 @@
   - mwext-testextension-hhvm
   - mwext-testextension-zend-composer
   - mwext-testextension-hhvm-composer
-  - mwext-qunit-composer
   - npm
   - php-composer-test
 
@@ -1825,17 +1824,19 @@
   # Triggers qunit jobs
   - name: extension-qunit
 test:
- - 'mwext-{name}-qunit'
+  - 'mwext-{name}-qunit'
 gate-and-submit:
- - 'mwext-{name}-qunit'
+  - 'mwext-{name}-qunit'
 
   # Triggers the generic mwext-qunit job
   # which doesn't process dependencies
   - name: extension-qunit-generic
 test:
- - 'mwext-qunit'
+  - mwext-qunit
 gate-and-submit:
- - 'mwext-qunit'
+  - mwext-qunit
+experimental:
+  - mwext-qunit-composer
 
   # Template for MediaWiki extensions.
   # Triggers phpcs jobs

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

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

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into wmf-deploy - change (mediawiki...ocg-collection)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Merge branch 'master' into wmf-deploy
..

Merge branch 'master' into wmf-deploy

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/18/238218/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9d220efbb2e4c561223f9bf7e2344da35427b2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] toolschecker: rename a test to actually reflect what it does. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: toolschecker: rename a test to actually reflect what it does.
..


toolschecker: rename a test to actually reflect what it does.

Not sure how 'ldap' got in the name of this test that has nothing
to do with ldap.

Change-Id: I780e5d7621ad3ae45048b9a67822d93589d4179c
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 5f313ac..6633b66 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -28,7 +28,7 @@
 
 
 @check('/labs-puppetmaster/eqiad')
-def ldap_catalog_check():
+def puppet_catalog_check():
 # Verify that we can get this host's catalog from the puppet server
 puppetmaster = "labs-puppetmaster-eqiad.wikimedia.org"
 fqdn = socket.getfqdn()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I780e5d7621ad3ae45048b9a67822d93589d4179c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updating to latest masters - change (mediawiki...ocg-collection)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Updating to latest masters
..

Updating to latest masters

Deployed new bundler (8d8cd3ec79367fa086a203768971e5aaa26811a8):
* Add User-Agent header to API requests.
* T110782: Add Parsoid v3 API support.
* Remove the (broken) --api option alias.

Deployed new texter (de5a441228dc6e6e8eafd68f198ea6fa33de6049):
* Support "standalone mode" for single-article conversion.

Change-Id: I39673945c3ce6e69230e81aec0275a1b0d0ea834
---
M mw-ocg-bundler
M mw-ocg-texter
2 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection 
refs/changes/17/238217/1

diff --git a/mw-ocg-bundler b/mw-ocg-bundler
index fe21e6f..8d8cd3e 16
--- a/mw-ocg-bundler
+++ b/mw-ocg-bundler
-Subproject commit fe21e6f1577f571ea83226ba04dbe0285e50e710
+Subproject commit 8d8cd3ec79367fa086a203768971e5aaa26811a8
diff --git a/mw-ocg-texter b/mw-ocg-texter
index bb89780..de5a441 16
--- a/mw-ocg-texter
+++ b/mw-ocg-texter
-Subproject commit bb897807e5ffa62788f8036bc58d31bf78b079f5
+Subproject commit de5a441228dc6e6e8eafd68f198ea6fa33de6049

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39673945c3ce6e69230e81aec0275a1b0d0ea834
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Cscott 

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

[MediaWiki-commits] [Gerrit] Added an ldap test. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: Added an ldap test.
..

Added an ldap test.

Bug: T107454
Change-Id: Ie2b29bd2d4e29d3a510e31623b78621b2cf60347
---
M modules/toollabs/files/toolschecker.py
1 file changed, 12 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/238216/1

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 6633b66..2ea7098 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -1,4 +1,6 @@
 import flask
+import ldap
+import ldapsupportlib
 import os
 import redis
 import requests
@@ -45,15 +47,16 @@
 return False
 
 
-@check('/labs-dns/private')
-def dns_private_check():
-# Verify that we can resolve our own address
-fqdn = socket.getfqdn()
-# This will throw an exception if it can't resolve:
-resolved = socket.gethostbyname_ex(fqdn)
-if len(resolved) == 3:
-if len(resolved[2]) > 0:
-return True
+@check('/ldap')
+def ldap_query_check():
+# Run a simple known query and verify that ldap returns something
+ldapConn = ldapsupportlib.LDAPSupportLib().connect()
+
+query = '(cn=testlabss)'
+base = 'ou=projects,dc=wikimedia,dc=org'
+result = ldapConn.search_s(base, ldap.SCOPE_SUBTREE, query)
+if len(result) >= 0:
+return True
 return False
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2b29bd2d4e29d3a510e31623b78621b2cf60347
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] toolschecker: rename a test to actually reflect what it does. - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

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

Change subject: toolschecker: rename a test to actually reflect what it does.
..

toolschecker: rename a test to actually reflect what it does.

Not sure how 'ldap' got in the name of this test that has nothing
to do with ldap.

Change-Id: I780e5d7621ad3ae45048b9a67822d93589d4179c
---
M modules/toollabs/files/toolschecker.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/toollabs/files/toolschecker.py 
b/modules/toollabs/files/toolschecker.py
index 5f313ac..6633b66 100644
--- a/modules/toollabs/files/toolschecker.py
+++ b/modules/toollabs/files/toolschecker.py
@@ -28,7 +28,7 @@
 
 
 @check('/labs-puppetmaster/eqiad')
-def ldap_catalog_check():
+def puppet_catalog_check():
 # Verify that we can get this host's catalog from the puppet server
 puppetmaster = "labs-puppetmaster-eqiad.wikimedia.org"
 fqdn = socket.getfqdn()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I780e5d7621ad3ae45048b9a67822d93589d4179c
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] Move the generic qunit-composer job to the qunit template - change (integration/config)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Move the generic qunit-composer job to the qunit template
..

Move the generic qunit-composer job to the qunit template

It accidentally was in the generic phpunit template.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/14/238214/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3656e4b..2593c95 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1796,7 +1796,6 @@
   - mwext-testextension-hhvm
   - mwext-testextension-zend-composer
   - mwext-testextension-hhvm-composer
-  - mwext-qunit-composer
   - npm
   - php-composer-test
 
@@ -1825,17 +1824,19 @@
   # Triggers qunit jobs
   - name: extension-qunit
 test:
- - 'mwext-{name}-qunit'
+  - 'mwext-{name}-qunit'
 gate-and-submit:
- - 'mwext-{name}-qunit'
+  - 'mwext-{name}-qunit'
 
   # Triggers the generic mwext-qunit job
   # which doesn't process dependencies
   - name: extension-qunit-generic
 test:
- - 'mwext-qunit'
+  - mwext-qunit
 gate-and-submit:
- - 'mwext-qunit'
+  - mwext-qunit
+experimental:
+  - mwext-qunit-composer
 
   # Template for MediaWiki extensions.
   # Triggers phpcs jobs

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

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

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

[MediaWiki-commits] [Gerrit] Allow full path to hosts file - change (mediawiki...scap)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Allow full path to hosts file
..

Allow full path to hosts file

Allow the use of a full path to hosts file to be specified. Makes
troubleshooting and development easier.

Rename the `utils.read_dsh_hosts_file` to be more-accurate
`utils.read_hosts_file`

Change-Id: I8b9c54caf8526c01ac014f977c734ca408001bfc
---
M scap/main.py
M scap/ssh.py
M scap/utils.py
3 files changed, 16 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/13/238213/1

diff --git a/scap/main.py b/scap/main.py
index c12d64c..6bec135 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -80,7 +80,7 @@
 def _get_proxy_list(self):
 """Get list of sync proxy hostnames that should be updated before the
 rest of the cluster."""
-return utils.read_dsh_hosts_file(self.config['dsh_proxies'])
+return utils.read_hosts_file(self.config['dsh_proxies'])
 
 def _proxy_sync_command(self):
 """Synchronization command to run on the proxy hosts."""
@@ -91,7 +91,7 @@
 
 def _get_target_list(self):
 """Get list of hostnames that should be updated from the proxies."""
-return utils.read_dsh_hosts_file(self.config['dsh_targets'])
+return utils.read_hosts_file(self.config['dsh_targets'])
 
 def _apache_sync_command(self, proxies):
 """Synchronization command to run on the apache hosts.
@@ -469,7 +469,7 @@
 err_msg = 'l10n cache missing for %s' % version
 utils.check_file_exists(cache_file, err_msg)
 
-mw_install_hosts = utils.read_dsh_hosts_file(
+mw_install_hosts = utils.read_hosts_file(
 self.config['dsh_targets'])
 tasks.sync_wikiversions(mw_install_hosts, self.config)
 
@@ -557,7 +557,7 @@
 exit_code = 0
 self.announce('Restarting HHVM: %s', self.arguments.message)
 
-target_hosts = utils.read_dsh_hosts_file(self.config['dsh_targets'])
+target_hosts = utils.read_hosts_file(self.config['dsh_targets'])
 succeeded, failed = tasks.restart_hhvm(
 target_hosts, self.config,
 # Use a batch size of 5% of the total target list
@@ -637,7 +637,7 @@
 
 targets = utils.get_target_hosts(
 self.arguments.limit_hosts,
-utils.read_dsh_hosts_file(self.config['dsh_targets'])
+utils.read_hosts_file(self.config['dsh_targets'])
 )
 
 logger.info(
diff --git a/scap/ssh.py b/scap/ssh.py
index e9f4656..e21d688 100644
--- a/scap/ssh.py
+++ b/scap/ssh.py
@@ -44,7 +44,7 @@
 
 def role(self, role):
 """Set hosts to run command on by network role."""
-return self.hosts(utils.read_dsh_hosts_file(role))
+return self.hosts(utils.read_hosts_file(role))
 
 def shuffle(self):
 """Randomize order of target hosts."""
diff --git a/scap/utils.py b/scap/utils.py
index 1e659be..3277a22 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -307,13 +307,21 @@
 return crc.hexdigest()
 
 
-def read_dsh_hosts_file(path):
+def read_hosts_file(path):
 """Reads hosts from a file into a list.
+
+if passed an absolute file path, this function treats that path as the
+host list, otherwise, uses /etc/dsh/group/[path]
 
 Blank lines and comments are ignored.
 """
+final_path = os.path.join('/etc/dsh/group', path)
+
+if os.path.isabs(path):
+final_path = path
+
 try:
-with open(os.path.join('/etc/dsh/group', path)) as hosts_file:
+with open(final_path) as hosts_file:
 return re.findall(r'^[\w\.\-]+', hosts_file.read(), re.MULTILINE)
 except IOError as e:
 raise IOError(e.errno, e.strerror, path)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b9c54caf8526c01ac014f977c734ca408001bfc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 

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

[MediaWiki-commits] [Gerrit] Only load nojs Special:Notifications styles on the special page - change (mediawiki...Echo)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Only load nojs Special:Notifications styles on the special page
..

Only load nojs Special:Notifications styles on the special page

Bug: T112407
Change-Id: I4112c8b819127dea7c5e2117feedfeecf583ef1f
(cherry picked from commit 3940f523baf7b339e258ef563945e56e6c6861b8)
---
M Resources.php
M includes/special/SpecialNotifications.php
2 files changed, 8 insertions(+), 2 deletions(-)


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

diff --git a/Resources.php b/Resources.php
index 2259613..ed261ef 100644
--- a/Resources.php
+++ b/Resources.php
@@ -119,7 +119,6 @@
'styles' => array(
'nojs/mw.echo.badge.less',
'nojs/mw.echo.alert.less',
-   'nojs/mw.echo.special.less',
'nojs/mw.echo.notifications.less'
),
'skinStyles' => array(
@@ -132,6 +131,13 @@
),
'targets' => array( 'desktop', 'mobile' ),
),
+   'ext.echo.nojs.special' => $echoResourceTemplate + array(
+   'position' => 'top',
+   'styles' => array(
+   'nojs/mw.echo.special.less',
+   ),
+   'targets' => array( 'desktop', 'mobile' ),
+   ),
'ext.echo.special' => $echoResourceTemplate + array(
'scripts' => array(
'special/ext.echo.special.js',
diff --git a/includes/special/SpecialNotifications.php 
b/includes/special/SpecialNotifications.php
index 50acbd5..7529167 100644
--- a/includes/special/SpecialNotifications.php
+++ b/includes/special/SpecialNotifications.php
@@ -134,7 +134,7 @@
)
);
// For no-js support
-   $out->addModuleStyles( "ext.echo.nojs" );
+   $out->addModuleStyles( array( 'ext.echo.nojs', 
'ext.echo.nojs.special' ) );
// Mark items as read
if ( $unread ) {
MWEchoNotifUser::newFromUser( $user )->markRead( 
$unread );

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

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

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

[MediaWiki-commits] [Gerrit] BookletLayout: Remove unnecessary JSHint override - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: BookletLayout: Remove unnecessary JSHint override
..


BookletLayout: Remove unnecessary JSHint override

Change-Id: I454a382da4d89b836f76a91fdc720519281590a5
---
M src/layouts/BookletLayout.js
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 7ab43cb..f82e297 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -228,7 +228,6 @@
// and check if they are focusable
items[ i ].$element
.find( 'input, select, textarea, button, object' )
-   /* jshint loopfunc:true */
.each( checkAndFocus );
}
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I454a382da4d89b836f76a91fdc720519281590a5
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

Change subject: Fix toggling initialization code
..


Fix toggling initialization code

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

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1166f725927d0564101c72bfad7c493e4d8e79c7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx 
Gerrit-Reviewer: Jdlrobson 
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 WikiReference::getHostname. - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Remove WikiReference::getHostname.
..


Remove WikiReference::getHostname.

getHostname() was broken and seems to be unused.

Change-Id: I8d44a6907ad395ea12deebf404831c06e07ed401
---
M includes/WikiMap.php
M tests/phpunit/includes/WikiReferenceTest.php
2 files changed, 5 insertions(+), 36 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  Jonas Kress (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index a01f1b6..027ff72 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -149,33 +149,18 @@
}
 
/**
-* @return string
-* @throws MWException
-*/
-   public function getHostname() {
-   $prefixes = array( 'http://', 'https://' );
-   foreach ( $prefixes as $prefix ) {
-   if ( substr( $this->mCanonicalServer, 0, strlen( 
$prefix ) ) ) {
-   return substr( $this->mCanonicalServer, strlen( 
$prefix ) );
-   }
-   }
-   throw new MWException( "Invalid hostname for wiki 
{$this->mMinor}.{$this->mMajor}" );
-   }
-
-   /**
 * Get the URL in a way to be displayed to the user
 * More or less Wikimedia specific
 *
 * @return string
 */
public function getDisplayName() {
-   $url = $this->getUrl( '' );
-   $parsed = wfParseUrl( $url );
+   $parsed = wfParseUrl( $this->mCanonicalServer );
if ( $parsed ) {
return $parsed['host'];
} else {
-   // Invalid URL. There's no sane thing to do here, so 
just return it
-   return $url;
+   // Invalid server spec. There's no sane thing to do 
here, so just return the canonical server name in full
+   return $this->mCanonicalServer;
}
}
 
diff --git a/tests/phpunit/includes/WikiReferenceTest.php 
b/tests/phpunit/includes/WikiReferenceTest.php
index ce9fc66..4fe2e85 100644
--- a/tests/phpunit/includes/WikiReferenceTest.php
+++ b/tests/phpunit/includes/WikiReferenceTest.php
@@ -6,30 +6,13 @@
 
 class WikiReferenceTest extends PHPUnit_Framework_TestCase {
 
-   public function provideGetHostname() {
-   return array(
-   'http' => array( 'foo.bar', 'http://foo.bar' ),
-   'https' => array( 'foo.bar', 'https://foo.bar' ),
-   );
-   }
-
-   /**
-* @dataProvider provideGetHostname
-*/
-   public function testGetHostname( $expected, $canonicalServer ) {
-   $this->markTestSkipped( 'The implementation is patently 
broken.' );
-
-   $reference = new WikiReference( 'wiki', 'xx', $canonicalServer, 
'/wiki/$1' );
-   $this->assertEquals( $expected, $reference->getHostname() );
-   }
-
public function provideGetDisplayName() {
return array(
'http' => array( 'foo.bar', 'http://foo.bar' ),
'https' => array( 'foo.bar', 'http://foo.bar' ),
 
// apparently, this is the expected behavior
-   'invalid' => array( 'purple kittens/wiki/', 'purple 
kittens' ),
+   'invalid' => array( 'purple kittens', 'purple kittens' 
),
);
}
 
@@ -67,6 +50,7 @@
 
/**
 * @dataProvider provideGetCanonicalUrl
+* @note getUrl is an alias for getCanonicalUrl
 */
public function testGetUrl( $expected, $canonicalServer, $server, 
$path, $page, $fragmentId ) {
$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, 
$path, $server );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d44a6907ad395ea12deebf404831c06e07ed401
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jonas Kress (WMDE) 
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] Add --environment flag to cli.Application - change (mediawiki...scap)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Add --environment flag to cli.Application
..

Add --environment flag to cli.Application

Adds an `--environment` or `-e` flag to the main cli.Application. The
environment specified by the `-e` flag directs `config.py` to use a
specific environment inside the `./scap` directory.

An example scap directory layout looks like:

scap
├── environments
│   └── staging-restbase
│   └── scap.cfg
└── scap.cfg

In the above example calling any scap bin file with the `-e
staging-restbase` flag would cause the config under
`./scap/environments/staging-restbase` to be used.

Change-Id: I706b8365dcfaf616a45fc67de879b7e4d4d92a15
---
M scap/cli.py
M scap/config.py
M scap/utils.py
A tests/env-test/README
A tests/env-test/environments/test/README
M tests/utils_test.py
6 files changed, 114 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/11/238211/1

diff --git a/scap/cli.py b/scap/cli.py
index 241ec3f..c9a14a1 100644
--- a/scap/cli.py
+++ b/scap/cli.py
@@ -144,6 +144,8 @@
 parser.add_argument('--no-shared-authsock', dest='shared_authsock',
 action='store_false',
 help='Ignore any shared ssh-auth configuration')
+parser.add_argument('-e', '--environment', default=None,
+  help='environment in which to execute scap')
 
 return parser
 
@@ -165,7 +167,11 @@
 defines = None
 if self.arguments.defines:
 defines = dict(self.arguments.defines)
-self.config = config.load(self.arguments.conf_file, defines)
+self.config = config.load(
+cfg_file=self.arguments.conf_file,
+environment=self.arguments.environment,
+overrides=defines
+)
 
 def _setup_loggers(self):
 """Setup logging."""
diff --git a/scap/config.py b/scap/config.py
index 3ef9463..b7a7d81 100644
--- a/scap/config.py
+++ b/scap/config.py
@@ -10,6 +10,8 @@
 import os
 import socket
 
+from . import utils
+
 
 DEFAULT_CONFIG = {
 'bin_dir': '/srv/deployment/scap/scap/bin',
@@ -38,7 +40,7 @@
 }
 
 
-def load(cfg_file=None, overrides=None):
+def load(cfg_file=None, environment=None, overrides=None):
 """Load configuration.
 
 A configuration file consists of sections, led by a ``[section]`` header
@@ -53,16 +55,27 @@
 ``eqiad.wmnet``, ``wmnet`` or ``global``. Sections not present in the
 configuration file will be ignored.
 
-Configuration values are loaded either from a given file or from the
-default locations of ``/../scap.cfg``,
-``/srv/scap/scap.cfg`` and ``/etc/scap.cfg``. When the default
-configuration files are used and both are found, the vaules in
-``/etc/scap.cfg`` will replace any values loaded from earlier files.
+Configuration values are loaded from a file specified by the ``-c`` or
+``--conf`` command-line options or from the default locations with the
+following hierarchy, sorted by override priority:
+
+#. ``$(pwd)/scap/environments//scap.cfg`` or
+   ``$(pwd)/scap/scap.cfg`` (if no environment was specified)
+#. ``/etc/scap.cfg``
+#. ``/srv/scap/scap.cfg``
+#. ``/../scap.cfg``
+
+For example, if a configuration parameter is set in ``/srv/scap/scap.cfg``
+and that same parameter is set in ``/etc/scap.cfg`` the value for that
+parameter set in ``/etc/scap.cfg`` will be used during execution.
 
 :param cfg_file: Alternate configuration file
+:param environment: the string path under which scap.cfg is found
 :param overrides: Dict of configuration values
 :returns: dict of configuration values
 """
+local_cfg = os.path.join(os.getcwd(), 'scap')
+
 parser = ConfigParser.SafeConfigParser()
 if cfg_file:
 try:
@@ -77,7 +90,10 @@
 os.path.join(os.path.dirname(__file__), '..', 'scap.cfg'),
 '/srv/scap/scap.cfg',
 '/etc/scap.cfg',
-os.path.join(os.getcwd(), 'scap.cfg'),
+utils.get_env_specific_filename(
+os.path.join(local_cfg, 'scap.cfg'),
+environment
+)
 ])
 
 fqdn = socket.getfqdn().split('.')
diff --git a/scap/utils.py b/scap/utils.py
index 78e3746..1e659be 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -92,6 +92,22 @@
 return get_username()
 
 
+def get_env_specific_filename(path, env=None):
+"""Find a file specific to the environment in which scap is running"""
+if env is None:
+return path
+
+base = os.path.dirname(path)
+filename = os.path.basename(path)
+
+env_filename = os.path.join(base, 'environments', env, filename)
+
+if os.path.isfile(env_filename):
+return env_filename
+
+return path
+
+
 def get_realm_specific_filename(filename, realm, datacenter):
  

[MediaWiki-commits] [Gerrit] [English Planet] Fetch all Magnus Manske posts - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: [English Planet] Fetch all Magnus Manske posts
..


[English Planet] Fetch all Magnus Manske posts

Some of the recent posts were missing a category, but in fact all
posts are wiki-related and relevant for the Planet so there is no
harm and only benefit in including the whole blog.

Change-Id: Icbfbc0db64e4a6088f20ab1d71275fa84306709a
---
M modules/planet/templates/feeds/en_config.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index f30429e..6aa48d7 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -299,7 +299,7 @@
 [http://www.harihareswara.net/nb/nb.cgi/syndicate/sumana/Work/Wikimedia]
 name=Sumana Harihareswara
 
-[http://magnusmanske.de/wordpress/?feed=rss2&cat=7]
+[http://magnusmanske.de/wordpress/?feed=rss2]
 name=Magnus Manske
 
 [http://faenwp.blogspot.com/feeds/posts/default/-/Wikimedia]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbfbc0db64e4a6088f20ab1d71275fa84306709a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Dzahn 
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] Slightly increase RESTBase job runner concurrency - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: Slightly increase RESTBase job runner concurrency
..


Slightly increase RESTBase job runner concurrency

In 8a130b805f5 we reduced job runner concurrency from five to three to reduce
Cassandra cluster load during an overload situation. While three runners have
been broadly keeping up since, there is still a persistent backlog of about
30k jobs in enwiki.

Increasing job runners slightly to four should help to reduce this backlog
more quickly.

Change-Id: I8157d400e5a02f0362278eadf5538c27e6c03453
---
M hieradata/role/common/mediawiki/jobrunner.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index cea24b0..9ef51d2 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -4,7 +4,7 @@
   - perf-admins
 mediawiki::jobrunner::runners_basic: 20
 mediawiki::jobrunner::runners_gwt: 1
-mediawiki::jobrunner::runners_restbase: 3
+mediawiki::jobrunner::runners_restbase: 4
 mediawiki::jobrunner::runners_translate: 1
 mediawiki::jobrunner::runners_upload: 7
 nutcracker::verbosity: "4"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8157d400e5a02f0362278eadf5538c27e6c03453
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Mark Bergsma 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ori.livneh 
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] Hide floating action button whilst using find in page - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Hide floating action button whilst using find in page
..


Hide floating action button whilst using find in page

Currently the floating action button remains visible when using find in page.
If the user has activated find in page they've displayed a clear intent such
that the floating action button is redundant. This patch hide the floating
action button whilst the user is using find in page, and makes it visible
again afterwards.

Bug: T111859
Change-Id: Iebfb82e8fd48d33c7707d603204a62b7bb7f0858
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Sniedzielski: Looks good to me, approved
  Mholloway: Looks good to me, but someone else must approve
  Niedzielski: Looks good to me, but someone else must approve
  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 7eca913..1e0d4a0 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -733,6 +733,7 @@
 findInPageActionMode = mode;
 MenuItem menuItem = menu.add(R.string.menu_page_find_in_page);
 MenuItemCompat.setActionProvider(menuItem, 
findInPageActionProvider);
+setToCButtonFadedIn(false);
 return true;
 }
 
@@ -752,6 +753,7 @@
 findInPageActionMode = null;
 webView.clearMatches();
 pageActivity.showToolbar();
+setToCButtonFadedIn(true);
 Utils.hideSoftKeyboard(pageActivity);
 }
 });

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

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

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

[MediaWiki-commits] [Gerrit] Provide VRS objects with a name for more informative debuggi... - change (mediawiki/core)

[Cscott (Code Review)]

Cscott has uploaded a new change for review.

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

Change subject: Provide VRS objects with a name for more informative 
debugging/logging
..

Provide VRS objects with a name for more informative debugging/logging

Bug: T112330
Change-Id: Iaa3af55ebc426d54e8bef94dba5415bc535e096b
---
M includes/libs/virtualrest/ParsoidVirtualRESTService.php
M includes/libs/virtualrest/RestbaseVirtualRESTService.php
M includes/libs/virtualrest/SwiftVirtualRESTService.php
M includes/libs/virtualrest/VirtualRESTService.php
4 files changed, 18 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/238209/1

diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php 
b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index 2a179be..43dfab3 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -54,6 +54,7 @@
}
// set up defaults and merge them with the given params
$mparams = array_merge( array(
+   'name' => 'parsoid',
'url' => 'http://localhost:8000/',
'prefix' => 'localhost',
'domain' => 'localhost',
diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php 
b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
index bc520aa..3a7bc58 100644
--- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
+++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
@@ -48,6 +48,7 @@
public function __construct( array $params ) {
// set up defaults and merge them with the given params
$mparams = array_merge( array(
+   'name' => 'restbase',
'url' => 'http://localhost:7231/',
'domain' => 'localhost',
'timeout' => 100,
diff --git a/includes/libs/virtualrest/SwiftVirtualRESTService.php 
b/includes/libs/virtualrest/SwiftVirtualRESTService.php
index 011dabe..88b0e1f 100644
--- a/includes/libs/virtualrest/SwiftVirtualRESTService.php
+++ b/includes/libs/virtualrest/SwiftVirtualRESTService.php
@@ -45,7 +45,11 @@
 *   - swiftAuthTTL   : Swift authentication TTL (seconds)
 */
public function __construct( array $params ) {
-   parent::__construct( $params );
+   // set up defaults and merge them with the given params
+   $mparams = array_merge( array(
+   'name' => 'swift'
+   ), $params );
+   parent::__construct( $mparams );
}
 
/**
diff --git a/includes/libs/virtualrest/VirtualRESTService.php 
b/includes/libs/virtualrest/VirtualRESTService.php
index 2a0b3f0..01a4ea6 100644
--- a/includes/libs/virtualrest/VirtualRESTService.php
+++ b/includes/libs/virtualrest/VirtualRESTService.php
@@ -45,6 +45,17 @@
}
 
/**
+* Return the name of this service, in a form suitable for error
+* reporting or debugging.
+*
+* @return string The name of the service behind this VRS object.
+*/
+   public function getName() {
+   return isset( $this->params['name'] ) ? $this->params['name'] :
+   get_class( $this );
+   }
+
+   /**
 * Prepare virtual HTTP(S) requests (for this service) for execution
 *
 * This method should mangle any of the $reqs entry fields as needed:

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

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

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

[MediaWiki-commits] [Gerrit] Hygiene: Fix a jscs issue - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Fix a jscs issue
..

Hygiene: Fix a jscs issue

Not sure why this wasn't picked up by Jenkins.

Change-Id: Ifbd7af49211cce6936b583581246b34a6ddca113
---
M resources/mobile.toggle/toggle.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/resources/mobile.toggle/toggle.js 
b/resources/mobile.toggle/toggle.js
index 9aba91b..eed89ad 100644
--- a/resources/mobile.toggle/toggle.js
+++ b/resources/mobile.toggle/toggle.js
@@ -194,6 +194,7 @@
 * @method
 * @param {jQuery.object} $container to apply toggling to
 * @param {String} prefix a prefix to use for the id.
+* @param {Page} page to allow storage of session for future visits
 * @ignore
 */
function enable( $container, prefix, page ) {

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

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

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

[MediaWiki-commits] [Gerrit] Add pattern-matching arg to limit deploy hosts - change (mediawiki...scap)

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review.

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

Change subject: Add pattern-matching arg to limit deploy hosts
..

Add pattern-matching arg to limit deploy hosts

Adds a flag to the deploy command `--limit-hosts` or `-l` that accepts a
pattern in one of the following formats:

- `~[regex]` - if the pattern starts with ~ it is interpreted as a
  regular expression, this is not combined with any other option
- `![pattern]` - can be combined with any other pattern to negate
  that pattern. May be combined with other pattern matching options.
- `host[01:10]` - range matching, works for ascii chars and numbers,
  including numbers with a leading 0, may be combined with other
  pattern-matching options.
- `host*` - Matches 0 or more characters in the set A-z, '_', '.', or
  '-'. May be combined with other pattern matching options.

This pattern is applied to the `dsh_targets` file to return a sub-set of
hosts to use as a deployment target.

Change-Id: I3ec5574c987ac576acc6cf23958542480a63ae66
---
M scap/main.py
M scap/utils.py
M tests/utils_test.py
3 files changed, 137 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap 
refs/changes/08/238208/1

diff --git a/scap/main.py b/scap/main.py
index fe03aee..c12d64c 100644
--- a/scap/main.py
+++ b/scap/main.py
@@ -616,6 +616,8 @@
 """
 
 @cli.argument('-r', '--rev', default='HEAD', help='Revision to deploy')
+@cli.argument('-l', '--limit-hosts', default='all',
+  help='Limit deploy to hosts matching expression')
 def main(self, *extra_args):
 logger = self.get_logger()
 repo = self.config['git_repo']
@@ -633,7 +635,16 @@
 'Script must be run from deployment repository under {}'
 .format(deploy_dir))
 
-targets = utils.read_dsh_hosts_file(self.config['dsh_targets'])
+targets = utils.get_target_hosts(
+self.arguments.limit_hosts,
+utils.read_dsh_hosts_file(self.config['dsh_targets'])
+)
+
+logger.info(
+'Deploy will run on the following targets: \n\t- {}'.format(
+'\n\t- '.join(targets)
+)
+)
 
 # batch_size not required, don't allow a batch_size > 80 if set
 batch_size = self.config.get('batch_size', 80)
diff --git a/scap/utils.py b/scap/utils.py
index 9a65569..78e3746 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -9,6 +9,7 @@
 import errno
 import fcntl
 import hashlib
+import inspect
 import json
 import logging
 import os
@@ -16,10 +17,10 @@
 import random
 import re
 import socket
+import string
 import struct
 import subprocess
 import tempfile
-import inspect
 
 from . import ansi
 from datetime import datetime
@@ -560,3 +561,75 @@
 }
 
 return (tag, tag_info)
+
+
+def get_target_hosts(pattern, hosts):
+"""Returns a subset of hosts based on wildcards
+
+if the pattern can specify a range of the format '[start:end]'
+
+if the supplied pattern begins with ``~`` then it is treated as a
+regular expression.
+
+If the pattern begins with ``!`` then it is negated.
+"""
+# Return early if there's no special pattern
+if pattern == '*' or pattern == 'all':
+return hosts
+
+# If pattern is a regex, handle that and return
+if pattern[0] == '~':
+regex = re.compile(pattern[1:])
+return [target for target in hosts if regex.match(target)]
+
+# Handle replacements of anything like [*:*] in pattern
+has_range = lambda x: 0 <= x.find('[') < x.find(':') < x.find(']')
+
+patterns = []
+rpattern = pattern
+while(has_range(rpattern)):
+head, nrange, tail = rpattern.replace(
+'[', '|', 1).replace(']', '|', 1).split('|')
+
+beg, end = nrange.split(':')
+zfill = len(end) if (len(beg) > 0 and beg.startswith('0')) else 0
+
+if (zfill != 0 and len(beg) != len(end)) or beg > end:
+raise ValueError("Host range incorrectly specified")
+
+try:
+asc = string.ascii_letters
+seq = asc[asc.index(beg):asc.index(end) + 1]
+except ValueError:  # numeric range
+seq = range(int(beg), int(end) + 1)
+
+patterns = [''.join([head, str(i).zfill(zfill), tail]) for i in seq]
+rpattern = rpattern[rpattern.find(']') + 1:]
+
+# If there weren't range replacements, make pattern an array
+if len(patterns) == 0:
+patterns = [pattern]
+
+targets = []
+for pattern in patterns:
+# remove any leading '!'
+test_pattern = pattern.lstrip('!')
+
+# change '.' to literal period
+test_pattern = test_pattern.replace('.', '\.')
+
+# convert '*' to match a-Z, 0-9, _, -, or .
+test_pattern = test_pattern.replace('*', '[\w\.-]*')
+
+# Add b

[MediaWiki-commits] [Gerrit] [English Planet] Fetch all Magnus Manske posts - change (operations/puppet)

[Nemo bis (Code Review)]

Nemo bis has uploaded a new change for review.

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

Change subject: [English Planet] Fetch all Magnus Manske posts
..

[English Planet] Fetch all Magnus Manske posts

Some of the recent posts were missing a category, but in fact all
posts are wiki-related and relevant for the Planet so there is no
harm and only benefit in including the whole blog.

Change-Id: Icbfbc0db64e4a6088f20ab1d71275fa84306709a
---
M modules/planet/templates/feeds/en_config.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/238207/1

diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index f30429e..6aa48d7 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -299,7 +299,7 @@
 [http://www.harihareswara.net/nb/nb.cgi/syndicate/sumana/Work/Wikimedia]
 name=Sumana Harihareswara
 
-[http://magnusmanske.de/wordpress/?feed=rss2&cat=7]
+[http://magnusmanske.de/wordpress/?feed=rss2]
 name=Magnus Manske
 
 [http://faenwp.blogspot.com/feeds/posts/default/-/Wikimedia]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbfbc0db64e4a6088f20ab1d71275fa84306709a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nemo bis 

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

[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...GoToShell)

[jenkins-bot (Code Review)]

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

Change subject: Remove i18n shim
..


Remove i18n shim

Change-Id: Ib9d6bbebb226dce786714eca43e9dd7b41bd33e0
---
D GoToShell.i18n.php
M GoToShell.php
2 files changed, 0 insertions(+), 36 deletions(-)

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



diff --git a/GoToShell.i18n.php b/GoToShell.i18n.php
deleted file mode 100644
index 39c06dd..000
--- a/GoToShell.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShime53dda8db63c42e9' ) ) {
-   function wfJsonI18nShime53dda8db63c42e9( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShime53dda8db63c42e9';
-}
diff --git a/GoToShell.php b/GoToShell.php
index 7a2d228..a615b9f 100644
--- a/GoToShell.php
+++ b/GoToShell.php
@@ -36,7 +36,6 @@
 );
  
 $wgGoToShellCommand = 'ls';
-$wgExtensionMessagesFiles['GoToShell'] = __DIR__ . '/GoToShell.i18n.php';
 $wgMessagesDirs['GoToShell'] = __DIR__ . '/i18n';
 $wgAutoloadClasses['SpecialGoToShell'] = __DIR__ . '/SpecialGoToShell.php';
 $wgSpecialPages['GoToShell'] = 'SpecialGoToShell';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9d6bbebb226dce786714eca43e9dd7b41bd33e0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GoToShell
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...MoodBar)

[jenkins-bot (Code Review)]

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

Change subject: Remove i18n shim
..


Remove i18n shim

Change-Id: I7d63afd60457ce44fdfa9e8f4319b283732ac4fa
---
D MoodBar.i18n.php
M MoodBar.php
2 files changed, 0 insertions(+), 36 deletions(-)

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



diff --git a/MoodBar.i18n.php b/MoodBar.i18n.php
deleted file mode 100644
index 2982e20..000
--- a/MoodBar.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimbd3812dcc81aade6' ) ) {
-   function wfJsonI18nShimbd3812dcc81aade6( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimbd3812dcc81aade6';
-}
diff --git a/MoodBar.php b/MoodBar.php
index bdc33fa..af1b29c 100644
--- a/MoodBar.php
+++ b/MoodBar.php
@@ -85,7 +85,6 @@
 
 // Internationalisation
 $wgMessagesDirs['MoodBar'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['MoodBar'] = $moodBarDir . 'MoodBar.i18n.php';
 $wgExtensionMessagesFiles['MoodBarAliases'] = $moodBarDir . 
'MoodBar.alias.php';
 
 // Resources

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d63afd60457ce44fdfa9e8f4319b283732ac4fa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MoodBar
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove SpecialMobileNotifications - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Remove SpecialMobileNotifications
..


Remove SpecialMobileNotifications

The Special:Notifications page on mobile has render issues and doesn't
seem to solve any problem. Let the code be improved in Echo.

Bug: T112189
Bug: T112191
Change-Id: I7bc41aca5965bab419349b25f1b04349282ef849
---
M MobileFrontend.php
M includes/MobileFrontend.hooks.php
M includes/Resources.php
D includes/specials/SpecialMobileNotifications.php
D resources/mobile.special.notifications.scripts/notifications.js
D resources/mobile.special.notifications.styles/notifications.less
6 files changed, 0 insertions(+), 227 deletions(-)

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



diff --git a/MobileFrontend.php b/MobileFrontend.php
index 8b79add..123142b 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -83,7 +83,6 @@
'SpecialNearby' => 'specials/SpecialNearby',
'SpecialMobileLanguages' => 'specials/SpecialMobileLanguages',
'SpecialMobilePreferences' => 'specials/SpecialMobilePreferences',
-   'SpecialMobileNotifications' => 'specials/SpecialMobileNotifications',
'SpecialTopicTag' => 'specials/browse/SpecialTopicTag',
'MobileSpecialPage' => 'specials/MobileSpecialPage',
'MobileSpecialPageFeed' => 'specials/MobileSpecialPageFeed',
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 811e8e2..fca44fa 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -389,10 +389,6 @@
 * Special:Contributions without the bells and whistles.
 */
$list['Contributions'] = 'SpecialMobileContributions';
-
-   if ( class_exists( 'MWEchoNotifUser' ) ) {
-   $list['Notifications'] = 
'SpecialMobileNotifications';
-   }
}
// add Special:Nearby only, if Nearby is activated
if ( $ctx->getMFConfig()->get( 'MFNearby' ) ) {
diff --git a/includes/Resources.php b/includes/Resources.php
index 5c4d095..7c43993 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1398,26 +1398,6 @@
'position' => 'top',
),
 
-   'mobile.special.notifications.styles' => 
$wgMFMobileSpecialPageResourceBoilerplate + array(
-   'styles' => array(
-   
'resources/mobile.special.notifications.styles/notifications.less',
-   ),
-   'position' => 'top',
-   ),
-
-   'mobile.special.notifications.scripts' => 
$wgMFMobileSpecialPageResourceBoilerplate + array(
-   'dependencies' => array(
-   'mobile.startup',
-   ),
-   'scripts' => array(
-   
'resources/mobile.special.notifications.scripts/notifications.js',
-   ),
-   'messages' => array(
-   // defined in Echo
-   'echo-load-more-error',
-   ),
-   ),
-
// These are NOT empty see $wgResourceModuleSkinStyles.
'mobile.special.history.styles' => 
$wgMFMobileSpecialPageResourceBoilerplate + array(
'position' => 'top',
diff --git a/includes/specials/SpecialMobileNotifications.php 
b/includes/specials/SpecialMobileNotifications.php
deleted file mode 100644
index cc7f2ad..000
--- a/includes/specials/SpecialMobileNotifications.php
+++ /dev/null
@@ -1,40 +0,0 @@
-getOutput();
-   $out->addModuleStyles( 'mobile.special.notifications.styles' );
-   $title = $out->getRequest()->getText( 'returnto' );
-   $title = Title::newFromText( $title );
-   if ( $title ) {
-   $out->addHtml(
-   Html::openElement( 'p' ) .
-   Html::element( 'a', array( 'href' => 
$title->getLocalUrl() ),
-   wfMessage( 'returnto', 
$title->getText() ) ) .
-   Html::closeElement( 'p' )
-   );
-   }
-   parent::execute( $par );
-   $out->addModules( 'mobile.special.notifications.scripts' );
-   }
-
-   /**
-* Don't show this page on Special:SpecialPages
-* @return false
-*/
-   public function isListed() {
-   return false;
-   }
-}
diff --git a/resources/mobile.special.notifications.scripts/notifications.js 
b/resources/mobile.special.notifications.scripts/notifications.js
deleted file mode 100644
index 7a4cfbb..000
--- a/resources/mobile.special.notifications.scripts/notifications.js
+++ /dev/null
@@ -1,154 +0,0 @@
-( function ( M, $ ) {
-
-   var api = M.require( 'api' ),
-

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

[Nuria (Code Review)]

Nuria has submitted this change and it was merged.

Change subject: Update code and separated repos scheme
..


Update code and separated repos scheme

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

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

[MediaWiki-commits] [Gerrit] possible values for Cargo fields should not include null values - change (mediawiki...SemanticForms)

[jenkins-bot (Code Review)]

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

Change subject: possible values for Cargo fields should not include null values
..


possible values for Cargo fields should not include null values

Change-Id: I638468a28c20cd3345918f6fe8a4a1bda2ffcad7
---
M includes/SF_FormPrinter.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index 5137587..fe1eb1e 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1096,7 +1096,7 @@
// values if a field and table have
// been specified.
if ( is_null( $possible_values ) && 
defined( 'CARGO_VERSION' ) && $cargo_table != null && $cargo_field != null ) {
-   $possible_values = 
SFUtils::getAllValuesForCargoField( $cargo_table, $cargo_field );
+   $possible_values = 
SFUtils::getValuesForCargoField( $cargo_table, $cargo_field, $cargo_field . " 
IS NOT NULL" );
}
 
if ( !is_null( $possible_values ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I638468a28c20cd3345918f6fe8a4a1bda2ffcad7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Cicalese 
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 es5-shim dependency to ext.centralNotice.display - change (mediawiki...CentralNotice)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Add es5-shim dependency to ext.centralNotice.display
..

Add es5-shim dependency to ext.centralNotice.display

It unconditionally calls Object.defineProperty, which is not available
in all browsers: .

Noticed by bawolff (T112552#1638401).

Change-Id: I8f7a8acb8138ba9d0764dd1dd625afd818de12af
---
M CentralNotice.modules.php
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/CentralNotice.modules.php b/CentralNotice.modules.php
index 77b3740..6e3e9ae 100644
--- a/CentralNotice.modules.php
+++ b/CentralNotice.modules.php
@@ -194,6 +194,7 @@
'jquery.cookie',
'json',
'mediawiki.Uri',
+   'es5-shim',
),
'targets'   => array( 'desktop', 'mobile' ),
 );
@@ -256,4 +257,4 @@
 $wgResourceModules[ 'ext.centralNotice.bannerChoiceData' ] = array();
 
 // Deprecated, left here for cached HTML
-$wgResourceModules[ 'ext.centralNotice.bannerController.lib' ] = array();
\ No newline at end of file
+$wgResourceModules[ 'ext.centralNotice.bannerController.lib' ] = array();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f7a8acb8138ba9d0764dd1dd625afd818de12af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
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] Create composer job variants to test MW extensions - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Create composer job variants to test MW extensions
..


Create composer job variants to test MW extensions

Change-Id: I97e1d3ca0f03776ba91fb45f4613ba22823a3a7e
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
M jjb/operations-misc.yaml
M jjb/php.yaml
M jjb/wikidata.yaml
M zuul/layout.yaml
7 files changed, 91 insertions(+), 9 deletions(-)

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



diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index ba098a8..1d030dd 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -620,7 +620,10 @@
 name: composer-validate
 builders:
  - shell: |
-if [[ -f "composer.json" ]]; then composer --ansi validate 
--no-check-publish; fi
+set -u
+cd "{dir}"
+[[ -f "composer.json" ]] || exit 0
+composer --ansi validate --no-check-publish
 
 # Validate a composer.json so it can be published on packagist.org
 - builder:
@@ -653,6 +656,14 @@
  - shell: |
 composer update --ansi --no-progress --prefer-dist --profile --no-dev
 
+- builder:
+name: composer-local-create
+builders:
+ - shell: |
+set -u
+cd src
+
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
"{deps}" composer.local.json
+
 # Runs "composer test"
 - builder:
 name: composer-test
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e8ebe14..16e8414 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -89,6 +89,31 @@
  - mw-install-mysql
  - mw-apply-settings
  - mw-run-update-script
+# same except for use with composer instead of cloning vendor
+- builder:
+name: prepare-mediawiki-zuul-project-no-vendor
+builders:
+ - shell: "echo $ZUUL_PROJECT > extensions_load.txt"
+ - shell: "echo -e $EXT_DEPENDENCIES >> extensions_load.txt"
+ - zuul-cloner:
+ projects: >
+ mediawiki/core
+ $(cat extensions_load.txt)
+ - shell: "mv extensions_load.txt src/extensions_load.txt"
+ - shell: |
+ if grep -q mediawiki/extensions/VisualEditor src/extensions_load.txt; 
then
+cd src/extensions/VisualEditor
+git submodule update --init
+ fi
+ - composer-validate:
+ dir: 'src'
+ - composer-local-create:
+ deps: 'extensions_load.txt'
+ - composer-update:
+ dir: 'src'
+ - mw-install-mysql
+ - mw-apply-settings
+ - mw-run-update-script
 
 - job-template:
 name: '{name}-{ext-name}-qunit'
@@ -116,6 +141,21 @@
  - zuul
 builders:
  - prepare-mediawiki-zuul-project
+ - qunit-karma
+publishers:
+ - localhost-cleanup
+ - mw-teardown-mysql
+ - archive-log-dir
+
+# Generic qunit job for extensions with composer update.
+- job:
+name: 'mwext-qunit-composer'
+node: contintLabsSlave && UbuntuTrusty
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - prepare-mediawiki-zuul-project-no-vendor
  - qunit-karma
 publishers:
  - localhost-cleanup
@@ -220,6 +260,24 @@
 results: 'log/junit*.xml'
  - mw-teardown-mysql
  - archive-log-dir
+# same but with composer update instead of cloning vendor
+- job-template:
+name: 'mwext-testextension-{phpflavor}-composer'
+node: 'contintLabsSlave && ((UbuntuPrecise && phpflavor-zend && 
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm && 
phpflavor-{phpflavor}))'
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - assert-phpflavor:
+ phpflavor: '{phpflavor}'
+ - hhvm-clear-hhbc
+ - prepare-mediawiki-zuul-project-no-vendor
+ - mw-run-phpunit-allexts
+publishers:
+ - junit:
+results: 'log/junit*.xml'
+ - mw-teardown-mysql
+ - archive-log-dir
 
 - project:
 name: 'mwext-testextension-generic'
@@ -228,6 +286,10 @@
 phpflavor:
 - hhvm
 - zend
+ - 'mwext-testextension-{phpflavor}-composer':
+phpflavor:
+- hhvm
+- zend
 
 - job:
 name: 'mwext-Flow-jsduck-publish'
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 6af9c52..394b006 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -173,7 +173,8 @@
  - zuul-cloner:
  projects: >
  mediawiki/core
- - composer-validate
+ - composer-validate:
+ dir: 'src'
  - composer-update:
  dir: 'src'
  - mw-install-mysql
diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml
index b586d35..ddc 100644
--- a/jjb/operations-misc.yaml
+++ b/jjb/operations-misc.yaml
@@ -40,7 +40,8 @@
 triggers:
  - zuul
 builders:
- - composer-validate
+ - composer-validate:
+ dir: '.'
  - phpunit-junit
 publishers:
  - phpunit-jun

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

[jenkins-bot (Code Review)]

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

Change subject: Drop unused, trivial EntityLabelUnitFormatter
..


Drop unused, trivial EntityLabelUnitFormatter

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec4ab8591a4abc21d4962f5857f5ca459341ae77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Tools: Accept mail for all submit hosts - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: Tools: Accept mail for all submit hosts
..


Tools: Accept mail for all submit hosts

When the grid engine sends mail to the owner of a job, by default it
uses the address $user@$submithost.  In the Tools mail setup, this
fails because $submithost never runs an SMTP service, thus mails sit
in the queue until they expire.  To work around this, users either
have to call qsub with the "-M" option and an explicit mail address to
use, or use the jsub wrapper that changes the default to
$u...@tools.wmflabs.org which is always deliverable.

This change sets up the mail relay to accept mail for all addresses in
the .tools.eqiad.wmflabs domain, i. e. all hosts and thus all submit
hosts in the project.  As the grid engine uses aliases for a submit
host if it is listed in host_aliases, this change also explicitly
lists all submit hosts in host_aliases.  Technically, that list is
dynamic and will hopefully be shrinking in the future, but if a host
is listed that is no longer in host_aliases, this will have no effect,
and if a host is not listed that was added to host_aliases, the
situation would not be worse than now.

Bug: T63484
Change-Id: I6ee8b8191f3260e64cd20baad95b24b91a30f065
---
M modules/toollabs/templates/mail-relay.exim4.conf.erb
1 file changed, 44 insertions(+), 2 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved
  Merlijn van Deen: Looks good to me, but someone else must approve



diff --git a/modules/toollabs/templates/mail-relay.exim4.conf.erb 
b/modules/toollabs/templates/mail-relay.exim4.conf.erb
index a324761..4ea02c2 100644
--- a/modules/toollabs/templates/mail-relay.exim4.conf.erb
+++ b/modules/toollabs/templates/mail-relay.exim4.conf.erb
@@ -1,6 +1,6 @@
 #
 # THIS FILE IS MAINTAINED BY PUPPET
-# source: modules/toollabs/templates/exim4.conf.erb
+# source: modules/toollabs/templates/mail-relay.exim4.conf.erb
 # from:   toollabs::mailrelay
 #
 
@@ -18,7 +18,49 @@
 primary_hostname = <%= @external_hostname %>
 qualify_domain = MAILDOMAIN
 
-domainlist local_domains = MAILDOMAIN
+domainlist local_domains = MAILDOMAIN : \
+   *.INSTANCEPROJECT.eqiad.wmflabs : \
+   # The following list names all grid submit
+   # hosts that have an alias defined in
+   # host_aliases which prevents them from
+   # matching the wildcard above.  The list
+   # can be generated with the command "qconf
+   # -ss | grep -v
+   # '\.tools\.eqiad\.wmflabs$'".  When
+   # host_aliases has been decommissioned
+   # (T109485), this list should be empty.
+   tools-bastion-01.eqiad.wmflabs : \
+   tools-bastion-02.eqiad.wmflabs : \
+   tools-checker-01.eqiad.wmflabs : \
+   tools-checker-02.eqiad.wmflabs : \
+   tools-mail.eqiad.wmflabs : \
+   tools-precise-dev.eqiad.wmflabs : \
+   tools-services-02.eqiad.wmflabs : \
+   tools-submit.eqiad.wmflabs : \
+   tools-webgrid-generic-1401.eqiad.wmflabs : \
+   tools-webgrid-generic-1402.eqiad.wmflabs : \
+   tools-webgrid-generic-1403.eqiad.wmflabs : \
+   tools-webgrid-generic-1404.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1201.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1202.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1203.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1204.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1205.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1206.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1207.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1208.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1209.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1210.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1401.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1402.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1403.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1404.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1405.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1406.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1407.eqiad.wmflabs : \
+   tools-webgrid-lighttpd-1408.eqiad.wmflabs : 

[MediaWiki-commits] [Gerrit] Split out .mw-echo-alert styles back into a separate module - change (mediawiki...Echo)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Split out .mw-echo-alert styles back into a separate module
..

Split out .mw-echo-alert styles back into a separate module

Change-Id: Ia946eb3b7cd917f84b7ab57a280f55a3eadfcebf
---
M Hooks.php
M Resources.php
2 files changed, 9 insertions(+), 3 deletions(-)


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

diff --git a/Hooks.php b/Hooks.php
index e0a24d6..f17978a 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -714,7 +714,7 @@
) {
$personal_urls['mytalk']['text'] = $sk->msg( 
'echo-new-messages' )->text();
$personal_urls['mytalk']['class'] = array( 
'mw-echo-alert' );
-   $sk->getOutput()->addModuleStyles( 'ext.echo.alert' );
+   $sk->getOutput()->addModuleStyles( 
'ext.echo.nojs.alert' );
}
 
return true;
diff --git a/Resources.php b/Resources.php
index ed261ef..08dbc2b 100644
--- a/Resources.php
+++ b/Resources.php
@@ -118,8 +118,14 @@
'position' => 'top',
'styles' => array(
'nojs/mw.echo.badge.less',
-   'nojs/mw.echo.alert.less',
'nojs/mw.echo.notifications.less'
+   ),
+   'targets' => array( 'desktop', 'mobile' ),
+   ),
+   'ext.echo.nojs.alert' => $echoResourceTemplate + array(
+   'position' => 'top',
+   'styles' => array(
+   'nojs/mw.echo.alert.less',
),
'skinStyles' => array(
'monobook' => array(
@@ -127,7 +133,7 @@
),
'modern' => array(
'nojs/mw.echo.alert.modern.less',
-   )
+   ),
),
'targets' => array( 'desktop', 'mobile' ),
),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia946eb3b7cd917f84b7ab57a280f55a3eadfcebf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] labs_lvm: Only run extend-instance-vol when needed - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: labs_lvm: Only run extend-instance-vol when needed
..


labs_lvm: Only run extend-instance-vol when needed

Currently, labs_lvm::volume calls extend-instance-vol in each Puppet
run, making logs unnecessarily noisy.  This change runs
extend-instance-vol only if it would not be a no-op.

It does this by depending the call on that "extend-instance-vol --test
$mountat $size" does /not/ succeed and building that logic into
extend-instance-vol, i. e. if "extend-instance-vol $mountat $size"
would fail because one of its tests fails, it is run (to not hide the
error from the user), and only if all the tests succeed and lvextend
would fail because the volume is already of the intended size,
"extend-instance-vol --test" succeeds, thus /not/ running the non-test
extend-instance-vol.

Ideally, this whole cascade of shell scripts and defined types would
be replaced by a custom Puppet type in Ruby that could be written more
straightforward, but ceterum censeo changing file systems inside a
running system is bad and should be done at the OpenStack level
instead.

Bug: T109933
Change-Id: Ie58720d12a8e94d1c5b6a71aa71160e3f499cabc
---
M modules/labs_lvm/files/extend-instance-vol
M modules/labs_lvm/manifests/extend.pp
2 files changed, 29 insertions(+), 8 deletions(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved
  Merlijn van Deen: Looks good to me, but someone else must approve



diff --git a/modules/labs_lvm/files/extend-instance-vol 
b/modules/labs_lvm/files/extend-instance-vol
index d87255b..3feb219 100755
--- a/modules/labs_lvm/files/extend-instance-vol
+++ b/modules/labs_lvm/files/extend-instance-vol
@@ -1,4 +1,15 @@
-#! /bin/bash
+#!/bin/bash
+
+# If we are called with --test as the first parameter, this means that
+# we change nothing on disk, but indicate with an exit status other
+# than 0 that we would have changed anything and with an exit status
+# of 0 that this call would have been a no-op.
+if [ "x$1" = "x--test" ]; then
+  dryrun=1
+  shift
+else
+  dryrun=0
+fi
 
 mount="$1"; shift
 size="$1"; shift
@@ -24,13 +35,26 @@
 fi
 
 if /sbin/lvextend -t $sopt "$volume" >/dev/null 2>&1; then
+  if [ $dryrun -ne 0 ]; then
+exit 1
+  fi
   /sbin/lvextend -r $sopt "$volume"
   exit
 else
-  if [ "$?" -eq 5 ]; then
+  lvextend_exitcode=$?
+  if [ $lvextend_exitcode -eq 5 ]; then
 echo "$0: no space left to grow $mount to $size" >&2
 exit 2
   fi
+  # This is the only case when --test should succeed: All the tests
+  # above have passed and lvextend wouldn't do anything because the
+  # partition is already of the requested size.
+  if [ $lvextend_exitcode -eq 3 ] && [ $dryrun -ne 0 ]; then
+exit 0
+  fi
+  if [ $dryrun -ne 0 ]; then
+exit 1
+  else
+exit 0
+  fi
 fi
-
-exit 0
diff --git a/modules/labs_lvm/manifests/extend.pp 
b/modules/labs_lvm/manifests/extend.pp
index 4d729b0..d330c9c 100644
--- a/modules/labs_lvm/manifests/extend.pp
+++ b/modules/labs_lvm/manifests/extend.pp
@@ -15,7 +15,6 @@
 # Sample Usage:
 #   labs_lvm::extend { '/srv': size => '8G' }
 #
-
 define labs_lvm::extend(
 $mountat= $title,
 $mountowner = 'root',
@@ -23,12 +22,10 @@
 $mountmode  = '755',
 $size   = '100%FREE',
 ) {
-
 exec { "extend-vd-${mountat}":
 logoutput => 'on_failure',
 require   => File['/usr/local/sbin/extend-instance-vol'],
 command   => "/usr/local/sbin/extend-instance-vol '${mountat}' 
'${size}'",
+unless=> "/usr/local/sbin/extend-instance-vol --test '${mountat}' 
'${size}'",
 }
-
 }
-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie58720d12a8e94d1c5b6a71aa71160e3f499cabc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Tim Landscheidt 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "switch wmfusercontent.org to RSA-only temporarily" - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Revert "switch wmfusercontent.org to RSA-only temporarily"
..

Revert "switch wmfusercontent.org to RSA-only temporarily"

This reverts commit a3fecd48ea2d90410d6926425987c10a81973aea.

Change-Id: I69061855b0d5a9ae0b5b0dfc9e4a36422b140e54
---
M modules/role/manifests/cache/ssl/misc.pp
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/cache/ssl/misc.pp 
b/modules/role/manifests/cache/ssl/misc.pp
index edf0a40..c1f4c67 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -6,8 +6,7 @@
 
 tlsproxy::localssl { 'wmfusercontent.org':
 do_ocsp=> true,
-certs  => ['star.wmfusercontent.org'], # temporary, until 
ECDSA re-issue
-# certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
+certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
 server_name=> 'wmfusercontent.org',
 server_aliases => ['*.wmfusercontent.org'];
 }

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

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

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

[MediaWiki-commits] [Gerrit] Revert "switch wmfusercontent.org to RSA-only temporarily" - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Revert "switch wmfusercontent.org to RSA-only temporarily"
..


Revert "switch wmfusercontent.org to RSA-only temporarily"

This reverts commit a3fecd48ea2d90410d6926425987c10a81973aea.

Change-Id: I69061855b0d5a9ae0b5b0dfc9e4a36422b140e54
---
M modules/role/manifests/cache/ssl/misc.pp
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/cache/ssl/misc.pp 
b/modules/role/manifests/cache/ssl/misc.pp
index edf0a40..c1f4c67 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -6,8 +6,7 @@
 
 tlsproxy::localssl { 'wmfusercontent.org':
 do_ocsp=> true,
-certs  => ['star.wmfusercontent.org'], # temporary, until 
ECDSA re-issue
-# certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
+certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
 server_name=> 'wmfusercontent.org',
 server_aliases => ['*.wmfusercontent.org'];
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69061855b0d5a9ae0b5b0dfc9e4a36422b140e54
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Add new ECDSA cert for wmfusercontent - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Add new ECDSA cert for wmfusercontent
..


Add new ECDSA cert for wmfusercontent

Change-Id: I4784dee3bd66ccbb35145a8b0824b33c8b378e70
---
M files/ssl/ecc-star.wmfusercontent.org.crt
1 file changed, 15 insertions(+), 15 deletions(-)

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



diff --git a/files/ssl/ecc-star.wmfusercontent.org.crt 
b/files/ssl/ecc-star.wmfusercontent.org.crt
index cca6b16..c00b762 100644
--- a/files/ssl/ecc-star.wmfusercontent.org.crt
+++ b/files/ssl/ecc-star.wmfusercontent.org.crt
@@ -1,13 +1,13 @@
 -BEGIN CERTIFICATE-
-MIIEkzCCA3ugAwIBAgISESErB2aY3XUiLG+qEbInHnzZMA0GCSqGSIb3DQEBCwUA
+MIIEkzCCA3ugAwIBAgISESF1MPzcxR6xcGdyxZ1WU3ZIMA0GCSqGSIb3DQEBCwUA
 MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
 VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUwNzE0MDAzMjA3WhcNMTUwOTEyMTM0MTEyWjB+MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
-BAMUFCoud21mdXNlcmNvbnRlbnQub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEOgU7W5Rp/dKtRBCiwMc9YvdwOp3kLHR83umWjxVtoP7H9zFL8Y56/UyShgwd
-wNxThQKU6ZMnLkEE/5H6AAb/9aOCAewwggHoMA4GA1UdDwEB/wQEAwIFoDBJBgNV
+MjU2IC0gRzIwHhcNMTUwOTE0MTgwMjAyWhcNMTYwOTEyMTM0MTEyWjB+MQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
+BAMMFCoud21mdXNlcmNvbnRlbnQub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEs4MkWeHYqf6kT6gagDn51ggLMmAbg2dM/qQpmBrxsfIElwNhCdnV3lddJMyc
+VKioVxqqWA//fieApwMNeAwlWKOCAewwggHoMA4GA1UdDwEB/wQEAwIFoDBJBgNV
 HSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9i
 YWxzaWduLmNvbS9yZXBvc2l0b3J5LzAzBgNVHREELDAqghQqLndtZnVzZXJjb250
 ZW50Lm9yZ4ISd21mdXNlcmNvbnRlbnQub3JnMAkGA1UdEwQCMAAwHQYDVR0lBBYw
@@ -16,12 +16,12 @@
 MIGgBggrBgEFBQcBAQSBkzCBkDBNBggrBgEFBQcwAoZBaHR0cDovL3NlY3VyZS5n
 bG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6YXRpb252YWxzaGEyZzJyMS5j
 cnQwPwYIKwYBBQUHMAGGM2h0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc29y
-Z2FuaXphdGlvbnZhbHNoYTJnMjAdBgNVHQ4EFgQUqVkrDUb4U2+PCD/RXMlkXtmQ
-tVkwHwYDVR0jBBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQEL
-BQADggEBAC6QKF9MDCspYgIOhr7vtQZhN1aNzUVHkrVwY+ry5anR/tL0Y2ANB6W9
-9BOvMOkAI9+W3K3wo5hB1gvvnviqa017cs/oNGADfScRBro2Ri5pLa/8QgM0eUmf
-GFVuV5CJxyPH3dVndZYNvyb0GRWiTYwKxFof2HkLSIO7tDzEOnBoF1/SDvYZ1K4d
-Vbh0iziD+USY45tdbQpAUE/X+Dwp/nU6eaDBfn7GfPkLOk3zt59ZGYkQLzUIRY2N
-tusuhiYwiD+dQ6r9f0+mNGA/U5dPV2enmqxTeuTq7kp7A/pHbWNw1NL4Ko85uNqu
-betQ5OLozu9KW/wp+nnQjzEJtla5EFs=
+Z2FuaXphdGlvbnZhbHNoYTJnMjAdBgNVHQ4EFgQUoGe153Z/4VByQklNv3SNJv+3
+RSMwHwYDVR0jBBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQEL
+BQADggEBALm5jjvTnoXbLQornUd4r4Wqd3wiygMCmuA5v0R/egVISuUGyzF8jEtP
+FzAeys0uEvXhbC9k1PgnJ2g1D11NMKFPxd4hDG5nQ4FtExUuW3QrW4ry7mUmj/cG
+4UK0NCoRRDR0ADqbvTKfgWlJt6wkcxiEMWEo3Y0URD3hy5R3rll6/hnruTnEE0MB
+CgIRXOa/+ivC9qhGReBilT7/Aioyqa0gxbLrIVf56FEbJrrct0F7YKPcXIB0m+PH
+PMgsIUBiThXi/J88y/jeYDBfPZGDP/lHX6Gs25VCdFFk6OI9eQru7+7kUOGRiwOz
+8uNVyQNvv5HYXqTAlKpwO8oMJtfnSuY=
 -END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4784dee3bd66ccbb35145a8b0824b33c8b378e70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Add new ECDSA cert for wmfusercontent - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Add new ECDSA cert for wmfusercontent
..

Add new ECDSA cert for wmfusercontent

Change-Id: I4784dee3bd66ccbb35145a8b0824b33c8b378e70
---
M files/ssl/ecc-star.wmfusercontent.org.crt
1 file changed, 15 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/238202/1

diff --git a/files/ssl/ecc-star.wmfusercontent.org.crt 
b/files/ssl/ecc-star.wmfusercontent.org.crt
index cca6b16..c00b762 100644
--- a/files/ssl/ecc-star.wmfusercontent.org.crt
+++ b/files/ssl/ecc-star.wmfusercontent.org.crt
@@ -1,13 +1,13 @@
 -BEGIN CERTIFICATE-
-MIIEkzCCA3ugAwIBAgISESErB2aY3XUiLG+qEbInHnzZMA0GCSqGSIb3DQEBCwUA
+MIIEkzCCA3ugAwIBAgISESF1MPzcxR6xcGdyxZ1WU3ZIMA0GCSqGSIb3DQEBCwUA
 MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
 VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTUwNzE0MDAzMjA3WhcNMTUwOTEyMTM0MTEyWjB+MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
-BAMUFCoud21mdXNlcmNvbnRlbnQub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEOgU7W5Rp/dKtRBCiwMc9YvdwOp3kLHR83umWjxVtoP7H9zFL8Y56/UyShgwd
-wNxThQKU6ZMnLkEE/5H6AAb/9aOCAewwggHoMA4GA1UdDwEB/wQEAwIFoDBJBgNV
+MjU2IC0gRzIwHhcNMTUwOTE0MTgwMjAyWhcNMTYwOTEyMTM0MTEyWjB+MQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
+BAMMFCoud21mdXNlcmNvbnRlbnQub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
+QgAEs4MkWeHYqf6kT6gagDn51ggLMmAbg2dM/qQpmBrxsfIElwNhCdnV3lddJMyc
+VKioVxqqWA//fieApwMNeAwlWKOCAewwggHoMA4GA1UdDwEB/wQEAwIFoDBJBgNV
 HSAEQjBAMD4GBmeBDAECAjA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9i
 YWxzaWduLmNvbS9yZXBvc2l0b3J5LzAzBgNVHREELDAqghQqLndtZnVzZXJjb250
 ZW50Lm9yZ4ISd21mdXNlcmNvbnRlbnQub3JnMAkGA1UdEwQCMAAwHQYDVR0lBBYw
@@ -16,12 +16,12 @@
 MIGgBggrBgEFBQcBAQSBkzCBkDBNBggrBgEFBQcwAoZBaHR0cDovL3NlY3VyZS5n
 bG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6YXRpb252YWxzaGEyZzJyMS5j
 cnQwPwYIKwYBBQUHMAGGM2h0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc29y
-Z2FuaXphdGlvbnZhbHNoYTJnMjAdBgNVHQ4EFgQUqVkrDUb4U2+PCD/RXMlkXtmQ
-tVkwHwYDVR0jBBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQEL
-BQADggEBAC6QKF9MDCspYgIOhr7vtQZhN1aNzUVHkrVwY+ry5anR/tL0Y2ANB6W9
-9BOvMOkAI9+W3K3wo5hB1gvvnviqa017cs/oNGADfScRBro2Ri5pLa/8QgM0eUmf
-GFVuV5CJxyPH3dVndZYNvyb0GRWiTYwKxFof2HkLSIO7tDzEOnBoF1/SDvYZ1K4d
-Vbh0iziD+USY45tdbQpAUE/X+Dwp/nU6eaDBfn7GfPkLOk3zt59ZGYkQLzUIRY2N
-tusuhiYwiD+dQ6r9f0+mNGA/U5dPV2enmqxTeuTq7kp7A/pHbWNw1NL4Ko85uNqu
-betQ5OLozu9KW/wp+nnQjzEJtla5EFs=
+Z2FuaXphdGlvbnZhbHNoYTJnMjAdBgNVHQ4EFgQUoGe153Z/4VByQklNv3SNJv+3
+RSMwHwYDVR0jBBgwFoAUlt5h8b0cFilTHMDMfTuDAEDmGnwwDQYJKoZIhvcNAQEL
+BQADggEBALm5jjvTnoXbLQornUd4r4Wqd3wiygMCmuA5v0R/egVISuUGyzF8jEtP
+FzAeys0uEvXhbC9k1PgnJ2g1D11NMKFPxd4hDG5nQ4FtExUuW3QrW4ry7mUmj/cG
+4UK0NCoRRDR0ADqbvTKfgWlJt6wkcxiEMWEo3Y0URD3hy5R3rll6/hnruTnEE0MB
+CgIRXOa/+ivC9qhGReBilT7/Aioyqa0gxbLrIVf56FEbJrrct0F7YKPcXIB0m+PH
+PMgsIUBiThXi/J88y/jeYDBfPZGDP/lHX6Gs25VCdFFk6OI9eQru7+7kUOGRiwOz
+8uNVyQNvv5HYXqTAlKpwO8oMJtfnSuY=
 -END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] aptly: Pin per-project aptly repository - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: aptly: Pin per-project aptly repository
..

aptly: Pin per-project aptly repository

Change-Id: I76b53c1073cbd007107ad8f60512f201a6583d31
---
M modules/aptly/manifests/client.pp
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/238201/1

diff --git a/modules/aptly/manifests/client.pp 
b/modules/aptly/manifests/client.pp
index 0af3464..9e790c4 100644
--- a/modules/aptly/manifests/client.pp
+++ b/modules/aptly/manifests/client.pp
@@ -17,4 +17,11 @@
 components => 'main',
 source => $source,
 }
+
+# Pin it so it has higher preference
+apt::pin { 'project-aptly':
+package  => '*',
+pin  => "origin ${servername}",
+priority => 1500,
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b53c1073cbd007107ad8f60512f201a6583d31
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] Fix sharing of links in Gingerbread. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

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


Fix sharing of links in Gingerbread.

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

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

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

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



diff --git a/app/src/main/java/org/wikipedia/util/ShareUtils.java 
b/app/src/main/java/org/wikipedia/util/ShareUtils.java
index b4262e7..839275a 100644
--- a/app/src/main/java/org/wikipedia/util/ShareUtils.java
+++ b/app/src/main/java/org/wikipedia/util/ShareUtils.java
@@ -179,9 +179,11 @@
 return null;
 }
 
-Intent bestIntent = intents.remove(0);
-return Intent.createChooser(bestIntent, chooserTitle)
-.putExtra(Intent.EXTRA_INITIAL_INTENTS, intents.toArray(new 
Parcelable[intents.size()]));
+Intent intent = Intent.createChooser(ApiUtil.hasHoneyComb() ? 
intents.remove(0) : targetIntent, chooserTitle);
+if (ApiUtil.hasHoneyComb()) {
+intent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intents.toArray(new 
Parcelable[intents.size()]));
+}
+return intent;
 }
 
 public static List queryIntents(@NonNull Context context,

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

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

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

[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

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


Localisation updates from https://translatewiki.net.

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

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



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

[MediaWiki-commits] [Gerrit] Revert "misc-web: temporarily broaden user content domain ma... - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Revert "misc-web: temporarily broaden user content domain match 
for phab"
..


Revert "misc-web: temporarily broaden user content domain match for phab"

This reverts commit 8af7a398eafd5635569e9415d4b8b92467bbae98.

Change-Id: I9ce43a8ea5f227203bd2218dc0757a60a4f07fdb
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 6620457..7185b3e 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -34,7 +34,7 @@
 set req.backend = ruthenium;
 } elsif (req.http.Host == "horizon.wikimedia.org") {
 set req.backend = californium;
-} elsif (req.http.Host == "phabricator.wikimedia.org" || req.http.Host ~ 
"^phab\." || req.http.Host == "bugzilla.wikimedia.org" || req.http.Host == 
"bugs.wikimedia.org") {
+} elsif (req.http.Host == "phabricator.wikimedia.org" || req.http.Host == 
"phab.wmfusercontent.org" || req.http.Host == "bugzilla.wikimedia.org" || 
req.http.Host == "bugs.wikimedia.org") {
 set req.backend = iridium;
 } elsif (req.http.Host == "static-bugzilla.wikimedia.org" || req.http.Host 
== "annual.wikimedia.org" || req.http.Host == "transparency.wikimedia.org") {
 set req.backend = bromine;

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

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

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

[MediaWiki-commits] [Gerrit] Revert "add phab.wikidata.org temporarily T112381" - change (operations/dns)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Revert "add phab.wikidata.org temporarily T112381"
..


Revert "add phab.wikidata.org temporarily T112381"

This reverts commit 79018e74a23834fda703f7a48a48f6a871cc86f3.

Change-Id: Ifa371b02887dcb902c24aae6c87006e1c57ff5d9
---
M templates/wikidata.org
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/templates/wikidata.org b/templates/wikidata.org
index 54ab959..1f7e559 100644
--- a/templates/wikidata.org
+++ b/templates/wikidata.org
@@ -40,6 +40,3 @@
 ; Mobile
 m   600 IN DYNA geoip!mobile-addrs
 test.m  600 IN DYNA geoip!mobile-addrs
-
-; temporary hack for phab
-phab600 IN CNAMEmisc-web-lb.eqiad.wikimedia.org.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa371b02887dcb902c24aae6c87006e1c57ff5d9
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

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


Fix sequencing of logged session events in ShareHandler.

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

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

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

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



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

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

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

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

[MediaWiki-commits] [Gerrit] Revert "misc-web: temporarily broaden user content domain ma... - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Revert "misc-web: temporarily broaden user content domain match 
for phab"
..

Revert "misc-web: temporarily broaden user content domain match for phab"

This reverts commit 8af7a398eafd5635569e9415d4b8b92467bbae98.

Change-Id: I9ce43a8ea5f227203bd2218dc0757a60a4f07fdb
---
M templates/varnish/misc.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/238200/1

diff --git a/templates/varnish/misc.inc.vcl.erb 
b/templates/varnish/misc.inc.vcl.erb
index 6620457..7185b3e 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -34,7 +34,7 @@
 set req.backend = ruthenium;
 } elsif (req.http.Host == "horizon.wikimedia.org") {
 set req.backend = californium;
-} elsif (req.http.Host == "phabricator.wikimedia.org" || req.http.Host ~ 
"^phab\." || req.http.Host == "bugzilla.wikimedia.org" || req.http.Host == 
"bugs.wikimedia.org") {
+} elsif (req.http.Host == "phabricator.wikimedia.org" || req.http.Host == 
"phab.wmfusercontent.org" || req.http.Host == "bugzilla.wikimedia.org" || 
req.http.Host == "bugs.wikimedia.org") {
 set req.backend = iridium;
 } elsif (req.http.Host == "static-bugzilla.wikimedia.org" || req.http.Host 
== "annual.wikimedia.org" || req.http.Host == "transparency.wikimedia.org") {
 set req.backend = bromine;

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Temporarily create phab.wikivoyage.org" - change (operations/dns)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Revert "Temporarily create phab.wikivoyage.org"
..


Revert "Temporarily create phab.wikivoyage.org"

This reverts commit c6a86d295e43a32f198b8c6ff0e4b3ac25404e2b.

Change-Id: Ibf35a77362f15a4f80c439ee6eff7b599eaa1dc5
---
M templates/wikivoyage.org
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/templates/wikivoyage.org b/templates/wikivoyage.org
index 56d4efc..9f38ba6 100644
--- a/templates/wikivoyage.org
+++ b/templates/wikivoyage.org
@@ -41,6 +41,3 @@
 
 ; Mobile
 m   600 IN DYNA geoip!mobile-addrs
-
-; temporary hack for phab
-phab600 IN CNAMEmisc-web-lb.eqiad.wikimedia.org.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf35a77362f15a4f80c439ee6eff7b599eaa1dc5
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "add phab.wikidata.org temporarily T112381" - change (operations/dns)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Revert "add phab.wikidata.org temporarily T112381"
..

Revert "add phab.wikidata.org temporarily T112381"

This reverts commit 79018e74a23834fda703f7a48a48f6a871cc86f3.

Change-Id: Ifa371b02887dcb902c24aae6c87006e1c57ff5d9
---
M templates/wikidata.org
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/99/238199/1

diff --git a/templates/wikidata.org b/templates/wikidata.org
index 54ab959..1f7e559 100644
--- a/templates/wikidata.org
+++ b/templates/wikidata.org
@@ -40,6 +40,3 @@
 ; Mobile
 m   600 IN DYNA geoip!mobile-addrs
 test.m  600 IN DYNA geoip!mobile-addrs
-
-; temporary hack for phab
-phab600 IN CNAMEmisc-web-lb.eqiad.wikimedia.org.

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Temporarily create phab.wikivoyage.org" - change (operations/dns)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Revert "Temporarily create phab.wikivoyage.org"
..

Revert "Temporarily create phab.wikivoyage.org"

This reverts commit c6a86d295e43a32f198b8c6ff0e4b3ac25404e2b.

Change-Id: Ibf35a77362f15a4f80c439ee6eff7b599eaa1dc5
---
M templates/wikivoyage.org
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/templates/wikivoyage.org b/templates/wikivoyage.org
index 56d4efc..9f38ba6 100644
--- a/templates/wikivoyage.org
+++ b/templates/wikivoyage.org
@@ -41,6 +41,3 @@
 
 ; Mobile
 m   600 IN DYNA geoip!mobile-addrs
-
-; temporary hack for phab
-phab600 IN CNAMEmisc-web-lb.eqiad.wikimedia.org.

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

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

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

[MediaWiki-commits] [Gerrit] Revert "Temporarily move phab altdom into wikivoyage.org" - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Revert "Temporarily move phab altdom into wikivoyage.org"
..


Revert "Temporarily move phab altdom into wikivoyage.org"

This reverts commit 2ef36fedff7650d4a007b28e0b1609e80ddc020d.

Change-Id: I65474c4a9e8189bc3b3e6e5db17b8d01c7e67f04
---
M manifests/role/phabricator.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 7e69c7a..9264da6 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -36,7 +36,7 @@
 
 $current_tag = 'release/2015-07-08/1'
 $domain = 'phabricator.wikimedia.org'
-$altdom = 'phab.wikivoyage.org' # TEMPORARY
+$altdom = 'phab.wmfusercontent.org'
 $mysql_host = 'm3-master.eqiad.wmnet'
 $mysql_slave = 'm3-slave.eqiad.wmnet'
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65474c4a9e8189bc3b3e6e5db17b8d01c7e67f04
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Revert "Temporarily move phab altdom into wikivoyage.org" - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Revert "Temporarily move phab altdom into wikivoyage.org"
..

Revert "Temporarily move phab altdom into wikivoyage.org"

This reverts commit 2ef36fedff7650d4a007b28e0b1609e80ddc020d.

Change-Id: I65474c4a9e8189bc3b3e6e5db17b8d01c7e67f04
---
M manifests/role/phabricator.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/238197/1

diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 7e69c7a..9264da6 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -36,7 +36,7 @@
 
 $current_tag = 'release/2015-07-08/1'
 $domain = 'phabricator.wikimedia.org'
-$altdom = 'phab.wikivoyage.org' # TEMPORARY
+$altdom = 'phab.wmfusercontent.org'
 $mysql_host = 'm3-master.eqiad.wmnet'
 $mysql_slave = 'm3-slave.eqiad.wmnet'
 

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

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

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

[MediaWiki-commits] [Gerrit] Revert "switch phab altdom to phab.wikidata.org T112381" - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: Revert "switch phab altdom to phab.wikidata.org T112381"
..

Revert "switch phab altdom to phab.wikidata.org T112381"

This reverts commit ff92d0207a447e2a2a08455aad5f28e1687235f9.

Change-Id: I94487094955a7cd2975845e45901530c84f2f0af
---
M manifests/role/phabricator.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 21d9af7..7e69c7a 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -36,7 +36,7 @@
 
 $current_tag = 'release/2015-07-08/1'
 $domain = 'phabricator.wikimedia.org'
-$altdom = 'phab.wikidata.org' # TEMPORARY
+$altdom = 'phab.wikivoyage.org' # TEMPORARY
 $mysql_host = 'm3-master.eqiad.wmnet'
 $mysql_slave = 'm3-slave.eqiad.wmnet'
 

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

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

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

[MediaWiki-commits] [Gerrit] Revert "switch phab altdom to phab.wikidata.org T112381" - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: Revert "switch phab altdom to phab.wikidata.org T112381"
..


Revert "switch phab altdom to phab.wikidata.org T112381"

This reverts commit ff92d0207a447e2a2a08455aad5f28e1687235f9.

Change-Id: I94487094955a7cd2975845e45901530c84f2f0af
---
M manifests/role/phabricator.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 21d9af7..7e69c7a 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -36,7 +36,7 @@
 
 $current_tag = 'release/2015-07-08/1'
 $domain = 'phabricator.wikimedia.org'
-$altdom = 'phab.wikidata.org' # TEMPORARY
+$altdom = 'phab.wikivoyage.org' # TEMPORARY
 $mysql_host = 'm3-master.eqiad.wmnet'
 $mysql_slave = 'm3-slave.eqiad.wmnet'
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94487094955a7cd2975845e45901530c84f2f0af
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Rewrite isFocusableElement for performance and correctness - change (oojs/ui)

[jenkins-bot (Code Review)]

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

Change subject: Rewrite isFocusableElement for performance and correctness
..


Rewrite isFocusableElement for performance and correctness

Improve performance by doing cheap tests first and returning
immediately, also avoid jQuery when possible.

Improve correctness by returning true for any element with a
tabIndex or contentEditable.

Avoid browser bugs with tabIndex by using $.prop.

Add area[href] as focusable.

Bug: T69156
Change-Id: Icdbbffa7112a56849118ffb73a85e37e20844500
---
M src/core.js
M tests/core.test.js
2 files changed, 118 insertions(+), 23 deletions(-)

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



diff --git a/src/core.js b/src/core.js
index 3bdd807..db422f4 100644
--- a/src/core.js
+++ b/src/core.js
@@ -53,30 +53,51 @@
  * @return {boolean}
  */
 OO.ui.isFocusableElement = function ( $element ) {
-   var node = $element[ 0 ],
-   nodeName = node.nodeName.toLowerCase(),
-   // Check if the element have tabindex set
-   isInElementGroup = 
/^(input|select|textarea|button|object)$/.test( nodeName ),
-   // Check if the element is a link with href or if it has 
tabindex
-   isOtherElement = (
-   ( nodeName === 'a' && node.href ) ||
-   !isNaN( $element.attr( 'tabindex' ) )
-   ),
-   // Check if the element is visible
-   isVisible = (
-   // This is quicker than calling $element.is( ':visible' 
)
-   $.expr.filters.visible( node ) &&
-   // Check that all parents are visible
-   !$element.parents().addBack().filter( function () {
-   return $.css( this, 'visibility' ) === 'hidden';
-   } ).length
-   ),
-   isTabOk = isNaN( $element.attr( 'tabindex' ) ) || 
+$element.attr( 'tabindex' ) >= 0;
+   var nodeName,
+   element = $element[ 0 ];
 
-   return (
-   ( isInElementGroup ? !node.disabled : isOtherElement ) &&
-   isVisible && isTabOk
-   );
+   // Anything disabled is not focusable
+   if ( element.disabled ) {
+   return false;
+   }
+
+   // Check if the element is visible
+   if ( !(
+   // This is quicker than calling $element.is( ':visible' )
+   $.expr.filters.visible( element ) &&
+   // Check that all parents are visible
+   !$element.parents().addBack().filter( function () {
+   return $.css( this, 'visibility' ) === 'hidden';
+   } ).length
+   ) ) {
+   return false;
+   }
+
+   // Check if the element is ContentEditable, which is the string 'true'
+   if ( element.contentEditable === 'true' ) {
+   return true;
+   }
+
+   // Anything with a non-negative numeric tabIndex is focusable.
+   // Use .prop to avoid browser bugs
+   if ( $element.prop( 'tabIndex' ) >= 0 ) {
+   return true;
+   }
+
+   // Some element types are naturally focusable
+   // (indexOf is much faster than regex in Chrome and about the
+   // same in FF: https://jsperf.com/regex-vs-indexof-array2)
+   nodeName = element.nodeName.toLowerCase();
+   if ( [ 'input', 'select', 'textarea', 'button', 'object' ].indexOf( 
nodeName ) !== -1 ) {
+   return true;
+   }
+
+   // Links and areas are focusable if they have an href
+   if ( ( nodeName === 'a' || nodeName === 'area' ) && $element.attr( 
'href' ) !== undefined ) {
+   return true;
+   }
+
+   return false;
 };
 
 /**
diff --git a/tests/core.test.js b/tests/core.test.js
index f89d5e7..45e0cff 100644
--- a/tests/core.test.js
+++ b/tests/core.test.js
@@ -16,3 +16,77 @@
assert.ok( OO.ui.isSafeUrl( '/relative' ) );
assert.ok( OO.ui.isSafeUrl( '/wiki/Extra:Colon' ) );
 } );
+
+QUnit.test( 'isFocusableElement', 10, function ( assert ) {
+   var i, $html, result,
+   cases = [
+   {
+   msg: 'Plain DIV',
+   html: 'foo',
+   expected: false
+   },
+   {
+   msg: 'Tabindexed span',
+   html: 'foo',
+   expected: true
+   },
+   {
+   msg: 'Hidden element',
+   html: 'foo',
+   expected: false
+   },
+   {
+   msg: 'Invalid tabindex',
+   html: 'foo',

[MediaWiki-commits] [Gerrit] Add a calculated min-height for the editor widget placeholder - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Add a calculated min-height for the editor widget placeholder
..


Add a calculated min-height for the editor widget placeholder

Now that both editors are the same height, the placeholder should
follow suit. It should have the calculated height of the editor
minHeight + toolbarHeight. However, each of those is in different
units (minHeight in em and toolbarHeight in px) which means we must
use CSS's native calc() method.

This commit escapes the calc() method while using LESS variables.

Change-Id: I5724b0265e357fb048dc7807768266a084f2071d
---
M modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
1 file changed, 10 insertions(+), 0 deletions(-)

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



diff --git 
a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less 
b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
index 510c47f..eaaf62f 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
@@ -1,4 +1,5 @@
 @import 'flow.colors';
+@import 'flow.variables';
 
 .flow-ui-editorSwitcherWidget {
display: block;
@@ -7,6 +8,15 @@
&-placeholder-input {
max-width: none;
background-color: transparent;
+   // Provide fallback for browsers that don't have calc function
+   // (Currently IE8, Opera Mini, Android 4.3)
+   min-height: @editorMinHeight;
+   // The placeholder should be the same height as the editor: 
minHeight + toolbarHeight.
+   // However, each of those is in different
+   // units (minHeight in em and toolbarHeight in px) which means 
we must
+   // use CSS's native calc() method.
+   // This escapes the calc() method while using LESS variables:
+   min-height: ~"calc(@{editorMinHeight} + 
@{editorToolbarHeight})";
 
& textarea {
border: none;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5724b0265e357fb048dc7807768266a084f2071d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] switch wmfusercontent.org to RSA-only temporarily - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: switch wmfusercontent.org to RSA-only temporarily
..


switch wmfusercontent.org to RSA-only temporarily

Change-Id: If1cc2074cd6308e9dcf8bcb2cd117ee5ee7362cb
---
M modules/role/manifests/cache/ssl/misc.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/cache/ssl/misc.pp 
b/modules/role/manifests/cache/ssl/misc.pp
index c1f4c67..edf0a40 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -6,7 +6,8 @@
 
 tlsproxy::localssl { 'wmfusercontent.org':
 do_ocsp=> true,
-certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
+certs  => ['star.wmfusercontent.org'], # temporary, until 
ECDSA re-issue
+# certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
 server_name=> 'wmfusercontent.org',
 server_aliases => ['*.wmfusercontent.org'];
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1cc2074cd6308e9dcf8bcb2cd117ee5ee7362cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] switch wmfusercontent.org to RSA-only temporarily - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: switch wmfusercontent.org to RSA-only temporarily
..

switch wmfusercontent.org to RSA-only temporarily

Change-Id: If1cc2074cd6308e9dcf8bcb2cd117ee5ee7362cb
---
M modules/role/manifests/cache/ssl/misc.pp
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/role/manifests/cache/ssl/misc.pp 
b/modules/role/manifests/cache/ssl/misc.pp
index c1f4c67..edf0a40 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -6,7 +6,8 @@
 
 tlsproxy::localssl { 'wmfusercontent.org':
 do_ocsp=> true,
-certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
+certs  => ['star.wmfusercontent.org'], # temporary, until 
ECDSA re-issue
+# certs  => ['ecc-star.wmfusercontent.org', 
'star.wmfusercontent.org'],
 server_name=> 'wmfusercontent.org',
 server_aliases => ['*.wmfusercontent.org'];
 }

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

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

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

[MediaWiki-commits] [Gerrit] BookletLayout: Remove unnecessary JSHint override - change (oojs/ui)

[Code Review]

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

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

Change subject: BookletLayout: Remove unnecessary JSHint override
..

BookletLayout: Remove unnecessary JSHint override

Change-Id: I454a382da4d89b836f76a91fdc720519281590a5
---
M src/layouts/BookletLayout.js
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/93/238193/1

diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index 7ab43cb..f82e297 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -228,7 +228,6 @@
// and check if they are focusable
items[ i ].$element
.find( 'input, select, textarea, button, object' )
-   /* jshint loopfunc:true */
.each( checkAndFocus );
}
 };

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I454a382da4d89b836f76a91fdc720519281590a5
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Don't show orange alert if you are viewing your user talk page - change (mediawiki...Echo)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Don't show orange alert if you are viewing your user talk page
..

Don't show orange alert if you are viewing your user talk page

We cannot count on the user_newtalk flag being cleared since that
happens in a deferred update.

Bug: T107655
Change-Id: Ie954ed7c5a4e784c3feb86288943a56cfb9c23c0
---
M Hooks.php
1 file changed, 9 insertions(+), 1 deletion(-)


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

diff --git a/Hooks.php b/Hooks.php
index 3d26498..e0a24d6 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -703,7 +703,15 @@
$personal_urls = wfArrayInsertAfter( $personal_urls, 
$insertUrls, 'userpage' );
 
// If the user has new messages, display a talk page alert
-   if ( $wgEchoNewMsgAlert && $user->getOption( 'echo-show-alert' 
) && $user->getNewtalk() ) {
+   // We need to check:
+   // * Orange alert is enabled in configuration
+   // * Enabled in user preferences
+   // * User actually has new messages
+   // * User is not viewing their user talk page, as user_newtalk
+   //   will not have been cleared yet. (bug T107655).
+   if ( $wgEchoNewMsgAlert && $user->getOption( 'echo-show-alert' )
+   && $user->getNewtalk() && 
$user->getTalkPage()->equals( $title )
+   ) {
$personal_urls['mytalk']['text'] = $sk->msg( 
'echo-new-messages' )->text();
$personal_urls['mytalk']['class'] = array( 
'mw-echo-alert' );
$sk->getOutput()->addModuleStyles( 'ext.echo.alert' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie954ed7c5a4e784c3feb86288943a56cfb9c23c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
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] update star.wmfusercontent.org cert - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: update star.wmfusercontent.org cert
..

update star.wmfusercontent.org cert

Change-Id: If2d438bf9d9d1caca50d82ee6afe16db2f484f1f
---
M files/ssl/star.wmfusercontent.org.crt
1 file changed, 19 insertions(+), 19 deletions(-)


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

diff --git a/files/ssl/star.wmfusercontent.org.crt 
b/files/ssl/star.wmfusercontent.org.crt
index 530b7d3..34c1f9c 100644
--- a/files/ssl/star.wmfusercontent.org.crt
+++ b/files/ssl/star.wmfusercontent.org.crt
@@ -1,17 +1,17 @@
 -BEGIN CERTIFICATE-
-MIIFXjCCBEagAwIBAgISESETvCPKpTq9GcGxioviBUwgMA0GCSqGSIb3DQEBCwUA
+MIIFXjCCBEagAwIBAgISESFEo6U9YVV0XlifOQMEHNMnMA0GCSqGSIb3DQEBCwUA
 MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
 VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTQwOTExMTM0MTEyWhcNMTUwOTEyMTM0MTEyWjB+MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
-BAMUFCoud21mdXNlcmNvbnRlbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAym4JoAC7kk5CbTl28CKpJx8fJE76lbo2lEWC9mZpgVdw5xeqcWx1
-rXJUHKBwM50/TH+ygFSWtDdxFCtIHdZAufUJDIH86pGXQabUXStX0fN2FGN9V9du
-XNVi8VJeF5BtZ6pyuP0rei0IBkZWU0M8ka+ewJH+dN8SvV3mFtsG9/9PtLxygs5Y
-9ZBnph7Pbehv6TdaHx6sPCc7XPhtBcat6hI47aIXERhY3F0GswLoJYmkVDuB/+rR
-z97N1cdQjuTrxKtFA2pyu6Ue6fFV0w05i8U5AopUusSTSHJMl4B+yQbw7gQF2rIZ
-KbgOBdMRXInsks/LDpQ5t0UVdEGLIauHTQIDAQABo4IB7DCCAegwDgYDVR0PAQH/
+MjU2IC0gRzIwHhcNMTUwOTE0MTQyNzUwWhcNMTYwOTEyMTM0MTEyWjB+MQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
+BAMMFCoud21mdXNlcmNvbnRlbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAqloA2ru1ImwcA/D1YDSdEdnM/70SKcmHMB405tEVrqheJzqGgyOA
+ViuG6q+9itJQInxH9jw5/xYI5SB6Zb8eRxnBCGfl5MyJITHeCClg2pU77FHc95lc
+2TzB6zGrhXIfsfu1tth0qckVE4HoIqhUGURrwcaq4I7BqZLDMp2UXVhgMv/+9mgI
+z+/Vy2nJwmRCoWC85ICOyJ8jdoVeyb82SuIBj85aLcqDsLg1L1YbVa38magtiey8
+Z8ovuR4HmJU55az2cTjiVJSqwtOR53owg2REAd04X4gwRXim2MSEOs0U7iL0h4zv
+Sg/JO9DL0TJ4oSEiYe173lxRqcRUYLvCkQIDAQABo4IB7DCCAegwDgYDVR0PAQH/
 BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYIKwYBBQUHAgEWJmh0dHBz
 Oi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMDMGA1UdEQQsMCqCFCou
 d21mdXNlcmNvbnRlbnQub3JnghJ3bWZ1c2VyY29udGVudC5vcmcwCQYDVR0TBAIw
@@ -20,12 +20,12 @@
 bHNoYTJnMi5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRw
 Oi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZh
 bHNoYTJnMnIxLmNydDA/BggrBgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNp
-Z24uY29tL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBSDHo9KrfCn
-07RStAqom1bD2NWDijAfBgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDAN
-BgkqhkiG9w0BAQsFAAOCAQEAp/9FUj5plqtWNoPp3WORxQXPmGPIwSy2MsWb30nn
-C6Lq5XRyGbzajs5nZk3qEsKG8AD2FDPonWVHsGhpt3Z81uWmT0KxnJPykiiEClZS
-H2Afst2JdPAEageAM3r0nEd/NCxNuL/dZiWz3L8vkEpySkn7mPz5XWeMZq+c+YE7
-mnr3JV4lzL2/+sEaurgnkuBzoDGcoUk1DgIQ9yM5Aij7veFMd60dtbsmhs5GrafE
-K/n5d50MAM1T0S8j1u7SHvRtkyENVUPZwqChtxqTHve8Dx7spPyIpdRnnAn/LP6t
-VQhlrv0vh3KTOTjb82u4jBwHhTF0crtPmI398CwItwjtGg==
+Z24uY29tL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBTs9bo7fGTb
+c8RGzVVqFGq7FJ4i1TAfBgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDAN
+BgkqhkiG9w0BAQsFAAOCAQEAMPqd8b+meFBHqYdbz3zAhM1NnspB96We0WSdy2zn
+fbWT3L5RB7dNstJbtQAuQw28qlQDPK2t6XBLcoQiif9c8UHVlfinNca1yY5mX8Sn
+7/u29n/NwugIJ4vNDdBRhWwYBI4Tu7gEYaVzemxni7DVDDTkNTS6QF7dIcnjHXHd
+tkw5JHBui4e/K+F9RKPfisbvmo0Idw6DZmZseKFU/oD7/8n10Yx2P232pk7B7Adi
+yYjxl2T8SS7tdtOpvHhkDs5Q1MUdzQTri0h1JxfulAUG9HYV7WqFmPBJCcUwEQZT
+5sQoJIsS7iwtoFyI+WNfsWzrPxm4ekgmH2ZdHob5Yu1Ocg==
 -END CERTIFICATE-

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

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

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

[MediaWiki-commits] [Gerrit] update star.wmfusercontent.org cert - change (operations/puppet)

[BBlack (Code Review)]

BBlack has submitted this change and it was merged.

Change subject: update star.wmfusercontent.org cert
..


update star.wmfusercontent.org cert

Change-Id: If2d438bf9d9d1caca50d82ee6afe16db2f484f1f
---
M files/ssl/star.wmfusercontent.org.crt
1 file changed, 19 insertions(+), 19 deletions(-)

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



diff --git a/files/ssl/star.wmfusercontent.org.crt 
b/files/ssl/star.wmfusercontent.org.crt
index 530b7d3..34c1f9c 100644
--- a/files/ssl/star.wmfusercontent.org.crt
+++ b/files/ssl/star.wmfusercontent.org.crt
@@ -1,17 +1,17 @@
 -BEGIN CERTIFICATE-
-MIIFXjCCBEagAwIBAgISESETvCPKpTq9GcGxioviBUwgMA0GCSqGSIb3DQEBCwUA
+MIIFXjCCBEagAwIBAgISESFEo6U9YVV0XlifOQMEHNMnMA0GCSqGSIb3DQEBCwUA
 MGYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTwwOgYD
 VQQDEzNHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gU0hB
-MjU2IC0gRzIwHhcNMTQwOTExMTM0MTEyWhcNMTUwOTEyMTM0MTEyWjB+MQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
-aXNjbzEjMCEGA1UEChMaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
-BAMUFCoud21mdXNlcmNvbnRlbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAym4JoAC7kk5CbTl28CKpJx8fJE76lbo2lEWC9mZpgVdw5xeqcWx1
-rXJUHKBwM50/TH+ygFSWtDdxFCtIHdZAufUJDIH86pGXQabUXStX0fN2FGN9V9du
-XNVi8VJeF5BtZ6pyuP0rei0IBkZWU0M8ka+ewJH+dN8SvV3mFtsG9/9PtLxygs5Y
-9ZBnph7Pbehv6TdaHx6sPCc7XPhtBcat6hI47aIXERhY3F0GswLoJYmkVDuB/+rR
-z97N1cdQjuTrxKtFA2pyu6Ue6fFV0w05i8U5AopUusSTSHJMl4B+yQbw7gQF2rIZ
-KbgOBdMRXInsks/LDpQ5t0UVdEGLIauHTQIDAQABo4IB7DCCAegwDgYDVR0PAQH/
+MjU2IC0gRzIwHhcNMTUwOTE0MTQyNzUwWhcNMTYwOTEyMTM0MTEyWjB+MQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
+aXNjbzEjMCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xHTAbBgNV
+BAMMFCoud21mdXNlcmNvbnRlbnQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAqloA2ru1ImwcA/D1YDSdEdnM/70SKcmHMB405tEVrqheJzqGgyOA
+ViuG6q+9itJQInxH9jw5/xYI5SB6Zb8eRxnBCGfl5MyJITHeCClg2pU77FHc95lc
+2TzB6zGrhXIfsfu1tth0qckVE4HoIqhUGURrwcaq4I7BqZLDMp2UXVhgMv/+9mgI
+z+/Vy2nJwmRCoWC85ICOyJ8jdoVeyb82SuIBj85aLcqDsLg1L1YbVa38magtiey8
+Z8ovuR4HmJU55az2cTjiVJSqwtOR53owg2REAd04X4gwRXim2MSEOs0U7iL0h4zv
+Sg/JO9DL0TJ4oSEiYe173lxRqcRUYLvCkQIDAQABo4IB7DCCAegwDgYDVR0PAQH/
 BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYIKwYBBQUHAgEWJmh0dHBz
 Oi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMDMGA1UdEQQsMCqCFCou
 d21mdXNlcmNvbnRlbnQub3JnghJ3bWZ1c2VyY29udGVudC5vcmcwCQYDVR0TBAIw
@@ -20,12 +20,12 @@
 bHNoYTJnMi5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQME0GCCsGAQUFBzAChkFodHRw
 Oi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc29yZ2FuaXphdGlvbnZh
 bHNoYTJnMnIxLmNydDA/BggrBgEFBQcwAYYzaHR0cDovL29jc3AyLmdsb2JhbHNp
-Z24uY29tL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBSDHo9KrfCn
-07RStAqom1bD2NWDijAfBgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDAN
-BgkqhkiG9w0BAQsFAAOCAQEAp/9FUj5plqtWNoPp3WORxQXPmGPIwSy2MsWb30nn
-C6Lq5XRyGbzajs5nZk3qEsKG8AD2FDPonWVHsGhpt3Z81uWmT0KxnJPykiiEClZS
-H2Afst2JdPAEageAM3r0nEd/NCxNuL/dZiWz3L8vkEpySkn7mPz5XWeMZq+c+YE7
-mnr3JV4lzL2/+sEaurgnkuBzoDGcoUk1DgIQ9yM5Aij7veFMd60dtbsmhs5GrafE
-K/n5d50MAM1T0S8j1u7SHvRtkyENVUPZwqChtxqTHve8Dx7spPyIpdRnnAn/LP6t
-VQhlrv0vh3KTOTjb82u4jBwHhTF0crtPmI398CwItwjtGg==
+Z24uY29tL2dzb3JnYW5pemF0aW9udmFsc2hhMmcyMB0GA1UdDgQWBBTs9bo7fGTb
+c8RGzVVqFGq7FJ4i1TAfBgNVHSMEGDAWgBSW3mHxvRwWKVMcwMx9O4MAQOYafDAN
+BgkqhkiG9w0BAQsFAAOCAQEAMPqd8b+meFBHqYdbz3zAhM1NnspB96We0WSdy2zn
+fbWT3L5RB7dNstJbtQAuQw28qlQDPK2t6XBLcoQiif9c8UHVlfinNca1yY5mX8Sn
+7/u29n/NwugIJ4vNDdBRhWwYBI4Tu7gEYaVzemxni7DVDDTkNTS6QF7dIcnjHXHd
+tkw5JHBui4e/K+F9RKPfisbvmo0Idw6DZmZseKFU/oD7/8n10Yx2P232pk7B7Adi
+yYjxl2T8SS7tdtOpvHhkDs5Q1MUdzQTri0h1JxfulAUG9HYV7WqFmPBJCcUwEQZT
+5sQoJIsS7iwtoFyI+WNfsWzrPxm4ekgmH2ZdHob5Yu1Ocg==
 -END CERTIFICATE-

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If2d438bf9d9d1caca50d82ee6afe16db2f484f1f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 

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

[MediaWiki-commits] [Gerrit] Minor tweaks to my .gitconfig - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

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

Change subject: Minor tweaks to my .gitconfig
..

Minor tweaks to my .gitconfig

- Use HTTPS, never SSH
- Push simple by default

Change-Id: I312700f1843edaa78d80aa07a21de2373208f962
---
M modules/admin/files/home/demon/.gitconfig
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/modules/admin/files/home/demon/.gitconfig 
b/modules/admin/files/home/demon/.gitconfig
index 9b801b8..2793966 100644
--- a/modules/admin/files/home/demon/.gitconfig
+++ b/modules/admin/files/home/demon/.gitconfig
@@ -34,5 +34,7 @@
keepBackup = false
 [gitreview]
username = demon
-[url "ssh://gerrit.wikimedia.org/"]
+[url "https://gerrit.wikimedia.org/r/p/";]
 insteadOf = "gerrit:"
+[push]
+   default = simple

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

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

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

[MediaWiki-commits] [Gerrit] Add Korean translation - change (mediawiki...Flow)

[jenkins-bot (Code Review)]

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

Change subject: Add Korean translation
..


Add Korean translation

주제 matches the translation in i18n/ko.json so there should be
no problem with the existing translations.

Change-Id: Id9c83b17d75529adfa4b909c149e3afac6037317
---
M Flow.namespaces.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/Flow.namespaces.php b/Flow.namespaces.php
index c74f8eb..387e6e5 100644
--- a/Flow.namespaces.php
+++ b/Flow.namespaces.php
@@ -79,6 +79,10 @@
 NS_TOPIC =>  'Argomento',
 );
 
+/** Korean */
+$namespaceNames['ko'] = array(
+   NS_TOPIC => '주제',
+);
 /** Luxembourgish */
 $namespaceNames['lb'] = array(
NS_TOPIC =>  'Thema',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9c83b17d75529adfa4b909c149e3afac6037317
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Revi 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Send image varnish frontend data from logs to statsd - change (operations/puppet)

[Ori.livneh (Code Review)]

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

Change subject: Send image varnish frontend data from logs to statsd
..


Send image varnish frontend data from logs to statsd

This is a modified version of varnishrls for varnish thumbnail access stats

Bug: T105681
Change-Id: Iae36f1916f28d568c5a9c76f07c55699a092b63c
---
M modules/role/manifests/cache/upload.pp
A modules/varnish/files/varnishmedia
A modules/varnish/files/varnishprocessor/__init__.py
A modules/varnish/files/varnishprocessor/varnishprocessor.py
M modules/varnish/files/varnishrls
A modules/varnish/manifests/logging/media.pp
A modules/varnish/templates/initscripts/varnishmedia.systemd.erb
7 files changed, 255 insertions(+), 73 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index eaa175e..7f90a44 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -134,4 +134,9 @@
 topic => 'webrequest_upload',
 }
 }
+
+# Media browser cache hit rate and request volume stats.
+::varnish::logging::media { 'media':
+statsd_server => 'statsd.eqiad.wmnet',
+}
 }
diff --git a/modules/varnish/files/varnishmedia 
b/modules/varnish/files/varnishmedia
new file mode 100755
index 000..a754450
--- /dev/null
+++ b/modules/varnish/files/varnishmedia
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+  varnishmedia
+  
+
+  Accumulate browser cache hit ratio and total request volume statistics
+  for media requests and report to StatsD.
+
+  Usage: varnishmedia [--statsd-server SERVER] [--key-prefix PREFIX]
+
+--statsd-server SERVER  statsd server (default: none; echo to stdout)
+--key-prefix PREFIX metric key prefix (default: 
media.thumbnail.varnish)
+
+  Copyright 2015 Ori Livneh 
+  Copyright 2015 Gilles Dubuc 
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+"""
+from __future__ import division
+
+import re
+
+import varnishlog
+import varnishprocessor
+
+
+class MediaVarnishLogProcessor(varnishprocessor.VarnishLogProcessor):
+description = 'Media Browser Cache Hit Ratio StatsD Reporter'
+key_prefix = 'media.thumbnail.varnish'
+
+def process_transaction(self, transaction):
+"""Process a single completed transaction."""
+status_code = transaction['TxStatus']
+metric_keys = ['reqs.all', 'resps.' + status_code]
+
+if 'RxHeader' in transaction:
+metric_keys.append('reqs.if_none_match')
+
+if 'TxHeader' in transaction:
+cache_control_header = transaction.get('TxHeader')
+cache_control = 'no'
+if cache_control_header:
+match = re.search(r'(?<=max-age=)\d+', cache_control_header)
+if match:
+cache_control = 'short' if match.group() == '300' else 
'long'
+metric_keys.append('responses.%s_cache_control.%s' %
+   (cache_control, status_code))
+
+for key in metric_keys:
+self.stats[key] = self.stats.get(key, 0) + 1
+
+if self.stats['reqs.all'] > 1:
+self.flush_stats()
+
+def start(self):
+varnishlog.varnishlog((
+('m', 'RxURL:/thumb/'), # Only look at thumb requests
+('n', 'frontend'),  # Consider the frontend Varnish instance
+('i', 'TxStatus'),  # Get TxStatus for the HTTP status code
+('i', 'RxURL'), # Get RxURL to match /w/load.php
+('i', 'ReqEnd'),# Get ReqEnd to delimit requests
+), self.handle_log_record)
+
+lp = MediaVarnishLogProcessor()
diff --git a/modules/varnish/files/varnishprocessor/__init__.py 
b/modules/varnish/files/varnishprocessor/__init__.py
new file mode 100644
index 000..b6cc654
--- /dev/null
+++ b/modules/varnish/files/varnishprocessor/__init__.py
@@ -0,0 +1 @@
+from .varnishprocessor import VarnishLogProcessor
diff --git a/modules/varnish/files/varnishprocessor/varnishprocessor.py 
b/modules/varnish/files/varnishprocessor/varnishprocessor.py
new file mode 100644
index 000..14b2d46
--- /dev/null
+++ b/modules/varnish/files/varnishprocessor/varnishprocessor.py
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+"""
+  VarnishLogProcessor
+  ~~~
+
+  Processes V

[MediaWiki-commits] [Gerrit] shinken: Make shinkengen compatible with ldap3 0.9.4.2 - change (operations/puppet)

[Tim Landscheidt (Code Review)]

Tim Landscheidt has uploaded a new change for review.

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

Change subject: shinken: Make shinkengen compatible with ldap3 0.9.4.2
..

shinken: Make shinkengen compatible with ldap3 0.9.4.2

ldap3's features AUTO_BIND_TLS_AFTER_BIND & Co. were added with
version 0.9.4.3.  The backport of ldap3 for Ubuntu will be Utopic's
0.9.4.2.  To be compatible with both, this change translates
AUTO_BIND_TLS_AFTER_BIND to bind() and start_tls().

Bug: T101824
Change-Id: I5f7f7b4e33c5643a95739bcde72dfc56c0372aad
---
M modules/shinken/files/shinkengen
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index c673069..6fe2f76 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -64,8 +64,9 @@
 def __init__(self, server, bindas, passwd):
 server = ldap3.Server(server)
 self.conn = ldap3.Connection(server, read_only=True,
- user=bindas, password=passwd,
- auto_bind=ldap3.AUTO_BIND_TLS_AFTER_BIND)
+ user=bindas, password=passwd)
+self.conn.bind()
+self.conn.start_tls()
 
 def get_instances(self, project):
 """

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f7f7b4e33c5643a95739bcde72dfc56c0372aad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

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

[MediaWiki-commits] [Gerrit] Fix to set CARGO_VERSION even if wfLoadExtension() is called - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has submitted this change and it was merged.

Change subject: Fix to set CARGO_VERSION even if wfLoadExtension() is called
..


Fix to set CARGO_VERSION even if wfLoadExtension() is called

Change-Id: Ia497a4e825403aa86ce5543cac95465ea101169c
---
M Cargo.php
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Yaron Koren: Checked; Looks good to me, approved



diff --git a/Cargo.php b/Cargo.php
index c26acaf..a9f74ee 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -6,6 +6,11 @@
  * @author Yaron Koren
  */
 
+// We need to set this at the top, so that it is also defined if
+// wfLoadExtension() is called, because its presence is used by other
+// extensions to determine whether Cargo is installed.
+define( 'CARGO_VERSION', '0.10-alpha' );
+
 if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'Cargo' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
@@ -18,9 +23,7 @@
return;
 }
 
-/* For Backword Compatibility */
-
-define( 'CARGO_VERSION', '0.10-alpha' );
+// All the rest is for backward compatibility, for MW 1.25 and lower.
 
 $wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,

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

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

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

[MediaWiki-commits] [Gerrit] de-centralize mustache js - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: de-centralize mustache js
..


de-centralize mustache js

Change-Id: Ibcc7ead979f35729551ced88b333d361ccaef2ab
---
M DonationInterface.php
R astropay_gateway/astropay.js
M astropay_gateway/astropay_gateway.body.php
M gateway_forms/Mustache.php
4 files changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/DonationInterface.php b/DonationInterface.php
index a7c9714..5a7ed85 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -850,11 +850,11 @@
'position' => 'top',
 );
 
-$wgResourceModules['ext.donationinterface.mustache.scripts'] = array (
-   'scripts' => 'forms.js',
+$wgResourceModules['ext.donationinterface.astropay.scripts'] = array (
+   'scripts' => 'astropay.js',
'dependencies' => 'di.form.core.validate',
-   'localBasePath' => __DIR__ . '/gateway_forms/mustache',
-   'remoteExtPath' => 'DonationInterface/gateway_forms/mustache'
+   'localBasePath' => __DIR__ . '/astropay_gateway',
+   'remoteExtPath' => 'DonationInterface/astropay_gateway'
 );
 
 // load any rapidhtml related resources
diff --git a/gateway_forms/mustache/forms.js b/astropay_gateway/astropay.js
similarity index 100%
rename from gateway_forms/mustache/forms.js
rename to astropay_gateway/astropay.js
diff --git a/astropay_gateway/astropay_gateway.body.php 
b/astropay_gateway/astropay_gateway.body.php
index 0a347dc..c3a2bb4 100644
--- a/astropay_gateway/astropay_gateway.body.php
+++ b/astropay_gateway/astropay_gateway.body.php
@@ -31,6 +31,7 @@
}
 
protected function handleRequest() {
+   $this->getOutput()->addModules( 
'ext.donationinterface.astropay.scripts' );
$this->handleDonationRequest();
}
 }
diff --git a/gateway_forms/Mustache.php b/gateway_forms/Mustache.php
index da704d9..0aee4d3 100644
--- a/gateway_forms/Mustache.php
+++ b/gateway_forms/Mustache.php
@@ -164,7 +164,6 @@
public function getResources() {
return array(
'ext.donationinterface.mustache.styles',
-   'ext.donationinterface.mustache.scripts'
);
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcc7ead979f35729551ced88b333d361ccaef2ab
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix to set CARGO_VERSION even if wfLoadExtension() is called - change (mediawiki...Cargo)

[Yaron Koren (Code Review)]

Yaron Koren has uploaded a new change for review.

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

Change subject: Fix to set CARGO_VERSION even if wfLoadExtension() is called
..

Fix to set CARGO_VERSION even if wfLoadExtension() is called

Change-Id: Ia497a4e825403aa86ce5543cac95465ea101169c
---
M Cargo.php
1 file changed, 6 insertions(+), 3 deletions(-)


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

diff --git a/Cargo.php b/Cargo.php
index c26acaf..a9f74ee 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -6,6 +6,11 @@
  * @author Yaron Koren
  */
 
+// We need to set this at the top, so that it is also defined if
+// wfLoadExtension() is called, because its presence is used by other
+// extensions to determine whether Cargo is installed.
+define( 'CARGO_VERSION', '0.10-alpha' );
+
 if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'Cargo' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
@@ -18,9 +23,7 @@
return;
 }
 
-/* For Backword Compatibility */
-
-define( 'CARGO_VERSION', '0.10-alpha' );
+// All the rest is for backward compatibility, for MW 1.25 and lower.
 
 $wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,

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

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

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

[MediaWiki-commits] [Gerrit] Create composer job variants to test MW extensions - change (integration/config)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Create composer job variants to test MW extensions
..

Create composer job variants to test MW extensions

Change-Id: I97e1d3ca0f03776ba91fb45f4613ba22823a3a7e
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/wikidata.yaml
M zuul/layout.yaml
4 files changed, 77 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/88/238188/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index ba098a8..5a95eef 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -653,6 +653,14 @@
  - shell: |
 composer update --ansi --no-progress --prefer-dist --profile --no-dev
 
+- builder:
+name: composer-local-create
+builders:
+ - shell: |
+set -u
+cd src
+
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
"{deps}" composer.local.json
+
 # Runs "composer test"
 - builder:
 name: composer-test
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e8ebe14..5614300 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -89,6 +89,29 @@
  - mw-install-mysql
  - mw-apply-settings
  - mw-run-update-script
+# same except for use with composer instead of cloning vendor
+- builder:
+name: prepare-mediawiki-zuul-project-no-vendor
+builders:
+ - shell: "echo $ZUUL_PROJECT > extensions_load.txt"
+ - shell: "echo -e $EXT_DEPENDENCIES >> extensions_load.txt"
+ - zuul-cloner:
+ projects: >
+ mediawiki/core
+ $(cat extensions_load.txt)
+ - shell: "mv extensions_load.txt src/extensions_load.txt"
+ - shell: |
+ if grep -q mediawiki/extensions/VisualEditor src/extensions_load.txt; 
then
+cd src/extensions/VisualEditor
+git submodule update --init
+ fi
+ - composer-validate
+ - composer-local-create:
+ deps: 'extensions_load.txt'
+ - composer-update
+ - mw-install-mysql
+ - mw-apply-settings
+ - mw-run-update-script
 
 - job-template:
 name: '{name}-{ext-name}-qunit'
@@ -116,6 +139,21 @@
  - zuul
 builders:
  - prepare-mediawiki-zuul-project
+ - qunit-karma
+publishers:
+ - localhost-cleanup
+ - mw-teardown-mysql
+ - archive-log-dir
+
+# Generic qunit job for extensions with composer update.
+- job:
+name: 'mwext-qunit-composer'
+node: contintLabsSlave && UbuntuTrusty
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - prepare-mediawiki-zuul-project-no-vendor
  - qunit-karma
 publishers:
  - localhost-cleanup
@@ -220,6 +258,24 @@
 results: 'log/junit*.xml'
  - mw-teardown-mysql
  - archive-log-dir
+# same but with composer update instead of cloning vendor
+- job-template:
+name: 'mwext-testextension-{phpflavor}-composer'
+node: 'contintLabsSlave && ((UbuntuPrecise && phpflavor-zend && 
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm && 
phpflavor-{phpflavor}))'
+concurrent: true
+triggers:
+ - zuul
+builders:
+ - assert-phpflavor:
+ phpflavor: '{phpflavor}'
+ - hhvm-clear-hhbc
+ - prepare-mediawiki-zuul-project-no-vendor
+ - mw-run-phpunit-allexts
+publishers:
+ - junit:
+results: 'log/junit*.xml'
+ - mw-teardown-mysql
+ - archive-log-dir
 
 - project:
 name: 'mwext-testextension-generic'
@@ -228,6 +284,10 @@
 phpflavor:
 - hhvm
 - zend
+ - 'mwext-testextension-{phpflavor}-composer':
+phpflavor:
+- hhvm
+- zend
 
 - job:
 name: 'mwext-Flow-jsduck-publish'
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 0dd888a..55a295d 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -1,10 +1,8 @@
 - builder:
 name: wd-mw-composer-merged-install
 builders:
-- shell: |
-set -u
-cd "$WORKSPACE/src/"
-
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
../deps.txt composer.local.json
+- composer-local-create:
+deps: '../deps.txt'
 - composer-update:
 dir: '$WORKSPACE/src/'
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e636770..3b5eca5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1792,6 +1792,9 @@
   - mediawiki-extensions-hhvm
   - mediawiki-extensions-qunit
   - mwext-testextension-hhvm
+  - mwext-testextension-zend-composer
+  - mwext-testextension-hhvm-composer
+  - mwext-qunit-composer
   - npm
   - php-composer-test
 
@@ -7502,6 +7505,10 @@
   - mwext-Wikibase-client-tests-mysql-hhvm
   - mwext-Wikibase-client-tests-sqlite-hhvm
   - mwext-Wikibase-qunit
+experimental:
+  - mwext-testextension-zend-composer
+ 

[MediaWiki-commits] [Gerrit] Add option to expose original sha1 in thumb url - change (mediawiki/core)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Add option to expose original sha1 in thumb url
..

Add option to expose original sha1 in thumb url

Bug: T112546
Change-Id: I545586ff8d0020d00d9faa1dff2d0d9721134452
---
M includes/DefaultSettings.php
M includes/filerepo/file/File.php
2 files changed, 18 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/86/238186/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 37429b9..77c6492 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -7714,6 +7714,14 @@
 $wgSearchRunSuggestedQueryPercent = 1;
 
 /**
+ * This exposes the original file's sha1 hash in the thumbnail URL.
+ *
+ * @var bool
+ * @since 1.26
+ */
+$wgIncludeOriginalSha1InThumbnailUrl = false;
+
+/**
  * For really cool vim folding this needs to be at the end:
  * vim: foldmarker=@{,@} foldmethod=marker
  * @}
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index f40d216..82e30df 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -940,13 +940,22 @@
 * @return string
 */
public function generateThumbName( $name, $params ) {
+   global $wgIncludeOriginalSha1InThumbnailUrl;
+
if ( !$this->getHandler() ) {
return null;
}
$extension = $this->getExtension();
list( $thumbExt, ) = $this->getHandler()->getThumbType(
$extension, $this->getMimeType(), $params );
-   $thumbName = $this->getHandler()->makeParamString( $params ) . 
'-' . $name;
+   $thumbName = $this->getHandler()->makeParamString( $params );
+
+   if ( $wgIncludeOriginalSha1InThumbnailUrl ) {
+   $thumbName .= '-' . $this->getSha1();
+   }
+
+   $thumbName .= '-' . $name;
+
if ( $thumbExt != $extension ) {
$thumbName .= ".$thumbExt";
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I545586ff8d0020d00d9faa1dff2d0d9721134452
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Enable far-future expires - change (mediawiki/vagrant)

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

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

Change subject: Enable far-future expires
..

Enable far-future expires

Soft-depends on I545586ff8d0020d00d9faa1dff2d0d9721134452

Bug: T111721
Change-Id: Ib018719037a45eb4a3e272a139beb8d600c56326
---
M puppet/modules/role/manifests/thumbor.pp
M puppet/modules/thumbor/templates/thumbor.conf.erb
M puppet/modules/varnish/templates/default.vcl.erb
3 files changed, 11 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/87/238187/1

diff --git a/puppet/modules/role/manifests/thumbor.pp 
b/puppet/modules/role/manifests/thumbor.pp
index 47fa103..5b6adb5 100644
--- a/puppet/modules/role/manifests/thumbor.pp
+++ b/puppet/modules/role/manifests/thumbor.pp
@@ -6,9 +6,9 @@
 include ::thumbor
 
 mediawiki::settings { 'thumbor':
-values => [
-'$wgThumbnailingService = array("type" => "thumbor", "host" => 
"127.0.0.1", "port" => , "path" => "/unsafe/", "dimensionsSeparator" => 
"x", "sourceParameter" => "/",);',
-],
+values => {
+wgIncludeOriginalSha1InThumbnailUrl => true,
+},
 }
 }
 
diff --git a/puppet/modules/thumbor/templates/thumbor.conf.erb 
b/puppet/modules/thumbor/templates/thumbor.conf.erb
index 9706000..e04f926 100644
--- a/puppet/modules/thumbor/templates/thumbor.conf.erb
+++ b/puppet/modules/thumbor/templates/thumbor.conf.erb
@@ -72,7 +72,7 @@
 
 ## Max AGE sent as a header for the image served by thumbor in seconds
 ## Defaults to: 86400
-#MAX_AGE = 86400
+MAX_AGE = 31536000
 
 ## Indicates the Max AGE header in seconds for temporary images (images with
 ## failed smart detection)
diff --git a/puppet/modules/varnish/templates/default.vcl.erb 
b/puppet/modules/varnish/templates/default.vcl.erb
index f4719d4..7786cf0 100755
--- a/puppet/modules/varnish/templates/default.vcl.erb
+++ b/puppet/modules/varnish/templates/default.vcl.erb
@@ -23,7 +23,7 @@
 set req.backend = default;
 
 <% if @thumbor -%>
-if (req.url ~ "^/images/thumb/.*\.(jpg|png)") {
+if (req.url ~ "^/images/thumb/.*\.(jpg|jpeg|png)") {
 set req.backend = thumbor;
 }
 <% end -%>
@@ -75,7 +75,7 @@
 }
 
 # Pass any requests with the "If-None-Match" header directly.
-if (req.http.If-None-Match<% if @thumbor -%> && !req.url ~ 
"^/images/thumb/.*\.(jpg|png)"<% end -%>) {
+if (req.http.If-None-Match<% if @thumbor -%> && !req.url ~ 
"^/images/thumb/.*\.(jpg|jpeg|png)"<% end -%>) {
 return(pass);
 }
 
@@ -136,15 +136,16 @@
 
 <% if @thumbor -%>
 # qlow jpg thumbs
-if (req.url ~ "^/images/thumb/(.*)/qlow-(\d+)px-.*\.jpg") {
-set bereq.url = "/unsafe/" + regsub(req.url, 
"^/images/thumb/(.*)/qlow-(\d+)px-.*\.jpg", "\2") + 
"x/filters:quality(40):sharpen(0.6,0.01,false)/http://127.0.0.1:8080/images/"; + 
regsub(req.url, "^/images/thumb/(.*)/qlow-(\d+)px-.*\.jpg", "\1");
+if (req.url ~ "^/images/thumb/(.*)/qlow-(\d+)px-.*\.(jpg|jpeg)") {
+set bereq.url = "/unsafe/" + regsub(req.url, 
"^/images/thumb/(.*)/qlow-(\d+)px-.*\.(jpg|jpeg)", "\2") + 
"x/filters:quality(40):sharpen(0.6,0.01,false)/http://127.0.0.1:8080/images/"; + 
regsub(req.url, "^/images/thumb/(.*)/qlow-(\d+)px-.*\.(jpg|jpeg)", "\1");
 # regular jpg thumbs
-} else if (req.url ~ "^/images/thumb/(.*)/(\d+)px-.*\.jpg") {
-set bereq.url = "/unsafe/" + regsub(req.url, 
"^/images/thumb/(.*)/(\d+)px-.*\.jpg", "\2") + 
"x/filters:quality(87):sharpen(0.6,0.01,false)/http://127.0.0.1:8080/images/"; + 
regsub(req.url, "^/images/thumb/(.*)/(\d+)px-.*\.jpg", "\1");
+} else if (req.url ~ "^/images/thumb/(.*)/(\d+)px-.*\.(jpg|jpeg)") {
+set bereq.url = "/unsafe/" + regsub(req.url, 
"^/images/thumb/(.*)/(\d+)px-.*\.(jpg|jpeg)", "\2") + 
"x/filters:quality(87):sharpen(0.6,0.01,false)/http://127.0.0.1:8080/images/"; + 
regsub(req.url, "^/images/thumb/(.*)/(\d+)px-.*\.(jpg|jpeg)", "\1");
 # png thumbs
 } else if (req.url ~ "^/images/thumb/(.*)/(\d+)px-.*\.png") {
 set bereq.url = "/unsafe/" + regsub(req.url, 
"^/images/thumb/(.*)/(\d+)px-.*\.png", "\2") + 
"x/http://127.0.0.1:8080/images/"; + regsub(req.url, 
"^/images/thumb/(.*)/(\d+)px-.*\.png", "\1");
 }
+
 <% end -%>
 }
 
@@ -154,14 +155,6 @@
 } else {
 set resp.http.X-Cache = "miss (0)";
 }
-
-<% if @thumbor -%>
-# Thumbor doesn't do fine-grained config for the headers it returns
-if (req.url ~ "^/images/thumb/.*\.(jpg|png)") {
-unset resp.http.Cache-Control;
-unset resp.http.Expires;
-}
-<% end -%>
 }
 
 # Called after a document has been successfully retrieved from the backend.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib018719037a45eb4a3e272a139beb8d600c56326
Gerrit-PatchSet: 1
Gerrit-

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

[jenkins-bot (Code Review)]

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

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


VisualEditor: Ignore id when getting hash object

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

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4da07cb7c112ce9ab449a060132856a2d054e57f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] optional address fields for mustache - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: optional address fields for mustache
..


optional address fields for mustache

WP ESOP doesn't actually end up needing these, but there are a couple things in 
here other patches depend on and I don't see any harm in merging the other 
stuff.

Change-Id: Ie22af578ad5190c350a02fa0a649e877f8331aef
---
M gateway_forms/mustache/personal_info.html.mustache
M worldpay_gateway/worldpay.adapter.php
2 files changed, 27 insertions(+), 0 deletions(-)

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



diff --git a/gateway_forms/mustache/personal_info.html.mustache 
b/gateway_forms/mustache/personal_info.html.mustache
index 4622774..184c39f 100644
--- a/gateway_forms/mustache/personal_info.html.mustache
+++ b/gateway_forms/mustache/personal_info.html.mustache
@@ -8,6 +8,18 @@



+{{# address_required }}
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+{{/ address_required }}
 {{# fiscal_number_required }}


diff --git a/worldpay_gateway/worldpay.adapter.php 
b/worldpay_gateway/worldpay.adapter.php
index 84481d1..927f270 100644
--- a/worldpay_gateway/worldpay.adapter.php
+++ b/worldpay_gateway/worldpay.adapter.php
@@ -182,6 +182,13 @@
parent::__construct( $options );
}
 
+   public function getFormClass() {
+   if ( $this->dataObj->getVal_Escaped( 'ffname' ) === 'wp-if' ) {
+   return 'Gateway_Form_Mustache';
+   }
+   return parent::getFormClass();
+   }
+
public function getCommunicationType() {
return 'xml';
}
@@ -951,6 +958,14 @@
return 'StringIn=' . str_replace( "\n", '', $xml );
}
 
+   public function getRequiredFields() {
+   $fields = parent::getRequiredFields();
+   if ( $this->dataObj->getVal_Escaped( 'ffname' ) === 'wp-if' ) {
+   $fields[] = 'address';
+   }
+   return $fields;
+   }
+
// override the charset from the parent function
protected function getTransactionSpecificValue( $gateway_field_name, 
$token = false ) {
$original = parent::getTransactionSpecificValue( 
$gateway_field_name, $token );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie22af578ad5190c350a02fa0a649e877f8331aef
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Ssmith 
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 analytics1011, 1016, and 1019 as Hadoop workers - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Remove analytics1011, 1016, and 1019 as Hadoop workers
..


Remove analytics1011, 1016, and 1019 as Hadoop workers

Bug: T112113
Change-Id: I0449d9ca684626f946a7fe099d5ddab84a16e024
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index f8be0f0..c21d001 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -115,14 +115,14 @@
 include base::firewall
 }
 
-# analytics1011, analytics1016-analytics1017, analytics1019,
+# analytics1017
 # analytics1028-analytics1057 are Hadoop worker nodes.
 #
 # NOTE:  If you add, remove or move Hadoop nodes, you should edit
 # templates/hadoop/net-topology.py.erb to make sure the
 # hostname -> /datacenter/rack/row id is correct.  This is
 # used for Hadoop network topology awareness.
-node /analytics10(11|1[67]|19|2[89]|3[0-9]|4[0-9]|5[0-7]).eqiad.wmnet/ {
+node /analytics10(17|2[89]|3[0-9]|4[0-9]|5[0-7]).eqiad.wmnet/ {
 
 role analytics::hadoop::worker, analytics::impala::worker
 include base::firewall

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0449d9ca684626f946a7fe099d5ddab84a16e024
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove analytics1011, 1016, and 1019 as Hadoop workers - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Remove analytics1011, 1016, and 1019 as Hadoop workers
..

Remove analytics1011, 1016, and 1019 as Hadoop workers

Bug: T112113
Change-Id: I0449d9ca684626f946a7fe099d5ddab84a16e024
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index f8be0f0..c21d001 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -115,14 +115,14 @@
 include base::firewall
 }
 
-# analytics1011, analytics1016-analytics1017, analytics1019,
+# analytics1017
 # analytics1028-analytics1057 are Hadoop worker nodes.
 #
 # NOTE:  If you add, remove or move Hadoop nodes, you should edit
 # templates/hadoop/net-topology.py.erb to make sure the
 # hostname -> /datacenter/rack/row id is correct.  This is
 # used for Hadoop network topology awareness.
-node /analytics10(11|1[67]|19|2[89]|3[0-9]|4[0-9]|5[0-7]).eqiad.wmnet/ {
+node /analytics10(17|2[89]|3[0-9]|4[0-9]|5[0-7]).eqiad.wmnet/ {
 
 role analytics::hadoop::worker, analytics::impala::worker
 include base::firewall

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

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

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

[MediaWiki-commits] [Gerrit] Share code between instrumentation and unit tests - change (apps...wikipedia)

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Share code between instrumentation and unit tests
..

Share code between instrumentation and unit tests

* Add new shared sources directory, testlib. Both JVM JUnit tests and
  Android instrumentation tests can import from testlib but no non-test
  code can. Update Checkstyle configuration.
* Move TestConstants and TestLatch to testlib. Update Java imports.
* Bump test timeout duration out to 60s for slow Jenkins.
* Use TestLatch in PageLoadPerformanceTests.

Change-Id: I90ba29d9b4236174de9e0b32f0ecb8ad31e66c02
---
M app/build.gradle
M app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
M app/src/test/java/org/wikipedia/test/TestWebServer.java
M app/src/test/java/org/wikipedia/zero/WikipediaZeroTaskTest.java
R app/src/testlib/java/org/wikipedia/testlib/TestConstants.java
R app/src/testlib/java/org/wikipedia/testlib/TestLatch.java
M config/quality.gradle
7 files changed, 20 insertions(+), 11 deletions(-)


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

diff --git a/app/build.gradle b/app/build.gradle
index 59c419c..3780618 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,6 +61,15 @@
 testApplicationId 'org.wikipedia.test'
 }
 
+sourceSets {
+test {
+java.srcDirs += 'src/testlib/java'
+}
+androidTest {
+java.srcDirs += 'src/testlib/java'
+}
+}
+
 signingConfigs {
 prod {
 setSigningConfigKey(prod, PROD_PROPS)
diff --git 
a/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
 
b/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
index d282a92..203f5c4 100644
--- 
a/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
+++ 
b/app/src/androidTest/java/org/wikipedia/test/perf/PageLoadPerformanceTests.java
@@ -4,19 +4,16 @@
 import org.wikipedia.page.PageFragment;
 import org.wikipedia.page.PageLoadCallbacks;
 import org.wikipedia.page.PageLoadTests;
+import org.wikipedia.testlib.TestLatch;
 
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.LargeTest;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Test performance of page loading. Update the NUM_RUNS for better 
statistical significance.
  */
 @LargeTest
 public class PageLoadPerformanceTests extends 
ActivityInstrumentationTestCase2 {
-private static final int TASK_COMPLETION_TIMEOUT = (int) 
TimeUnit.SECONDS.toMillis(60);
 private static final int NUM_RUNS = 1; //50;
 private final MeasurementController measurement = new 
MeasurementController();
 
@@ -47,7 +44,7 @@
 }
 
 private void loadPageUi(final String title) throws Throwable {
-final CountDownLatch latch = new CountDownLatch(1);
+final TestLatch latch = new TestLatch();
 getInstrumentation().runOnMainSync(new Runnable() {
 @Override
 public void run() {
@@ -57,10 +54,10 @@
 PageLoadTests.loadPage(getFragment(), title);
 }
 });
-assertTrue(latch.await(TASK_COMPLETION_TIMEOUT, 
TimeUnit.MILLISECONDS));
+latch.await();
 }
 
-private PageLoadCallbacks newCallbacks(final String title, final 
CountDownLatch latch) {
+private PageLoadCallbacks newCallbacks(final String title, final TestLatch 
latch) {
 return new PageLoadCallbacks() {
 @Override
 public void onLoadComplete() {
diff --git a/app/src/test/java/org/wikipedia/test/TestWebServer.java 
b/app/src/test/java/org/wikipedia/test/TestWebServer.java
index 575b713..38c38b7 100644
--- a/app/src/test/java/org/wikipedia/test/TestWebServer.java
+++ b/app/src/test/java/org/wikipedia/test/TestWebServer.java
@@ -3,6 +3,8 @@
 import com.squareup.okhttp.mockwebserver.MockResponse;
 import com.squareup.okhttp.mockwebserver.MockWebServer;
 
+import org.wikipedia.testlib.TestConstants;
+
 import java.io.IOException;
 import java.net.URL;
 
diff --git a/app/src/test/java/org/wikipedia/zero/WikipediaZeroTaskTest.java 
b/app/src/test/java/org/wikipedia/zero/WikipediaZeroTaskTest.java
index 3af1325..655f81c 100644
--- a/app/src/test/java/org/wikipedia/zero/WikipediaZeroTaskTest.java
+++ b/app/src/test/java/org/wikipedia/zero/WikipediaZeroTaskTest.java
@@ -11,9 +11,9 @@
 import org.wikipedia.test.ImmediateExecutor;
 import org.wikipedia.test.TestApi;
 import org.wikipedia.test.TestFileUtil;
-import org.wikipedia.test.TestLatch;
 import org.wikipedia.test.TestRunner;
 import org.wikipedia.test.TestWebServer;
+import org.wikipedia.testlib.TestLatch;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
diff --git a/app/src/test/java/org/wikipedia/test/Te

[MediaWiki-commits] [Gerrit] Fix possible crash when dismissing link preview when activit... - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

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

Change subject: Fix possible crash when dismissing link preview when activity 
closed.
..

Fix possible crash when dismissing link preview when activity closed.

We call dismiss() as a possible result of an AsyncTask, so if the task
takes a long time, then dismiss() might get called after
onSaveInstanceState() has already been called, which would produce an
exception.  The AsyncTask tries to handle this by checking for isAdded(),
but this seems to keep returning true even after onSaveInstanceState().

This patch overrides the dismiss() function and adds a check for
isResumed(), which actually checks whether this fragment is within the
"live" state (between onResume and onPause).

It may be worthwhile to see if isResumed() should be used instead of
isAdded() in other places, as well.

Bug: T112518
Change-Id: I27cf59b5ccb017600b4b4e9289d94f8c5862aeee
---
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java 
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
index 8d5bbc8..9002218 100644
--- 
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
+++ 
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
@@ -126,6 +126,16 @@
 }
 }
 
+@Override
+public void dismiss() {
+// Since we call dismiss() from some AsyncTasks, make sure that this 
fragment
+// is actually active, since calling dismiss() after 
onSaveInstanceState() produces
+// an exception.
+if (isResumed()) {
+super.dismiss();
+}
+}
+
 public void setDialogPeekHeight(int height) {
 dialogPeekHeight = height;
 }

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

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

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

[MediaWiki-commits] [Gerrit] Use math to compute badge padding in nojs - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

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

Change subject: Use math to compute badge padding in nojs
..


Use math to compute badge padding in nojs

More clearly indicates how those numbers get there, and fixes
a discrepancy of 0.02em.

Change-Id: Idbc33878953fda85185cada5550f99a1076b9036
---
M modules/nojs/mw.echo.badge.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/nojs/mw.echo.badge.less b/modules/nojs/mw.echo.badge.less
index 242f5b1..4229f7c 100644
--- a/modules/nojs/mw.echo.badge.less
+++ b/modules/nojs/mw.echo.badge.less
@@ -8,7 +8,7 @@
.mixin-notifications-badge();
display: inline-block;
 
-   padding: @badge-padding 0.35em @badge-padding 1.45em;
+   padding: @badge-padding (@badge-padding + 0.25em) 
@badge-padding (@badge-padding + 0.25em + 1.1em);
 
body.ltr & {
background-position: @badge-padding center;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbc33878953fda85185cada5550f99a1076b9036
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope 
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] Fix NPE in PageLoadPerformanceTests - change (apps...wikipedia)

[jenkins-bot (Code Review)]

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

Change subject: Fix NPE in PageLoadPerformanceTests
..


Fix NPE in PageLoadPerformanceTests

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

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

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

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



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

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

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

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

[MediaWiki-commits] [Gerrit] Use math to compute badge padding in nojs - change (mediawiki...Echo)

[Catrope (Code Review)]

Catrope has uploaded a new change for review.

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

Change subject: Use math to compute badge padding in nojs
..

Use math to compute badge padding in nojs

More clearly indicates how those numbers get there, and fixes
a discrepancy of 0.02em.

Change-Id: Idbc33878953fda85185cada5550f99a1076b9036
---
M modules/nojs/mw.echo.badge.less
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/nojs/mw.echo.badge.less b/modules/nojs/mw.echo.badge.less
index 242f5b1..4229f7c 100644
--- a/modules/nojs/mw.echo.badge.less
+++ b/modules/nojs/mw.echo.badge.less
@@ -8,7 +8,7 @@
.mixin-notifications-badge();
display: inline-block;
 
-   padding: @badge-padding 0.35em @badge-padding 1.45em;
+   padding: @badge-padding (@badge-padding + 0.25em) 
@badge-padding (@badge-padding + 0.25em + 1.1em);
 
body.ltr & {
background-position: @badge-padding center;

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

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

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

[MediaWiki-commits] [Gerrit] Add analytics1053 and 1057 to Hadoop net-topology.py - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Add analytics1053 and 1057 to Hadoop net-topology.py
..


Add analytics1053 and 1057 to Hadoop net-topology.py

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

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



diff --git a/templates/hadoop/net-topology.py.erb 
b/templates/hadoop/net-topology.py.erb
index 8d9f6d4..fb06807 100755
--- a/templates/hadoop/net-topology.py.erb
+++ b/templates/hadoop/net-topology.py.erb
@@ -54,9 +54,11 @@
 'analytics1051.eqiad.wmnet':  '/eqiad/B/3',
 
 'analytics1052.eqiad.wmnet':  '/eqiad/A/3',
+'analytics1053.eqiad.wmnet':  '/eqiad/A/3',
 'analytics1054.eqiad.wmnet':  '/eqiad/A/3',
 'analytics1055.eqiad.wmnet':  '/eqiad/A/3',
-'analytics1056.eqiad.wmnet':  '/eqiad/A/3'
+'analytics1056.eqiad.wmnet':  '/eqiad/A/3',
+'analytics1057.eqiad.wmnet':  '/eqiad/A/3'
 }
 
 if len(argv) < 2:

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

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

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

[MediaWiki-commits] [Gerrit] Add Thalia Chan to V+2'ers - change (integration/config)

[jenkins-bot (Code Review)]

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

Change subject: Add Thalia Chan to V+2'ers
..


Add Thalia Chan to V+2'ers

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e636770..87e5a5e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -157,6 +157,7 @@
 | stefan\.petrea@gmail\.com
 | sucheta\.ghoshal@gmail\.com
 | tamaraslosarek@gmail\.com
+| thalia\.e\.chan@googlemail\.com
 | thomaspt@hotmail\.fr
 | tim@tim-landscheidt\.de
 | trevorparscal@gmail\.com
@@ -356,6 +357,7 @@
- ^se4598@gmx\.de$
- ^skizzerz@gmail\.com$
- ^s7eph4n@gmail\.org$ # Foxtrott
+   - ^thalia\.e\.chan@googlemail\.com$ # Thalia Chan
- ^thomaspt@hotmail\.fr$
- ^at\.light@live\.com\.au$ # This, that and the other
- ^tomasz@twkozlowski\.com$

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib297b420a31430812ac2a3c0d4c80eb8e906c68c
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Tchanders 
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 analytics1053 and 1057 to Hadoop net-topology.py - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Add analytics1053 and 1057 to Hadoop net-topology.py
..

Add analytics1053 and 1057 to Hadoop net-topology.py

Change-Id: I9ec1396a9fff3c5440faeb0c469fe0fc4e48290d
---
M templates/hadoop/net-topology.py.erb
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/238181/1

diff --git a/templates/hadoop/net-topology.py.erb 
b/templates/hadoop/net-topology.py.erb
index 8d9f6d4..792ad3d 100755
--- a/templates/hadoop/net-topology.py.erb
+++ b/templates/hadoop/net-topology.py.erb
@@ -54,9 +54,11 @@
 'analytics1051.eqiad.wmnet':  '/eqiad/B/3',
 
 'analytics1052.eqiad.wmnet':  '/eqiad/A/3',
+'analytics1053.eqiad.wmnet':  '/eqiad/A/3',
 'analytics1054.eqiad.wmnet':  '/eqiad/A/3',
 'analytics1055.eqiad.wmnet':  '/eqiad/A/3',
 'analytics1056.eqiad.wmnet':  '/eqiad/A/3'
+'analytics1057.eqiad.wmnet':  '/eqiad/A/3'
 }
 
 if len(argv) < 2:

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

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

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

[MediaWiki-commits] [Gerrit] Correct a few outdated comment regarding dependencies - change (integration/config)

[JanZerebecki (Code Review)]

JanZerebecki has uploaded a new change for review.

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

Change subject: Correct a few outdated comment regarding dependencies
..

Correct a few outdated comment regarding dependencies

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/80/238180/1

diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e8ebe14..d3c98a3 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -106,8 +106,7 @@
  - mw-teardown-mysql
  - archive-log-dir
 
-# Generic qunit job for extensions. Can only be used by
-# those that currently don't have dependencies
+# Generic qunit job for extensions.
 - job:
 name: 'mwext-qunit'
 node: contintLabsSlave && UbuntuTrusty
@@ -201,8 +200,7 @@
  - mw-teardown-mysql
  - archive-log-dir
 
-# Generic phpunit job for extensions. Can only be used by
-# those that currently don't have dependencies
+# Generic phpunit job for extensions.
 - job-template:
 name: 'mwext-testextension-{phpflavor}'
 node: 'contintLabsSlave && ((UbuntuPrecise && phpflavor-zend && 
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm && 
phpflavor-{phpflavor}))'
@@ -583,9 +581,9 @@
 jobs:
  - mwext-check-jobs
 
- # qunit jobs for MediaWiki extensions
- # Only extensions that have dependencies should be listed here.
- # Others should use the generic 'mwext-qunit' job.
+ # deprecated qunit jobs for MediaWiki extensions
+ # Should be migrated to use the generic 'mwext-qunit' job whith
+ # dependencies defined in zuul/ext_dependencies.py .
 
  - '{name}-{ext-name}-qunit':
 name: mwext
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8b86602..fd28bb4 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1820,7 +1820,6 @@
  - 'mwext-{name}-qunit'
 
   # Triggers the generic mwext-qunit job
-  # which doesn't process dependencies
   - name: extension-qunit-generic
 test:
  - 'mwext-qunit'

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

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

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

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

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

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


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

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14c6a3f85297c00b0e1b27de40436dbaabf1b8c8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

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

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

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

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

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


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

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

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

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

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

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

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

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

python3 tests passes in pywikibot/wikibase, mark them voting

In change I0afcfd60 I fixed python 3 issues.

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


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

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

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Fix python3 basestring issue
..


Fix python3 basestring issue

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

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



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

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

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

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

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

[jenkins-bot (Code Review)]

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

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


Stats: Fix the color for points in deletion graph

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5875dfa78817b46ab1db3f38d8f158611d83389f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: KartikMistry 
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] Change a bunch of parsoid references to acknowledge that RES... - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

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

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

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


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

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

[MediaWiki-commits] [Gerrit] Add Thalia Chan to V+2'ers - change (integration/config)

[Jforrester (Code Review)]

Jforrester has uploaded a new change for review.

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

Change subject: Add Thalia Chan to V+2'ers
..

Add Thalia Chan to V+2'ers

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


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

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 249afb8..242cf23 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -157,6 +157,7 @@
 | stefan\.petrea@gmail\.com
 | sucheta\.ghoshal@gmail\.com
 | tamaraslosarek@gmail\.com
+| thalia\.e\.chan@googlemail\.com
 | thomaspt@hotmail\.fr
 | tim@tim-landscheidt\.de
 | trevorparscal@gmail\.com
@@ -356,6 +357,7 @@
- ^se4598@gmx\.de$
- ^skizzerz@gmail\.com$
- ^s7eph4n@gmail\.org$ # Foxtrott
+   - ^thalia\.e\.chan@googlemail\.com$ # Thalia Chan
- ^thomaspt@hotmail\.fr$
- ^at\.light@live\.com\.au$ # This, that and the other
- ^tomasz@twkozlowski\.com$

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

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

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

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

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

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

Adding new journalnodes in prep for decomissioning analytics1011 and 
analytics1019

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


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

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

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

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

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

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

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

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


Adding new journalnodes in prep for decomissioning analytics1011 and 
analytics1019

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

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



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

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I669c27eba6cccbaa22a7688b55674857c38e434e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

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

[jenkins-bot (Code Review)]

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

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


Migrate labs/toollabs to new debian glue job

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

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

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

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



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

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

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

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

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

[Ladsgroup (Code Review)]

Ladsgroup has uploaded a new change for review.

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

Change subject: Fix python3 basestring issue
..

Fix python3 basestring issue

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


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/wikibase 
refs/changes/72/238172/1

diff --git a/pywikibase/claim.py b/pywikibase/claim.py
index 2758dd7..704625b 100644
--- a/pywikibase/claim.py
+++ b/pywikibase/claim.py
@@ -17,6 +17,11 @@
 from pywikibase import Property
 import pywikibase.itempage
 
+try:
+unicode = unicode
+except NameError:
+basestring = (str, bytes)
+
 
 class Claim(Property):
 
diff --git a/pywikibase/wikibasepage.py b/pywikibase/wikibasepage.py
index e8acb47..3bbbdf2 100644
--- a/pywikibase/wikibasepage.py
+++ b/pywikibase/wikibasepage.py
@@ -13,6 +13,11 @@
 
 import json
 
+try:
+unicode = unicode
+except NameError:
+basestring = (str, bytes)
+
 
 class WikibasePage(object):
 
diff --git a/tests/test_itempage.py b/tests/test_itempage.py
index cc692d4..24e2357 100644
--- a/tests/test_itempage.py
+++ b/tests/test_itempage.py
@@ -5,9 +5,9 @@
 from pywikibase import ItemPage, Claim
 
 try:
-basestring
+unicode = unicode
 except NameError:
-basestring = str
+basestring = (str, bytes)
 
 
 class TestItemPage(unittest.TestCase):
diff --git a/tests/test_propertypage.py b/tests/test_propertypage.py
index 7ff34c0..4a10420 100644
--- a/tests/test_propertypage.py
+++ b/tests/test_propertypage.py
@@ -2,9 +2,9 @@
 from pywikibase import PropertyPage, Claim
 
 try:
-basestring
+unicode = unicode
 except NameError:
-basestring = str
+basestring = (str, bytes)
 
 
 class TestPropertyPage(unittest.TestCase):
diff --git a/tests/test_wikibasepage.py b/tests/test_wikibasepage.py
index e9a5bd1..de1aa1c 100644
--- a/tests/test_wikibasepage.py
+++ b/tests/test_wikibasepage.py
@@ -5,9 +5,9 @@
 from pywikibase import WikibasePage, Claim
 
 try:
-basestring
+unicode = unicode
 except NameError:
-basestring = str
+basestring = (str, bytes)
 
 
 class TestWikibasePage(unittest.TestCase):

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

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

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

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

[jenkins-bot (Code Review)]

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

Change subject: Generic debian-glue
..


Generic debian-glue

Creates debian-glue

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

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

Set the distribution from debian/changelog

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

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



diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index ff5e0e7..d1347be 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -70,7 +70,7 @@
   - debian-glue-lintian
   - debian-glue-piuparts
 
-publishers:
+publishers: &debian-glue-publishers
   - junit:
   results: 'lintian-*.xml'
   - tap:
@@ -78,6 +78,50 @@
   - archive:
   artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,lintian-*.txt,lintian-*.xml,piuparts.txt,piuparts.tap'
 
+- job-template:
+name: 'debian-glue'
+defaults: use-remoteonly-zuul
+node: DebianGlue && DebianJessie
+concurrent: false
+triggers:
+- zuul
+
+scm:
+ - git:
+url: '$ZUUL_URL/$ZUUL_PROJECT'
+branches:
+ - '$ZUUL_COMMIT'
+refspec: '$ZUUL_REF'
+# Git plugin would set GIT_BRANCH=detached which confuses debian glue
+# Will override it as a workaround
+local-branch: $ZUUL_REF
+basedir: 'source'
+wipe-workspace: true
+shallow-clone: true
+submodule:
+disable: true
+builders:
+- shell: |
+# GIT_BRANCH is set to 'detached' :-(
+export GIT_BRANCH="$ZUUL_REF"
+/usr/bin/generate-git-snapshot
+- shell: |
+# Skip repository setup
+export BUILD_ONLY=yes
+
+export distribution=$(dpkg-parsechangelog --show-field 
distribution -lsource/debian/changelog)
+echo "Distribution set from debian/changelog to $distribution"
+
+/usr/bin/build-and-provide-package
+- debian-glue-lintian
+- debian-glue-piuparts
+publishers: *debian-glue-publishers
+
+- project:
+name: 'debian-glue'
+jobs:
+- 'debian-glue'
+
 #
 # PROJECTS
 #

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

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

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

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

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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

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

Migrate labs/toollabs to new debian glue job

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

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

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


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

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

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

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

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

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

[Niedzielski (Code Review)]

Niedzielski has uploaded a new change for review.

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

Change subject: Fix NPE in PageLoadPerformanceTests
..

Fix NPE in PageLoadPerformanceTests

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

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

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


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

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

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

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

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