[MediaWiki-commits] [Gerrit] translatewiki[master]: [Cite] Remove deleted key

2017-03-07 Thread Raimond Spekking (Code Review) 
Raimond Spekking has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341758 )

Change subject: [Cite] Remove deleted key
..


[Cite] Remove deleted key

Change-Id: I4d7e710e60d37525c32dc87def7ef646010f3fb3
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index a0b980b..bcfdfdc 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -619,7 +619,7 @@
 optional = cite_reference_link_key_with_num, cite_reference_link_prefix, 
cite_reference_link_suffix, cite_references_link_prefix
 optional = cite_references_link_suffix, cite_reference_link, 
cite_references_link_one, cite_references_link_many
 optional = cite_references_link_many_format, 
cite_references_link_many_format_backlink_labels, 
cite_references_link_many_sep, cite_references_link_many_and
-ignored = cite_references_prefix, cite_references_suffix, 
cite_references_no_link
+ignored = cite_references_no_link
 ignored = cite_error_refs_without_references_category, 
visualeditor-cite-tool-definition.json, cite-tool-definition.json
 
 Cite - VisualEditor

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

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

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

[MediaWiki-commits] [Gerrit] translatewiki[master]: [Cite] Remove deleted key

2017-03-07 Thread Raimond Spekking (Code Review) 
Raimond Spekking has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341758 )

Change subject: [Cite] Remove deleted key
..

[Cite] Remove deleted key

Change-Id: I4d7e710e60d37525c32dc87def7ef646010f3fb3
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/58/341758/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index a0b980b..bcfdfdc 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -619,7 +619,7 @@
 optional = cite_reference_link_key_with_num, cite_reference_link_prefix, 
cite_reference_link_suffix, cite_references_link_prefix
 optional = cite_references_link_suffix, cite_reference_link, 
cite_references_link_one, cite_references_link_many
 optional = cite_references_link_many_format, 
cite_references_link_many_format_backlink_labels, 
cite_references_link_many_sep, cite_references_link_many_and
-ignored = cite_references_prefix, cite_references_suffix, 
cite_references_no_link
+ignored = cite_references_no_link
 ignored = cite_error_refs_without_references_category, 
visualeditor-cite-tool-definition.json, cite-tool-definition.json
 
 Cite - VisualEditor

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Restore db1060 normal weight

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341757 )

Change subject: db-eqiad.php: Restore db1060 normal weight
..


db-eqiad.php: Restore db1060 normal weight

db1060 had to be reimaged and was getting repooled slowly yesterday.
It is now time for it to get it to its normal weight and restore the
original config file weights.

Bug: T158193
Change-Id: Ia264ed2255e8851f25930a956ce16b96314dcc7a
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 3ff7fca..facc1a3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -112,7 +112,7 @@
'db1036' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1054' => 1,   # A3 2.8TB  96GB, api
'db1060' => 1,   # C2 2.8TB  96GB, api
-   'db1063' => 1,   # D1 2.8TB 128GB #temporary API
+#  'db1063' => 0,   # D1 2.8TB 128GB
 #  'db1067' => 0,   # D1 2.8TB 160GB
'db1074' => 500, # A2 3.6TB 512GB
'db1076' => 500, # B1 3.6TB 512GB
@@ -279,7 +279,6 @@
'api' => [
'db1054' => 1,
'db1060' => 1,
-   'db1063' => 1,
],
'watchlist' => [
'db1036' => 1,

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Restore db1060 normal weight

2017-03-07 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341757 )

Change subject: db-eqiad.php: Restore db1060 normal weight
..

db-eqiad.php: Restore db1060 normal weight

db1060 had to be reimaged and was getting repooled slowly yesterday.
It is now time for it to get it to its normal weight and restore the
original config file weights.

Bug: T158193
Change-Id: Ia264ed2255e8851f25930a956ce16b96314dcc7a
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 3ff7fca..facc1a3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -112,7 +112,7 @@
'db1036' => 1,   # B2 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1054' => 1,   # A3 2.8TB  96GB, api
'db1060' => 1,   # C2 2.8TB  96GB, api
-   'db1063' => 1,   # D1 2.8TB 128GB #temporary API
+#  'db1063' => 0,   # D1 2.8TB 128GB
 #  'db1067' => 0,   # D1 2.8TB 160GB
'db1074' => 500, # A2 3.6TB 512GB
'db1076' => 500, # B1 3.6TB 512GB
@@ -279,7 +279,6 @@
'api' => [
'db1054' => 1,
'db1060' => 1,
-   'db1063' => 1,
],
'watchlist' => [
'db1036' => 1,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache_maps: do not set cookies

2017-03-07 Thread Ema (Code Review) 
Ema has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341575 )

Change subject: cache_maps: do not set cookies
..


cache_maps: do not set cookies

Similarly to upload, maps does not serve authenticated requests. Make it
cookie-free.

Change-Id: I8d2069d93bb05e78cb60b9f3622737c2be0d7810
---
A modules/varnish/files/tests/maps/12-no-cookies.vtc
M modules/varnish/templates/maps-frontend.inc.vcl.erb
2 files changed, 27 insertions(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  MaxSem: Looks good to me, but someone else must approve
  Gehel: Looks good to me, but someone else must approve



diff --git a/modules/varnish/files/tests/maps/12-no-cookies.vtc 
b/modules/varnish/files/tests/maps/12-no-cookies.vtc
new file mode 100644
index 000..1dd28c9
--- /dev/null
+++ b/modules/varnish/files/tests/maps/12-no-cookies.vtc
@@ -0,0 +1,22 @@
+varnishtest "Strip cookies"
+
+server s1 {
+rxreq
+txresp -hdr "Set-Cookie: foo" -hdr "Set-Cookie: bar"
+} -start
+
+varnish v1 -arg "-p vcc_err_unref=false" -vcl+backend {
+backend vtc_backend {
+.host = "${s1_addr}"; .port = "${s1_port}";
+}
+
+include "/usr/share/varnish/tests/wikimedia_maps-frontend.vcl";
+} -start
+
+client c1 {
+txreq -url "/test" -hdr "X-Forwarded-Proto: https" -hdr "Host: 
maps.wikimedia.org"
+rxresp
+
+expect resp.status == 200
+expect resp.http.Set-Cookie == 
+} -run
diff --git a/modules/varnish/templates/maps-frontend.inc.vcl.erb 
b/modules/varnish/templates/maps-frontend.inc.vcl.erb
index a8f02cf..3f774ef 100644
--- a/modules/varnish/templates/maps-frontend.inc.vcl.erb
+++ b/modules/varnish/templates/maps-frontend.inc.vcl.erb
@@ -9,5 +9,9 @@
 sub cluster_fe_backend_fetch { }
 sub cluster_fe_backend_response_early { }
 sub cluster_fe_backend_response { }
-sub cluster_fe_deliver { }
+sub cluster_fe_deliver {
+   // Similarly to upload, maps does not serve authenticated requests. 
Make it
+   // cookie-free.
+   unset resp.http.Set-Cookie;
+}
 sub cluster_fe_err_synth { }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8d2069d93bb05e78cb60b9f3622737c2be0d7810
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to dec47257 + enable linting in prod

2017-03-07 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341755 )

Change subject: Bump src/ to dec47257 + enable linting in prod
..

Bump src/ to dec47257 + enable linting in prod

Change-Id: Ie83017d180086c598997e16f740376ad96b6dabc
---
M scap/environments/beta/vars.yaml
M scap/vars.yaml
M src
3 files changed, 3 insertions(+), 5 deletions(-)


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

diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index c4a6667..33a5a26 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,4 +1,2 @@
 localsettings: conf/wmf/betalabs.localsettings.js
 load_wmf: false
-linting: true
-linter_send_api: true
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 1994779..a152df6 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -12,8 +12,8 @@
 port: 8000
 localsettings: conf/wmf/localsettings.js
 load_wmf: true
-linting: false
-linter_send_api: false
+linting: true
+linter_send_api: true
 mwapi_server:
 mwapi_proxy:
 
diff --git a/src b/src
index 9f96b2a..dec4725 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 9f96b2a0ae73cc1b8e80e9c8db814a6a9c0c14f8
+Subproject commit dec47257ba261651fd7744b0c81a1fbfc881c6c1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie83017d180086c598997e16f740376ad96b6dabc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Do not record void 'N0NE PROVIDED' address data'

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341753 )

Change subject: Do not record void 'N0NE PROVIDED' address data'
..

Do not record void 'N0NE PROVIDED' address data'

Change-Id: I94604c3bb1bb8136759de79f992e1377e25aeb64
---
A sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
1 file changed, 60 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/53/341753/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
new file mode 100644
index 000..2e4c23a
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
@@ -0,0 +1,60 @@
+callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org')
+);
+  }
+
+  public function tearDown() {
+CRM_Core_DAO::executeQuery("DELETE FROM civicrm_contact WHERE last_name = 
'Mouse'");
+  }
+
+  /**
+   * Test creating an address with void data does not create an address.
+   */
+  public function testAddressImportVoidData() {
+
+$msg = array(
+  'currency' => 'USD',
+  'date' => time(),
+  'last_name' => 'Mouse',
+  'email' => 'nob...@wikimedia.org',
+  'gateway' => 'test_gateway',
+  'gateway_txn_id' => mt_rand(),
+  'gross' => '1.23',
+  'payment_method' => 'cc',
+  'phone' => 'N0NE PROVIDED',
+  'postal_code' => 0,
+);
+
+$contribution = wmf_civicrm_contribution_message_import($msg);
+$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
+$this->assertEquals(0, $addresses['count']);
+
+  }
+
+  /**
+   * Test creating an address with void data does not create an address.
+   *
+   * In this case the contact already exists.
+   */
+  public function testAddressImportVoidDataContactExists() {
+
+  }
+
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94604c3bb1bb8136759de79f992e1377e25aeb64
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Do not record dummy data 'N0NE PROVIDED' to the database,

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341754 )

Change subject: Do not record dummy data 'N0NE PROVIDED' to the database,
..

Do not record dummy data 'N0NE PROVIDED' to the database,

Also omit 'postal_code' => 0

Bug: T158268
Change-Id: I69f0c0f115c4b820a121716df3e87745970e23b1
---
M sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
2 files changed, 23 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/54/341754/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
index 2e4c23a..fc576b6 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/AddressImportTest.php
@@ -15,9 +15,10 @@
 
   public function setUp() {
 civicrm_initialize();
-$this->callAPISuccess('Contact', 'create', array(
+$contact = $this->callAPISuccess('Contact', 'create', array(
   'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'min...@mouse.org')
 );
+$this->contactID = $contact['id'];
   }
 
   public function tearDown() {
@@ -28,7 +29,6 @@
* Test creating an address with void data does not create an address.
*/
   public function testAddressImportVoidData() {
-
 $msg = array(
   'currency' => 'USD',
   'date' => time(),
@@ -38,14 +38,13 @@
   'gateway_txn_id' => mt_rand(),
   'gross' => '1.23',
   'payment_method' => 'cc',
-  'phone' => 'N0NE PROVIDED',
+  'street_address' => 'N0NE PROVIDED',
   'postal_code' => 0,
 );
 
 $contribution = wmf_civicrm_contribution_message_import($msg);
 $addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
 $this->assertEquals(0, $addresses['count']);
-
   }
 
   /**
@@ -54,7 +53,23 @@
* In this case the contact already exists.
*/
   public function testAddressImportVoidDataContactExists() {
+$msg = array(
+  'contact_id' => $this->contactID,
+  'currency' => 'USD',
+  'date' => time(),
+  'last_name' => 'Mouse',
+  'email' => 'nob...@wikimedia.org',
+  'gateway' => 'test_gateway',
+  'gateway_txn_id' => mt_rand(),
+  'gross' => '1.23',
+  'payment_method' => 'cc',
+  'street_address' => 'N0NE PROVIDED',
+  'postal_code' => 0,
+);
 
+$contribution = wmf_civicrm_contribution_message_import($msg);
+$addresses = $this->callAPISuccess('Address', 'get', array('contact_id' => 
$contribution['contact_id']));
+$this->assertEquals(0, $addresses['count']);
   }
 
 }
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index f8a9ba1..fc6f2c4 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -1503,10 +1503,10 @@
   $country_id = wmf_civicrm_get_country_id( $msg[ 'country' ] );
   $address = array(
 'is_primary' => 1,
-'street_address' => $msg['street_address'],
+'street_address' => ($msg['street_address'] !== 'N0NE PROVIDED') ? 
$msg['street_address'] : '',
 'supplemental_address_1' => !empty($msg['supplemental_address_1']) ? 
$msg['supplemental_address_1'] : '',
 'city' => $msg['city'],
-'postal_code' => $msg['postal_code'],
+'postal_code' => empty($msg['postal_code']) ? '' : $msg['postal_code'],
 'country_id' => $country_id,
 'country' => $msg['country' ],
 'is_billing' => 1,
@@ -1554,10 +1554,10 @@
 'contact_id' => $contact_id,
 'location_type_id' => $loc_type_id,
 'is_primary' => 1,
-'street_address' => $msg['street_address'],
+'street_address' => ($msg['street_address'] !== 'N0NE PROVIDED') ? 
$msg['street_address'] : '',
 'supplemental_address_1' => !empty($msg['supplemental_address_1']) ? 
$msg['supplemental_address_1'] : NULL,
 'city' => $msg['city'],
-'postal_code' => $msg['postal_code'],
+'postal_code' => !empty($msg['postal_code']) ? $msg['postal_code'] : 
'',
 'country_id' => $country_id,
 'country' => $msg[ 'country' ],
 'is_billing' => 1,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69f0c0f115c4b820a121716df3e87745970e23b1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Handle missing namespace prefix in XML dumps more gracefully

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/246815 )

Change subject: Handle missing namespace prefix in XML dumps more gracefully
..


Handle missing namespace prefix in XML dumps more gracefully

If an XML dump of a wiki is exported using dumpBackup.php, and there are
pages in a namespace that is not registered (perhaps because of a missing
extension), they will appear in the dump in the form

 ... PageTitle 1234 ... 

This caused the ForeignTitle code to raise an undefined offset error,
because it assumed that the  element was of the form
"Namespace:PageTitle" when  was nonzero. This assumption is not valid.

Now, the importation of such dumps will no longer throw errors and the
pages will be correctly imported, although possibly to unexpected
locations.

Bug: T114115
Change-Id: I0271435dc208e7ea118339584f8a0e359c96113a
---
M includes/export/XmlDumpWriter.php
M includes/title/NamespaceAwareForeignTitleFactory.php
M tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
3 files changed, 27 insertions(+), 3 deletions(-)

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



diff --git a/includes/export/XmlDumpWriter.php 
b/includes/export/XmlDumpWriter.php
index 5be166b..341e2aa 100644
--- a/includes/export/XmlDumpWriter.php
+++ b/includes/export/XmlDumpWriter.php
@@ -431,6 +431,9 @@
global $wgContLang;
$prefix = $wgContLang->getFormattedNsText( 
$title->getNamespace() );
 
+   // @todo Emit some kind of warning to the user if 
$title->getNamespace() !==
+   // NS_MAIN and $prefix === '' (viz. pages in an unregistered 
namespace)
+
if ( $prefix !== '' ) {
$prefix .= ':';
}
diff --git a/includes/title/NamespaceAwareForeignTitleFactory.php 
b/includes/title/NamespaceAwareForeignTitleFactory.php
index 2d67a28..4d24cb8 100644
--- a/includes/title/NamespaceAwareForeignTitleFactory.php
+++ b/includes/title/NamespaceAwareForeignTitleFactory.php
@@ -115,15 +115,23 @@
protected function parseTitleWithNs( $title, $ns ) {
$pieces = explode( ':', $title, 2 );
 
+   // Is $title of the form Namespace:Title (true), or just Title 
(false)?
+   $titleIncludesNamespace = ( $ns != '0' && count( $pieces ) === 
2 );
+
if ( isset( $this->foreignNamespaces[$ns] ) ) {
$namespaceName = $this->foreignNamespaces[$ns];
} else {
-   $namespaceName = $ns == '0' ? '' : $pieces[0];
+   // If the foreign wiki is misconfigured, XML dumps can 
contain a page with
+   // a non-zero namespace ID, but whose title doesn't 
contain a colon
+   // (T114115). In those cases, output a made-up 
namespace name to avoid
+   // collisions. The ImportTitleFactory might replace 
this with something
+   // more appropriate.
+   $namespaceName = $titleIncludesNamespace ? $pieces[0] : 
"Ns$ns";
}
 
// We assume that the portion of the page title before the 
colon is the
-   // namespace name, except in the case of namespace 0
-   if ( $ns != '0' ) {
+   // namespace name, except in the case of namespace 0.
+   if ( $titleIncludesNamespace ) {
$pageName = $pieces[1];
} else {
$pageName = $title;
diff --git 
a/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php 
b/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
index 76cedc6..520108a 100644
--- a/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
+++ b/tests/phpunit/includes/title/NamespaceAwareForeignTitleFactoryTest.php
@@ -37,8 +37,16 @@
new ForeignTitle( 0, '', 'MainNamespaceArticle' 
),
],
[
+   'Magic:_The_Gathering', 0,
+   new ForeignTitle( 0, '', 'Magic:_The_Gathering' 
),
+   ],
+   [
'Talk:Nice_talk', 1,
new ForeignTitle( 1, 'Talk', 'Nice_talk' ),
+   ],
+   [
+   'Talk:Magic:_The_Gathering', 1,
+   new ForeignTitle( 1, 'Talk', 
'Magic:_The_Gathering' ),
],
[
'Bogus:Nice_talk', 0,
@@ -56,6 +64,11 @@
'Bogus:Nice_talk', 1,
new ForeignTitle( 1, 'Talk', 'Nice_talk' ),
],
+   //

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: ApiReview: Make generic error conditionals actually reachable

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/331212 )

Change subject: ApiReview: Make generic error conditionals actually reachable
..


ApiReview: Make generic error conditionals actually reachable

These errors can be generated when approving and when unapproving, so
it didn't make sense to have them in an else block at the bottom where
they couldn't be reached.

Bug: T56817
Change-Id: I889011deef5686be1fd8bc132a49b75162ed1400
---
M api/actions/ApiReview.php
1 file changed, 13 insertions(+), 15 deletions(-)

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



diff --git a/api/actions/ApiReview.php b/api/actions/ApiReview.php
index 6f3aa71..ad3b35c 100644
--- a/api/actions/ApiReview.php
+++ b/api/actions/ApiReview.php
@@ -113,6 +113,19 @@
if ( $status === true ) {
$this->getResult()->addValue(
null, $this->getModuleName(), array( 'result' 
=> 'Success' ) );
+   # Generic failures
+   } elseif ( $status === 'review_page_notexists' ) {
+   if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+   $this->dieWithError( 
'apierror-flaggedrevs-pagedoesnotexist', 'notarget' );
+   } else {
+   $this->dieUsage( "Provided page does not 
exist.", 'notarget' );
+   }
+   } elseif ( $status === 'review_page_unreviewable' ) {
+   if ( is_callable( array( $this, 'dieWithError' ) ) ) {
+   $this->dieWithError( 
'apierror-flaggedrevs-notreviewable', 'notreviewable' );
+   } else {
+   $this->dieUsage( "Provided page is not 
reviewable.", 'notreviewable' );
+   }
# Approve-specific failures
} elseif ( $form->getAction() === 'approve' ) {
if ( $status === 'review_denied' ) {
@@ -177,21 +190,6 @@
$this->dieWithError( array( 
'apierror-unknownerror-nocode' ), 'unknownerror' );
} else {
$this->dieUsageMsg( array( 
'unknownerror', '' ) );
-   }
-   }
-   # Generic failures
-   } else {
-   if ( $status === 'review_page_unreviewable' ) {
-   if ( is_callable( array( $this, 'dieWithError' 
) ) ) {
-   $this->dieWithError( 
'apierror-flaggedrevs-notreviewable', 'notreviewable' );
-   } else {
-   $this->dieUsage( "Provided page is not 
reviewable.", 'notreviewable' );
-   }
-   } elseif ( $status === 'review_page_notexists' ) {
-   if ( is_callable( array( $this, 'dieWithError' 
) ) ) {
-   $this->dieWithError( 
'apierror-flaggedrevs-pagedoesnotexist', 'notarget' );
-   } else {
-   $this->dieUsage( "Provided page does 
not exist.", 'notarget' );
}
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I889011deef5686be1fd8bc132a49b75162ed1400
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: TTO 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: postEdit: Only call mw.cookie.get() if needed

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341752 )

Change subject: postEdit: Only call mw.cookie.get() if needed
..

postEdit: Only call mw.cookie.get() if needed

Don't run synchronous document.cookie reads unconditionally during page load.

At least avoid non-view actions and special pages.

Ideally this would happen in mw.requestIdleCallback, but unfurtunately there
is a fragile dependence from various extensions on reading mw.config wgPostEdit
at initialitation time which would likely fail if this is no longer set
synchronously. To be revisited...

Change-Id: Ib655bf6507333c1a9845a05eb436dca522efbab7
---
M resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
1 file changed, 20 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/52/341752/1

diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js 
b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
index b339371..5dfdede 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
@@ -25,8 +25,7 @@
var config = mw.config.get( [ 'wgAction', 'wgCurRevisionId' ] ),
// This should match EditPage::POST_EDIT_COOKIE_KEY_PREFIX:
cookieKey = 'PostEditRevision' + config.wgCurRevisionId,
-   cookieVal = mw.cookie.get( cookieKey ),
-   $div, id;
+   cookieVal, $div, id;
 
function removeConfirmation() {
$div.remove();
@@ -64,20 +63,26 @@
 
mw.hook( 'postEdit' ).add( showConfirmation );
 
-   if ( config.wgAction === 'view' && cookieVal ) {
-   mw.config.set( 'wgPostEdit', true );
+   // Only when viewing wiki pages, that exist
+   // (E.g. not on special pages or non-view actions)
+   if ( config.wgCurRevisionId && config.wgAction === 'view' ) {
+   cookieVal = mw.cookie.get( cookieKey );
+   if ( cookieVal ) {
+   mw.config.set( 'wgPostEdit', true );
 
-   mw.hook( 'postEdit' ).fire( {
-   // The following messages can be used here:
-   // postedit-confirmation-saved
-   // postedit-confirmation-created
-   // postedit-confirmation-restored
-   message: mw.msg(
-   'postedit-confirmation-' + cookieVal,
-   mw.user
-   )
-   } );
-   mw.cookie.set( cookieKey, null );
+   mw.hook( 'postEdit' ).fire( {
+   // The following messages can be used here:
+   // postedit-confirmation-saved
+   // postedit-confirmation-created
+   // postedit-confirmation-restored
+   message: mw.msg(
+   'postedit-confirmation-' + cookieVal,
+   mw.user
+   )
+   } );
+
+   mw.cookie.set( cookieKey, null );
+   }
}
 
 }( mediaWiki, jQuery ) );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Skin: Only load jquery.makeCollapsible if needed

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341751 )

Change subject: Skin: Only load jquery.makeCollapsible if needed
..

Skin: Only load jquery.makeCollapsible if needed

Currently, module 'jquery.makeCollapsible' is loaded on all pages
regarless of whether the page contains any collapsible elements.

It is required via 'mediawiki.page.ready'. Change this to lazy-loading
when needed only.

However, this lazy-load is discovered very late (after page ready,
after modules ready). To avoid regressing UX with an annoying reflow
of content and a very late hiding of collapsed elements, still
enqueue it in the main module loader by default on pages that
contain collapsible content server-side.

Bug: T159911
Change-Id: I4703ecd52d2d60207ba39108a4b3ef4aa1570965
---
M includes/skins/Skin.php
M resources/Resources.php
M resources/src/mediawiki/page/ready.js
3 files changed, 13 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/341751/1

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index c61f5e9..52678d4 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -179,6 +179,11 @@
$modules['content'][] = 'jquery.tablesorter';
}
 
+   // Preload jquery.makeCollapsible for mediawiki.page.ready
+   if ( strpos( $out->getHTML(), 'mw-collapsible' ) !== false ) {
+   $modules['content'][] = 'jquery.makeCollapsible';
+   }
+
// Add various resources if required
if ( $wgUseAjax && $wgEnableAPI ) {
if ( $wgEnableWriteAPI && $user->isLoggedIn()
diff --git a/resources/Resources.php b/resources/Resources.php
index 0c3d27d..8b1b2ca 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1671,7 +1671,6 @@
'dependencies' => [
'jquery.accessKeyLabel',
'jquery.checkboxShiftClick',
-   'jquery.makeCollapsible',
'jquery.placeholder',
'jquery.mw-jump',
],
diff --git a/resources/src/mediawiki/page/ready.js 
b/resources/src/mediawiki/page/ready.js
index 860fcf5..d2d7a53 100644
--- a/resources/src/mediawiki/page/ready.js
+++ b/resources/src/mediawiki/page/ready.js
@@ -12,15 +12,20 @@
}
 
mw.hook( 'wikipage.content' ).add( function ( $content ) {
-   var $sortable;
+   var $sortable, $colllapsible;
 
// Run jquery.placeholder polyfill if placeholder is not 
supported
if ( !supportsPlaceholder ) {
$content.find( 'input[placeholder]' ).placeholder();
}
 
-   // Run jquery.makeCollapsible
-   $content.find( '.mw-collapsible' ).makeCollapsible();
+   $colllapsible = $content.find( '.mw-collapsible' );
+   if ( $colllapsible.length ) {
+   // Preloaded by Skin::getDefaultModules()
+   mw.loader.using( 'jquery.makeCollapsible', function () {
+   $colllapsible.makeCollapsible();
+   } );
+   }
 
$sortable = $content.find( 'table.sortable' );
if ( $sortable.length ) {

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Skin: Preload jquery.tablesorter based on rough heuristics

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341750 )

Change subject: Skin: Preload jquery.tablesorter based on rough heuristics
..

Skin: Preload jquery.tablesorter based on rough heuristics

Whenever a page contains table.sortable, mediawiki/page/ready.js
will lazy-load the module. However this can create a significant
delay and hides the entire prodecure from our module loader.

Instead, do a rough check (similarl to mw-ui-button) and preload
the module based on that.

Bug: T159911
Change-Id: I87600f968241c723e6bead3ef96c34f1021e1164
---
M includes/skins/Skin.php
M resources/src/mediawiki/page/ready.js
2 files changed, 13 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/50/341750/1

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 3ef646a..c61f5e9 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -149,6 +149,9 @@
 * Defines the ResourceLoader modules that should be added to the skin
 * It is recommended that skins wishing to override call 
parent::getDefaultModules()
 * and substitute out any modules they wish to change by using a key to 
look them up
+*
+* For style modules, use setupSkinUserCss() instead.
+*
 * @return array Array of modules with helper keys for easy overriding
 */
public function getDefaultModules() {
@@ -171,6 +174,11 @@
'user' => [],
];
 
+   // Preload jquery.tablesorter for mediawiki.page.ready
+   if ( strpos( $out->getHTML(), 'sortable' ) !== false ) {
+   $modules['content'][] = 'jquery.tablesorter';
+   }
+
// Add various resources if required
if ( $wgUseAjax && $wgEnableAPI ) {
if ( $wgEnableWriteAPI && $user->isLoggedIn()
diff --git a/resources/src/mediawiki/page/ready.js 
b/resources/src/mediawiki/page/ready.js
index d228f3e..860fcf5 100644
--- a/resources/src/mediawiki/page/ready.js
+++ b/resources/src/mediawiki/page/ready.js
@@ -12,7 +12,7 @@
}
 
mw.hook( 'wikipage.content' ).add( function ( $content ) {
-   var $sortableTables;
+   var $sortable;
 
// Run jquery.placeholder polyfill if placeholder is not 
supported
if ( !supportsPlaceholder ) {
@@ -22,11 +22,11 @@
// Run jquery.makeCollapsible
$content.find( '.mw-collapsible' ).makeCollapsible();
 
-   // Lazy load jquery.tablesorter
-   $sortableTables = $content.find( 'table.sortable' );
-   if ( $sortableTables.length ) {
+   $sortable = $content.find( 'table.sortable' );
+   if ( $sortable.length ) {
+   // Preloaded by Skin::getDefaultModules()
mw.loader.using( 'jquery.tablesorter', function () {
-   $sortableTables.tablesorter();
+   $sortable.tablesorter();
} );
}
 

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add options menu to reading list fragment.

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341622 )

Change subject: Add options menu to reading list fragment.
..


Add options menu to reading list fragment.

Bug: T156073
Change-Id: Iff8979287c9825ac5dce20aba2da1d83b312572a
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
1 file changed, 29 insertions(+), 0 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
index d7d4d52..6fbef9d 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
@@ -11,6 +11,9 @@
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -99,6 +102,32 @@
 super.onDestroyView();
 }
 
+@Override
+public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+inflater.inflate(R.menu.menu_reading_lists, menu);
+inflater.inflate(R.menu.menu_reading_list_item, menu);
+}
+
+@Override
+public boolean onOptionsItemSelected(MenuItem item) {
+switch (item.getItemId()) {
+case R.id.menu_search_lists:
+return true;
+case R.id.menu_sort_by_name:
+return true;
+case R.id.menu_sort_by_recent:
+return true;
+case R.id.menu_reading_list_rename:
+return true;
+case R.id.menu_reading_list_edit_description:
+return true;
+case R.id.menu_reading_list_delete:
+return true;
+default:
+return super.onOptionsItemSelected(item);
+}
+}
+
 private AppCompatActivity getAppCompatActivity() {
 return (AppCompatActivity) getActivity();
 }

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

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

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Populate reading list screen with reading list items.

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341621 )

Change subject: Populate reading list screen with reading list items.
..


Populate reading list screen with reading list items.

Bug: T156073
Change-Id: Ib3a52cb08067f1b30d24d2add36b3ea37014c93b
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
A app/src/main/res/drawable/ic_offline_pin_black_24dp.xml
2 files changed, 66 insertions(+), 1 deletion(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
index 89496d2..d7d4d52 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
@@ -7,6 +7,7 @@
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
@@ -15,7 +16,13 @@
 
 import org.wikipedia.R;
 import org.wikipedia.concurrency.CallbackTask;
+import org.wikipedia.readinglist.page.ReadingListPage;
+import org.wikipedia.util.ResourceUtil;
+import org.wikipedia.views.DefaultViewHolder;
+import org.wikipedia.views.DrawableItemDecoration;
+import org.wikipedia.views.PageItemView;
 
+import java.util.Collections;
 import java.util.List;
 
 import butterknife.BindView;
@@ -32,6 +39,8 @@
 private Unbinder unbinder;
 
 @Nullable private ReadingList readingList;
+private ReadingListPageItemAdapter adapter = new 
ReadingListPageItemAdapter();
+
 @NonNull private ReadingLists readingLists = new ReadingLists();
 
 @NonNull
@@ -54,10 +63,18 @@
 
getAppCompatActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 getAppCompatActivity().getSupportActionBar().setTitle("");
 
+recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+recyclerView.setAdapter(adapter);
+recyclerView.addItemDecoration(new DrawableItemDecoration(getContext(),
+ResourceUtil.getThemedAttributeId(getContext(), 
R.attr.list_separator_drawable), true));
+
 final String readingListTitle = 
getArguments().getString(EXTRA_READING_LIST_TITLE);
 ReadingList.DAO.queryMruLists(null, new 
CallbackTask.Callback() {
 @Override
 public void success(List lists) {
+if (getActivity() == null) {
+return;
+}
 readingLists.set(lists);
 readingList = readingLists.get(readingListTitle);
 update();
@@ -74,6 +91,9 @@
 }
 
 @Override public void onDestroyView() {
+readingList = null;
+readingLists.set(Collections.emptyList());
+recyclerView.setAdapter(null);
 unbinder.unbind();
 unbinder = null;
 super.onDestroyView();
@@ -84,6 +104,42 @@
 }
 
 private void update() {
-// TODO: update UI state for the current reading list.
+adapter.notifyDataSetChanged();
+}
+
+private class ReadingListPageItemHolder extends 
DefaultViewHolder {
+private ReadingListPage page;
+
+ReadingListPageItemHolder(PageItemView itemView) {
+super(itemView);
+}
+
+void bindItem(ReadingListPage page) {
+this.page = page;
+getView().setItem(page);
+getView().setActionIcon(R.drawable.ic_offline_pin_black_24dp);
+getView().setTitle(page.title());
+getView().setDescription(page.description());
+getView().setImageUrl(page.thumbnailUrl());
+}
+}
+
+private final class ReadingListPageItemAdapter extends 
RecyclerView.Adapter {
+@Override
+public int getItemCount() {
+return readingList == null ? 0 : readingList.getPages().size();
+}
+
+@Override
+public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, 
int type) {
+return new ReadingListPageItemHolder(new 
PageItemView(getContext()));
+}
+
+@Override
+public void onBindViewHolder(RecyclerView.ViewHolder holder, int pos) {
+if (readingList != null && holder instanceof 
ReadingListPageItemHolder) {
+((ReadingListPageItemHolder) 
holder).bindItem(readingList.getPages().get(pos));
+}
+}
 }
 }
diff --git a/app/src/main/res/drawable/ic_offline_pin_black_24dp.xml 
b/app/src/main/res/drawable/ic_offline_pin_black_24dp.xml
new file mode 100644
index 000..d04f270
--- /dev/null
+++

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Benevity import, still create relationship when no individua...

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341749 )

Change subject: Benevity import, still create relationship when no individual 
gift
..

Benevity import, still create relationship when no individual gift

Bug: T115044
Change-Id: I9f00f1d74a9ba8ecf680089d0cc0ad557489e160
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
A 
sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
3 files changed, 47 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/49/341749/1

diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index 13d01a6..b072fc1 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -160,6 +160,11 @@
   // soft credit it.
   wmf_civicrm_message_create_contact($msg);
 }
+if (isset($msg['employer_id'])) {
+  // This is done in the import but if we have no donation let's still do 
this update.
+  civicrm_api3('Contact', 'create', array('contact_id' => 
$msg['contact_id'],'employer_id' => $msg['employer_id']));
+}
+
 
 if (!empty($msg['matching_amount']) && $msg['matching_amount'] > 0) {
   $matchedMsg = $msg;
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index bf170b4..89f2347 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -135,6 +135,45 @@
*/
   function testImportSucceedIndividualNoExistingMatchOnlyMatchingGift() {
 $thaMouseMeister = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
+$relationships = $this->callAPISuccess('Relationship', 'get', array(
+'contact_id_b' => $thaMouseMeister['id'])
+);
+$this->assertEquals(0, $relationships['count']);
+
+$importer = new BenevityFile( __DIR__ . "/data/benevity_only_match.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('All rows were imported', $messages['Result']);
+$contribution = $this->callAPISuccessGetSingle('Contribution', 
array('trxn_id' => 'BENEVITY TRXN-SQUEAK_MATCHED'));
+$relationship = $this->callAPISuccessGetSingle('Relationship', array(
+'contact_id_b' => $thaMouseMeister['id'])
+);
+$this->assertEquals( $relationship['contact_id_a'], 
$contribution['soft_credit_to']);
+  }
+
+  /**
+   * Test when creating a contact just for the matching gift on a soft credit 
match.
+   *
+   * In this scenario the contact is matched based on a prior soft credit. 
Their
+   * email is ignored to make this match.
+   *
+   * The contact does not make a donation but is soft credited the 
organisation's donation.
+   *
+   * We are checking the relationship is created.
+   */
+  function testImportSucceedIndividualSofCreditMatchMatchingGiftNoDonorGift() {
+$thaMouseMeister = $this->callAPISuccess('Contact', 'create', 
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' => 
'Organization'));
+$minnie = $this->callAPISuccess('Contact', 'create', array(
+  'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' => 
'Individual', 'email' => 'minnie@mouse_home.org'
+));
+// Create a contribution on the organisation, soft credited to Better 
Minnie.
+$this->callAPISuccess('Contribution', 'create', array(
+  'total_amount' => 4,
+  'financial_type_id' => 'Donation',
+  'soft_credit_to' => $minnie['id'],
+  'contact_id' => $thaMouseMeister['id'],
+));
+
 $importer = new BenevityFile( __DIR__ . "/data/benevity_only_match.csv" );
 $importer->import();
 $messages = $importer->getMessages();
@@ -257,7 +296,6 @@
 $this->assertEquals(0, $emails['values'][1]['is_primary']);
 $this->assertEquals('min...@mouse.org', $emails['values'][1]['email']);
   }
-
 
   /**
* Check that without an email the match is only accepted with an employer 
connection.
diff --git 
a/sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
 
b/sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
new file mode 100644
index 000..c06a645
--- /dev/null
+++ 
b/sites/all/modules/offline2civicrm/tests/data/benevity_mice_no_email_matched_only.csv
@@ -0,0 +1,3 @@
+Participating Corporation,Project,Date of Donation,Donor First Name,Donor Last 
Name,Email,Address,City,State/Province,Postal Code,Comment,Transaction 
ID,Donation Frequency,Donation Amount,Matched Amount,Total
+Mickey Mouse Inc,,2015-11-02,Minnie,Mouse,Not shared by donor,Not shared by 
donor,Not shared by

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Enable base::firewall in role::test::system by default

2017-03-07 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341550 )

Change subject: Enable base::firewall in role::test::system by default
..


Enable base::firewall in role::test::system by default

With ruthenium converted to base::firewall, include base::firewall
in the role, so that it's enabled by default.

Change-Id: If244ebebaace27628dccada3c2c3b4186cb9c682
---
M manifests/site.pp
M modules/role/manifests/test/system.pp
2 files changed, 1 insertion(+), 4 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 63e5461..50b1257 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1234,7 +1234,6 @@
 # graphite test machine, currently with SSD caching + spinning disks
 node 'graphite1002.eqiad.wmnet' {
 role(test::system)
-include ::base::firewall
 }
 
 # graphite additional machine, for additional space
@@ -1923,7 +1922,6 @@
 # misc. test server, keep (T156208)
 node 'multatuli.wikimedia.org' {
 role(test::system)
-include ::base::firewall
 
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
@@ -2528,7 +2526,6 @@
 role(test::system,
 parsoid::testing, parsoid::rt_server, parsoid::rt_client,
 parsoid::vd_server, parsoid::vd_client)
-include ::base::firewall
 }
 
 # cluster management (salt master, cumin master)
@@ -2732,7 +2729,6 @@
 # test system for performance team (T117888)
 node 'tungsten.eqiad.wmnet' {
 role(test::system, xhgui::app)
-include ::base::firewall
 }
 
 # replaced magnesium (RT) (T119112 T123713)
diff --git a/modules/role/manifests/test/system.pp 
b/modules/role/manifests/test/system.pp
index 12eaf4d..8cd4214 100644
--- a/modules/role/manifests/test/system.pp
+++ b/modules/role/manifests/test/system.pp
@@ -3,6 +3,7 @@
 # filtertags: labs-project-puppet
 class role::test::system {
 include ::standard
+include ::base::firewall
 
 system::role { 'role::test::system': description => 'Unpuppetised system 
for testing' }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If244ebebaace27628dccada3c2c3b4186cb9c682
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: [WIP] Do not pass go. This has gone too far, constructor or...

2017-03-07 Thread Awight (Code Review) 
Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341748 )

Change subject: [WIP] Do not pass go.  This has gone too far, constructor order 
is fragile.
..

[WIP] Do not pass go.  This has gone too far, constructor order is fragile.

Change-Id: I7bf79b71f3c7410c61ccd24889996315e1097815
---
M gateway_common/gateway.adapter.php
M tests/phpunit/GatewayPageTest.php
2 files changed, 24 insertions(+), 20 deletions(-)


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

diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 69b0f05..65619bc 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -245,18 +245,6 @@
 
$this->defineDataTransformers();
 
-   $this->session_resetOnSwitch(); // Need to do this before 
creating DonationData
-
-   // FIXME: this should not have side effects like setting 
order_id_meta['final']
-   // TODO: On second thought, neither set data nor validate in 
this constructor.
-   $this->dataObj = new DonationData( $this, 
$options['external_data'] );
-
-   $this->unstaged_data = $this->dataObj->getData();
-   $this->staged_data = $this->unstaged_data;
-
-   // checking to see if we have an edit token in the request...
-   $this->posted = ( $this->dataObj->wasPosted() && ( !is_null( 
WmfFramework::getRequestValue( 'wmf_token', null ) ) ) );
-
$this->findAccount();
$this->defineAccountInfo();
$this->defineTransactions();
@@ -266,9 +254,23 @@
 
$this->setGatewayDefaults( $options );
 
-   // FIXME: Same as above, don't validate or stage in the 
constructor.
-   $this->errors = $this->validate();
+   $this->session_resetOnSwitch(); // Need to do this before 
creating DonationData
 
+   // FIXME: this should not have side effects like setting 
order_id_meta['final']
+   // TODO: On second thought, neither set data nor validate in 
this constructor.
+   $this->dataObj = new DonationData( $this, 
$options['external_data'] );
+
+   // FIXME: Same as above, don't validate or stage in the 
constructor.
+   // Sets $this->errors if validation fails.
+   $this->validate();
+
+   $this->unstaged_data = $this->dataObj->getData();
+   $this->staged_data = $this->unstaged_data;
+
+   // checking to see if we have an edit token in the request...
+   $this->posted = ( $this->dataObj->wasPosted() && ( !is_null( 
WmfFramework::getRequestValue( 'wmf_token', null ) ) ) );
+
+   // FIXME: Don't stage if invalid.
$this->stageData();
 
BannerHistoryLogIdProcessor::onGatewayReady( $this );
@@ -532,6 +534,8 @@
return $staged_data;
}
 
+   // FIXME: Rename and drop "escaped" at the least.  Better yet, only use
+   // normalized data.  See T134548.
public function getData_Unstaged_Escaped( $val = '' ) {
if ( $val === '' ) {
return $this->unstaged_data;
@@ -1228,7 +1232,7 @@
 */
public function getPaymentMethod() {
// FIXME: this should return the final calculated method
-   return $this->getData_Unstaged_Escaped( 'payment_method' );
+   return $this->dataObj->getVal( 'payment_method' );
}
 
/**
@@ -1243,7 +1247,7 @@
}
 
public function getPaymentSubmethod() {
-   return $this->getData_Unstaged_Escaped( 'payment_submethod' );
+   return $this->dataObj->getVal( 'payment_submethod' );
}
 
public function getPaymentSubmethods() {
@@ -2375,7 +2379,7 @@
 
// Add any country-specific required fields
if ( isset( $this->config['country_fields'] ) ) {
-   $country = $this->getData_Unstaged_Escaped( 'country' );
+   $country = $this->dataObj->getVal( 'country' );
if ( $country && isset( 
$this->config['country_fields'][$country] ) ) {
$validation = 
$this->config['country_fields'][$country];
}
@@ -2413,7 +2417,7 @@
//however, that's not happening 
in this class in the code I'm replacing, so...
//TODO: Something clever in the 
DataValidator with data groups like these.
);
-   $country = 
$this->getData_Unstaged_Escaped( 'country' );
+   $country = $this->dataObj->getVal(

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: noc: Remove old IE-fixes.css for IE6/IE7

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341740 )

Change subject: noc: Remove old IE-fixes.css for IE6/IE7
..


noc: Remove old IE-fixes.css for IE6/IE7

No longer supported. And falls back gracefully with slightly different
styling, which seems acceptable for NOC.

Change-Id: Iae8a356e2915839fe496072a09a2827b94ec2702
---
D docroot/noc/css/IE-fixes.css
M docroot/noc/index.html
2 files changed, 0 insertions(+), 36 deletions(-)

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



diff --git a/docroot/noc/css/IE-fixes.css b/docroot/noc/css/IE-fixes.css
deleted file mode 100644
index b0f3414..000
--- a/docroot/noc/css/IE-fixes.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (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.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * Contributor(s): Marc Schumann 
-  */
-
-#footer #useful-links li {
-padding-bottom: 0.8ex;
-}
-
-#footer .label {
-display: block;
-float: left;
-width: 8.2em;
-padding-bottom: 0.1ex;
-}
-
-#footer #links-actions .label {
-padding-top: 0.35em;
-}
-
-#footer .links {
-display: inline;
-}
diff --git a/docroot/noc/index.html b/docroot/noc/index.html
index 735588f..714ae0f 100644
--- a/docroot/noc/index.html
+++ b/docroot/noc/index.html
@@ -5,9 +5,6 @@
Wikimedia NOC


-   


dd { margin-bottom: 1em; }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iae8a356e2915839fe496072a09a2827b94ec2702
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add db-codfw.php to noc.wikimedia.org visible config

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340487 )

Change subject: Add db-codfw.php to noc.wikimedia.org visible config
..


Add db-codfw.php to noc.wikimedia.org visible config

No reason to hide it (it does not contain private data), plus
now it makes more sense as it can be the active dc., etc.

In particular, I need an easy to access double-check of pooled
servers, now I only have it for db-eqiad.php.

Change-Id: I9f02dee3cea54323415fe5e7b858386c15a54ef5
---
A docroot/noc/conf/db-codfw.php.txt
M docroot/noc/createTxtFileSymlinks.sh
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/docroot/noc/conf/db-codfw.php.txt 
b/docroot/noc/conf/db-codfw.php.txt
new file mode 12
index 000..b904c80
--- /dev/null
+++ b/docroot/noc/conf/db-codfw.php.txt
@@ -0,0 +1 @@
+../../../wmf-config/db-codfw.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh 
b/docroot/noc/createTxtFileSymlinks.sh
index 947afb8..5768600 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -14,6 +14,7 @@
CirrusSearch-common.php
CirrusSearch-labs.php
CirrusSearch-production.php
+db-codfw.php
db-eqiad.php
db-labs.php
FeaturedFeedsWMF.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f02dee3cea54323415fe5e7b858386c15a54ef5
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: noc: Fix url to conftool (currently 404 Not Found)

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341734 )

Change subject: noc: Fix url to conftool (currently 404 Not Found)
..


noc: Fix url to conftool (currently 404 Not Found)

The data structure changed recently, following activity around
T149617 and other tasks.

Just point it to the root, where pyball/ and discovery/ are listed.

Change-Id: I2f34be0a53b1cec824ea5dc5006c87881dbb6249
---
M docroot/noc/index.html
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/docroot/noc/index.html b/docroot/noc/index.html
index ce82553..735588f 100644
--- a/docroot/noc/index.html
+++ b/docroot/noc/index.html
@@ -23,7 +23,7 @@

Server configuration
   Config files of Wikimedia's MediaWiki installation
-   https://config-master.wikimedia.org/conftool/;>Conftool 
configuration
+   https://config-master.wikimedia.org/;>Conftool 
configuration
   Config files of Wikimedia's https://wikitech.wikimedia.org/wiki/Etcd;>etcd
used for pooling services in LVS
https://dbtree.wikimedia.org/;>Core dbs

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phabricator: monitor PHD service only on active server

2017-03-07 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341747 )

Change subject: phabricator: monitor PHD service only on active server
..

phabricator: monitor PHD service only on active server

Only if on the active server, monitor that PHD service is running.
(It must stay stopped on warm stand-by as long as clustering is disabled).

Just like we only send SMS if it is the active server.

We always monitor https though.

This avoids CRITs in Icinga on phab2001 that are just permanently
ACKed but still clutter.

Change-Id: Iac3fd0c952cf869d3c3a43b72a5ce4b3f4b46a6c
---
M modules/phabricator/manifests/monitoring.pp
1 file changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/341747/1

diff --git a/modules/phabricator/manifests/monitoring.pp 
b/modules/phabricator/manifests/monitoring.pp
index 99a3aff..c6baf0c 100644
--- a/modules/phabricator/manifests/monitoring.pp
+++ b/modules/phabricator/manifests/monitoring.pp
@@ -9,16 +9,18 @@
 
 $phabricator_active_server = hiera('phabricator_active_server')
 
+# (only if) on active server monitor that PHD is running,
+# and send actual SMS to contacts. monitor https on all though.
 if $::hostname == $phabricator_active_server {
 $phab_contact_groups = 'admins,phabricator,sms'
+
+nrpe::monitor_service { 'check_phab_taskmaster':
+description   => 'PHD should be supervising processes',
+nrpe_command  => '/usr/lib/nagios/plugins/check_procs -c 3:150 -u 
phd',
+contact_group => $phab_contact_groups,
+}
 } else {
 $phab_contact_groups = 'admins,phabricator'
-}
-
-nrpe::monitor_service { 'check_phab_taskmaster':
-description   => 'PHD should be supervising processes',
-nrpe_command  => '/usr/lib/nagios/plugins/check_procs -c 3:150 -u phd',
-contact_group => $phab_contact_groups,
 }
 
 monitoring::service { 'phabricator-https':

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...twilightsparql[master]: Annotate Reportupdater migration on graphs

2017-03-07 Thread Bearloga (Code Review) 
Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341746 )

Change subject: Annotate Reportupdater migration on graphs
..

Annotate Reportupdater migration on graphs

Change-Id: I51e717f7a0f9782e6d4d0261ab60264aa98a64b2
---
M server.R
M tab_documentation/wdqs_usage.md
M tab_documentation/wdqs_visits.md
3 files changed, 13 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/twilightsparql 
refs/changes/46/341746/1

diff --git a/server.R b/server.R
index 0a9ec5f..1974ddb 100644
--- a/server.R
+++ b/server.R
@@ -27,7 +27,8 @@
   dyAxis("y", logscale = input$usage_logscale) %>%
   dyLegend(labelsDiv = "usage_legend") %>%
   dyRangeSelector %>%
-  dyEvent(as.Date("2017-01-01"), "D (Started tracking LDF usage)", 
labelLoc = "bottom")
+  dyEvent(as.Date("2017-01-01"), "D (Started tracking LDF usage)", 
labelLoc = "bottom") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   )
 
   output$sparql_usage_plot <- renderDygraph(
@@ -43,7 +44,8 @@
   dyRangeSelector %>%
   dyEvent(as.Date("2015-09-07"), "A (Announcement)", labelLoc = "bottom") 
%>%
   dyEvent(as.Date("2015-11-05"), "B (Labs bot)", labelLoc = "bottom") %>%
-  dyEvent(as.Date("2016-12-28"), "C (Bot ruleset)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-12-28"), "C (Bot ruleset)", labelLoc = "bottom") 
%>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   )
 
   output$wdqs_visits_plot <- renderDygraph(
@@ -59,7 +61,8 @@
   # ...because we're using dygraphs' native log-scaling:
   dyAxis("y", logscale = input$visits_logscale) %>%
   dyLegend(labelsDiv = "wdqs_visits_legend") %>%
-  dyEvent(as.Date("2015-09-07"), "A (Announcement)", labelLoc = "bottom")
+  dyEvent(as.Date("2015-09-07"), "A (Announcement)", labelLoc = "bottom") 
%>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   )
 
   # Check datasets for missing data and notify user which datasets are missing 
data (if any)
diff --git a/tab_documentation/wdqs_usage.md b/tab_documentation/wdqs_usage.md
index 3d6cc3f..158a6c6 100644
--- a/tab_documentation/wdqs_usage.md
+++ b/tab_documentation/wdqs_usage.md
@@ -6,10 +6,11 @@
 Outages and inaccuracies
 --
 
-- **'A'**: We announced WDQS to the public.
-- **'B'**: From 2015-11-04 to 2015-11-06 there was what we believe to be a 
broken bot responsible for 21+ million requests.
-- **'C'**: As part of a refactoring to a new metric-generating framework (see 
[T150915](https://phabricator.wikimedia.org/T150915)), we revised the ruleset 
for determining when a request came from a bot/tool. For example, requests with 
URLs and email addresses in the UserAgent were classified as automata after 
2016-12-28.
-- **'D'**: We started tracking LDF endpoint usage on 2017-01-01. See 
[T153936](https://phabricator.wikimedia.org/T153936) and 
[T136358](https://phabricator.wikimedia.org/T136358) for more details.
+* '__A__': We announced WDQS to the public.
+* '__B__': From 2015-11-04 to 2015-11-06 there was what we believe to be a 
broken bot responsible for 21+ million requests.
+* '__C__': As part of a refactoring to a new metric-generating framework (see 
[T150915](https://phabricator.wikimedia.org/T150915)), we revised the ruleset 
for determining when a request came from a bot/tool. For example, requests with 
URLs and email addresses in the UserAgent were classified as automata after 
2016-12-28.
+* '__D__': We started tracking LDF endpoint usage on 2017-01-01. See 
[T153936](https://phabricator.wikimedia.org/T153936) and 
[T136358](https://phabricator.wikimedia.org/T136358) for more details.
+* '__R__': on 2017-01-01 we started calculating all of Discovery's metrics 
using a new version of [our data retrieval and processing 
codebase](https://phabricator.wikimedia.org/diffusion/WDGO/) that we migrated 
to [Wikimedia Analytics](https://www.mediawiki.org/wiki/Analytics)' 
[Reportupdater 
infrastructure](https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater). 
See [T150915](https://phabricator.wikimedia.org/T150915) for more details.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/wdqs_visits.md b/tab_documentation/wdqs_visits.md
index 02fffcf..192eb2e 100644
--- a/tab_documentation/wdqs_visits.md
+++ b/tab_documentation/wdqs_visits.md
@@ -6,7 +6,8 @@
 Outages and inaccuracies
 --
 
-- **'A'**: We announced WDQS to the public.
+* '__A__': We announced WDQS to the public.
+* '__R__': on 2017-01-01 we started calculating all of Discovery's metrics 
using a new version of [our data retrieval and processing 
codebase](https://phabricator.wikimedia.org/diffusion/WDGO/) that we migrated 
to [Wikimedia Analytics](https://www.mediawiki.org/wiki/Analytics)' 
[Reportupdater

[MediaWiki-commits] [Gerrit] wikimedia...wonderbolt[master]: Annotate Reportupdater migration on graphs

2017-03-07 Thread Bearloga (Code Review) 
Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341744 )

Change subject: Annotate Reportupdater migration on graphs
..

Annotate Reportupdater migration on graphs

Change-Id: If916e90d5b11e6a2ee6f9582b0603d6d7b224b9e
---
M server.R
M tab_documentation/traffic_byengine.md
M tab_documentation/traffic_summary.md
3 files changed, 14 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wonderbolt 
refs/changes/44/341744/1

diff --git a/server.R b/server.R
index 1888f89..b0863cf 100644
--- a/server.R
+++ b/server.R
@@ -7,12 +7,12 @@
 existing_date <- Sys.Date() - 1
 
 function(input, output, session) {
-  
+
   if (Sys.Date() != existing_date) {
 read_traffic()
 existing_date <<- Sys.Date()
   }
-  
+
   output$traffic_summary_dygraph <- renderDygraph({
 summary_traffic_data[[input$platform_traffic_summary]] %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_traffic_summary)) 
%>%
@@ -21,9 +21,10 @@
   dyLegend(labelsDiv = "traffic_summary_legend", show = "always", 
showZeroValues = FALSE) %>%
   dyRangeSelector %>%
   dyEvent(as.Date("2016-03-07"), "A (new UDF)", labelLoc = "bottom") %>%
-  dyEvent(as.Date("2016-06-26"), "B (DuckDuckGo)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-06-26"), "B (DuckDuckGo)", labelLoc = "bottom") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
-  
+
   output$traffic_bysearch_dygraph <- renderDygraph({
 bysearch_traffic_data[[input$platform_traffic_bysearch]] %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_traffic_bysearch)) %>%
@@ -32,9 +33,10 @@
   dyLegend(labelsDiv = "traffic_bysearch_legend", show = "always", 
showZeroValues = FALSE) %>%
   dyAxis("y", logscale = input$platform_traffic_bysearch_log) %>%
   dyRangeSelector(fillColor = "", strokeColor = "") %>%
-  dyEvent(as.Date("2016-06-26"), "A (DuckDuckGo)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-06-26"), "A (DuckDuckGo)", labelLoc = "bottom") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
-  
+
   # Check datasets for missing data and notify user which datasets are missing 
data (if any)
   output$message_menu <- renderMenu({
 notifications <- list(
@@ -43,5 +45,5 @@
 notifications <- notifications[!sapply(notifications, is.null)]
 return(dropdownMenu(type = "notifications", .list = notifications))
   })
-  
+
 }
diff --git a/tab_documentation/traffic_byengine.md 
b/tab_documentation/traffic_byengine.md
index b6e7571..30d33ac 100644
--- a/tab_documentation/traffic_byengine.md
+++ b/tab_documentation/traffic_byengine.md
@@ -11,7 +11,8 @@
 
 Outages and notes
 --
-- **A**: On 25 August 2016 we patched the UDF to also look for [Duck Duck 
Go](https://duckduckgo.com) when it processes referer data. That referreral 
data was deleted and backfilled from 26 June 2016. See 
[T143287](https://phabricator.wikimedia.org/T143287) for more details.
+* '__A__': on 2016-08-25 we patched the UDF to also look for [Duck Duck 
Go](https://duckduckgo.com) when it processes referer data. That referreral 
data was deleted and backfilled from 26 June 2016. See 
[T143287](https://phabricator.wikimedia.org/T143287) for more details.
+* '__R__': on 2017-01-01 we started calculating all of Discovery's metrics 
using a new version of [our data retrieval and processing 
codebase](https://phabricator.wikimedia.org/diffusion/WDGO/) that we migrated 
to [Wikimedia Analytics](https://www.mediawiki.org/wiki/Analytics)' 
[Reportupdater 
infrastructure](https://wikitech.wikimedia.org/wiki/Analytics/Reportupdater). 
See [T150915](https://phabricator.wikimedia.org/T150915) for more details.
 
 Questions, bug reports, and feature suggestions
 --
diff --git a/tab_documentation/traffic_summary.md 
b/tab_documentation/traffic_summary.md
index b1b7cf6..e8f0919 100644
--- a/tab_documentation/traffic_summary.md
+++ b/tab_documentation/traffic_summary.md
@@ -10,9 +10,10 @@
 
 Outages and notes
 --
-- **A**: We switched to a finalized version of the UDF that extracts internal 
traffic (see [T130083](https://phabricator.wikimedia.org/T130083))
-- **B**: On 25 August 2016 we patched the UDF to also look for [Duck Duck 
Go](https://duckduckgo.com) when it processes referer data. That referreral 
data was deleted and backfilled from 26 June 2016. See 
[T143287](https://phabricator.wikimedia.org/T143287) for more details.
+* '__A__': We switched to a finalized version of the UDF that extracts 
internal traffic (see [T130083](https://phabricator.wikimedia.org/T130083))
+* '__B__': on 25 August 2016 we patched the UDF to also look for [Duck Duck 
Go](https://duckduckgo.com) when it processes referer data. That referreral 
data was deleted and

[MediaWiki-commits] [Gerrit] wikimedia...wetzel[master]: Annotate Reportupdater migration on graphs

2017-03-07 Thread Bearloga (Code Review) 
Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341745 )

Change subject: Annotate Reportupdater migration on graphs
..

Annotate Reportupdater migration on graphs

Change-Id: I8bc4bd8ca8883e947ca77439edb0f5af47a6be8a
---
M server.R
M tab_documentation/geo_breakdown.md
M tab_documentation/geohack_usage.md
M tab_documentation/tiles_summary.md
M tab_documentation/tiles_total_by_zoom.md
M tab_documentation/tiles_users_by_style.md
M tab_documentation/unique_users.md
M tab_documentation/wikiminiatlas_usage.md
M tab_documentation/wikivoyage_usage.md
M tab_documentation/wiwosm_usage.md
10 files changed, 42 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wetzel 
refs/changes/45/341745/1

diff --git a/server.R b/server.R
index d3353e7..d24e621 100644
--- a/server.R
+++ b/server.R
@@ -40,7 +40,8 @@
   dyEvent(as.Date("2015-09-17"), "A (announcement)", labelLoc = "bottom") 
%>%
   dyEvent(as.Date("2016-01-08"), "B (enwiki launch)", labelLoc = "bottom") 
%>%
   dyEvent(as.Date("2016-01-12"), "C (cache clear)", labelLoc = "bottom") 
%>%
-  dyEvent(as.Date("2016-11-09"), "D (pkget)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-11-09"), "D (pkget)", labelLoc = "bottom") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$tiles_style_series <- renderDygraph({
@@ -59,7 +60,8 @@
   dyEvent(as.Date("2015-09-17"), "A (announcement)", labelLoc = "bottom") 
%>%
   dyEvent(as.Date("2016-01-08"), "B (enwiki launch)", labelLoc = "bottom") 
%>%
   dyEvent(as.Date("2016-01-12"), "C (cache clear)", labelLoc = "bottom") 
%>%
-  dyEvent(as.Date("2016-11-09"), "D (pkget)", labelLoc = "top")
+  dyEvent(as.Date("2016-11-09"), "D (pkget)", labelLoc = "top") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$tiles_users_series <- renderDygraph({
@@ -78,7 +80,8 @@
   dyEvent(as.Date("2015-09-17"), "A (announcement)", labelLoc = "bottom") 
%>%
   dyEvent(as.Date("2016-01-08"), "B (enwiki launch)", labelLoc = "bottom") 
%>%
   dyEvent(as.Date("2016-01-12"), "C (cache clear)", labelLoc = "bottom") 
%>%
-  dyEvent(as.Date("2016-11-08"), "D (pkget)", labelLoc = "top")
+  dyEvent(as.Date("2016-11-08"), "D (pkget)", labelLoc = "top") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$zoom_level_selector_container <- renderUI({
@@ -99,7 +102,8 @@
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_tiles_zoom_series)) %>%
   polloi::make_dygraph("Date", "Tiles", "Total tiles by zoom level") %>%
   dyAxis("y", logscale = input$tiles_zoom_logscale) %>%
-  dyLegend(labelsDiv = "tiles_zoom_series_legend", show = "always")
+  dyLegend(labelsDiv = "tiles_zoom_series_legend", show = "always") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$users_per_platform <- renderDygraph({
@@ -110,7 +114,8 @@
   dyLegend(labelsDiv = "users_per_platform_legend", show = "always") %>%
   dyRangeSelector %>%
   dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") 
%>%
-  dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$geohack_feature_usage <- renderDygraph({
@@ -120,7 +125,8 @@
   dyRangeSelector %>%
   dyAxis("y", logscale = input$geohack_feature_usage_logscale) %>%
   dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") 
%>%
-  dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$wikiminiatlas_feature_usage <- renderDygraph({
@@ -130,7 +136,8 @@
   dyRangeSelector %>%
   dyAxis("y", logscale = input$wikiminiatlas_feature_usage_logscale) %>%
   dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") 
%>%
-  dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom") 
%>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$wikivoyage_feature_usage <- renderDygraph({
@@ -140,7 +147,8 @@
   dyRangeSelector %>%
   dyAxis("y", logscale = input$wikivoyage_feature_usage_logscale) %>%
   dyEvent(as.Date("2016-04-15"), "A (Maps EL bug)", labelLoc = "bottom") 
%>%
-  dyEvent(as.Date("2016-06-17"), "A (Maps EL patch)", labelLoc = "bottom")
+

[MediaWiki-commits] [Gerrit] wikimedia...rainbow[master]: Annotate Reportupdater migration on graphs

2017-03-07 Thread Bearloga (Code Review) 
Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341742 )

Change subject: Annotate Reportupdater migration on graphs
..

Annotate Reportupdater migration on graphs

Change-Id: Ie650b1eb0f5c9cc40e43a316b71f44e0b8b8cab7
---
M server.R
M tab_documentation/app_events.md
M tab_documentation/app_load.md
M tab_documentation/click_position.md
M tab_documentation/desktop_events.md
M tab_documentation/desktop_load.md
M tab_documentation/failure_breakdown.md
M tab_documentation/failure_langproj.md
M tab_documentation/failure_rate.md
M tab_documentation/failure_suggests.md
M tab_documentation/fulltext_basic.md
M tab_documentation/geo_basic.md
M tab_documentation/invoke_source.md
M tab_documentation/kpi_api_usage.md
M tab_documentation/kpi_augmented_clickthroughs.md
M tab_documentation/kpi_load_time.md
M tab_documentation/kpi_zero_results.md
M tab_documentation/language_basic.md
M tab_documentation/mobile_events.md
M tab_documentation/mobile_load.md
M tab_documentation/open_basic.md
M tab_documentation/paulscore_approx.html
M tab_documentation/prefix_basic.md
M tab_documentation/survival.md
24 files changed, 100 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow 
refs/changes/42/341742/1

diff --git a/server.R b/server.R
index 343dd5f..158ecf5 100644
--- a/server.R
+++ b/server.R
@@ -69,7 +69,8 @@
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_event)) 
%>%
   polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Desktop 
search events, by day") %>%
   dyRangeSelector %>%
-  dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom") 
%>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$desktop_load_plot <- renderDygraph({
@@ -77,7 +78,8 @@
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_load)) %>%
   polloi::make_dygraph(xlab = "Date", ylab = "Load time (ms)", title = 
"Desktop load times, by day", use_si = FALSE) %>%
   dyRangeSelector %>%
-  dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom")
+  dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom") 
%>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$paulscore_approx_plot_fulltext <- renderDygraph({
@@ -149,14 +151,16 @@
 mobile_dygraph_set %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_mobile_event)) %>%
   polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Mobile 
search events, by day") %>%
-  dyRangeSelector
+  dyRangeSelector %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$mobile_load_plot <- renderDygraph({
 mobile_load_data %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_mobile_load)) %>%
   polloi::make_dygraph(xlab = "Date", ylab = "Load time (ms)", title = 
"Mobile search events, by day", use_si = FALSE) %>%
-  dyRangeSelector
+  dyRangeSelector %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   ## App value boxes
@@ -192,28 +196,32 @@
 android_dygraph_set %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_app_event)) %>%
   polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Android 
mobile app search events, by day") %>%
-  dyRangeSelector
+  dyRangeSelector %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$android_load_plot <- renderDygraph({
 android_load_data %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_app_load)) %>%
   polloi::make_dygraph(xlab = "Date", ylab = "Load time (ms)", title = 
"Android result load times, by day", use_si = FALSE) %>%
-  dyRangeSelector
+  dyRangeSelector %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$ios_event_plot <- renderDygraph({
 ios_dygraph_set %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_app_event)) %>%
   polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "iOS mobile 
app search events, by day") %>%
-  dyRangeSelector
+  dyRangeSelector %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom")
   })
 
   output$ios_load_plot <- renderDygraph({
 ios_load_data %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global,

[MediaWiki-commits] [Gerrit] wikimedia...prince[master]: Annotate Reportupdater migration on graphs

2017-03-07 Thread Bearloga (Code Review) 
Bearloga has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341743 )

Change subject: Annotate Reportupdater migration on graphs
..

Annotate Reportupdater migration on graphs

Change-Id: Idd8b46e61db9e33788d2be63564c3dc40334dc5f
---
M server.R
M tab_documentation/action_breakdown.md
M tab_documentation/applinks.md
M tab_documentation/clickthrough_rate.md
M tab_documentation/dwelltime.md
M tab_documentation/first_visit.md
M tab_documentation/geography.md
M tab_documentation/languages_summary.md
M tab_documentation/languages_visited.md
M tab_documentation/most_common.md
M tab_documentation/pageviews.md
M tab_documentation/referers_byengine.md
M tab_documentation/referers_summary.md
M tab_documentation/sisproj.md
M utils.R
15 files changed, 95 insertions(+), 63 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/prince 
refs/changes/43/341743/1

diff --git a/server.R b/server.R
index 9da5d5a..2d82d55 100644
--- a/server.R
+++ b/server.R
@@ -51,7 +51,8 @@
   dyEvent(as.Date("2016-05-18"), "Sister Links Updated", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-06-02"), "Detect Language Deployed", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-08-16"), "Secondary Links Collapsed", labelLoc = 
"bottom", color = "white") %>%
-  dyEvent(as.Date("2016-09-13"), "B (schema switch)", labelLoc = "bottom", 
color = "white")
+  dyEvent(as.Date("2016-09-13"), "B (schema switch)", labelLoc = "bottom", 
color = "white") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom", 
color = "white")
   })
 
   output$action_breakdown_dygraph <- renderDygraph({
@@ -68,7 +69,8 @@
   dyEvent(as.Date("2016-05-18"), "Sister Links Updated", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-06-02"), "Detect Language Deployed", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-08-16"), "Secondary Links Collapsed", labelLoc = 
"bottom", color = "white") %>%
-  dyEvent(as.Date("2016-09-13"), "B (schema switch)", labelLoc = "bottom", 
color = "white")
+  dyEvent(as.Date("2016-09-13"), "B (schema switch)", labelLoc = "bottom", 
color = "white") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom", 
color = "white")
   })
 
   output$most_common_dygraph <- renderDygraph({
@@ -83,7 +85,8 @@
   dyEvent(as.Date("2016-05-18"), "Sister Links Updated", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-06-02"), "Detect Language Deployed", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-08-16"), "Secondary Links Collapsed", labelLoc = 
"bottom", color = "white") %>%
-  dyEvent(as.Date("2016-09-13"), "A (schema switch)", labelLoc = "bottom", 
color = "white")
+  dyEvent(as.Date("2016-09-13"), "A (schema switch)", labelLoc = "bottom", 
color = "white") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom", 
color = "white")
   })
 
   output$first_visit_dygraph <- renderDygraph({
@@ -99,7 +102,8 @@
   dyEvent(as.Date("2016-05-18"), "Sister Links Updated", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-06-02"), "Detect Language Deployed", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-08-16"), "Secondary Links Collapsed", labelLoc = 
"bottom", color = "white") %>%
-  dyEvent(as.Date("2016-09-13"), "A (schema switch)", labelLoc = "bottom", 
color = "white")
+  dyEvent(as.Date("2016-09-13"), "A (schema switch)", labelLoc = "bottom", 
color = "white") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom", 
color = "white")
   })
 
   output$dwelltime_dygraph <- renderDygraph({
@@ -115,7 +119,8 @@
   dyEvent(as.Date("2016-05-18"), "Sister Links Updated", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-06-02"), "Detect Language Deployed", labelLoc = 
"bottom", color = "white") %>%
   dyEvent(as.Date("2016-08-16"), "Secondary Links Collapsed", labelLoc = 
"bottom", color = "white") %>%
-  dyEvent(as.Date("2016-09-13"), "B (schema switch)", labelLoc = "bottom", 
color = "white")
+  dyEvent(as.Date("2016-09-13"), "B (schema switch)", labelLoc = "bottom", 
color = "white") %>%
+  dyEvent(as.Date("2017-01-01"), "R (reportupdater)", labelLoc = "bottom", 
color = "white")
   })
 
   output$sisproj_dygraph <- renderDygraph({
@@ -137,7 +142,8 @@
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, input$smoothing_sisproj), rename 
= FALSE) %>%
   polloi::make_dygraph("Date", ifelse(input$sisproj_type == "prop", 
"Proportion (%)", input$sisproj_metric),
paste(ifelse(input$sisproj_metric == "Clicks", 
"Clicks", "Users who clicked"), "on links other Wikimedia Foundation 
projects")) %>%
-

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Make infused and non-infused DateInputWidget consistent

2017-03-07 Thread Sn1per (Code Review) 
Sn1per has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341741 )

Change subject: [WIP] Make infused and non-infused DateInputWidget consistent
..

[WIP] Make infused and non-infused DateInputWidget consistent

* Infused DateInputWidget should inherit from TextInputWidget to match the
  non-infused version
* Adjust CSS so that the non-infused version looks approx. the same

Bug: T120733
Change-Id: I8625fee07385b5f9afe3e22f876e11d22832be86
---
M includes/specials/SpecialContributions.php
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
M resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
3 files changed, 16 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/341741/1

diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 1028002..8bff1a5 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -40,6 +40,7 @@
$out->addModuleStyles( [
'mediawiki.special',
'mediawiki.special.changeslist',
+   'mediawiki.widgets.DateInputWidget',
] );
$this->addHelpLink( 'Help:User contributions' );
 
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js 
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index 0ec6a4c..e5c3420 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -56,7 +56,7 @@
 * } );
 *
 * @class
-* @extends OO.ui.InputWidget
+* @extends OO.ui.TextInputWidget
 * @mixins OO.ui.mixin.IndicatorElement
 *
 * @constructor
@@ -116,7 +116,6 @@
 
// Properties (must be set before parent constructor, which 
calls #setValue)
this.$handle = $( '' );
-   this.label = new OO.ui.LabelWidget();
this.textInput = new OO.ui.TextInputWidget( {
required: config.required,
placeholder: placeholderDateFormat,
@@ -135,8 +134,8 @@
this.longDisplayFormat = config.longDisplayFormat;
this.required = config.required;
this.placeholderLabel = config.placeholderLabel;
-
// Validate and set min and max dates as properties
+
if ( config.mustBeAfter !== undefined ) {
mustBeAfter = moment( config.mustBeAfter, '-MM-DD' 
);
if ( mustBeAfter.isValid() ) {
@@ -149,12 +148,13 @@
this.mustBeBefore = mustBeBefore;
}
}
-
// Parent constructor
mw.widgets.DateInputWidget.parent.call( this, config );
 
// Mixin constructors
OO.ui.mixin.IndicatorElement.call( this, config );
+
+   this.label = new OO.ui.LabelWidget();
 
// Events
this.calendar.connect( this, {
@@ -239,7 +239,7 @@
 
/* Inheritance */
 
-   OO.inheritClass( mw.widgets.DateInputWidget, OO.ui.InputWidget );
+   OO.inheritClass( mw.widgets.DateInputWidget, OO.ui.TextInputWidget );
OO.mixinClass( mw.widgets.DateInputWidget, OO.ui.mixin.IndicatorElement 
);
 
/* Methods */
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less 
b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index 8ba9a99..a39ae1e 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -30,15 +30,17 @@
 @indicator-size: unit( 12 / 16 / 0.8, em );
 
 .mw-widget-dateInputWidget {
-   display: inline-block;
-   position: relative;
-   width: 21em;
-   margin-top: 0.25em;
-   .oo-ui-inline-spacing( 0.5em );
-   margin-bottom: 0.25em;
-   margin-left: 0;
+   &.oo-ui-textInputWidget {
+   display: inline-block;
+   position: relative;
+   width: 21em;
+   margin-top: 0.25em;
+   .oo-ui-inline-spacing(0.5em);
+   margin-bottom: 0.25em;
+   margin-left: 0;
+   }
 
-   &-handle {
+   &-handle, &.oo-ui-textInputWidget input {
background-color: #fff;
display: inline-block;
position: relative;

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: noc: Remove old IE-fixes.css for IE6/IE7

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341740 )

Change subject: noc: Remove old IE-fixes.css for IE6/IE7
..

noc: Remove old IE-fixes.css for IE6/IE7

No longer supported. And falls back gracefully with slightly different
styling, which seems acceptable for NOC.

Change-Id: Iae8a356e2915839fe496072a09a2827b94ec2702
---
D docroot/noc/css/IE-fixes.css
M docroot/noc/index.html
2 files changed, 0 insertions(+), 36 deletions(-)


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

diff --git a/docroot/noc/css/IE-fixes.css b/docroot/noc/css/IE-fixes.css
deleted file mode 100644
index b0f3414..000
--- a/docroot/noc/css/IE-fixes.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/* The contents of this file are subject to the Mozilla Public
-  * License Version 1.1 (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.mozilla.org/MPL/
-  *
-  * Software distributed under the License is distributed on an "AS
-  * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  * implied. See the License for the specific language governing
-  * rights and limitations under the License.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * Contributor(s): Marc Schumann 
-  */
-
-#footer #useful-links li {
-padding-bottom: 0.8ex;
-}
-
-#footer .label {
-display: block;
-float: left;
-width: 8.2em;
-padding-bottom: 0.1ex;
-}
-
-#footer #links-actions .label {
-padding-top: 0.35em;
-}
-
-#footer .links {
-display: inline;
-}
diff --git a/docroot/noc/index.html b/docroot/noc/index.html
index 735588f..714ae0f 100644
--- a/docroot/noc/index.html
+++ b/docroot/noc/index.html
@@ -5,9 +5,6 @@
Wikimedia NOC


-   


dd { margin-bottom: 1em; }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "authdns lint support for full puppetized config"

2017-03-07 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341739 )

Change subject: Revert "authdns lint support for full puppetized config"
..


Revert "authdns lint support for full puppetized config"

This reverts commit d79dc312355c67ec42021f1081245d3b8377b6e5.

Change-Id: I1cdf890d343dca8dd9874a3330af937a16fe548a
---
M modules/authdns/files/authdns-lint
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/lint.pp
D modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
6 files changed, 111 insertions(+), 159 deletions(-)

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



diff --git a/modules/authdns/files/authdns-lint 
b/modules/authdns/files/authdns-lint
index 5ad52df..878f25a 100644
--- a/modules/authdns/files/authdns-lint
+++ b/modules/authdns/files/authdns-lint
@@ -35,23 +35,11 @@
 echo "Using $TESTDIR as the output working directory (gdnsd chroot)"
 mkdir -p $TESTDIR/etc/zones
 
-if [ ! -e /var/lib/gdnsd/testconfig/config ]; then
-die "main config file not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-geo-resources ]; then
-die "discovery-geo-resources not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-metafo-resources ]; then
-die "discovery-metafo-resources not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-states ]; then
-die "discovery-states not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-map ]; then
-die "discovery-map not found, system misconfigured?"
-fi
 if [ ! -e "$WORKINGDIR/templates" ]; then
 die "templates not found, system misconfigured?"
+fi
+if [ ! -e "$WORKINGDIR/config-geo-test" ]; then
+die "config-geo-test not found, system misconfigured?"
 fi
 if [ ! -e "$WORKINGDIR/geo-maps" ]; then
 die "geo-maps not found, system misconfigured?"
@@ -64,11 +52,7 @@
 authdns-gen-zones $WORKINGDIR/templates $TESTDIR/etc/zones
 
 echo "Generating gdnsd config"
-cp -f /var/lib/gdnsd/testconfig/config $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-geo-resources $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-metafo-resources $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-states $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-map $TESTDIR/etc/
+cp -f $WORKINGDIR/config-geo-test $TESTDIR/etc/config
 cp -f $WORKINGDIR/geo-maps $TESTDIR/etc/geo-maps
 cp -f $WORKINGDIR/geo-resources $TESTDIR/etc/geo-resources
 
diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 675c655..6202faf 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -1,152 +1,136 @@
 # == Class authdns
-# Base authdns setup shared by authdns::ns and authdns::lint
-#
-# $nameservers - Array of FQDN of nameservers participating in
-# "authdns-update" scheme for syncing zone data.  If left un-set, will
-# default to only the local machine's FQDN, creating what is effectively
-# an isolated test server.
-# $gitrepo - If defined, this is the repo to pull DNS zone data from, and
-# this code assumes setup of a live gdnsd server and ensures config is
-# templated and git data is pulled into place before the package is
-# installed to avoid potentially issuing REFUSED for unknown zones, etc.
-# If undefined (the default), the gdnsd OS-level service is
-# disabled/stopped, and no data syncing for zone data is set up at all.
-# $config_dir - default "/etc/gdnsd" - place where config files deployed.
+# A class to implement Wikimedia's authoritative DNS system
 #
 class authdns(
 $nameservers = [ $::fqdn ],
 $gitrepo = undef,
-$config_dir='/etc/gdnsd',
+$monitoring = true,
+$conftool_prefix = hiera('conftool_prefix'),
+$lvs_services,
+$discovery_services,
 ) {
+require ::authdns::account
 require ::authdns::scripts
-
-if $gitrepo {
-require ::geoip::data::puppet
-$svc_ensure = 'running'
-$svc_enable = true
-}
-else {
-include ::geoip
-$svc_ensure = 'stopped'
-$svc_enable = false
-}
+require ::geoip::data::puppet
 
 package { 'gdnsd':
 ensure => installed,
 }
 
 service { 'gdnsd':
-ensure => $svc_ensure,
-enable => $svc_enable,
+ensure => 'running',
 hasrestart => true,
 hasstatus  => true,
 require=> Package['gdnsd'],
 }
 
-file { $config_dir:
+# the package creates this, but we want to set up the config before we
+# install the package, so that the daemon starts up with a well-known
+# config that leaves no window where it'd refuse to answer properly
+file { '/etc/gdnsd':
 ensure => 'directory',
 owner  => 'root',
 group  =>

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "authdns lint support for full puppetized config"

2017-03-07 Thread BBlack (Code Review) 
Hello Giuseppe Lavagetto, jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "authdns lint support for full puppetized config"
..

Revert "authdns lint support for full puppetized config"

This reverts commit d79dc312355c67ec42021f1081245d3b8377b6e5.

Change-Id: I1cdf890d343dca8dd9874a3330af937a16fe548a
---
M modules/authdns/files/authdns-lint
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/lint.pp
D modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
6 files changed, 111 insertions(+), 159 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/341739/1

diff --git a/modules/authdns/files/authdns-lint 
b/modules/authdns/files/authdns-lint
index 5ad52df..878f25a 100644
--- a/modules/authdns/files/authdns-lint
+++ b/modules/authdns/files/authdns-lint
@@ -35,23 +35,11 @@
 echo "Using $TESTDIR as the output working directory (gdnsd chroot)"
 mkdir -p $TESTDIR/etc/zones
 
-if [ ! -e /var/lib/gdnsd/testconfig/config ]; then
-die "main config file not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-geo-resources ]; then
-die "discovery-geo-resources not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-metafo-resources ]; then
-die "discovery-metafo-resources not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-states ]; then
-die "discovery-states not found, system misconfigured?"
-fi
-if [ ! -e /var/lib/gdnsd/testconfig/discovery-map ]; then
-die "discovery-map not found, system misconfigured?"
-fi
 if [ ! -e "$WORKINGDIR/templates" ]; then
 die "templates not found, system misconfigured?"
+fi
+if [ ! -e "$WORKINGDIR/config-geo-test" ]; then
+die "config-geo-test not found, system misconfigured?"
 fi
 if [ ! -e "$WORKINGDIR/geo-maps" ]; then
 die "geo-maps not found, system misconfigured?"
@@ -64,11 +52,7 @@
 authdns-gen-zones $WORKINGDIR/templates $TESTDIR/etc/zones
 
 echo "Generating gdnsd config"
-cp -f /var/lib/gdnsd/testconfig/config $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-geo-resources $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-metafo-resources $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-states $TESTDIR/etc/
-cp -f /var/lib/gdnsd/testconfig/discovery-map $TESTDIR/etc/
+cp -f $WORKINGDIR/config-geo-test $TESTDIR/etc/config
 cp -f $WORKINGDIR/geo-maps $TESTDIR/etc/geo-maps
 cp -f $WORKINGDIR/geo-resources $TESTDIR/etc/geo-resources
 
diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 675c655..6202faf 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -1,152 +1,136 @@
 # == Class authdns
-# Base authdns setup shared by authdns::ns and authdns::lint
-#
-# $nameservers - Array of FQDN of nameservers participating in
-# "authdns-update" scheme for syncing zone data.  If left un-set, will
-# default to only the local machine's FQDN, creating what is effectively
-# an isolated test server.
-# $gitrepo - If defined, this is the repo to pull DNS zone data from, and
-# this code assumes setup of a live gdnsd server and ensures config is
-# templated and git data is pulled into place before the package is
-# installed to avoid potentially issuing REFUSED for unknown zones, etc.
-# If undefined (the default), the gdnsd OS-level service is
-# disabled/stopped, and no data syncing for zone data is set up at all.
-# $config_dir - default "/etc/gdnsd" - place where config files deployed.
+# A class to implement Wikimedia's authoritative DNS system
 #
 class authdns(
 $nameservers = [ $::fqdn ],
 $gitrepo = undef,
-$config_dir='/etc/gdnsd',
+$monitoring = true,
+$conftool_prefix = hiera('conftool_prefix'),
+$lvs_services,
+$discovery_services,
 ) {
+require ::authdns::account
 require ::authdns::scripts
-
-if $gitrepo {
-require ::geoip::data::puppet
-$svc_ensure = 'running'
-$svc_enable = true
-}
-else {
-include ::geoip
-$svc_ensure = 'stopped'
-$svc_enable = false
-}
+require ::geoip::data::puppet
 
 package { 'gdnsd':
 ensure => installed,
 }
 
 service { 'gdnsd':
-ensure => $svc_ensure,
-enable => $svc_enable,
+ensure => 'running',
 hasrestart => true,
 hasstatus  => true,
 require=> Package['gdnsd'],
 }
 
-file { $config_dir:
+# the package creates this, but we want to set up the config before we
+# install the package, so that the daemon starts up with a well-known
+# config that leaves no window where it'd refuse to answer properly
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "authdns: move hiera() down into module"

2017-03-07 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341738 )

Change subject: Revert "authdns: move hiera() down into module"
..


Revert "authdns: move hiera() down into module"

This reverts commit 80103e91445d5811842de9358f84ffce96d2fbe8.

Change-Id: Iee5cc954971d1d953081f92ab572d53450a0b63a
---
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
4 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 29a137f..675c655 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -20,9 +20,6 @@
 ) {
 require ::authdns::scripts
 
-$lvs_services = hiera('lvs::configuration::lvs_services')
-$discovery_services = hiera('discovery::services')
-
 if $gitrepo {
 require ::geoip::data::puppet
 $svc_ensure = 'running'
diff --git a/modules/authdns/manifests/ns.pp b/modules/authdns/manifests/ns.pp
index f52d47f..b541921 100644
--- a/modules/authdns/manifests/ns.pp
+++ b/modules/authdns/manifests/ns.pp
@@ -6,10 +6,9 @@
 $gitrepo = undef,
 $monitoring = true,
 $conftool_prefix = hiera('conftool_prefix'),
+$lvs_services,
+$discovery_services,
 ) {
-$lvs_services = hiera('lvs::configuration::lvs_services')
-$discovery_services = hiera('discovery::services')
-
 class { 'authdns':
 nameservers => $nameservers,
 gitrepo => $gitrepo,
diff --git a/modules/role/manifests/authdns/server.pp 
b/modules/role/manifests/authdns/server.pp
index 7bfa0c7..f2893b0 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -14,8 +14,10 @@
 )
 
 class { 'authdns::ns':
-nameservers => $role::authdns::data::nameservers,
-gitrepo => $role::authdns::data::gitrepo,
+nameservers=> $role::authdns::data::nameservers,
+gitrepo=> $role::authdns::data::gitrepo,
+lvs_services   => hiera('lvs::configuration::lvs_services'),
+discovery_services => hiera('discovery::services'),
 }
 
 ferm::service { 'udp_dns_auth':
diff --git a/modules/role/manifests/authdns/testns.pp 
b/modules/role/manifests/authdns/testns.pp
index a637e86..0d6f9d6 100644
--- a/modules/role/manifests/authdns/testns.pp
+++ b/modules/role/manifests/authdns/testns.pp
@@ -3,7 +3,9 @@
 class role::authdns::testns {
 include role::authdns::data
 class { 'authdns::ns':
-gitrepo=> $role::authdns::data::gitrepo,
-monitoring => false,
+gitrepo=> $role::authdns::data::gitrepo,
+monitoring => false,
+lvs_services   => hiera('lvs::configuration::lvs_services'),
+discovery_services => hiera('discovery::services'),
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee5cc954971d1d953081f92ab572d53450a0b63a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "authdns: move hiera() down into module"

2017-03-07 Thread BBlack (Code Review) 
Hello Giuseppe Lavagetto, jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "authdns: move hiera() down into module"
..

Revert "authdns: move hiera() down into module"

This reverts commit 80103e91445d5811842de9358f84ffce96d2fbe8.

Change-Id: Iee5cc954971d1d953081f92ab572d53450a0b63a
---
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
4 files changed, 10 insertions(+), 10 deletions(-)


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

diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 29a137f..675c655 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -20,9 +20,6 @@
 ) {
 require ::authdns::scripts
 
-$lvs_services = hiera('lvs::configuration::lvs_services')
-$discovery_services = hiera('discovery::services')
-
 if $gitrepo {
 require ::geoip::data::puppet
 $svc_ensure = 'running'
diff --git a/modules/authdns/manifests/ns.pp b/modules/authdns/manifests/ns.pp
index f52d47f..b541921 100644
--- a/modules/authdns/manifests/ns.pp
+++ b/modules/authdns/manifests/ns.pp
@@ -6,10 +6,9 @@
 $gitrepo = undef,
 $monitoring = true,
 $conftool_prefix = hiera('conftool_prefix'),
+$lvs_services,
+$discovery_services,
 ) {
-$lvs_services = hiera('lvs::configuration::lvs_services')
-$discovery_services = hiera('discovery::services')
-
 class { 'authdns':
 nameservers => $nameservers,
 gitrepo => $gitrepo,
diff --git a/modules/role/manifests/authdns/server.pp 
b/modules/role/manifests/authdns/server.pp
index 7bfa0c7..f2893b0 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -14,8 +14,10 @@
 )
 
 class { 'authdns::ns':
-nameservers => $role::authdns::data::nameservers,
-gitrepo => $role::authdns::data::gitrepo,
+nameservers=> $role::authdns::data::nameservers,
+gitrepo=> $role::authdns::data::gitrepo,
+lvs_services   => hiera('lvs::configuration::lvs_services'),
+discovery_services => hiera('discovery::services'),
 }
 
 ferm::service { 'udp_dns_auth':
diff --git a/modules/role/manifests/authdns/testns.pp 
b/modules/role/manifests/authdns/testns.pp
index a637e86..0d6f9d6 100644
--- a/modules/role/manifests/authdns/testns.pp
+++ b/modules/role/manifests/authdns/testns.pp
@@ -3,7 +3,9 @@
 class role::authdns::testns {
 include role::authdns::data
 class { 'authdns::ns':
-gitrepo=> $role::authdns::data::gitrepo,
-monitoring => false,
+gitrepo=> $role::authdns::data::gitrepo,
+monitoring => false,
+lvs_services   => hiera('lvs::configuration::lvs_services'),
+discovery_services => hiera('discovery::services'),
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee5cc954971d1d953081f92ab572d53450a0b63a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Further fix on 'Remove bulk update blank addresses from bein...

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341737 )

Change subject: Further fix on 'Remove bulk update blank addresses from being 
treated as 'updates'.'
..

Further fix on 'Remove bulk update blank addresses from being treated as 
'updates'.'

It seems we have some contacts whose addresses should have been removed, but 
were not. eg. id 408435 , contact_id1861137.

Since this still has not run on prod we can just edit.

Bug: T159396
Change-Id: I590bc192797af4aca35be9716b5dee778a48f96a
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/37/341737/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 6b496ab..3cf448a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2727,6 +2727,7 @@
OR l.postal_code IS NOT NULL
OR l.city IS NOT NULL
   )
+  AND l.log_conn_id NOT IN ('" . implode("','", 
wmf_civicrm_get_log_conn_bulk_update()) . "')
 WHERE l.id IS NULL
 ");
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I590bc192797af4aca35be9716b5dee778a48f96a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: authdns: move hiera() down into module

2017-03-07 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341735 )

Change subject: authdns: move hiera() down into module
..


authdns: move hiera() down into module

I know it's awful, that's why I put it in the main subject line.
We'll have to fix it later, all of this needs a refactor anyways.

Change-Id: Id0860dd5ca90e44a4d011d09620cc7baabd98151
---
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
4 files changed, 10 insertions(+), 10 deletions(-)

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



diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 675c655..29a137f 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -20,6 +20,9 @@
 ) {
 require ::authdns::scripts
 
+$lvs_services = hiera('lvs::configuration::lvs_services')
+$discovery_services = hiera('discovery::services')
+
 if $gitrepo {
 require ::geoip::data::puppet
 $svc_ensure = 'running'
diff --git a/modules/authdns/manifests/ns.pp b/modules/authdns/manifests/ns.pp
index b541921..f52d47f 100644
--- a/modules/authdns/manifests/ns.pp
+++ b/modules/authdns/manifests/ns.pp
@@ -6,9 +6,10 @@
 $gitrepo = undef,
 $monitoring = true,
 $conftool_prefix = hiera('conftool_prefix'),
-$lvs_services,
-$discovery_services,
 ) {
+$lvs_services = hiera('lvs::configuration::lvs_services')
+$discovery_services = hiera('discovery::services')
+
 class { 'authdns':
 nameservers => $nameservers,
 gitrepo => $gitrepo,
diff --git a/modules/role/manifests/authdns/server.pp 
b/modules/role/manifests/authdns/server.pp
index f2893b0..7bfa0c7 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -14,10 +14,8 @@
 )
 
 class { 'authdns::ns':
-nameservers=> $role::authdns::data::nameservers,
-gitrepo=> $role::authdns::data::gitrepo,
-lvs_services   => hiera('lvs::configuration::lvs_services'),
-discovery_services => hiera('discovery::services'),
+nameservers => $role::authdns::data::nameservers,
+gitrepo => $role::authdns::data::gitrepo,
 }
 
 ferm::service { 'udp_dns_auth':
diff --git a/modules/role/manifests/authdns/testns.pp 
b/modules/role/manifests/authdns/testns.pp
index 0d6f9d6..a637e86 100644
--- a/modules/role/manifests/authdns/testns.pp
+++ b/modules/role/manifests/authdns/testns.pp
@@ -3,9 +3,7 @@
 class role::authdns::testns {
 include role::authdns::data
 class { 'authdns::ns':
-gitrepo=> $role::authdns::data::gitrepo,
-monitoring => false,
-lvs_services   => hiera('lvs::configuration::lvs_services'),
-discovery_services => hiera('discovery::services'),
+gitrepo=> $role::authdns::data::gitrepo,
+monitoring => false,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: m

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341736 )

Change subject: m
..

m

Change-Id: I671dcbc257ba9dc119fbb625d861209a9f4f97b5
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/36/341736/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 6b496ab..3cf448a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2727,6 +2727,7 @@
OR l.postal_code IS NOT NULL
OR l.city IS NOT NULL
   )
+  AND l.log_conn_id NOT IN ('" . implode("','", 
wmf_civicrm_get_log_conn_bulk_update()) . "')
 WHERE l.id IS NULL
 ");
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I671dcbc257ba9dc119fbb625d861209a9f4f97b5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: authdns: move hiera() down into module

2017-03-07 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341735 )

Change subject: authdns: move hiera() down into module
..

authdns: move hiera() down into module

I know it's awful, that's why I put it in the main subject line.
We'll have to fix it later, all of this needs a refactor anyways.

Change-Id: Id0860dd5ca90e44a4d011d09620cc7baabd98151
---
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
4 files changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 675c655..29a137f 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -20,6 +20,9 @@
 ) {
 require ::authdns::scripts
 
+$lvs_services = hiera('lvs::configuration::lvs_services')
+$discovery_services = hiera('discovery::services')
+
 if $gitrepo {
 require ::geoip::data::puppet
 $svc_ensure = 'running'
diff --git a/modules/authdns/manifests/ns.pp b/modules/authdns/manifests/ns.pp
index b541921..f52d47f 100644
--- a/modules/authdns/manifests/ns.pp
+++ b/modules/authdns/manifests/ns.pp
@@ -6,9 +6,10 @@
 $gitrepo = undef,
 $monitoring = true,
 $conftool_prefix = hiera('conftool_prefix'),
-$lvs_services,
-$discovery_services,
 ) {
+$lvs_services = hiera('lvs::configuration::lvs_services')
+$discovery_services = hiera('discovery::services')
+
 class { 'authdns':
 nameservers => $nameservers,
 gitrepo => $gitrepo,
diff --git a/modules/role/manifests/authdns/server.pp 
b/modules/role/manifests/authdns/server.pp
index f2893b0..b4e8aba 100644
--- a/modules/role/manifests/authdns/server.pp
+++ b/modules/role/manifests/authdns/server.pp
@@ -16,8 +16,6 @@
 class { 'authdns::ns':
 nameservers=> $role::authdns::data::nameservers,
 gitrepo=> $role::authdns::data::gitrepo,
-lvs_services   => hiera('lvs::configuration::lvs_services'),
-discovery_services => hiera('discovery::services'),
 }
 
 ferm::service { 'udp_dns_auth':
diff --git a/modules/role/manifests/authdns/testns.pp 
b/modules/role/manifests/authdns/testns.pp
index 0d6f9d6..7585e56 100644
--- a/modules/role/manifests/authdns/testns.pp
+++ b/modules/role/manifests/authdns/testns.pp
@@ -5,7 +5,5 @@
 class { 'authdns::ns':
 gitrepo=> $role::authdns::data::gitrepo,
 monitoring => false,
-lvs_services   => hiera('lvs::configuration::lvs_services'),
-discovery_services => hiera('discovery::services'),
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: noc: Fix url to conftool (currently 404 Not Found)

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341734 )

Change subject: noc: Fix url to conftool (currently 404 Not Found)
..

noc: Fix url to conftool (currently 404 Not Found)

The data structure changed recently, following activity around
T149617 and other tasks.

Just point it to the root, where pyball/ and discovery/ are listed.

Change-Id: I2f34be0a53b1cec824ea5dc5006c87881dbb6249
---
M docroot/noc/index.html
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/docroot/noc/index.html b/docroot/noc/index.html
index ce82553..735588f 100644
--- a/docroot/noc/index.html
+++ b/docroot/noc/index.html
@@ -23,7 +23,7 @@

Server configuration
   Config files of Wikimedia's MediaWiki installation
-   https://config-master.wikimedia.org/conftool/;>Conftool 
configuration
+   https://config-master.wikimedia.org/;>Conftool 
configuration
   Config files of Wikimedia's https://wikitech.wikimedia.org/wiki/Etcd;>etcd
used for pooling services in LVS
https://dbtree.wikimedia.org/;>Core dbs

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: authdns lint support for full puppetized config

2017-03-07 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341564 )

Change subject: authdns lint support for full puppetized config
..


authdns lint support for full puppetized config

Bug: T156100
Change-Id: Iae9d35fcbcd46e11940d0040b13143d65df25d77
---
M modules/authdns/files/authdns-lint
M modules/authdns/manifests/init.pp
M modules/authdns/manifests/lint.pp
A modules/authdns/manifests/ns.pp
M modules/role/manifests/authdns/server.pp
M modules/role/manifests/authdns/testns.pp
6 files changed, 160 insertions(+), 112 deletions(-)

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



diff --git a/modules/authdns/files/authdns-lint 
b/modules/authdns/files/authdns-lint
index 878f25a..5ad52df 100644
--- a/modules/authdns/files/authdns-lint
+++ b/modules/authdns/files/authdns-lint
@@ -35,11 +35,23 @@
 echo "Using $TESTDIR as the output working directory (gdnsd chroot)"
 mkdir -p $TESTDIR/etc/zones
 
+if [ ! -e /var/lib/gdnsd/testconfig/config ]; then
+die "main config file not found, system misconfigured?"
+fi
+if [ ! -e /var/lib/gdnsd/testconfig/discovery-geo-resources ]; then
+die "discovery-geo-resources not found, system misconfigured?"
+fi
+if [ ! -e /var/lib/gdnsd/testconfig/discovery-metafo-resources ]; then
+die "discovery-metafo-resources not found, system misconfigured?"
+fi
+if [ ! -e /var/lib/gdnsd/testconfig/discovery-states ]; then
+die "discovery-states not found, system misconfigured?"
+fi
+if [ ! -e /var/lib/gdnsd/testconfig/discovery-map ]; then
+die "discovery-map not found, system misconfigured?"
+fi
 if [ ! -e "$WORKINGDIR/templates" ]; then
 die "templates not found, system misconfigured?"
-fi
-if [ ! -e "$WORKINGDIR/config-geo-test" ]; then
-die "config-geo-test not found, system misconfigured?"
 fi
 if [ ! -e "$WORKINGDIR/geo-maps" ]; then
 die "geo-maps not found, system misconfigured?"
@@ -52,7 +64,11 @@
 authdns-gen-zones $WORKINGDIR/templates $TESTDIR/etc/zones
 
 echo "Generating gdnsd config"
-cp -f $WORKINGDIR/config-geo-test $TESTDIR/etc/config
+cp -f /var/lib/gdnsd/testconfig/config $TESTDIR/etc/
+cp -f /var/lib/gdnsd/testconfig/discovery-geo-resources $TESTDIR/etc/
+cp -f /var/lib/gdnsd/testconfig/discovery-metafo-resources $TESTDIR/etc/
+cp -f /var/lib/gdnsd/testconfig/discovery-states $TESTDIR/etc/
+cp -f /var/lib/gdnsd/testconfig/discovery-map $TESTDIR/etc/
 cp -f $WORKINGDIR/geo-maps $TESTDIR/etc/geo-maps
 cp -f $WORKINGDIR/geo-resources $TESTDIR/etc/geo-resources
 
diff --git a/modules/authdns/manifests/init.pp 
b/modules/authdns/manifests/init.pp
index 6202faf..675c655 100644
--- a/modules/authdns/manifests/init.pp
+++ b/modules/authdns/manifests/init.pp
@@ -1,136 +1,152 @@
 # == Class authdns
-# A class to implement Wikimedia's authoritative DNS system
+# Base authdns setup shared by authdns::ns and authdns::lint
+#
+# $nameservers - Array of FQDN of nameservers participating in
+# "authdns-update" scheme for syncing zone data.  If left un-set, will
+# default to only the local machine's FQDN, creating what is effectively
+# an isolated test server.
+# $gitrepo - If defined, this is the repo to pull DNS zone data from, and
+# this code assumes setup of a live gdnsd server and ensures config is
+# templated and git data is pulled into place before the package is
+# installed to avoid potentially issuing REFUSED for unknown zones, etc.
+# If undefined (the default), the gdnsd OS-level service is
+# disabled/stopped, and no data syncing for zone data is set up at all.
+# $config_dir - default "/etc/gdnsd" - place where config files deployed.
 #
 class authdns(
 $nameservers = [ $::fqdn ],
 $gitrepo = undef,
-$monitoring = true,
-$conftool_prefix = hiera('conftool_prefix'),
-$lvs_services,
-$discovery_services,
+$config_dir='/etc/gdnsd',
 ) {
-require ::authdns::account
 require ::authdns::scripts
-require ::geoip::data::puppet
+
+if $gitrepo {
+require ::geoip::data::puppet
+$svc_ensure = 'running'
+$svc_enable = true
+}
+else {
+include ::geoip
+$svc_ensure = 'stopped'
+$svc_enable = false
+}
 
 package { 'gdnsd':
 ensure => installed,
 }
 
 service { 'gdnsd':
-ensure => 'running',
+ensure => $svc_ensure,
+enable => $svc_enable,
 hasrestart => true,
 hasstatus  => true,
 require=> Package['gdnsd'],
 }
 
-# the package creates this, but we want to set up the config before we
-# install the package, so that the daemon starts up with a well-known
-# config that leaves no window where it'd refuse to answer properly
-file { '/etc/gdnsd':
+file { $config_dir:
 ensure => 'directory',
 owner  => 'root',
 group  => 'root',
 mode   => '0755',
 }
-file {

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: resourceloader: Add 1 minute stale-while-revalidate (Cache-c...

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341733 )

Change subject: resourceloader: Add 1 minute stale-while-revalidate 
(Cache-control)
..

resourceloader: Add 1 minute stale-while-revalidate (Cache-control)

Configure as 1 minute. Or half of the max age, if the lowest maxage
is 2 minutes or less (e.g. in development mode).

This gives popular resources a 1 minute grace window for a request
to come in after it expired but still be served while the resource
is asynchronously fetched for the next time.

Web browsers do not support this yet as of writing, but various
web proxies and CDNs do.

Known to support stale-while-revalidate:
* Varnish 4.1.0 (as default value of obj.grace)
* Squid 2.7
* Fastly CDN

Bug: T132418
Change-Id: Ifae1f09722be4abf1c4dfe895122a3503010a422
---
M includes/resourceloader/ResourceLoader.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/341733/1

diff --git a/includes/resourceloader/ResourceLoader.php 
b/includes/resourceloader/ResourceLoader.php
index 717fb45..582b8b6 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -857,7 +857,8 @@
header( 'Cache-Control: private, no-cache, 
must-revalidate' );
header( 'Pragma: no-cache' );
} else {
-   header( "Cache-Control: public, max-age=$maxage, 
s-maxage=$smaxage" );
+   $grace = (int)min( 60, $maxage / 2, $smaxage / 2 );
+   header( "Cache-Control: public, max-age=$maxage, 
s-maxage=$smaxage, stale-while-revalidate=$grace" );
$exp = min( $maxage, $smaxage );
header( 'Expires: ' . wfTimestamp( TS_RFC2822, $exp + 
time() ) );
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: [WIP] Add ORES filters to new RCFilters

2017-03-07 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341732 )

Change subject: [WIP] Add ORES filters to new RCFilters
..

[WIP] Add ORES filters to new RCFilters

And port old-style filter to the new hooks.

The code works, but needs to be cleaned up. The old hooks need
to be removed, and the code that remains after that may need
some cleanup or refactoring after that.

Change-Id: I82516b0bb5be3b4f3c1a9782b87978a6f01b0c4f
Depends-On: Iec2d82f6a830403d1c948a280efa58992e0cdee7
Bug: T158459
---
M extension.json
M i18n/en.json
M includes/Hooks.php
3 files changed, 160 insertions(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index d0336f0..c55d03d 100644
--- a/extension.json
+++ b/extension.json
@@ -30,6 +30,9 @@
"ChangesListSpecialPageFilters": [
"ORES\\Hooks::onChangesListSpecialPageFilters"
],
+   "ChangesListSpecialPageStructuredFilters": [
+   "ORES\\Hooks::onChangesListSpecialPageStructuredFilters"
+   ],
"ChangesListSpecialPageQuery": [
"ORES\\Hooks::onChangesListSpecialPageQuery"
],
diff --git a/i18n/en.json b/i18n/en.json
index d9e9dbf..7fb37e3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,6 +17,22 @@
"ores-pref-damaging": "ORES sensitivity",
"ores-pref-rc-hidenondamaging": "Hide probably good edits from recent 
changes",
"ores-pref-watchlist-hidenondamaging": "Hide probably good edits from 
the watchlist",
+   "ores-rcfilters-damaging-title": "Contribution quality predictions",
+   "ores-rcfilters-damaging-likelygood-label": "Very likely good",
+   "ores-rcfilters-damaging-likelygood-desc": "Highly accurate at finding 
almost all problem-free edits.",
+   "ores-rcfilters-damaging-maybebad-label": "May have problems",
+   "ores-rcfilters-damaging-maybebad-desc": "Finds most flawed or damaging 
edits but with lower accuracy.",
+   "ores-rcfilters-damaging-likelybad-label": "Likely have problems",
+   "ores-rcfilters-damaging-likelybad-desc": "Finds half of flawed or 
damaging edits with medium accuracy.",
+   "ores-rcfilters-damaging-verylikelybad-label": "Very likely have 
problems",
+   "ores-rcfilters-damaging-verylikelybad-desc": "Highly accurate at 
finding the most obvious 10% of flawed or damaging edits.",
+   "ores-rcfilters-goodfaith-title": "User intent predictions",
+   "ores-rcfilters-goodfaith-good-label": "Very likely good faith",
+   "ores-rcfilters-goodfaith-good-desc": "Highly accurate at finding 
almost all good-faith edits.",
+   "ores-rcfilters-goodfaith-maybebad-label": "May be bad faith",
+   "ores-rcfilters-goodfaith-maybebad-desc": "Finds most bad-faith edits 
but with a lower accuracy.",
+   "ores-rcfilters-goodfaith-bad-label": "Likely bad faith",
+   "ores-rcfilters-goodfaith-bad-desc": "With medium accuracy, finds the 
most obvious obvious 25% of bad-faith edits.",
"prefs-ores" : "Revision scoring",
"apihelp-query+ores-description": "Return ORES configuration and model 
data for this wiki.",
"apihelp-query+ores-example-simple": "Fetch ORES data:",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index bc3ce2f..111f0d9 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,6 +4,7 @@
 
 use BetaFeatures;
 use ChangesList;
+use ChangesListFilterGroup;
 use ChangesListSpecialPage;
 use ContribsPager;
 use DatabaseUpdater;
@@ -77,6 +78,143 @@
}
}
 
+   public static function onChangesListSpecialPageStructuredFilters(
+   ChangesListSpecialPage $clsp
+   ) {
+   if ( !self::oresEnabled( $clsp->getUser() ) ) {
+   return;
+   }
+   if ( self::isModelEnabled( 'damaging' ) ) {
+   $newDamagingGroup = new ChangesListFilterGroup( [
+   'name' => 'damaging',
+   'title' => 'ores-rcfilters-damaging-title',
+   'type' => 
ChangesListFilterGroup::STRING_OPTIONS,
+   'priority' => 1,
+   'filters' => [
+   [
+   'name' => 'likelygood',
+   'label' => 
'ores-rcfilters-damaging-likelygood-label',
+   'description' => 
'ores-rcfilters-damaging-likelygood-desc',
+   ],
+   [
+   'name' => 'maybebad',
+   'label' =>

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Anchor the highlight popup

2017-03-07 Thread Mooeypoo (Code Review) 
Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341731 )

Change subject: RCFilters UI: Anchor the highlight popup
..

RCFilters UI: Anchor the highlight popup

Due to a regression in popups positioning in OOUI, the popup
renders wrongly when it is unanchored.

Fixing this to an anchored popup while the OOUI bug is being fixed.

Bug: T159906
Change-Id: I38ca560929f7f9488ff48b148b089f0613d67d97
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
1 file changed, 5 insertions(+), 1 deletion(-)


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

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
index 17aad51..889ba08 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
@@ -19,7 +19,11 @@
icon: 'highlight',
indicator: 'down',
popup: {
-   anchor: false,
+   // TODO: There is a bug in non-anchored popups 
in
+   // OOUI, so we set this popup to "anchored" 
until
+   // the bug is fixed.
+   // See: 
https://phabricator.wikimedia.org/T159906
+   anchor: true,
padded: true,
align: 'backwards',
horizontalPosition: 'end',

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Restore blanked addresses overwritten on merge.

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341730 )

Change subject: Restore blanked addresses overwritten on merge.
..

Restore blanked addresses overwritten on merge.

I feel like this is a pretty cautious approach to restoring the simplest cases 
where
blank addresses overwrote real addresses.

Bug: T159408
Change-Id: I683940498ce5f78ddf8ea89ef0603d3fae508410
---
M sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
A sites/all/modules/wmf_civicrm/update_restore_addresses.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
4 files changed, 195 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/30/341730/1

diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php 
b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
index 5263d4f..fce23fd 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/MergeTest.php
@@ -1226,4 +1226,57 @@
 return $contact['id'];
   }
 
+  /**
+   * Test recovery where a blank email has overwritten a non-blank email on 
merge.
+   *
+   * In this case an email existed during merge that held no data. It was used
+   * on the merge, but now we want the lost data.
+   */
+  public function testRepairBlankedEmailOnMerge() {
+CRM_Core_DAO::executeQuery('DROP TABLE IF EXISTS blank_addresses');
+require_once __DIR__ . '/../../wmf_civicrm.install';
+require_once __DIR__ . '/../../update_restore_addresses.php';
+wmf_civicrm_update_7475();
+$this->replicateBlankedAddress();
+
+$address = $this->callAPISuccessGetSingle('Address', array('contact_id' => 
$this->contactID));
+$this->assertTrue(empty($address['street_address']));
+
+wmf_civicrm_fix_blanked_address($address['id']);
+$address = $this->callAPISuccessGetSingle('Address', array('contact_id' => 
$this->contactID));
+$this->assertEquals('25 Mousey Way', $address['street_address']);
+
+CRM_Core_DAO::executeQuery('DROP TABLE blank_addresses');
+  }
+
+  /**
+   * Replicate the merge that would result in a blanked address.
+   */
+  protected function replicateBlankedAddress() {
+$this->contributionCreate(array(
+  'contact_id' => $this->contactID,
+  'receive_date' => '2010-01-01',
+  'invoice_id' => 1,
+  'trxn_id' => 1
+));
+$this->contributionCreate(array(
+  'contact_id' => $this->contactID2,
+  'receive_date' => '2012-01-01',
+  'invoice_id' => 2,
+  'trxn_id' => 2
+));
+$this->callAPISuccess('Address', 'create', array(
+  'street_address' => '25 Mousey Way',
+  'country_id' => 'US',
+  'contact_id' => $this->contactID,
+  'location_type_id' => 'Main',
+));
+$this->callAPISuccess('Address', 'create', array(
+  'street_address' => NULL,
+  'contact_id' => $this->contactID2,
+  'location_type_id' => 'Main',
+));
+$this->callAPISuccess('Job', 'process_batch_merge', array('mode' => 
'safe'));
+  }
+
 }
diff --git a/sites/all/modules/wmf_civicrm/update_restore_addresses.php 
b/sites/all/modules/wmf_civicrm/update_restore_addresses.php
new file mode 100644
index 000..070e512
--- /dev/null
+++ b/sites/all/modules/wmf_civicrm/update_restore_addresses.php
@@ -0,0 +1,118 @@
+ array(
+  $addressID,
+  'Int'
+)
+  ))->fetchAll();
+  if (count($logEntries) === 2
+&& (in_array($logEntries[0]['log_action'], array('Insert', 'Initialize'))
+  && $logEntries[1]['log_action'] === 'Update'
+)
+  ) {
+// we only have a create & an update, not a long complicated history.
+$dataFields = array(
+  'street_address',
+  'city',
+  'postal_code',
+  'state_province_id',
+  'country_id',
+  'supplemental_address_1',
+  'supplemental_address_2',
+  'supplemental_address_3',
+  'county_id',
+  'postal_code_suffix',
+  'name'
+);
+foreach ($dataFields as $dataField) {
+  if (!empty($logEntries[0][$dataField]) || 
!empty($logEntries[1][$dataField])) {
+// Not blank enough to process.
+return;
+  }
+}
+if ($logEntries[0]['contact_id'] == $logEntries[1]['contact_id']) {
+  // We are specifically trying to handle merged data at this stage.
+  // May extend if we identify other patterns.
+  return;
+}
+// We definitely have a situation where a blank record was inserted & 
then, on merge
+// was transferred to another contact. We have the log_conn_id & the new 
contact id.
+// let's make sure the new contact has not since been deleted (merged)
+// and that they still have no address.
+//
+// If all that follows we should have a fairly simple case of address 
rescue.
+$keptContact = civicrm_api3('Contact', 'get', array(
+  'id' =>

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Revert "Remove FloatableElement hack, no longer needed"

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341725 )

Change subject: Revert "Remove FloatableElement hack, no longer needed"
..


Revert "Remove FloatableElement hack, no longer needed"

We still need overflow-x set to a non-visible value, so that
the overflow-y: visible rule doesn't take effect. If it does
take effect, it breaks clipping.

This reverts commit 97bde4d21a98562de79a2bd07079ba20d90e085d.

Bug: T159888
Change-Id: Id834d9cf9615a8d2dad27faf2eb89743ad95da9d
---
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less 
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
index d0bf013..b2285a5 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
@@ -41,7 +41,9 @@
> .oo-ui-popupWidget-body {
// Work around scrollbar rendering bug in Chrome
overflow-y: visible;
-   // overflow-x can't be set to visible, 
otherwise ClippableElement breaks
+   // ...but make sure we don't actually overflow 
in the Y direction,
+   // to avoid breaking ClippableElement
+   overflow-x: auto;
 
> .mw-echo-ui-notificationsListWidget > 
.mw-echo-ui-notificationItemWidget {
// The popup body itself has a border. 
We need to override the notification

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id834d9cf9615a8d2dad27faf2eb89743ad95da9d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move all ssl certs to the module and out of files/

2017-03-07 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341729 )

Change subject: Move all ssl certs to the module and out of files/
..

Move all ssl certs to the module and out of files/

Change-Id: Ic90102f8355ecaf3c7622b8782263cebe6e5bc34
---
R modules/sslcert/files/certs/api.svc.codfw.wmnet.crt
R modules/sslcert/files/certs/api.svc.eqiad.wmnet.crt
R modules/sslcert/files/certs/appservers.svc.codfw.wmnet.crt
R modules/sslcert/files/certs/appservers.svc.eqiad.wmnet.crt
R modules/sslcert/files/certs/benefactorevents.wikimedia.org.crt
R modules/sslcert/files/certs/blog.wikimedia.org.crt
R modules/sslcert/files/certs/digicert-2016-ecdsa-unified.crt
R modules/sslcert/files/certs/digicert-2016-rsa-unified.crt
R modules/sslcert/files/certs/ecc-star.planet.wikimedia.org.crt
R modules/sslcert/files/certs/ecc-star.wmfusercontent.org.crt
R modules/sslcert/files/certs/ecc-uni.wikimedia.org.crt
R modules/sslcert/files/certs/etcd.codfw.wmnet.crt
R modules/sslcert/files/certs/eventdonations.wikimedia.org.crt
R modules/sslcert/files/certs/globalsign-2016-ecdsa-unified.crt
R modules/sslcert/files/certs/globalsign-2016-rsa-unified.crt
R modules/sslcert/files/certs/labtestservices2001.wikimedia.org.crt
R modules/sslcert/files/certs/labvirt-star.codfw.wmnet.crt
R modules/sslcert/files/certs/labvirt-star.eqiad.wmnet.crt
R modules/sslcert/files/certs/ldap-corp.codfw.wikimedia.org.crt
R modules/sslcert/files/certs/ldap-corp.eqiad.wikimedia.org.crt
R modules/sslcert/files/certs/ldap-labs.codfw.wikimedia.org.crt
R modules/sslcert/files/certs/ldap-labs.eqiad.wikimedia.org.crt
R modules/sslcert/files/certs/ldap-mirror.wikimedia.org.crt
R modules/sslcert/files/certs/lists.wikimedia.org.crt
R modules/sslcert/files/certs/mail.wikimedia.org.crt
R modules/sslcert/files/certs/ms-fe.svc.codfw.wmnet.crt
R modules/sslcert/files/certs/ms-fe.svc.eqiad.wmnet.crt
R modules/sslcert/files/certs/policy.wikimedia.org.crt
R modules/sslcert/files/certs/rendering.svc.codfw.wmnet.crt
R modules/sslcert/files/certs/rendering.svc.eqiad.wmnet.crt
R modules/sslcert/files/certs/star.planet.wikimedia.org.crt
R modules/sslcert/files/certs/star.tools.wmflabs.org.crt
R modules/sslcert/files/certs/star.wmflabs.org.crt
R modules/sslcert/files/certs/star.wmfusercontent.org.crt
R modules/sslcert/files/certs/uni.wikimedia.org.crt
R modules/sslcert/files/certs/virt-star.eqiad.wmnet.crt
M modules/sslcert/manifests/certificate.pp
37 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/341729/1

diff --git a/files/ssl/api.svc.codfw.wmnet.crt 
b/modules/sslcert/files/certs/api.svc.codfw.wmnet.crt
similarity index 100%
rename from files/ssl/api.svc.codfw.wmnet.crt
rename to modules/sslcert/files/certs/api.svc.codfw.wmnet.crt
diff --git a/files/ssl/api.svc.eqiad.wmnet.crt 
b/modules/sslcert/files/certs/api.svc.eqiad.wmnet.crt
similarity index 100%
rename from files/ssl/api.svc.eqiad.wmnet.crt
rename to modules/sslcert/files/certs/api.svc.eqiad.wmnet.crt
diff --git a/files/ssl/appservers.svc.codfw.wmnet.crt 
b/modules/sslcert/files/certs/appservers.svc.codfw.wmnet.crt
similarity index 100%
rename from files/ssl/appservers.svc.codfw.wmnet.crt
rename to modules/sslcert/files/certs/appservers.svc.codfw.wmnet.crt
diff --git a/files/ssl/appservers.svc.eqiad.wmnet.crt 
b/modules/sslcert/files/certs/appservers.svc.eqiad.wmnet.crt
similarity index 100%
rename from files/ssl/appservers.svc.eqiad.wmnet.crt
rename to modules/sslcert/files/certs/appservers.svc.eqiad.wmnet.crt
diff --git a/files/ssl/benefactorevents.wikimedia.org.crt 
b/modules/sslcert/files/certs/benefactorevents.wikimedia.org.crt
similarity index 100%
rename from files/ssl/benefactorevents.wikimedia.org.crt
rename to modules/sslcert/files/certs/benefactorevents.wikimedia.org.crt
diff --git a/files/ssl/blog.wikimedia.org.crt 
b/modules/sslcert/files/certs/blog.wikimedia.org.crt
similarity index 100%
rename from files/ssl/blog.wikimedia.org.crt
rename to modules/sslcert/files/certs/blog.wikimedia.org.crt
diff --git a/files/ssl/digicert-2016-ecdsa-unified.crt 
b/modules/sslcert/files/certs/digicert-2016-ecdsa-unified.crt
similarity index 100%
rename from files/ssl/digicert-2016-ecdsa-unified.crt
rename to modules/sslcert/files/certs/digicert-2016-ecdsa-unified.crt
diff --git a/files/ssl/digicert-2016-rsa-unified.crt 
b/modules/sslcert/files/certs/digicert-2016-rsa-unified.crt
similarity index 100%
rename from files/ssl/digicert-2016-rsa-unified.crt
rename to modules/sslcert/files/certs/digicert-2016-rsa-unified.crt
diff --git a/files/ssl/ecc-star.planet.wikimedia.org.crt 
b/modules/sslcert/files/certs/ecc-star.planet.wikimedia.org.crt
similarity index 100%
rename from files/ssl/ecc-star.planet.wikimedia.org.crt
rename to modules/sslcert/files/certs/ecc-star.planet.wikimedia.org.crt
diff --git a/files/ssl/ecc-star.wmfusercontent.org.crt

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Prevent the popup from disappearing when input...

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341101 )

Change subject: RCFilters UI: Prevent the popup from disappearing when input is 
out of view
..


RCFilters UI: Prevent the popup from disappearing when input is out of view

Depends on OOjs-UI patch (and subsequent release)

Bug: T158118
Change-Id: I5248dcde7fef47a78b60630e944a9392bec99f64
Depends-On: I92b794d5556302099df72af36620299536bf6fe4
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 7da97a1..e3269f8 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -56,7 +56,8 @@
$content: this.filterPopup.$element,
$footer: $footer,
classes: [ 
'mw-rcfilters-ui-filterWrapperWidget-popup' ],
-   width: 650
+   width: 650,
+   hideWhenOutOfView: false
}
} );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5248dcde7fef47a78b60630e944a9392bec99f64
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
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] wikimedia/portals[master]: Fix "lang" attribute incorrectly set

2017-03-07 Thread JGirault (Code Review) 
JGirault has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341728 )

Change subject: Fix  "lang" attribute incorrectly set
..

Fix  "lang" attribute incorrectly set

Bug: T154349
Change-Id: I8605e3768567de27f59f3ee7a2ddc57599d6fbe1
---
M dev/wikipedia.org/assets/js/page-localized.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals 
refs/changes/28/341728/1

diff --git a/dev/wikipedia.org/assets/js/page-localized.js 
b/dev/wikipedia.org/assets/js/page-localized.js
index b2034c8..0363315 100644
--- a/dev/wikipedia.org/assets/js/page-localized.js
+++ b/dev/wikipedia.org/assets/js/page-localized.js
@@ -166,7 +166,7 @@
}
 
function addHtmlLang( lang ) {
-   document.lang = lang;
+   document.documentElement.lang = lang;
if ( rtlLangs.indexOf( lang ) >= 0 ) {
document.dir = 'rtl';
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8605e3768567de27f59f3ee7a2ddc57599d6fbe1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/portals
Gerrit-Branch: master
Gerrit-Owner: JGirault 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: [WIP] snippet for grading

2017-03-07 Thread Awight (Code Review) 
Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341726 )

Change subject: [WIP] snippet for grading
..

[WIP] snippet for grading

Change-Id: Id6fbe69fa1ce2f0575a2deb2c4bbcdf8ab0d6898
---
M gateway_common/gateway.adapter.php
1 file changed, 13 insertions(+), 2 deletions(-)


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

diff --git a/gateway_common/gateway.adapter.php 
b/gateway_common/gateway.adapter.php
index 84b980d..fe1cc9a 100644
--- a/gateway_common/gateway.adapter.php
+++ b/gateway_common/gateway.adapter.php
@@ -152,8 +152,19 @@
 * constants defined in @see FinalStatus
 */
protected $final_status;
-   protected $validation_errors;
-   protected $manual_errors = array();
+   /**
+* @var array Map of errors preventing this transaction from continuing.
+* Structure is like:
+* [
+* # An i18n key name to an error message that will display 
atop of
+* # the screen, indicating that something general needs fixing.
+* 'general' => 'warning-currency-fallback',
+* # Example of a very specific error string that only the 
gateway
+* # could calculate.
+* 'address' => 'key saying: "Address is required for 
E-Commerce transactions."',
+* ]
+*/
+   protected $errors = array();
 
/**
 * Name of the current transaction.  Set via @see setCurrentTransaction

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6fbe69fa1ce2f0575a2deb2c4bbcdf8ab0d6898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: [WIP] Deprecate "manual" errors

2017-03-07 Thread Awight (Code Review) 
Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341727 )

Change subject: [WIP] Deprecate "manual" errors
..

[WIP] Deprecate "manual" errors

The original intent may have been a firewall between the validation errors
which can only be set by the adapter, and errors which can be set by other
classes.

I'm simplifying down to a single list of errors.  If any errors are present,
you will not advance to the next step in your donation.

Change-Id: I279052521a20e28d0935ce100c31087a2519e365
---
M amazon_gateway/amazon.api.php
M gateway_common/DonationData.php
M gateway_common/GatewayPage.php
M gateway_common/donation.api.php
M gateway_common/gateway.adapter.php
M gateway_forms/Mustache.php
M globalcollect_gateway/orphan.adapter.php
M tests/phpunit/Adapter/AstroPay/AstroPayTest.php
M tests/phpunit/GatewayPageTest.php
M tests/phpunit/GatewayValidationTest.php
M tests/phpunit/includes/test_gateway/TestingGenericAdapter.php
11 files changed, 82 insertions(+), 97 deletions(-)


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

diff --git a/amazon_gateway/amazon.api.php b/amazon_gateway/amazon.api.php
index 07ad771..c82a956 100644
--- a/amazon_gateway/amazon.api.php
+++ b/amazon_gateway/amazon.api.php
@@ -25,11 +25,11 @@
 
$adapter = new AmazonAdapter( $adapterParams );
 
-   if ( $adapter->getAllErrors() ) {
+   if ( $adapter->getErrors() ) {
$output->addValue(
null,
'errors',
-   $adapter->getAllErrors()
+   $adapter->getErrors()
);
} else if ( $token && $adapter->checkTokens() ) {
if ( $recurring ) {
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 07c6d43..4983ab1 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -1088,7 +1088,7 @@
$this->getVal( 'language' ),
array( $this->gateway->getGlobal( 
'FallbackCurrency' ) )
);
-   $this->gateway->addManualError( $error );
+   $this->gateway->mergeError( $error );
}
}
 }
diff --git a/gateway_common/GatewayPage.php b/gateway_common/GatewayPage.php
index 8d32960..f4ce1c7 100644
--- a/gateway_common/GatewayPage.php
+++ b/gateway_common/GatewayPage.php
@@ -163,14 +163,13 @@
 * a piece of mostly UI, this function needs to be moved inside the 
gateway 
 * adapter class.
 *
-* @return boolean Returns false on an error-free validation, otherwise 
true.
-* FIXME: that return value seems backwards to me.
+* @return boolean Returns true on an error-free validation, otherwise 
false.
 */
public function validateForm() {
 
-   $validated_ok = $this->adapter->revalidate();
+   $validated_ok = $this->adapter->validate();
 
-   return !$validated_ok;
+   return $validated_ok;
}
 
/**
@@ -348,14 +347,16 @@
if ( $this->isProcessImmediate() ) {
// Check form for errors
// FIXME: Should this be rolled into 
adapter.doPayment?
-   $form_errors = $this->validateForm() || 
$this->adapter->getManualErrors();
+   $validated_ok = $this->validateForm();
 
-   // If there were errors, redisplay form, 
otherwise proceed to next step
-   if ( $form_errors ) {
-   $this->displayForm();
-   } else {
-   // Attempt to process the payment, and 
render the response.
+   // Proceed to the next step, unless there were 
errors.
+   if ( $validated_ok ) {
+   // Attempt to process the payment, then 
render the response.
$this->processPayment();
+   } else {
+   // Redisplay form to give the donor 
notification and a
+   // chance correct their errors.
+   $this->displayForm();
}
} else {
$this->adapter->session_addDonorData();
@@ -363,7 +364,7 @@
}
} else { //token mismatch
$error['general']['token-mismatch'] = $this->msg( 
'donate_interface-token-mismatch'

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RC filters: update the state of the app on popstate.

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340494 )

Change subject: RC filters: update the state of the app on popstate.
..


RC filters: update the state of the app on popstate.

Also re-fetch changes list.

Bug: T153949
Change-Id: Id3d4ea2a4de6074ae1c15cadb74e7a324a39e7ff
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
6 files changed, 119 insertions(+), 70 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
index 18f1299..0df34f8 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterItem.js
@@ -378,4 +378,13 @@
mw.rcfilters.dm.FilterItem.prototype.isHighlightSupported = function () 
{
return !!this.getCssClass();
};
+
+   /**
+* Check if the filter is currently highlighted
+*
+* @return {boolean}
+*/
+   mw.rcfilters.dm.FilterItem.prototype.isHighlighted = function () {
+   return this.isHighlightEnabled() && !!this.getHighlightColor();
+   };
 }( mediaWiki ) );
diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 2afe286..5be3656 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -359,7 +359,7 @@
mw.rcfilters.dm.FiltersViewModel.prototype.setFiltersToDefaults = 
function () {
var defaultFilterStates = this.getFiltersFromParameters( 
this.getDefaultParams() );
 
-   this.updateFilters( defaultFilterStates );
+   this.toggleFiltersSelected( defaultFilterStates );
};
 
/**
@@ -418,7 +418,7 @@
 *  are the selected highlight colors.
 */
mw.rcfilters.dm.FiltersViewModel.prototype.getHighlightParameters = 
function () {
-   var result = { highlight: this.isHighlightEnabled() };
+   var result = { highlight: Number( this.isHighlightEnabled() ) };
 
this.getItems().forEach( function ( filterItem ) {
result[ filterItem.getName() + '_color' ] = 
filterItem.getHighlightColor();
@@ -472,15 +472,10 @@
 * @return {boolean} Current filters are all empty
 */
mw.rcfilters.dm.FiltersViewModel.prototype.areCurrentFiltersEmpty = 
function () {
-   var model = this;
-
// Check if there are either any selected items or any items
// that have highlight enabled
return !this.getItems().some( function ( filterItem ) {
-   return (
-   filterItem.isSelected() ||
-   ( model.isHighlightEnabled() && 
filterItem.getHighlightColor() )
-   );
+   return filterItem.isSelected() || 
filterItem.isHighlighted();
} );
};
 
@@ -602,14 +597,19 @@
 * This is equivalent to display all.
 */
mw.rcfilters.dm.FiltersViewModel.prototype.emptyAllFilters = function 
() {
-   var filters = {};
-
this.getItems().forEach( function ( filterItem ) {
-   filters[ filterItem.getName() ] = false;
-   } );
+   this.toggleFilterSelected( filterItem.getName(), false 
);
+   }.bind( this ) );
+   };
 
-   // Update filters
-   this.updateFilters( filters );
+   /**
+* Toggle selected state of one item
+*
+* @param {string} name Name of the filter item
+* @param {boolean} [isSelected] Filter selected state
+*/
+   mw.rcfilters.dm.FiltersViewModel.prototype.toggleFilterSelected = 
function ( name, isSelected ) {
+   this.getItemByName( name ).toggleSelected( isSelected );
};
 
/**
@@ -617,13 +617,10 @@
 *
 * @param {Object} filterDef Filter definitions
 */
-   mw.rcfilters.dm.FiltersViewModel.prototype.updateFilters = function ( 
filterDef ) {
-   var name, filterItem;
-
-   for ( name in filterDef ) {
-   filterItem =

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Scap clean: abort if a branch is still in use

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340250 )

Change subject: Scap clean: abort if a branch is still in use
..


Scap clean: abort if a branch is still in use

It's easy to accidentally hose the whole site if we don't validate
our input first :)

Change-Id: Id7c77b6cc9f16736b57bba88740de82ba8b6d2a9
---
M scap/plugins/clean.py
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py
index 50116eb..83e8712 100644
--- a/scap/plugins/clean.py
+++ b/scap/plugins/clean.py
@@ -34,6 +34,9 @@
   help='Only keep static assets (CSS/JS and the like).')
 def main(self, *extra_args):
 """ Clean old branches from the cluster for space savings! """
+if self.arguments.branch in self.active_wikiversions():
+raise ValueError('Branch "%s" is still in use, aborting' %
+ self.arguments.branch)
 self.cleanup_branch(self.arguments.branch, self.arguments.keep_static)
 
 def cleanup_branch(self, branch, keep_static):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id7c77b6cc9f16736b57bba88740de82ba8b6d2a9
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Add 'highlight' icon to highlight button

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341457 )

Change subject: RCFilters UI: Add 'highlight' icon to highlight button
..


RCFilters UI: Add 'highlight' icon to highlight button

Bug: T149467
Change-Id: Iba11de7ba47e41046631dbf16f464f8bd3820811
Depends-On: I0b5adaaec52f9cc01c3dfb6262adaf2da368476e
---
M resources/Resources.php
D resources/src/mediawiki.rcfilters/images/marker-ltr.svg
D resources/src/mediawiki.rcfilters/images/marker-rtl.svg
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js
5 files changed, 10 insertions(+), 16 deletions(-)

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



diff --git a/resources/Resources.php b/resources/Resources.php
index 67a3de5..c00a1ba 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1853,6 +1853,7 @@
'mediawiki.rcfilters.filters.dm',
'oojs-ui.styles.icons-moderation',
'oojs-ui.styles.icons-editing-core',
+   'oojs-ui.styles.icons-editing-styling',
'oojs-ui.styles.icons-interactions',
],
],
diff --git a/resources/src/mediawiki.rcfilters/images/marker-ltr.svg 
b/resources/src/mediawiki.rcfilters/images/marker-ltr.svg
deleted file mode 100644
index eb42923..000
--- a/resources/src/mediawiki.rcfilters/images/marker-ltr.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-http://www.w3.org/2000/svg; viewBox="0 0 24 24" height="24" 
width="24">
-
-
diff --git a/resources/src/mediawiki.rcfilters/images/marker-rtl.svg 
b/resources/src/mediawiki.rcfilters/images/marker-rtl.svg
deleted file mode 100644
index 9b1940e..000
--- a/resources/src/mediawiki.rcfilters/images/marker-rtl.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-http://www.w3.org/2000/svg; viewBox="0 0 24 24" height="24" 
width="24">
-
-
diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less
index 0f30137..198f599 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less
@@ -1,11 +1,6 @@
 @import 'mw.rcfilters.mixins';
 
 .mw-rcfilters-ui-filterItemHighlightButton {
-   .oo-ui-iconElement-icon.oo-ui-icon-highlight {
-   /* @embed */
-   background-image: url( ../images/marker-ltr.svg );
-   }
-
.oo-ui-buttonWidget.oo-ui-popupButtonWidget .oo-ui-buttonElement-button 
> &-circle {
display: inline-block;
vertical-align: middle;
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js
index cefe749..4011e6d 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js
@@ -29,7 +29,8 @@
this.groups = {};
this.selected = null;
 
-   this.highlightButton = new OO.ui.ButtonWidget( {
+   this.highlightButton = new OO.ui.ToggleButtonWidget( {
+   icon: 'highlight',
label: mw.message( 'rcfilters-highlightbutton-title' 
).text(),
classes: [ 
'mw-rcfilters-ui-filtersListWidget-hightlightButton' ]
} );
@@ -43,7 +44,7 @@
this.highlightButton.connect( this, { click: 
'onHighlightButtonClick' } );
this.model.connect( this, {
initialize: 'onModelInitialize',
-   highlightChange: 'onHighlightChange'
+   highlightChange: 'onModelHighlightChange'
} );
 
// Initialize
@@ -109,7 +110,12 @@
);
};
 
-   mw.rcfilters.ui.FiltersListWidget.prototype.onHighlightChange = 
function ( highlightEnabled ) {
+   /**
+* Respond to model highlight change event
+*
+* @param {boolean} highlightEnabled Highlight is enabled
+*/
+   mw.rcfilters.ui.FiltersListWidget.prototype.onModelHighlightChange = 
function ( highlightEnabled ) {
this.highlightButton.setActive( highlightEnabled );
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba11de7ba47e41046631dbf16f464f8bd3820811
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Display popups above CapsuleItemWidgets

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341114 )

Change subject: RCFilters UI: Display popups above CapsuleItemWidgets
..


RCFilters UI: Display popups above CapsuleItemWidgets

Depends on I6f2d03ac83aa in oojs-ui

Change-Id: Ia0ff92ef34431827c80a4bc86b391f9d3a3a8958
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
1 file changed, 3 insertions(+), 2 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
index 05f2f66..a1cee21 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.CapsuleItemWidget.js
@@ -38,6 +38,7 @@
popup: {
padded: false,
align: 'center',
+   position: 'above',
$content: $popupContent
.append( descLabelWidget.$element ),
$floatableContainer: this.$element,
@@ -149,8 +150,8 @@
mw.rcfilters.ui.CapsuleItemWidget.prototype.onMouseEnter = function () {
if ( this.model.getDescription() ) {
if ( !this.positioned ) {
-   // Recalculate position to be center of the 
capsule item
-   this.popup.$element.css( 'margin-left', ( 
this.$element.width() / 2 ) );
+   // Recalculate anchor position to be center of 
the capsule item
+   this.popup.$anchor.css( 'margin-left', ( 
this.$element.width() / 2 ) );
this.positioned = true;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0ff92ef34431827c80a4bc86b391f9d3a3a8958
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
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] VisualEditor/VisualEditor[master]: DesktopContext: Unhide context before positioning popup

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341038 )

Change subject: DesktopContext: Unhide context before positioning popup
..


DesktopContext: Unhide context before positioning popup

The popup is inside the context, so if the context is hidden
the popup is also not visible, which breaks its positioning code
in center mode (because measuring its width returns 0).
Ensure that the popup is visible while it's being positioned.

In combination with I37f06ae7b in oojs-ui this fixes a bug
where contexts for right(/left)-aligned focusable nodes expand
the document and cause horizontal scrollbars.

Bug: T159472
Change-Id: I9b5107682b2ec88d0a66aee1fb86507e587ec3e6
---
M src/ui/contexts/ve.ui.DesktopContext.js
1 file changed, 5 insertions(+), 6 deletions(-)

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



diff --git a/src/ui/contexts/ve.ui.DesktopContext.js 
b/src/ui/contexts/ve.ui.DesktopContext.js
index 67ce6c3..16b6da5 100644
--- a/src/ui/contexts/ve.ui.DesktopContext.js
+++ b/src/ui/contexts/ve.ui.DesktopContext.js
@@ -171,10 +171,9 @@
this.transitioning = $.Deferred();
promise = this.transitioning.promise();
 
-   this.popup.toggle( show );
-
// Parent method
ve.ui.DesktopContext.super.prototype.toggle.call( this, show );
+   this.popup.toggle( show );
 
this.transitioning.resolve();
this.transitioning = null;
@@ -234,7 +233,7 @@
// to browser weirdness.
// Skip updating the cursor position, but still update the 
width and height.
this.popup.toggleAnchor( true );
-   this.popup.align = 'center';
+   this.popup.setAlignment( 'center' );
} else if ( isTableSelection || ( focusedNode && 
!focusedNode.isContent() ) ) {
embeddable = this.isEmbeddable() &&
boundingRect.height > this.$group.outerHeight() + 5 &&
@@ -246,7 +245,7 @@
x: rtl ? boundingRect.left : boundingRect.right,
y: boundingRect.top
};
-   this.popup.align = 'backwards';
+   this.popup.setAlignment( 'backwards' );
} else {
// Position the context underneath the center of the 
node
middle = ( boundingRect.left + boundingRect.right ) / 2;
@@ -254,7 +253,7 @@
x: middle,
y: boundingRect.bottom
};
-   this.popup.align = 'center';
+   this.popup.setAlignment( 'center' );
}
} else {
// The selection is text or an inline focused node
@@ -280,7 +279,7 @@
}
 
this.popup.toggleAnchor( true );
-   this.popup.align = 'center';
+   this.popup.setAlignment( 'center' );
}
 
if ( position ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b5107682b2ec88d0a66aee1fb86507e587ec3e6
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: DLynch 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Add namespace translations for Western Punjabi (pnb)

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341714 )

Change subject: Add namespace translations for Western Punjabi (pnb)
..


Add namespace translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: If4ff6bec1d96ffe21e17394295220ff5bb23895d
---
M Flow.namespaces.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Flow.namespaces.php b/Flow.namespaces.php
index a57e670..cf83b49 100644
--- a/Flow.namespaces.php
+++ b/Flow.namespaces.php
@@ -163,6 +163,11 @@
NS_TOPIC =>  'Wątek',
 );
 
+/** Western Punjabi */
+$namespaceNames['pnb'] = array(
+   NS_TOPIC =>  'موضوع',
+);
+
 /** Portuguese */
 $namespaceNames['pt'] = array(
NS_TOPIC =>  'Tópico',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If4ff6bec1d96ffe21e17394295220ff5bb23895d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Revert "Remove FloatableElement hack, no longer needed"

2017-03-07 Thread Catrope (Code Review) 
Hello jenkins-bot, Jforrester, Mooeypoo,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Remove FloatableElement hack, no longer needed"
..

Revert "Remove FloatableElement hack, no longer needed"

This reverts commit 97bde4d21a98562de79a2bd07079ba20d90e085d.

Bug: T159888
Change-Id: Id834d9cf9615a8d2dad27faf2eb89743ad95da9d
---
M modules/styles/mw.echo.ui.NotificationBadgeWidget.less
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less 
b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
index d0bf013..b82f335 100644
--- a/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
+++ b/modules/styles/mw.echo.ui.NotificationBadgeWidget.less
@@ -41,7 +41,8 @@
> .oo-ui-popupWidget-body {
// Work around scrollbar rendering bug in Chrome
overflow-y: visible;
-   // overflow-x can't be set to visible, 
otherwise ClippableElement breaks
+   // Work around OO.ui.FloatableElement bug 
(T130153)
+   overflow-x: auto;
 
> .mw-echo-ui-notificationsListWidget > 
.mw-echo-ui-notificationItemWidget {
// The popup body itself has a border. 
We need to override the notification

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id834d9cf9615a8d2dad27faf2eb89743ad95da9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Gadgets[master]: Add namespace translations for Western Punjabi (pnb)

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341713 )

Change subject: Add namespace translations for Western Punjabi (pnb)
..


Add namespace translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: I4a3882534a0f0f64fd233dc4c8f389bdd9bbff1a
---
M Gadgets.namespaces.php
1 file changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/Gadgets.namespaces.php b/Gadgets.namespaces.php
index 0075876..8aeeab9 100644
--- a/Gadgets.namespaces.php
+++ b/Gadgets.namespaces.php
@@ -177,6 +177,13 @@
NS_GADGET_DEFINITION_TALK => 'Dyskusja_definicji_gadżetu',
 ];
 
+$namespaceNames['pnb'] = [
+   NS_GADGET => 'آلہ',
+   NS_GADGET_TALK => 'آلہ_گل_بات',
+   NS_GADGET_DEFINITION => 'آلہ_تعریف',
+   NS_GADGET_DEFINITION_TALK => 'آلہ_تعریف_گل_بات',
+];
+
 $namespaceNames['ur'] = [
NS_GADGET => 'آلہ',
NS_GADGET_TALK => 'تبادلۂ_خیال_آلہ',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a3882534a0f0f64fd233dc4c8f389bdd9bbff1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Scribunto[master]: Add namespace translations for Western Punjabi (pnb)

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341712 )

Change subject: Add namespace translations for Western Punjabi (pnb)
..


Add namespace translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: I10a5fa3ac2a4ef60d7373b24b82e3a94d84b88ca
---
M Scribunto.namespaces.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php
index cc0e3ca..4b5af91 100644
--- a/Scribunto.namespaces.php
+++ b/Scribunto.namespaces.php
@@ -327,6 +327,11 @@
829 => 'Dyskusja_modułu',
 );
 
+$namespaceNames['pnb'] = array(
+   828 => 'ماڈیول',
+   829 => 'ماڈیول_گل_بات',
+);
+
 $namespaceNames['pt'] = array(
828 => 'Módulo',
829 => 'Módulo_Discussão',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I10a5fa3ac2a4ef60d7373b24b82e3a94d84b88ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Add special page translations for Western Punjabi (pnb)

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341716 )

Change subject: Add special page translations for Western Punjabi (pnb)
..


Add special page translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: Icbbf329790d8a461d20b814bb88b9afd87a3b9f7
---
M Collection.alias.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/Collection.alias.php b/Collection.alias.php
index 3c67d12..1164b11 100644
--- a/Collection.alias.php
+++ b/Collection.alias.php
@@ -354,6 +354,11 @@
'Book' => array( 'Książka', 'Kolekcja' ),
 );
 
+/** Western Punjabi (پنجابی) */
+$specialPageAliases['pnb'] = array(
+   'Book' => array( 'کتاب' ),
+);
+
 /** Portuguese (português) */
 $specialPageAliases['pt'] = array(
'Book' => array( 'Livro', 'Colecção' ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icbbf329790d8a461d20b814bb88b9afd87a3b9f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webperf: Use trebuchet install of eventlogging for ve.py

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341723 )

Change subject: webperf: Use trebuchet install of eventlogging for ve.py
..

webperf: Use trebuchet install of eventlogging for ve.py

Bug: T131977
Change-Id: Ia4a74b64f64e38f4a3aeeffb63b2bde5fecb5353
---
M modules/role/manifests/webperf.pp
M modules/webperf/manifests/ve.pp
M modules/webperf/templates/ve.systemd.erb
3 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/341723/1

diff --git a/modules/role/manifests/webperf.pp 
b/modules/role/manifests/webperf.pp
index 6774660..a2c575d 100644
--- a/modules/role/manifests/webperf.pp
+++ b/modules/role/manifests/webperf.pp
@@ -21,8 +21,10 @@
 # Report VisualEditor performance measurements to Graphite.
 # See 
 class { '::webperf::ve':
-endpoint=> "tcp://${eventlogging_host}:8600",
-statsd_host => $statsd_host,
+endpoint  => "tcp://${eventlogging_host}:8600",
+# Installed by eventlogging class using trebuchet
+eventlogging_path => "/srv/deployment/eventlogging",
+statsd_host   => $statsd_host,
 }
 
 # Provisions a service which gather stats about static assets count
diff --git a/modules/webperf/manifests/ve.pp b/modules/webperf/manifests/ve.pp
index b42d601..5c5499a 100644
--- a/modules/webperf/manifests/ve.pp
+++ b/modules/webperf/manifests/ve.pp
@@ -8,6 +8,10 @@
 #   URI of EventLogging event publisher to subscribe to.
 #   Example: 'tcp://eventlogging.corp.org:8600'.
 #
+# [*eventlogging_path*]
+#   Path where the EventLogging python library is installed.
+#   Example: '/srv/deployment/eventlogging'.
+#
 # [*statsd_host*]
 #   Write stats to this StatsD instance. Default: '127.0.0.1'.
 #
@@ -16,6 +20,7 @@
 #
 class webperf::ve(
 $endpoint,
+$eventlogging_path,
 $statsd_host = '127.0.0.1',
 $statsd_port = 8125,
 ) {
diff --git a/modules/webperf/templates/ve.systemd.erb 
b/modules/webperf/templates/ve.systemd.erb
index 7162a21..fa7839e 100644
--- a/modules/webperf/templates/ve.systemd.erb
+++ b/modules/webperf/templates/ve.systemd.erb
@@ -4,6 +4,7 @@
 
 [Service]
 WorkingDirectory=/srv/webperf
+Environment="PYTHONPATH=<%= @eventlogging_path %>"
 ExecStart=/usr/bin/python /srv/webperf/ve.py \
 <%= @endpoint %> \
 --statsd-host <%= @statsd_host %> \

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: webperf: Update navtiming.py to use eventlogging instead of zmq

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341724 )

Change subject: webperf: Update navtiming.py to use eventlogging instead of zmq
..

webperf: Update navtiming.py to use eventlogging instead of zmq

Change-Id: I1efb6840a0708ec75a9b062f2bf9d0f27c0070ee
---
M modules/role/manifests/webperf.pp
M modules/webperf/files/navtiming.py
M modules/webperf/manifests/navtiming.pp
M modules/webperf/templates/navtiming.systemd.erb
4 files changed, 16 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/341724/1

diff --git a/modules/role/manifests/webperf.pp 
b/modules/role/manifests/webperf.pp
index a2c575d..4811100 100644
--- a/modules/role/manifests/webperf.pp
+++ b/modules/role/manifests/webperf.pp
@@ -9,21 +9,23 @@
 
 $eventlogging_host = 'eventlog1001.eqiad.wmnet'
 $statsd_host = 'statsd.eqiad.wmnet'
+# Installed by eventlogging class using trebuchet
+$eventlogging_path = '/srv/deployment/eventlogging'
 
 # Aggregate client-side latency measurements collected via the
 # NavigationTiming MediaWiki extension and send them to Graphite.
 # See 
 class { '::webperf::navtiming':
-endpoint=> "tcp://${eventlogging_host}:8600",
-statsd_host => $statsd_host,
+endpoint  => "tcp://${eventlogging_host}:8600",
+eventlogging_path => $eventlogging_path,
+statsd_host   => $statsd_host,
 }
 
 # Report VisualEditor performance measurements to Graphite.
 # See 
 class { '::webperf::ve':
 endpoint  => "tcp://${eventlogging_host}:8600",
-# Installed by eventlogging class using trebuchet
-eventlogging_path => "/srv/deployment/eventlogging",
+eventlogging_path => $eventlogging_path,
 statsd_host   => $statsd_host,
 }
 
diff --git a/modules/webperf/files/navtiming.py 
b/modules/webperf/files/navtiming.py
index 3a88470..172f7b2 100755
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -11,7 +11,7 @@
 import socket
 import unittest
 
-import zmq
+import eventlogging
 import yaml
 
 
@@ -291,23 +291,17 @@
 ap.add_argument('--statsd-host', default='localhost',
 type=socket.gethostbyname)
 ap.add_argument('--statsd-port', default=8125, type=int)
-
 args = ap.parse_args()
 
 logging.basicConfig(format='%(asctime)-15s %(message)s',
 level=logging.INFO, stream=sys.stdout)
 
-ctx = zmq.Context()
-zsock = ctx.socket(zmq.SUB)
-zsock.hwm = 3000
-zsock.linger = 0
-zsock.connect(args.endpoint)
-zsock.subscribe = b''
-
 addr = args.statsd_host, args.statsd_port
 sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
-for meta in iter(zsock.recv_json, ''):
+events = eventlogging.connect(args.endpoint)
+
+for meta in events:
 f = handlers.get(meta['schema'])
 if f is not None:
 f(meta)
diff --git a/modules/webperf/manifests/navtiming.pp 
b/modules/webperf/manifests/navtiming.pp
index 8073dfc..24a7036 100644
--- a/modules/webperf/manifests/navtiming.pp
+++ b/modules/webperf/manifests/navtiming.pp
@@ -10,6 +10,10 @@
 #   URI of EventLogging event publisher to subscribe to.
 #   Example: 'tcp://eventlogging.corp.org:8600'.
 #
+# [*eventlogging_path*]
+#   Path where the EventLogging python library is installed.
+#   Example: '/srv/deployment/eventlogging'.
+#
 # [*statsd_host*]
 #   Write stats to this StatsD instance. Default: '127.0.0.1'.
 #
@@ -18,6 +22,7 @@
 #
 class webperf::navtiming(
 $endpoint,
+$eventlogging_path,
 $statsd_host = '127.0.0.1',
 $statsd_port = 8125,
 ) {
diff --git a/modules/webperf/templates/navtiming.systemd.erb 
b/modules/webperf/templates/navtiming.systemd.erb
index 86e0c68..a4c410b 100644
--- a/modules/webperf/templates/navtiming.systemd.erb
+++ b/modules/webperf/templates/navtiming.systemd.erb
@@ -4,6 +4,7 @@
 
 [Service]
 WorkingDirectory=/srv/webperf
+Environment="PYTHONPATH=<%= @eventlogging_path %>"
 ExecStart=/usr/bin/python /srv/webperf/navtiming.py \
 <%= @endpoint %> \
 --statsd-host <%= @statsd_host %> \

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Copy accepted currencies from PayPal legacy to express checkout

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341429 )

Change subject: Copy accepted currencies from PayPal legacy to express checkout
..


Copy accepted currencies from PayPal legacy to express checkout

Bug: T159755
Change-Id: I4f1ebc984419a62401b820d7778ce4e46c90733a
---
M paypal_gateway/express_checkout/config/currencies.yaml
1 file changed, 27 insertions(+), 2 deletions(-)

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



diff --git a/paypal_gateway/express_checkout/config/currencies.yaml 
b/paypal_gateway/express_checkout/config/currencies.yaml
index d991dbd..51369e9 100644
--- a/paypal_gateway/express_checkout/config/currencies.yaml
+++ b/paypal_gateway/express_checkout/config/currencies.yaml
@@ -1,2 +1,27 @@
-- JPY
-# TODO: Full list once we've tested more
+# see 
https://www.x.com/developers/paypal/documentation-tools/api/currency-codes
+# TODO: Investigate per-country support at this URL
+# https://developer.paypal.com/docs/classic/api/currency_codes/#creditcard
+- AUD
+# - BRL # in-country only... it seems to work but I'm respecting the docs
+- CAD
+- CZK
+- DKK
+- EUR
+- HKD
+- HUF
+- ILS
+- JPY # no fractions
+# - MYR # in-country only
+- MXN
+- NOK
+- NZD
+- PHP
+- PLN
+- GBP
+# - SGD # Only available for singaporian entities
+- SEK
+- CHF
+- TWD # no fractions
+- THB
+# - TRY # in-country only
+- USD

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.19.5

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341707 )

Change subject: Update OOjs UI to v0.19.5
..


Update OOjs UI to v0.19.5

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.5

Change-Id: Ic15534df2f4006b94d1161a91e2d689f96892073
---
M composer.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-content.json
M resources/lib/oojs-ui/themes/apex/icons-editing-styling.json
M resources/lib/oojs-ui/themes/apex/icons-interactions.json
M resources/lib/oojs-ui/themes/apex/icons-moderation.json
M resources/lib/oojs-ui/themes/apex/icons.json
A resources/lib/oojs-ui/themes/apex/images/icons/add-invert.png
A resources/lib/oojs-ui/themes/apex/images/icons/add-invert.svg
M resources/lib/oojs-ui/themes/apex/images/icons/close.svg
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-rtl.svg
A resources/lib/oojs-ui/themes/apex/images/icons/journal-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/journal-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/journal-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/journal-rtl.svg
A resources/lib/oojs-ui/themes/apex/images/icons/subtract-invert.png
A resources/lib/oojs-ui/themes/apex/images/icons/subtract-invert.svg
A resources/lib/oojs-ui/themes/apex/images/icons/subtract.png
A resources/lib/oojs-ui/themes/apex/images/icons/subtract.svg
M resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json
M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json
M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json
M resources/lib/oojs-ui/themes/mediawiki/icons.json
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-invert.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-invert.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-progressive.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-progressive.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-progressive.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-progressive.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-progressive.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-progressive.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-invert.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-invert.svg
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-progressive.png
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-progressive.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-invert.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-invert.svg
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-progressive.png
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-progressive.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl.svg
M resources/lib/oojs-ui/themes/mediawiki/images/icons/journal-ltr-invert.png
M resources/lib/oojs-ui/themes/mediawiki/images/icons/journal-ltr-invert.svg

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Remove deprecated function

2017-03-07 Thread Awight (Code Review) 
Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341721 )

Change subject: Remove deprecated function
..

Remove deprecated function

Change-Id: I2a36b910b7181fc4db101bfd90cdbb41cf372181
---
M gateway_common/DonationData.php
1 file changed, 0 insertions(+), 16 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/21/341721/1

diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 96a2650..07c6d43 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -1015,22 +1015,6 @@
return $this->validationErrors;
}
 
-   /**
-* validatedOK
-* Checks to see if the data validated ok (no errors).
-* @return boolean True if no errors, false if errors exist.
-*/
-   public function validatedOK() {
-   if ( is_null( $this->validationErrors ) ) {
-   $this->getValidationErrors();
-   }
-
-   if ( count( $this->validationErrors ) === 0 ) {
-   return true;
-   }
-   return false;
-   }
-
private function expungeNulls() {
foreach ( $this->normalized as $key => $val ) {
if ( is_null( $val ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a36b910b7181fc4db101bfd90cdbb41cf372181
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: [WIP] Remove irrelevant test?

2017-03-07 Thread Awight (Code Review) 
Awight has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341722 )

Change subject: [WIP] Remove irrelevant test?
..

[WIP] Remove irrelevant test?

However, this test is failing on I4f1ebc984419a62401b820d7778ce4e46c90733a so
I'm concerned that nothing else is covering the same conditions.

Change-Id: I9d948b2ed063bd142fa9423a94fe0d7afe04
---
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
1 file changed, 0 insertions(+), 28 deletions(-)


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

diff --git 
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php 
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
index 6682a87..27c7c4e 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
@@ -114,34 +114,6 @@
$this->verifyNoLogErrors();
}
 
-   public function testGCFormLoad() {
-   $init = $this->getDonorTestData( 'US' );
-   unset( $init['order_id'] );
-   $init['payment_method'] = 'cc';
-   $init['payment_submethod'] = 'visa';
-   $init['ffname'] = 'cc-vmad';
-
-   $assertNodes = array (
-   'submethod-mc' => array (
-   'nodename' => 'input'
-   ),
-   'selected-amount' => array (
-   'nodename' => 'span',
-   'innerhtmlmatches' => '/^\s*' .
-   str_replace( '$', '\$',
-   Amount::format( 1.55, 'USD', 
$init['language'] . '_' . $init['country'] )
-   ).
-   '\s*$/',
-   ),
-   'state' => array (
-   'nodename' => 'select',
-   'selected' => 'CA',
-   ),
-   );
-
-   $this->verifyFormOutput( 'GlobalCollectGateway', $init, 
$assertNodes, true );
-   }
-
/**
 * Tests to make sure that certain error codes returned from GC will
 * trigger order cancellation, even if retryable errors also exist.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d948b2ed063bd142fa9423a94fe0d7afe04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Submodule update for CiviCRM 91d02f7 CRM-20061 Add tables as...

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341720 )

Change subject: Submodule update for CiviCRM 91d02f7 CRM-20061 Add tables as a 
parameter on the revert api
..

Submodule update for CiviCRM
91d02f7 CRM-20061 Add tables as a parameter on the revert api

Change-Id: I2ae5741fe0f4f60e809edbddd46504f833c996e5
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/20/341720/1

diff --git a/civicrm b/civicrm
index 40a7a0b..91d02f7 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit 40a7a0bef5085ef69a8b3919e414064290af6ab0
+Subproject commit 91d02f7dce6faf2b61a5a8366257200acc4494c2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ae5741fe0f4f60e809edbddd46504f833c996e5
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RC Filters UI: 'restore defaults' clears highlight

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341603 )

Change subject: RC Filters UI: 'restore defaults' clears highlight
..


RC Filters UI: 'restore defaults' clears highlight

The 'restore defaults' button clear any
highlight config and brings the UI back
to the same default state every time.

Bug: T159848
Change-Id: I78397c914aa5510e259a28c226f6e953b4dded4d
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 1c05909..ec5a7bc 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -59,6 +59,7 @@
 */
mw.rcfilters.Controller.prototype.resetToDefaults = function () {
this.filtersModel.setFiltersToDefaults();
+   this.filtersModel.clearAllHighlightColors();
// Check all filter interactions
this.filtersModel.reassessFilterInteractions();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78397c914aa5510e259a28c226f6e953b4dded4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: Implement responsive columns for reference lists

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/229852 )

Change subject: Implement responsive columns for reference lists
..


Implement responsive columns for reference lists

This is based on the popular 'count' parameter from Template:Reflist on
English Wikipedia, which has also been adopted by many other wikis.

That template's 'count' parameter allows maximum flexibility on a per-
page basis. This was important because the template can't know how many
references the list will contain. Users typically manually add (and
later, increment) the 'count' parameter when the list exceeds a certain
threshold.

The template currently sets an exact column count (via the CSS3
property `column-count`).

This patch improves on that by instead using the closely related CSS3
`column-width` property. This automatically derives the column count
based on the available space in the browser window. It will thus create
two or three columns on a typical desktop screen, and two or no columns
on a mobile device.

The specified width is the minimum width of a column. This ensures that
the list is not split when rendered on a narrow screen or mobile device.

It also hooks into the raw list before parsing and adds the class only
when the list will contain more than a certain number of items. This
prevents very short lists from being split into multiple columns.

Templates like Template:Reflist on English Wikipedia currently are not
able to set inline styles on the list element directly, which is why
they set it on a `` wrapping the `` output. Because
of this, the feature of the Cite extension must not be enabled at the
same time, as that would result in both the template's wrapper and the
references list being split. The end result would involve sitations with
three columns split in four sub-columns, creating a complicated mess of
nine intermixed columns.

To provide a smooth migration for wikis, this feature can be disabled by
default using `$wgCiteResponsiveReferences = false`. Each individual
template createing reference list can then be migrated, by removing the
wrapper column styles and instead settting the new "responsive"
attribute, like so: ``.

Once any conflicting templates have been migrated, the default for the
wiki can be swapped by setting `$wgCiteResponsiveReferences = true`.

If wikis wish for some templates to keep their custom column splitting
behaviour, templates can also opt-out by setting `responsive="0"`, which
will make sure that it will keep behaving the current way even after the
feature becomes enabled by default for the wiki.

In summary, when disabled by default, pages can opt into this system
with ``. When enabled by default, pages can opt
out of the system with ``.

* Deprecate cite_references_prefix/cite_references_suffix.

  This message is rarely used and opens up compatibility hazards.
  It was already removed by Parsoid, but the PHP implementation
  still had it. It's typically used to add inline styles to the
  wrapper which is more appropiately done in Common.css (or
  obsoleted as part of the skin or Cite extenion itself nowadays
  depending on what style in question).

  It was also a HTML-style message with separated open and close
  segments, which is an anti-pattern in itself.

* Declare module target explicitly and include mobile. The absence of
  this stylesheet caused subtle BiDi/RTL bugs on mobile.

Bug: T33597
Change-Id: Ia535f9b722e825e71e792b36356febc3bd444387
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Cite.php
M modules/ext.cite.styles.css
M tests/parser/citeParserTests.txt
6 files changed, 109 insertions(+), 79 deletions(-)

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



diff --git a/extension.json b/extension.json
index 35d451c..ac9cd43 100644
--- a/extension.json
+++ b/extension.json
@@ -54,7 +54,11 @@
"media": "print"
}
},
-   "position": "bottom"
+   "position": "bottom",
+   "targets": [
+   "desktop",
+   "mobile"
+   ]
},
"ext.cite.a11y": {
"scripts": "ext.cite.a11y.js",
@@ -90,7 +94,8 @@
"CiteCacheReferences": false,
"CiteStoreReferencesData": false,
"CiteCacheReferencesDataOnParse": false,
-   "CiteVisualEditorOtherGroup": false
+   "CiteVisualEditorOtherGroup": false,
+   "CiteResponsiveReferences": true
},
"AutoloadClasses": {
"ApiQueryReferences": "includes/ApiQueryReferences.php",
diff --git

[MediaWiki-commits] [Gerrit] operations/dns[master]: add 2030.wikimedia.org

2017-03-07 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341362 )

Change subject: add 2030.wikimedia.org
..


add 2030.wikimedia.org

Add 2030.wikimedia.org, point to text cluster for a redirect
requested in T158981.

Bug: T158981
Change-Id: Ieeb144c3a51a3d674ca88d0ed012fe9e58e2d851
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 8594a94..c19fbdf 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -638,6 +638,7 @@
 zero 600 IN DYNA geoip!text-addrs
 
 ; Other websites (NO wikis!)
+2030 600 IN DYNA geoip!text-addrs
 analytics600 IN DYNA geoip!misc-addrs
 blog 1H  IN CNAMEwikimediablog.wordpress.com.
 bugs 600 IN DYNA geoip!misc-addrs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieeb144c3a51a3d674ca88d0ed012fe9e58e2d851
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Actually add scb200[56]

2017-03-07 Thread Mobrovac (Code Review) 
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341719 )

Change subject: Actually add scb200[56]
..


Actually add scb200[56]

There was a typo in the previous commit. Oooops.

Bug: T159486
Change-Id: I3d941242f5e227873f895181d13f23de7cbe243f
---
M scap/targets
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/scap/targets b/scap/targets
index 4501af0..40c0343 100644
--- a/scap/targets
+++ b/scap/targets
@@ -1,9 +1,9 @@
 scb2002.codfw.wmnet
 scb2003.codfw.wmnet
 scb2004.codfw.wmnet
+scb2005.codfw.wmnet
+scb2006.codfw.wmnet
 scb1001.eqiad.wmnet
 scb1002.eqiad.wmnet
 scb1003.eqiad.wmnet
 scb1004.eqiad.wmnet
-scb1005.eqiad.wmnet
-scb1006.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d941242f5e227873f895181d13f23de7cbe243f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/electron-render/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Actually add scb200[56]

2017-03-07 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341719 )

Change subject: Actually add scb200[56]
..

Actually add scb200[56]

There was a typo in the previous commit. Oooops.

Bug: T159486
Change-Id: I3d941242f5e227873f895181d13f23de7cbe243f
---
M scap/targets
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/electron-render/deploy 
refs/changes/19/341719/1

diff --git a/scap/targets b/scap/targets
index 4501af0..40c0343 100644
--- a/scap/targets
+++ b/scap/targets
@@ -1,9 +1,9 @@
 scb2002.codfw.wmnet
 scb2003.codfw.wmnet
 scb2004.codfw.wmnet
+scb2005.codfw.wmnet
+scb2006.codfw.wmnet
 scb1001.eqiad.wmnet
 scb1002.eqiad.wmnet
 scb1003.eqiad.wmnet
 scb1004.eqiad.wmnet
-scb1005.eqiad.wmnet
-scb1006.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d941242f5e227873f895181d13f23de7cbe243f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/electron-render/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Hygiene: Remove duplicate file preview/index.js

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341349 )

Change subject: Hygiene: Remove duplicate file preview/index.js
..


Hygiene: Remove duplicate file preview/index.js

The same file is on preview/model.js which is the one actually used by
the application. For some reason the file is a duplicate of model.js,
and it is the file that is required on its QUnit tests.

This patch removes it and points the unit tests to the correct file,
preview/model.js

It was also required by popups.js which was removed in the previous
commit.

Change-Id: Id175a764d9b67fb8d0e8fbf4a4623a3420f76094
---
D src/preview/index.js
M tests/node-qunit/gateway/mediawiki.test.js
2 files changed, 1 insertion(+), 140 deletions(-)

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



diff --git a/src/preview/index.js b/src/preview/index.js
deleted file mode 100644
index 89dadb5..000
--- a/src/preview/index.js
+++ /dev/null
@@ -1,139 +0,0 @@
-var createModel,
-   TYPE_GENERIC = 'generic',
-   TYPE_PAGE = 'page';
-
-/**
- * @typedef {Object} ext.popups.PreviewModel
- * @property {String} title
- * @property {String} url The canonical URL of the page being previewed
- * @property {String} languageCode
- * @property {String} languageDirection Either "ltr" or "rtl"
- * @property {String|undefined} extract `undefined` if the extract isn't
- *  viable, e.g. if it's empty after having ellipsis and parentheticals
- *  removed
- * @property {String} type Either "EXTRACT" or "GENERIC"
- * @property {Object|undefined} thumbnail
- */
-
-/**
- * Creates a preview model.
- *
- * @param {String} title
- * @param {String} url The canonical URL of the page being previewed
- * @param {String} languageCode
- * @param {String} languageDirection Either "ltr" or "rtl"
- * @param {String} extract
- * @param {Object|undefined} thumbnail
- * @return {ext.popups.PreviewModel}
- */
-createModel = function (
-   title,
-   url,
-   languageCode,
-   languageDirection,
-   extract,
-   thumbnail
-) {
-   var processedExtract = processExtract( extract ),
-   result = {
-   title: title,
-   url: url,
-   languageCode: languageCode,
-   languageDirection: languageDirection,
-   extract: processedExtract,
-   type: processedExtract === undefined ? TYPE_GENERIC : 
TYPE_PAGE,
-   thumbnail: thumbnail
-   };
-
-   return result;
-};
-
-/**
- * Processes the extract returned by the TextExtracts MediaWiki API query
- * module.
- *
- * @param {String|undefined} extract
- * @return {String|undefined}
- */
-function processExtract( extract ) {
-   var result;
-
-   if ( extract === undefined || extract === '' ) {
-   return undefined;
-   }
-
-   result = extract;
-   result = removeParentheticals( result );
-   result = removeEllipsis( result );
-
-   return result.length > 0 ? result : undefined;
-}
-
-/**
- * Removes the trailing ellipsis from the extract, if it's there.
- *
- * This function was extracted from
- * `mw.popups.renderer.article#removeEllipsis`.
- *
- * @param {String} extract
- * @return {String}
- */
-function removeEllipsis( extract ) {
-   return extract.replace( /\.\.\.$/, '' );
-}
-
-/**
- * Removes parentheticals from the extract.
- *
- * If the parenthesis are unbalanced or out of order, then the extract is
- * returned without further processing.
- *
- * This function was extracted from
- * `mw.popups.renderer.article#removeParensFromText`.
- *
- * @param {String} extract
- * @return {String}
- */
-function removeParentheticals( extract ) {
-   var
-   ch,
-   result = '',
-   level = 0,
-   i = 0;
-
-   for ( i; i < extract.length; i++ ) {
-   ch = extract.charAt( i );
-
-   if ( ch === ')' && level === 0 ) {
-   return extract;
-   }
-   if ( ch === '(' ) {
-   level++;
-   continue;
-   } else if ( ch === ')' ) {
-   level--;
-   continue;
-   }
-   if ( level === 0 ) {
-   // Remove leading spaces before brackets
-   if ( ch === ' ' && extract.charAt( i + 1 ) === '(' ) {
-   continue;
-   }
-   result += ch;
-   }
-   }
-
-   return ( level === 0 ) ? result : extract;
-}
-
-module.exports = {
-   /**
-   * @constant {String}
-   */
-   TYPE_GENERIC: TYPE_GENERIC,
-   /**
-   * @constant {String}
-   */
-   TYPE_PAGE: TYPE_PAGE,
-   createModel: createModel
-};
diff

[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.29.0-wmf.15]: Add and listen to 'modified' event for popup clip()

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341709 )

Change subject: Add and listen to 'modified' event for popup clip()
..


Add and listen to 'modified' event for popup clip()

Separate the behavior of promise vs event when changes happen and
we need to clip the popup. The popup should only clip itself after
the DOM has finished populating, not "just" after the model has
been populated with data.

Adding an event that triggers whenever the main list changes anything
that is in its DOM, and having the badge widget trigger a popup clip
will solve this issue and untangle the expectation of the promises
vs. the widgets populating themselves through the events.

Change-Id: Iff9996eb1810e7ade135359139e16837e6dc74f0
(cherry picked from commit bee8aaa4995f678b82437dffb3c13041c84e1041)
---
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
M modules/ui/mw.echo.ui.NotificationsListWidget.js
2 files changed, 29 insertions(+), 1 deletion(-)

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



diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js 
b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
index 788f705..25170f4 100644
--- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
@@ -176,6 +176,7 @@
this.badgeButton.connect( this, {
click: 'onBadgeButtonClick'
} );
+   this.notificationsWidget.connect( this, { modified: 
'onNotificationsListModified' } );
 
this.$element
.prop( 'id', 'pt-notifications-' + adjustedTypeString )
@@ -214,6 +215,16 @@
 */
 
/* Methods */
+
+   /**
+* Respond to list widget modified event.
+*
+* This means the list's actual DOM was modified and we should make sure
+* that the popup resizes itself.
+*/
+   
mw.echo.ui.NotificationBadgeWidget.prototype.onNotificationsListModified = 
function () {
+   this.popup.clip();
+   };
 
mw.echo.ui.NotificationBadgeWidget.prototype.onFooterNoticeDismiss = 
function () {
// Clip again to recalculate height
@@ -339,7 +350,6 @@
// Fire initialization hook
mw.hook( 
'ext.echo.popup.onInitialize' ).fire( widget.manager.getTypeString(), 
widget.controller );
 
-   widget.popup.clip();
// Update seen time
return 
widget.controller.updateSeenTime();
}
@@ -357,6 +367,7 @@
)
.then( this.emit.bind( this, 'finishLoading' ) )
.always( function () {
+   widget.popup.clip();
// Pop pending
widget.popPending();
widget.promiseRunning = false;
diff --git a/modules/ui/mw.echo.ui.NotificationsListWidget.js 
b/modules/ui/mw.echo.ui.NotificationsListWidget.js
index 6365fbc..14348d5 100644
--- a/modules/ui/mw.echo.ui.NotificationsListWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationsListWidget.js
@@ -71,6 +71,16 @@
 
OO.inheritClass( mw.echo.ui.NotificationsListWidget, 
mw.echo.ui.SortedListWidget );
 
+   /* Events */
+
+   /**
+* @event modified
+*
+* The content of this list has changed.
+* This event is to state that not only has the content changed
+* but the actual DOM has been manipulated.
+*/
+
/* Methods */
 
mw.echo.ui.NotificationsListWidget.prototype.onModelManagerDiscard = 
function ( modelName ) {
@@ -90,6 +100,8 @@
}
}
}
+
+   this.emit( 'modified' );
};
 
/**
@@ -99,6 +111,7 @@
 *
 * @param {Object} models Object of new models to populate the
 *  list.
+* @fires modified
 */
mw.echo.ui.NotificationsListWidget.prototype.resetDataFromModel = 
function ( models ) {
var i, modelId, model, subItems, subItem, widget,
@@ -169,6 +182,8 @@
this.addItems( itemWidgets );
 
this.checkForEmptyNotificationsList();
+
+   this.emit( 'modified' );
};
 
/**
@@ -196,6 +211,7 @@
 *
 * @param {string} [label] Label for the option widget
 * @param {string} [link] Link for the option widget
+* @fires modified
 */
mw.echo.ui.NotificationsListWidget.prototype.resetLoadingOption = 
function ( label, link ) {
this.loadingOptionWidget.setLabel( label

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Modify add/remove groups for I984157d5

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341382 )

Change subject: Modify add/remove groups for I984157d5
..


Modify add/remove groups for I984157d5

Working is the same as before, however to make it less confusing for
users, instead of adding 'flood' to RemoveGroupsToSelf (then making it
confusing for not-yet-flood-users on Special:UserRights, as a '*' will
appear telling them that they can't remove the permission once they've
granted it to themselves, when it's not really true), we add 'sysop'
and 'contentadmin' being explicitly able to add and remove this perm-
ission from their groups. We also add the ability for 'bureaucrats' to
remove this permission from anyone who holds it, just in case somebody
forgets to remove it from their accounts when they're done, or (hopefu-
lly unlikely) are abusing it.

This is a follow-up from I984157d5 where we introduced this permission.

Change-Id: I9c46cb50372a5e96f61dd7a46b1da3e88b467b8c
---
M wmf-config/InitialiseSettings.php
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index ef9a8b1..aa4c3e8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10760,6 +10760,7 @@
'bot',
'confirmed',
'contentadmin',
+   'flood',
'oathauth',
'oauthadmin',
'shell',
@@ -12464,7 +12465,10 @@
'sysop' => [ 'flood', 'translationadmin' ], // T50013, T48856
'flood' => [ 'flood' ], // T50013
],
-   'wikitech' => [ 'flood' => [ 'flood' ] ],
+   'wikitech' => [
+   'contentadmin' => [ 'flood' ],
+   'sysop' => [ 'flood' ],
+   ],
'zhwiki' => [
'sysop' => [ 'flood' ],
'massmessage-sender' => [ 'massmessage-sender' ], // T130814

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c46cb50372a5e96f61dd7a46b1da3e88b467b8c
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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] operations/puppet[production]: Phabricator: Add a upstart init phd script

2017-03-07 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341630 )

Change subject: Phabricator: Add a upstart init phd script
..


Phabricator: Add a upstart init phd script

This is for iridium as we need to maintain backward compatibility for trusty 
until iridium is migrated to jessie.

We will be using https://secure.phabricator.com/T4181#133830 but modified for 
our use.

Change-Id: I7cdfa6126693ea20765ad4d45b01bd9abeb0c30b
---
A modules/phabricator/templates/initscripts/phd.upstart.erb
1 file changed, 27 insertions(+), 0 deletions(-)

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



diff --git a/modules/phabricator/templates/initscripts/phd.upstart.erb 
b/modules/phabricator/templates/initscripts/phd.upstart.erb
new file mode 100644
index 000..d97c604
--- /dev/null
+++ b/modules/phabricator/templates/initscripts/phd.upstart.erb
@@ -0,0 +1,27 @@
+# Phabricator daemons init script
+description "Phabricator Daemons supervisor"
+author  "Wikimedia Foundation"
+
+stop on runlevel [!2345]
+
+respawn
+respawn limit 10 5
+oom never
+
+kill timeout 86400 #If it's given a stop order, this is how long it will take 
to stop.
+
+setuid phd
+setgid phd
+
+env PHD_HOME=/srv/phab/phabricator
+env PHABRICATOR_ENV=phd
+
+pre-start script
+# Start phd
+exec $PHD_HOME/bin/phd start --force
+end script
+
+post-stop script
+# Stop phd
+exec $PHD_HOME/bin/phd stop --force
+end script

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cdfa6126693ea20765ad4d45b01bd9abeb0c30b
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable wgCiteResponsiveReferences by default for back-compat

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341708 )

Change subject: Disable wgCiteResponsiveReferences by default for back-compat
..


Disable wgCiteResponsiveReferences by default for back-compat

Follows-up Ia535f9b722e82 in Cite extension, which adds a responsive
setting to ``. For third parties and new wikis, this is
enabled by default.

For Wikimedia wikis, keep it disabled for now since existing column
wrapping templates are not (and can't be) compatible with this (it
would result in two wrappings and an odd 6 or 9 column devision).

Individual wikis can opt-in after they've added "responsive=0" in
templates that need it and/or migrated to "responsive=1".

Bug: T33597
Change-Id: I477a3a1bfac278a574ffd2e2c42e370dae5ca26f
---
M wmf-config/InitialiseSettings.php
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 04d5d6e..ef9a8b1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14314,6 +14314,15 @@
 
 // --- VisualEditor end ---
 
+'wgCiteResponsiveReferences' => [
+   'default' => false,
+
+   // group0
+   'testwiki' => true,
+   'test2wiki' => true,
+   'mediawikiwiki' => true,
+],
+
 'wmgUseRSSExtension' => [
'default' => false,
'foundationwiki' => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I477a3a1bfac278a574ffd2e2c42e370dae5ca26f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump trending period to 24h

2017-03-07 Thread Mobrovac (Code Review) 
Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341715 )

Change subject: Bump trending period to 24h
..


Bump trending period to 24h

Bug: T156411
Change-Id: Ib9285f4f34dc8acb491d658d91581f6a1da8c82b
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index ebc9e18..3795b38 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -80,7 +80,7 @@
 # maximum time in minutes a page can go without edits
 max_inactivity: 1440
 # maximum age allowed in minutes
-max_age: 1080
+max_age: 1440
 # minimum speed in edits per minute that a page is kept around
 min_speed: 0.1
   # the number of edits needed to take a page into account

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9285f4f34dc8acb491d658d91581f6a1da8c82b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Fixup deprecated codepointToUtf8 call

2017-03-07 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341717 )

Change subject: Fixup deprecated codepointToUtf8 call
..

Fixup deprecated codepointToUtf8 call

Removes need to include moved UtfNormalUtil.php file (was the manual
require still needed as it was in Setup.php anyway?)

Change-Id: Ie79c6bc328713e2503f9a7691c37e6a7770a19b3
---
M importUseModWikipedia.php
1 file changed, 3 insertions(+), 2 deletions(-)


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

diff --git a/importUseModWikipedia.php b/importUseModWikipedia.php
index cb5d57e..b95bb70 100644
--- a/importUseModWikipedia.php
+++ b/importUseModWikipedia.php
@@ -9,7 +9,8 @@
  */
 
 require_once __DIR__ . '/WikimediaMaintenance.php';
-require_once "$IP/includes/libs/normal/UtfNormalUtil.php";
+
+use UtfNormal\Utils;
 
 class ImportUseModWikipedia extends Maintenance {
public $encodeMap, $decodeMap;
@@ -143,7 +144,7 @@
$dest = $source;
}
$sourceChar = chr( $source );
-   $destChar = codepointToUtf8( $dest );
+   $destChar = Utils::codepointToUtf8( $dest );
$this->encodeMap[$sourceChar] = $destChar;
$this->decodeMap[$destChar] = $sourceChar;
}

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update trending-edits to eed6c85

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341711 )

Change subject: Update trending-edits to eed6c85
..


Update trending-edits to eed6c85

List of changes:
0a70573 Surface how long we have been watching edits from
369f2b0 Trending takes optional filter parameter
eed6c85 Decay based on period parameter
xxx Update node module dependencies

Change-Id: Ib4a453158b9d2e8ea5c632b7e3b5ff369587b612
---
D node_modules/.bin/har-validator
D node_modules/.bin/window-size
A node_modules/ajv/.tonic_example.js
R node_modules/ajv/LICENSE
A node_modules/ajv/dist/ajv.bundle.js
A node_modules/ajv/dist/ajv.min.js
A node_modules/ajv/dist/ajv.min.js.map
A node_modules/ajv/dist/nodent.min.js
A node_modules/ajv/dist/regenerator.min.js
A node_modules/ajv/lib/ajv.d.ts
A node_modules/ajv/lib/ajv.js
A node_modules/ajv/lib/async.js
A node_modules/ajv/lib/cache.js
A node_modules/ajv/lib/compile/_rules.js
A node_modules/ajv/lib/compile/equal.js
A node_modules/ajv/lib/compile/formats.js
A node_modules/ajv/lib/compile/index.js
A node_modules/ajv/lib/compile/resolve.js
A node_modules/ajv/lib/compile/rules.js
A node_modules/ajv/lib/compile/schema_obj.js
A node_modules/ajv/lib/compile/ucs2length.js
A node_modules/ajv/lib/compile/util.js
A node_modules/ajv/lib/compile/validation_error.js
A node_modules/ajv/lib/dot/_limit.jst
A node_modules/ajv/lib/dot/_limitItems.jst
A node_modules/ajv/lib/dot/_limitLength.jst
A node_modules/ajv/lib/dot/_limitProperties.jst
A node_modules/ajv/lib/dot/allOf.jst
A node_modules/ajv/lib/dot/anyOf.jst
A node_modules/ajv/lib/dot/coerce.def
A node_modules/ajv/lib/dot/custom.jst
A node_modules/ajv/lib/dot/defaults.def
A node_modules/ajv/lib/dot/definitions.def
A node_modules/ajv/lib/dot/dependencies.jst
A node_modules/ajv/lib/dot/enum.jst
A node_modules/ajv/lib/dot/errors.def
A node_modules/ajv/lib/dot/format.jst
A node_modules/ajv/lib/dot/items.jst
A node_modules/ajv/lib/dot/missing.def
A node_modules/ajv/lib/dot/multipleOf.jst
A node_modules/ajv/lib/dot/not.jst
A node_modules/ajv/lib/dot/oneOf.jst
A node_modules/ajv/lib/dot/pattern.jst
A node_modules/ajv/lib/dot/properties.jst
A node_modules/ajv/lib/dot/ref.jst
A node_modules/ajv/lib/dot/required.jst
A node_modules/ajv/lib/dot/uniqueItems.jst
A node_modules/ajv/lib/dot/v5/_formatLimit.jst
A node_modules/ajv/lib/dot/v5/constant.jst
A node_modules/ajv/lib/dot/v5/patternRequired.jst
A node_modules/ajv/lib/dot/v5/switch.jst
A node_modules/ajv/lib/dot/validate.jst
A node_modules/ajv/lib/dotjs/_formatLimit.js
A node_modules/ajv/lib/dotjs/_limit.js
A node_modules/ajv/lib/dotjs/_limitItems.js
A node_modules/ajv/lib/dotjs/_limitLength.js
A node_modules/ajv/lib/dotjs/_limitProperties.js
A node_modules/ajv/lib/dotjs/allOf.js
A node_modules/ajv/lib/dotjs/anyOf.js
A node_modules/ajv/lib/dotjs/constant.js
A node_modules/ajv/lib/dotjs/custom.js
A node_modules/ajv/lib/dotjs/dependencies.js
A node_modules/ajv/lib/dotjs/enum.js
A node_modules/ajv/lib/dotjs/format.js
A node_modules/ajv/lib/dotjs/items.js
A node_modules/ajv/lib/dotjs/multipleOf.js
A node_modules/ajv/lib/dotjs/not.js
A node_modules/ajv/lib/dotjs/oneOf.js
A node_modules/ajv/lib/dotjs/pattern.js
A node_modules/ajv/lib/dotjs/patternRequired.js
A node_modules/ajv/lib/dotjs/properties.js
A node_modules/ajv/lib/dotjs/ref.js
A node_modules/ajv/lib/dotjs/required.js
A node_modules/ajv/lib/dotjs/switch.js
A node_modules/ajv/lib/dotjs/uniqueItems.js
A node_modules/ajv/lib/dotjs/validate.js
A node_modules/ajv/lib/keyword.js
A node_modules/ajv/lib/refs/json-schema-draft-04.json
A node_modules/ajv/lib/refs/json-schema-v5.json
A node_modules/ajv/lib/v5.js
A node_modules/ajv/package.json
A node_modules/ajv/scripts/bundle
A node_modules/ajv/scripts/compile-dots.js
A node_modules/ajv/scripts/info
A node_modules/ajv/scripts/prepare-tests
A node_modules/ajv/scripts/travis-gh-pages
M node_modules/ansi-regex/package.json
D node_modules/ansi-styles/index.js
D node_modules/ansi-styles/license
D node_modules/ansi-styles/package.json
A node_modules/asap/asap.js
A node_modules/asap/browser-asap.js
A node_modules/asap/browser-raw.js
A node_modules/asap/package.json
A node_modules/asap/raw.js
M node_modules/aws4/aws4.js
M node_modules/aws4/package.json
M node_modules/bcrypt-pbkdf/index.js
M node_modules/bcrypt-pbkdf/package.json
M node_modules/bluebird/LICENSE
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/js/release/finally.js
M node_modules/bluebird/js/release/generators.js
M node_modules/bluebird/js/release/promise.js
M node_modules/bluebird/js/release/promise_array.js
M node_modules/bluebird/js/release/props.js
M node_modules/bluebird/js/release/schedule.js
M node_modules/bluebird/package.json
M node_modules/body-parser/lib/read.js
M

[MediaWiki-commits] [Gerrit] mediawiki...Collection[master]: Add special page translations for Western Punjabi (pnb)

2017-03-07 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341716 )

Change subject: Add special page translations for Western Punjabi (pnb)
..

Add special page translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: Icbbf329790d8a461d20b814bb88b9afd87a3b9f7
---
M Collection.alias.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/Collection.alias.php b/Collection.alias.php
index 3c67d12..1164b11 100644
--- a/Collection.alias.php
+++ b/Collection.alias.php
@@ -354,6 +354,11 @@
'Book' => array( 'Książka', 'Kolekcja' ),
 );
 
+/** Western Punjabi (پنجابی) */
+$specialPageAliases['pnb'] = array(
+   'Book' => array( 'کتاب' ),
+);
+
 /** Portuguese (português) */
 $specialPageAliases['pt'] = array(
'Book' => array( 'Livro', 'Colecção' ),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbbf329790d8a461d20b814bb88b9afd87a3b9f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
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] mediawiki...deploy[master]: Bump trending period to 24h

2017-03-07 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341715 )

Change subject: Bump trending period to 24h
..

Bump trending period to 24h

Bug: T156411
Change-Id: Ib9285f4f34dc8acb491d658d91581f6a1da8c82b
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits/deploy 
refs/changes/15/341715/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index ebc9e18..3795b38 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -80,7 +80,7 @@
 # maximum time in minutes a page can go without edits
 max_inactivity: 1440
 # maximum age allowed in minutes
-max_age: 1080
+max_age: 1440
 # minimum speed in edits per minute that a page is kept around
 min_speed: 0.1
   # the number of edits needed to take a page into account

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9285f4f34dc8acb491d658d91581f6a1da8c82b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Add namespace translations for Western Punjabi (pnb)

2017-03-07 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341714 )

Change subject: Add namespace translations for Western Punjabi (pnb)
..

Add namespace translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: If4ff6bec1d96ffe21e17394295220ff5bb23895d
---
M Flow.namespaces.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/Flow.namespaces.php b/Flow.namespaces.php
index a57e670..cf83b49 100644
--- a/Flow.namespaces.php
+++ b/Flow.namespaces.php
@@ -163,6 +163,11 @@
NS_TOPIC =>  'Wątek',
 );
 
+/** Western Punjabi */
+$namespaceNames['pnb'] = array(
+   NS_TOPIC =>  'موضوع',
+);
+
 /** Portuguese */
 $namespaceNames['pt'] = array(
NS_TOPIC =>  'Tópico',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4ff6bec1d96ffe21e17394295220ff5bb23895d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
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] mediawiki...Gadgets[master]: Add namespace translations for Western Punjabi (pnb)

2017-03-07 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341713 )

Change subject: Add namespace translations for Western Punjabi (pnb)
..

Add namespace translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: I4a3882534a0f0f64fd233dc4c8f389bdd9bbff1a
---
M Gadgets.namespaces.php
1 file changed, 7 insertions(+), 0 deletions(-)


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

diff --git a/Gadgets.namespaces.php b/Gadgets.namespaces.php
index 0075876..8aeeab9 100644
--- a/Gadgets.namespaces.php
+++ b/Gadgets.namespaces.php
@@ -177,6 +177,13 @@
NS_GADGET_DEFINITION_TALK => 'Dyskusja_definicji_gadżetu',
 ];
 
+$namespaceNames['pnb'] = [
+   NS_GADGET => 'آلہ',
+   NS_GADGET_TALK => 'آلہ_گل_بات',
+   NS_GADGET_DEFINITION => 'آلہ_تعریف',
+   NS_GADGET_DEFINITION_TALK => 'آلہ_تعریف_گل_بات',
+];
+
 $namespaceNames['ur'] = [
NS_GADGET => 'آلہ',
NS_GADGET_TALK => 'تبادلۂ_خیال_آلہ',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a3882534a0f0f64fd233dc4c8f389bdd9bbff1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
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] mediawiki...Scribunto[master]: Add namespace translations for Western Punjabi (pnb)

2017-03-07 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341712 )

Change subject: Add namespace translations for Western Punjabi (pnb)
..

Add namespace translations for Western Punjabi (pnb)

Bug: T157871
Change-Id: I10a5fa3ac2a4ef60d7373b24b82e3a94d84b88ca
---
M Scribunto.namespaces.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php
index cc0e3ca..4b5af91 100644
--- a/Scribunto.namespaces.php
+++ b/Scribunto.namespaces.php
@@ -327,6 +327,11 @@
829 => 'Dyskusja_modułu',
 );
 
+$namespaceNames['pnb'] = array(
+   828 => 'ماڈیول',
+   829 => 'ماڈیول_گل_بات',
+);
+
 $namespaceNames['pt'] = array(
828 => 'Módulo',
829 => 'Módulo_Discussão',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10a5fa3ac2a4ef60d7373b24b82e3a94d84b88ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
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] mediawiki...Popups[master]: Hygiene: Remove global variable mw.popups in most places

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340952 )

Change subject: Hygiene: Remove global variable mw.popups in most places
..


Hygiene: Remove global variable mw.popups in most places

Now that most unit tests are run in node with common.js for loading
sources there is no reason to keep global variables around exposing all
the sources.

Only exception is the only qunit integration test processLinks.test.js
which still consumes mw.popups.processLinks, which is the only global
variable remaining in the codebase.

Changes:
* Remove references to mw.popups in code comments and reference the JS
  file instead
* Remove popups.js which exposes all common.js modules as global
  variables
* Export mw.popups.processLinks in processLinks.js for testing in
  processLinks.test.js

Change-Id: I91066654b9282f73a80eb1ba5018bd091656c61d
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/actions.js
M src/changeListeners/syncUserSettings.js
M src/index.js
M src/isEnabled.js
D src/popups.js
M src/processLinks.js
M src/userSettings.js
9 files changed, 35 insertions(+), 239 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91066654b9282f73a80eb1ba5018bd091656c61d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez 
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] mediawiki...deploy[master]: Update trending-edits to eed6c85

2017-03-07 Thread Mobrovac (Code Review) 
Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341711 )

Change subject: Update trending-edits to eed6c85
..

Update trending-edits to eed6c85

List of changes:
0a70573 Surface how long we have been watching edits from
369f2b0 Trending takes optional filter parameter
eed6c85 Decay based on period parameter
xxx Update node module dependencies

Change-Id: Ib4a453158b9d2e8ea5c632b7e3b5ff369587b612
---
D node_modules/.bin/har-validator
D node_modules/.bin/window-size
A node_modules/ajv/.tonic_example.js
R node_modules/ajv/LICENSE
A node_modules/ajv/dist/ajv.bundle.js
A node_modules/ajv/dist/ajv.min.js
A node_modules/ajv/dist/ajv.min.js.map
A node_modules/ajv/dist/nodent.min.js
A node_modules/ajv/dist/regenerator.min.js
A node_modules/ajv/lib/ajv.d.ts
A node_modules/ajv/lib/ajv.js
A node_modules/ajv/lib/async.js
A node_modules/ajv/lib/cache.js
A node_modules/ajv/lib/compile/_rules.js
A node_modules/ajv/lib/compile/equal.js
A node_modules/ajv/lib/compile/formats.js
A node_modules/ajv/lib/compile/index.js
A node_modules/ajv/lib/compile/resolve.js
A node_modules/ajv/lib/compile/rules.js
A node_modules/ajv/lib/compile/schema_obj.js
A node_modules/ajv/lib/compile/ucs2length.js
A node_modules/ajv/lib/compile/util.js
A node_modules/ajv/lib/compile/validation_error.js
A node_modules/ajv/lib/dot/_limit.jst
A node_modules/ajv/lib/dot/_limitItems.jst
A node_modules/ajv/lib/dot/_limitLength.jst
A node_modules/ajv/lib/dot/_limitProperties.jst
A node_modules/ajv/lib/dot/allOf.jst
A node_modules/ajv/lib/dot/anyOf.jst
A node_modules/ajv/lib/dot/coerce.def
A node_modules/ajv/lib/dot/custom.jst
A node_modules/ajv/lib/dot/defaults.def
A node_modules/ajv/lib/dot/definitions.def
A node_modules/ajv/lib/dot/dependencies.jst
A node_modules/ajv/lib/dot/enum.jst
A node_modules/ajv/lib/dot/errors.def
A node_modules/ajv/lib/dot/format.jst
A node_modules/ajv/lib/dot/items.jst
A node_modules/ajv/lib/dot/missing.def
A node_modules/ajv/lib/dot/multipleOf.jst
A node_modules/ajv/lib/dot/not.jst
A node_modules/ajv/lib/dot/oneOf.jst
A node_modules/ajv/lib/dot/pattern.jst
A node_modules/ajv/lib/dot/properties.jst
A node_modules/ajv/lib/dot/ref.jst
A node_modules/ajv/lib/dot/required.jst
A node_modules/ajv/lib/dot/uniqueItems.jst
A node_modules/ajv/lib/dot/v5/_formatLimit.jst
A node_modules/ajv/lib/dot/v5/constant.jst
A node_modules/ajv/lib/dot/v5/patternRequired.jst
A node_modules/ajv/lib/dot/v5/switch.jst
A node_modules/ajv/lib/dot/validate.jst
A node_modules/ajv/lib/dotjs/_formatLimit.js
A node_modules/ajv/lib/dotjs/_limit.js
A node_modules/ajv/lib/dotjs/_limitItems.js
A node_modules/ajv/lib/dotjs/_limitLength.js
A node_modules/ajv/lib/dotjs/_limitProperties.js
A node_modules/ajv/lib/dotjs/allOf.js
A node_modules/ajv/lib/dotjs/anyOf.js
A node_modules/ajv/lib/dotjs/constant.js
A node_modules/ajv/lib/dotjs/custom.js
A node_modules/ajv/lib/dotjs/dependencies.js
A node_modules/ajv/lib/dotjs/enum.js
A node_modules/ajv/lib/dotjs/format.js
A node_modules/ajv/lib/dotjs/items.js
A node_modules/ajv/lib/dotjs/multipleOf.js
A node_modules/ajv/lib/dotjs/not.js
A node_modules/ajv/lib/dotjs/oneOf.js
A node_modules/ajv/lib/dotjs/pattern.js
A node_modules/ajv/lib/dotjs/patternRequired.js
A node_modules/ajv/lib/dotjs/properties.js
A node_modules/ajv/lib/dotjs/ref.js
A node_modules/ajv/lib/dotjs/required.js
A node_modules/ajv/lib/dotjs/switch.js
A node_modules/ajv/lib/dotjs/uniqueItems.js
A node_modules/ajv/lib/dotjs/validate.js
A node_modules/ajv/lib/keyword.js
A node_modules/ajv/lib/refs/json-schema-draft-04.json
A node_modules/ajv/lib/refs/json-schema-v5.json
A node_modules/ajv/lib/v5.js
A node_modules/ajv/package.json
A node_modules/ajv/scripts/bundle
A node_modules/ajv/scripts/compile-dots.js
A node_modules/ajv/scripts/info
A node_modules/ajv/scripts/prepare-tests
A node_modules/ajv/scripts/travis-gh-pages
M node_modules/ansi-regex/package.json
D node_modules/ansi-styles/index.js
D node_modules/ansi-styles/license
D node_modules/ansi-styles/package.json
A node_modules/asap/asap.js
A node_modules/asap/browser-asap.js
A node_modules/asap/browser-raw.js
A node_modules/asap/package.json
A node_modules/asap/raw.js
M node_modules/aws4/aws4.js
M node_modules/aws4/package.json
M node_modules/bcrypt-pbkdf/index.js
M node_modules/bcrypt-pbkdf/package.json
M node_modules/bluebird/LICENSE
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/js/release/finally.js
M node_modules/bluebird/js/release/generators.js
M node_modules/bluebird/js/release/promise.js
M node_modules/bluebird/js/release/promise_array.js
M node_modules/bluebird/js/release/props.js
M node_modules/bluebird/js/release/schedule.js
M node_modules/bluebird/package.json
M node_modules/body-parser/lib/read.js
M

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add some translations for Western Punjabi (pnb)

2017-03-07 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341710 )

Change subject: Add some translations for Western Punjabi (pnb)
..

Add some translations for Western Punjabi (pnb)

The space in the translation of '#REDIRECT' is intentional and works.

Bug: T157871
Change-Id: I567662c1861293ca9c7e841e2b839b721bd60103
---
M languages/messages/MessagesPnb.php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/341710/1

diff --git a/languages/messages/MessagesPnb.php 
b/languages/messages/MessagesPnb.php
index fcbdac4..a4638ef 100644
--- a/languages/messages/MessagesPnb.php
+++ b/languages/messages/MessagesPnb.php
@@ -37,3 +37,11 @@
NS_CATEGORY => 'گٹھ',
NS_CATEGORY_TALK=> 'گٹھ_گل_بات',
 ];
+
+$namespaceAliases = [
+   'تصویر' => NS_FILE,
+];
+
+$magicWords = [
+   'redirect' => [ '0', '#مڑ رجوع', '#REDIRECT' ],
+];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I567662c1861293ca9c7e841e2b839b721bd60103
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] mediawiki...MultimediaViewer[master]: Align to WikimediaUI style guide and code cleanup

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/340903 )

Change subject: Align to WikimediaUI style guide and code cleanup
..


Align to WikimediaUI style guide and code cleanup

Aligning to WikimediaUI style guide by replacing colors with
standard color palette equivalents, merging close colors
(ex: `#E6E6E6` & `#eee` become `#eaecf0` ) and slightly increase
contrast on a few to meet WCAG 2.0 level AA criteria.
Also:
- following other code bases like MobileFrontend or OOjs UI in
using `border-radius` property instead of obsolete mixin
- removing non-existing browser vendor prefixes in mixins
- removing non-used Less variables
- bringing CSS/Less code closer to coding standards and
- simplifying Less code where applicable

Change-Id: Icb936e14ff613471ea1da6df6341ec1b0543cfaf
---
M resources/mmv/img/expand.svg
M resources/mmv/img/gear_gray.svg
M resources/mmv/img/x_gray.svg
M resources/mmv/mmv.bootstrap.less
M resources/mmv/mmv.lightboxinterface.less
M resources/mmv/mmv.mixins.less
M resources/mmv/ui/img/angle-separator.svg
M resources/mmv/ui/img/cc.svg
M resources/mmv/ui/img/commons_gray.svg
M resources/mmv/ui/img/ellipsis_darkgray.svg
M resources/mmv/ui/img/ellipsis_gray.svg
M resources/mmv/ui/img/ellipsis_lightgray.svg
M resources/mmv/ui/img/error-media-icon.svg
M resources/mmv/ui/img/file.svg
M resources/mmv/ui/img/horn_grey.svg
M resources/mmv/ui/img/icon_mmv.svg
M resources/mmv/ui/img/icon_page.svg
M resources/mmv/ui/img/license.svg
M resources/mmv/ui/img/location.svg
M resources/mmv/ui/img/pd.svg
M resources/mmv/ui/img/repo.svg
M resources/mmv/ui/img/restrict-2257.svg
M resources/mmv/ui/img/restrict-aus-reserve.svg
M resources/mmv/ui/img/restrict-communist.svg
M resources/mmv/ui/img/restrict-costume.svg
M resources/mmv/ui/img/restrict-currency.svg
M resources/mmv/ui/img/restrict-default.svg
M resources/mmv/ui/img/restrict-design.svg
M resources/mmv/ui/img/restrict-fan-art.svg
M resources/mmv/ui/img/restrict-ihl.svg
M resources/mmv/ui/img/restrict-insignia.svg
M resources/mmv/ui/img/restrict-ita-mibac.svg
M resources/mmv/ui/img/restrict-nazi.svg
M resources/mmv/ui/img/restrict-personality.svg
M resources/mmv/ui/img/time.svg
M resources/mmv/ui/img/user-ltr.svg
M resources/mmv/ui/img/user-rtl.svg
M resources/mmv/ui/mmv.ui.canvas.less
M resources/mmv/ui/mmv.ui.dialog.less
M resources/mmv/ui/mmv.ui.download.dialog.less
M resources/mmv/ui/mmv.ui.download.pane.less
M resources/mmv/ui/mmv.ui.metadataPanel.less
M resources/mmv/ui/mmv.ui.permission.less
M resources/mmv/ui/mmv.ui.reuse.dialog.less
M resources/mmv/ui/mmv.ui.reuse.embed.less
M resources/mmv/ui/mmv.ui.reuse.share.less
M resources/mmv/ui/mmv.ui.reuse.shareembed.less
M resources/mmv/ui/mmv.ui.stripeButtons.less
M resources/mmv/ui/mmv.ui.tipsyDialog.less
M resources/mmv/ui/mmv.ui.truncatableTextField.less
M resources/mmv/ui/mmv.ui.viewingOptions.less
M viewer-ltr.svg
M viewer-rtl.svg
53 files changed, 125 insertions(+), 180 deletions(-)

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



diff --git a/resources/mmv/img/expand.svg b/resources/mmv/img/expand.svg
index 24750de..d83c2a9 100644
--- a/resources/mmv/img/expand.svg
+++ b/resources/mmv/img/expand.svg
@@ -1,6 +1,6 @@
 
 http://www.w3.org/2000/svg; viewBox="0 0 1024 768">
-
+
 
 
 
diff --git a/resources/mmv/img/gear_gray.svg b/resources/mmv/img/gear_gray.svg
index abc6874..6d9e656 100644
--- a/resources/mmv/img/gear_gray.svg
+++ b/resources/mmv/img/gear_gray.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; viewBox="0 0 1024 768">
-
+
 
diff --git a/resources/mmv/img/x_gray.svg b/resources/mmv/img/x_gray.svg
index e1e4f73..c4f55e1 100644
--- a/resources/mmv/img/x_gray.svg
+++ b/resources/mmv/img/x_gray.svg
@@ -1,4 +1,4 @@
 
 http://www.w3.org/2000/svg; viewBox="0 0 612 792">
-
+
 
diff --git a/resources/mmv/mmv.bootstrap.less b/resources/mmv/mmv.bootstrap.less
index c6fc0c4..0fbceda 100644
--- a/resources/mmv/mmv.bootstrap.less
+++ b/resources/mmv/mmv.bootstrap.less
@@ -1,5 +1,3 @@
-@expand-link-border-color: #ddd;
-
 .mw-mmv-overlay {
position: fixed;
top: 0;
@@ -7,7 +5,7 @@
right: 0;
bottom: 0;
z-index: 1000;
-   background-color: rgb( 0, 0, 0 );
+   background-color: #000;
 }
 
 body.mw-mmv-lightbox-open {
diff --git a/resources/mmv/mmv.lightboxinterface.less 
b/resources/mmv/mmv.lightboxinterface.less
index 78baa80..77d9354 100644
--- a/resources/mmv/mmv.lightboxinterface.less
+++ b/resources/mmv/mmv.lightboxinterface.less
@@ -1,8 +1,6 @@
 @import 'mmv.globals';
 @import 'mmv.mixins';
 
-@metadata-background: rgb( 248, 248, 248 );
-
 .mw-mmv-wrapper {
top: 0;
left: 0;
@@ -54,7 +52,7 @@
width: 100%;
bottom: auto;
height: auto;
-   color: #333;
+   color: #222;
background-color:

[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.29.0-wmf.15]: Add and listen to 'modified' event for popup clip()

2017-03-07 Thread Catrope (Code Review) 
Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341709 )

Change subject: Add and listen to 'modified' event for popup clip()
..

Add and listen to 'modified' event for popup clip()

Separate the behavior of promise vs event when changes happen and
we need to clip the popup. The popup should only clip itself after
the DOM has finished populating, not "just" after the model has
been populated with data.

Adding an event that triggers whenever the main list changes anything
that is in its DOM, and having the badge widget trigger a popup clip
will solve this issue and untangle the expectation of the promises
vs. the widgets populating themselves through the events.

Change-Id: Iff9996eb1810e7ade135359139e16837e6dc74f0
(cherry picked from commit bee8aaa4995f678b82437dffb3c13041c84e1041)
---
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
M modules/ui/mw.echo.ui.NotificationsListWidget.js
2 files changed, 29 insertions(+), 1 deletion(-)


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

diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js 
b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
index 788f705..25170f4 100644
--- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
@@ -176,6 +176,7 @@
this.badgeButton.connect( this, {
click: 'onBadgeButtonClick'
} );
+   this.notificationsWidget.connect( this, { modified: 
'onNotificationsListModified' } );
 
this.$element
.prop( 'id', 'pt-notifications-' + adjustedTypeString )
@@ -214,6 +215,16 @@
 */
 
/* Methods */
+
+   /**
+* Respond to list widget modified event.
+*
+* This means the list's actual DOM was modified and we should make sure
+* that the popup resizes itself.
+*/
+   
mw.echo.ui.NotificationBadgeWidget.prototype.onNotificationsListModified = 
function () {
+   this.popup.clip();
+   };
 
mw.echo.ui.NotificationBadgeWidget.prototype.onFooterNoticeDismiss = 
function () {
// Clip again to recalculate height
@@ -339,7 +350,6 @@
// Fire initialization hook
mw.hook( 
'ext.echo.popup.onInitialize' ).fire( widget.manager.getTypeString(), 
widget.controller );
 
-   widget.popup.clip();
// Update seen time
return 
widget.controller.updateSeenTime();
}
@@ -357,6 +367,7 @@
)
.then( this.emit.bind( this, 'finishLoading' ) )
.always( function () {
+   widget.popup.clip();
// Pop pending
widget.popPending();
widget.promiseRunning = false;
diff --git a/modules/ui/mw.echo.ui.NotificationsListWidget.js 
b/modules/ui/mw.echo.ui.NotificationsListWidget.js
index 6365fbc..14348d5 100644
--- a/modules/ui/mw.echo.ui.NotificationsListWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationsListWidget.js
@@ -71,6 +71,16 @@
 
OO.inheritClass( mw.echo.ui.NotificationsListWidget, 
mw.echo.ui.SortedListWidget );
 
+   /* Events */
+
+   /**
+* @event modified
+*
+* The content of this list has changed.
+* This event is to state that not only has the content changed
+* but the actual DOM has been manipulated.
+*/
+
/* Methods */
 
mw.echo.ui.NotificationsListWidget.prototype.onModelManagerDiscard = 
function ( modelName ) {
@@ -90,6 +100,8 @@
}
}
}
+
+   this.emit( 'modified' );
};
 
/**
@@ -99,6 +111,7 @@
 *
 * @param {Object} models Object of new models to populate the
 *  list.
+* @fires modified
 */
mw.echo.ui.NotificationsListWidget.prototype.resetDataFromModel = 
function ( models ) {
var i, modelId, model, subItems, subItem, widget,
@@ -169,6 +182,8 @@
this.addItems( itemWidgets );
 
this.checkForEmptyNotificationsList();
+
+   this.emit( 'modified' );
};
 
/**
@@ -196,6 +211,7 @@
 *
 * @param {string} [label] Label for the option widget
 * @param {string} [link] Link for the option widget
+* @fires modified
 */
mw.echo.ui.NotificationsListWidget.prototype.resetLoadingOption = 
function ( label, link ) {

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable wgCiteResponsiveReferences by default for back-compat

2017-03-07 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341708 )

Change subject: Disable wgCiteResponsiveReferences by default for back-compat
..

Disable wgCiteResponsiveReferences by default for back-compat

Follows-up Ia535f9b722e82 in Cite extension, which adds a responsive
setting to ``. For third parties and new wikis, this is
enabled by default.

For Wikimedia wikis, keep it disabled for now since existing column
wrapping templates are not (and can't be) compatible with this (it
would result in two wrappings and an odd 6 or 9 column devision).

Individual wikis can opt-in after they've added "responsive=0" in
templates that need it and/or migrated to "responsive=1".

Bug: T33597
Change-Id: I477a3a1bfac278a574ffd2e2c42e370dae5ca26f
---
M wmf-config/InitialiseSettings.php
1 file changed, 9 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 04d5d6e..ef9a8b1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14314,6 +14314,15 @@
 
 // --- VisualEditor end ---
 
+'wgCiteResponsiveReferences' => [
+   'default' => false,
+
+   // group0
+   'testwiki' => true,
+   'test2wiki' => true,
+   'mediawikiwiki' => true,
+],
+
 'wmgUseRSSExtension' => [
'default' => false,
'foundationwiki' => true,

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: lower heap to 20g

2017-03-07 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341701 )

Change subject: Gerrit: lower heap to 20g
..


Gerrit: lower heap to 20g

28g uses too much system memory, and we haven't actually needed this
large of a heap so the overhead is more harmful than useful

We can likely go lower, but incremental is best so we find the sweet
spot

Change-Id: I99d5cb6c0d506e3548eebc6daabc707e2e3cce66
---
M modules/gerrit/manifests/jetty.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 0e7c92f..da8fb56 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -6,7 +6,7 @@
 $db_user = 'gerrit',
 $git_dir = 'git',
 $ssh_host_key = undef,
-$heap_limit = '28g',
+$heap_limit = '20g',
 $slave = false,
 $java_home = '/usr/lib/jvm/java-8-openjdk-amd64/jre',
 $log_host = undef,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99d5cb6c0d506e3548eebc6daabc707e2e3cce66
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Ascertain reading list from title passed through intent.

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341620 )

Change subject: Ascertain reading list from title passed through intent.
..


Ascertain reading list from title passed through intent.

Bug: T156073
Change-Id: I0f25ab7659eb5411f19e7988a865a0e19d0320bd
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
M app/src/main/java/org/wikipedia/readinglist/ReadingLists.java
2 files changed, 29 insertions(+), 2 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
index 6e07167..89496d2 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
@@ -14,6 +14,9 @@
 import android.view.ViewGroup;
 
 import org.wikipedia.R;
+import org.wikipedia.concurrency.CallbackTask;
+
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -27,6 +30,9 @@
 @BindView(R.id.reading_list_app_bar) AppBarLayout appBarLayout;
 @BindView(R.id.reading_list_contents) RecyclerView recyclerView;
 private Unbinder unbinder;
+
+@Nullable private ReadingList readingList;
+@NonNull private ReadingLists readingLists = new ReadingLists();
 
 @NonNull
 public static ReadingListFragment newInstance(@NonNull String listTitle) {
@@ -48,8 +54,15 @@
 
getAppCompatActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 getAppCompatActivity().getSupportActionBar().setTitle("");
 
-String readingListTitle = 
getArguments().getString(EXTRA_READING_LIST_TITLE);
-// TODO: do something with the reading list title
+final String readingListTitle = 
getArguments().getString(EXTRA_READING_LIST_TITLE);
+ReadingList.DAO.queryMruLists(null, new 
CallbackTask.Callback() {
+@Override
+public void success(List lists) {
+readingLists.set(lists);
+readingList = readingLists.get(readingListTitle);
+update();
+}
+});
 
 return view;
 }
@@ -69,4 +82,8 @@
 private AppCompatActivity getAppCompatActivity() {
 return (AppCompatActivity) getActivity();
 }
+
+private void update() {
+// TODO: update UI state for the current reading list.
+}
 }
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingLists.java 
b/app/src/main/java/org/wikipedia/readinglist/ReadingLists.java
index 48bb91f..0c21498 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingLists.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingLists.java
@@ -1,6 +1,7 @@
 package org.wikipedia.readinglist;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,6 +38,15 @@
 return lists.get(pos);
 }
 
+@Nullable public ReadingList get(@Nullable String title) {
+for (ReadingList list : lists) {
+if (list.getTitle().equals(title)) {
+return list;
+}
+}
+return null;
+}
+
 public int size() {
 return lists.size();
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f25ab7659eb5411f19e7988a865a0e19d0320bd
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
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] mediawiki/core[master]: Update OOjs UI to v0.19.5

2017-03-07 Thread VolkerE (Code Review) 
VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341707 )

Change subject: Update OOjs UI to v0.19.5
..

Update OOjs UI to v0.19.5

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.5

Change-Id: Ic15534df2f4006b94d1161a91e2d689f96892073
---
M composer.json
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-core-apex.css
M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-core.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-toolbars.js
M resources/lib/oojs-ui/oojs-ui-widgets-apex.css
M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-widgets.js
M resources/lib/oojs-ui/oojs-ui-windows-apex.css
M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-windows.js
M resources/lib/oojs-ui/themes/apex/icons-content.json
M resources/lib/oojs-ui/themes/apex/icons-editing-styling.json
M resources/lib/oojs-ui/themes/apex/icons-interactions.json
M resources/lib/oojs-ui/themes/apex/icons-moderation.json
M resources/lib/oojs-ui/themes/apex/icons.json
A resources/lib/oojs-ui/themes/apex/images/icons/add-invert.png
A resources/lib/oojs-ui/themes/apex/images/icons/add-invert.svg
M resources/lib/oojs-ui/themes/apex/images/icons/close.svg
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/highlight-rtl.svg
A resources/lib/oojs-ui/themes/apex/images/icons/journal-ltr.png
A resources/lib/oojs-ui/themes/apex/images/icons/journal-ltr.svg
A resources/lib/oojs-ui/themes/apex/images/icons/journal-rtl.png
A resources/lib/oojs-ui/themes/apex/images/icons/journal-rtl.svg
A resources/lib/oojs-ui/themes/apex/images/icons/subtract-invert.png
A resources/lib/oojs-ui/themes/apex/images/icons/subtract-invert.svg
A resources/lib/oojs-ui/themes/apex/images/icons/subtract.png
A resources/lib/oojs-ui/themes/apex/images/icons/subtract.svg
M resources/lib/oojs-ui/themes/mediawiki/icons-editing-styling.json
M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json
M resources/lib/oojs-ui/themes/mediawiki/icons-moderation.json
M resources/lib/oojs-ui/themes/mediawiki/icons.json
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-invert.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-invert.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-progressive.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-progressive.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-progressive.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close-progressive.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-progressive.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-progressive.svg
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.png
D resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/close.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-invert.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-invert.svg
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-progressive.png
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr-progressive.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-ltr.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-invert.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-invert.svg
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-progressive.png
A 
resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl-progressive.svg
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl.png
A resources/lib/oojs-ui/themes/mediawiki/images/icons/highlight-rtl.svg
M resources/lib/oojs-ui/themes/mediawiki/images/icons/journal-ltr-invert.png
M resources/lib/oojs-ui/themes/mediawiki/images/icons/journal-ltr-invert.svg
M

[MediaWiki-commits] [Gerrit] operations/puppet[production]: redirect 2030.wikimedia.org to meta page

2017-03-07 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341363 )

Change subject: redirect 2030.wikimedia.org to meta page
..


redirect 2030.wikimedia.org to meta page

Redirect the entire 2030.wikimedia.org subdomain,
,so "funnel" it, to a single page on meta.

As requested on T158981.

Subdomain to be created in Ieeb144c3a51a3d6.

Bug: T158981
Change-Id: I036dc3c8df8a19f5af17366d30728774d2a95a3d
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/modules/mediawiki/files/apache/sites/redirects.conf 
b/modules/mediawiki/files/apache/sites/redirects.conf
index 70ab2e3..8e0c501 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -320,6 +320,7 @@
ServerAlias svn.mediawiki.org
ServerAlias download.wikimedia.org
ServerAlias download.wikipedia.org
+   ServerAlias 2030.wikimedia.org
 
# allow caching for redirects

@@ -880,6 +881,9 @@
# rewrite   download.wikipedia.org  https://dumps.wikimedia.org
RewriteCond %{HTTP_HOST} =download.wikipedia.org
RewriteRule ^[^\x00-\x1F]* https://dumps.wikimedia.org$0 [R=301,L,NE]
+   # funnel2030.wikimedia.org  
//meta.wikimedia.org/wiki/Strategy/Wikimedia_movement/2017
+   RewriteCond %{HTTP_HOST} =2030.wikimedia.org
+   RewriteRule . 
%{ENV:RW_PROTO}://meta.wikimedia.org/wiki/Strategy/Wikimedia_movement/2017 
[R=301,L,NE]
 
# Type: wildcard
# funnel*wikijunior.com //en.wikibooks.org/wiki/Wikijunior
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat 
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index a6c4779..f882d59 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -482,3 +482,7 @@
 # rewrite download.wiki(m|p)edia to dumps.wikimedia - T107575
 rewritedownload.wikimedia.org  https://dumps.wikimedia.org
 rewritedownload.wikipedia.org  https://dumps.wikimedia.org
+
+# redirect 2030.wikimedia.org to meta (T158981)
+funnel 2030.wikimedia.org  
//meta.wikimedia.org/wiki/Strategy/Wikimedia_movement/2017
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I036dc3c8df8a19f5af17366d30728774d2a95a3d
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: zuul: the deb packages creates /etc/zuul

2017-03-07 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341700 )

Change subject: zuul: the deb packages creates /etc/zuul
..


zuul: the deb packages creates /etc/zuul

When provisionning an instance with the role::zuul::server the resource
Git::Clone[integration/config] fails because /etc/zuul is not realized
yet. The directory is crated by the Zuul debian package.

Make the dependency explicit.

Change-Id: Ide8f2cbd93aa9ec1ceb477bb10ae71720634df83
---
M modules/role/manifests/zuul/server.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/role/manifests/zuul/server.pp 
b/modules/role/manifests/zuul/server.pp
index be8caf9..4f4765c 100644
--- a/modules/role/manifests/zuul/server.pp
+++ b/modules/role/manifests/zuul/server.pp
@@ -46,6 +46,7 @@
 umask => '002',
 origin=> 'https://gerrit.wikimedia.org/r/p/integration/config.git',
 branch=> $conf_server['config_git_branch'],
+require   => Package['zuul'],  # for /etc/zuul
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide8f2cbd93aa9ec1ceb477bb10ae71720634df83
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Add and listen to 'modified' event for popup clip()

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341702 )

Change subject: Add and listen to 'modified' event for popup clip()
..


Add and listen to 'modified' event for popup clip()

Separate the behavior of promise vs event when changes happen and
we need to clip the popup. The popup should only clip itself after
the DOM has finished populating, not "just" after the model has
been populated with data.

Adding an event that triggers whenever the main list changes anything
that is in its DOM, and having the badge widget trigger a popup clip
will solve this issue and untangle the expectation of the promises
vs. the widgets populating themselves through the events.

Change-Id: Iff9996eb1810e7ade135359139e16837e6dc74f0
---
M modules/ui/mw.echo.ui.NotificationBadgeWidget.js
M modules/ui/mw.echo.ui.NotificationsListWidget.js
2 files changed, 29 insertions(+), 1 deletion(-)

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



diff --git a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js 
b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
index 788f705..25170f4 100644
--- a/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationBadgeWidget.js
@@ -176,6 +176,7 @@
this.badgeButton.connect( this, {
click: 'onBadgeButtonClick'
} );
+   this.notificationsWidget.connect( this, { modified: 
'onNotificationsListModified' } );
 
this.$element
.prop( 'id', 'pt-notifications-' + adjustedTypeString )
@@ -214,6 +215,16 @@
 */
 
/* Methods */
+
+   /**
+* Respond to list widget modified event.
+*
+* This means the list's actual DOM was modified and we should make sure
+* that the popup resizes itself.
+*/
+   
mw.echo.ui.NotificationBadgeWidget.prototype.onNotificationsListModified = 
function () {
+   this.popup.clip();
+   };
 
mw.echo.ui.NotificationBadgeWidget.prototype.onFooterNoticeDismiss = 
function () {
// Clip again to recalculate height
@@ -339,7 +350,6 @@
// Fire initialization hook
mw.hook( 
'ext.echo.popup.onInitialize' ).fire( widget.manager.getTypeString(), 
widget.controller );
 
-   widget.popup.clip();
// Update seen time
return 
widget.controller.updateSeenTime();
}
@@ -357,6 +367,7 @@
)
.then( this.emit.bind( this, 'finishLoading' ) )
.always( function () {
+   widget.popup.clip();
// Pop pending
widget.popPending();
widget.promiseRunning = false;
diff --git a/modules/ui/mw.echo.ui.NotificationsListWidget.js 
b/modules/ui/mw.echo.ui.NotificationsListWidget.js
index 6365fbc..14348d5 100644
--- a/modules/ui/mw.echo.ui.NotificationsListWidget.js
+++ b/modules/ui/mw.echo.ui.NotificationsListWidget.js
@@ -71,6 +71,16 @@
 
OO.inheritClass( mw.echo.ui.NotificationsListWidget, 
mw.echo.ui.SortedListWidget );
 
+   /* Events */
+
+   /**
+* @event modified
+*
+* The content of this list has changed.
+* This event is to state that not only has the content changed
+* but the actual DOM has been manipulated.
+*/
+
/* Methods */
 
mw.echo.ui.NotificationsListWidget.prototype.onModelManagerDiscard = 
function ( modelName ) {
@@ -90,6 +100,8 @@
}
}
}
+
+   this.emit( 'modified' );
};
 
/**
@@ -99,6 +111,7 @@
 *
 * @param {Object} models Object of new models to populate the
 *  list.
+* @fires modified
 */
mw.echo.ui.NotificationsListWidget.prototype.resetDataFromModel = 
function ( models ) {
var i, modelId, model, subItems, subItem, widget,
@@ -169,6 +182,8 @@
this.addItems( itemWidgets );
 
this.checkForEmptyNotificationsList();
+
+   this.emit( 'modified' );
};
 
/**
@@ -196,6 +211,7 @@
 *
 * @param {string} [label] Label for the option widget
 * @param {string} [link] Link for the option widget
+* @fires modified
 */
mw.echo.ui.NotificationsListWidget.prototype.resetLoadingOption = 
function ( label, link ) {
this.loadingOptionWidget.setLabel( label || '' );
@@ -203,6 +219,7 @@
if ( this.isEmpty() ) {

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Create custom view for page list items for use in RecyclerVi...

2017-03-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341619 )

Change subject: Create custom view for page list items for use in RecyclerViews.
..


Create custom view for page list items for use in RecyclerViews.

This introduces a custom view that represents a general-use page list item
that can be reused in any list of page titles, e.g. reading lists,
history, search results, etc.

This also adds an "action button" to each list item, which is hidden by
default, but can be enabled for any consumer that needs it.

Bug: T156073
Change-Id: Ia499b8cfd4902ea15af316c8250b7aa1d2c7e21c
---
A app/src/main/java/org/wikipedia/views/PageItemView.java
M app/src/main/res/layout/item_page_list_entry.xml
2 files changed, 110 insertions(+), 2 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/views/PageItemView.java 
b/app/src/main/java/org/wikipedia/views/PageItemView.java
new file mode 100644
index 000..675d20a
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/views/PageItemView.java
@@ -0,0 +1,95 @@
+package org.wikipedia.views;
+
+import android.content.Context;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+
+import org.wikipedia.R;
+import org.wikipedia.util.FeedbackUtil;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/*
+ * TODO: Use this for future RecyclerView updates where we show a list of pages
+ * (e.g. History, Search, Disambiguation)
+ */
+public class PageItemView extends FrameLayout {
+public interface Callback {
+void onClick(@Nullable T item);
+void onActionClick(@Nullable T item);
+}
+
+@BindView(R.id.page_list_item_title) TextView titleView;
+@BindView(R.id.page_list_item_description) TextView descriptionView;
+@BindView(R.id.page_list_item_image) SimpleDraweeView imageView;
+@BindView(R.id.page_list_item_action_button) ImageView actionView;
+
+@Nullable private Callback callback;
+@Nullable private T item;
+
+public PageItemView(@NonNull Context context) {
+super(context);
+init();
+}
+
+public void setItem(@Nullable T item) {
+this.item = item;
+}
+
+public void setCallback(@Nullable Callback callback) {
+this.callback = callback;
+}
+
+public void setTitle(@Nullable CharSequence text) {
+titleView.setText(text);
+}
+
+public void setDescription(@Nullable CharSequence text) {
+descriptionView.setText(text);
+}
+
+public void setImageUrl(@Nullable String url) {
+ViewUtil.loadImageUrlInto(imageView, url);
+}
+
+public void setActionIcon(@DrawableRes int id) {
+actionView.setImageResource(id);
+actionView.setVisibility(VISIBLE);
+}
+
+public void setActionHint(@StringRes int id) {
+actionView.setContentDescription(getContext().getString(id));
+}
+
+@OnClick(R.id.page_list_item_container) void onClick() {
+if (callback != null) {
+callback.onClick(item);
+}
+}
+
+@OnClick(R.id.page_list_item_action_button) void onActionClick() {
+if (callback != null) {
+callback.onActionClick(item);
+}
+}
+
+private void init() {
+inflate(getContext(), R.layout.item_page_list_entry, this);
+ButterKnife.bind(this);
+
+setLayoutParams(new 
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ViewGroup.LayoutParams.WRAP_CONTENT));
+
+FeedbackUtil.setToolbarButtonLongPressToast(actionView);
+}
+}
diff --git a/app/src/main/res/layout/item_page_list_entry.xml 
b/app/src/main/res/layout/item_page_list_entry.xml
index 730c3dc..3e815f6 100644
--- a/app/src/main/res/layout/item_page_list_entry.xml
+++ b/app/src/main/res/layout/item_page_list_entry.xml
@@ -22,7 +22,7 @@
 android:id="@+id/page_list_header_text"
 android:layout_width="match_parent"
 android:layout_height="wrap_content"
-android:layout_marginBottom="8dp"
+android:layout_marginBottom="16dp"
 android:gravity="center_vertical"
 android:visibility="gone"
 tools:visibility="visible"
@@ -38,7 +38,6 @@
 android:id="@+id/page_list_item_image"
 android:layout_width="@dimen/view_list_card_item_image"
 android:layout_height="@dimen/view_list_card_item_image"
-android:layout_marginTop="6dp"
 app:roundedCornerRadius="2dp"

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add & use Benevity financial type.

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341704 )

Change subject: Add & use Benevity financial type.
..

Add & use Benevity financial type.

This is a follow up on Benevity import as apparently Engage is not
appropriate if not being entered.

Bug: T115044
Change-Id: I422b2c196f63c3a7d2d5ab2e31b23ce413edf1a4
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
3 files changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/04/341704/1

diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php 
b/sites/all/modules/offline2civicrm/BenevityFile.php
index 44331d2..13d01a6 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -114,7 +114,7 @@
   // and recording it in our system would seem to imply we know for
   // sure it happened (as opposed to Benevity says it happens).
   'no_thank_you' => 1,
-  'financial_type_id' => "Engage",
+  'financial_type_id' => "Benevity",
 );
   }
 
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php 
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index bace33f..bf170b4 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -119,7 +119,7 @@
 $messages = $importer->getMessages();
 $this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
 $contribution = $this->callAPISuccessGetSingle('Contribution', 
array('trxn_id' => 'BENEVITY TRXN-SQUEAK'));
-$this->assertEquals('Engage', $contribution['financial_type']);
+$this->assertEquals('Benevity', $contribution['financial_type']);
 $relationships = $this->callAPISuccess('Relationship', 'get', array(
   'contact_id_a' => $contribution['contact_id'],
   'contact_id_b' => $thaMouseMeister['id'])
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index 2eb3eab..c5b1c54 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -158,6 +158,7 @@
 $payment_instruments = array(
 'Amazon',
 'Bank Transfer',
+'Benevity',
 'Boleto',
 'Bpay',
 'Cash',
@@ -2793,3 +2794,12 @@
   );
 
 }
+
+/**
+ * Add benevity as a financial type for benevity imports.
+ *
+ * Bug: T115044
+ */
+function wmf_civicrm_update_7500() {
+wmf_civicrm_create_financial_types(array('Benevity'));
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I422b2c196f63c3a7d2d5ab2e31b23ce413edf1a4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.19.5

2017-03-07 Thread VolkerE (Code Review) 
VolkerE has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/341697 )

Change subject: Tag v0.19.5
..


Tag v0.19.5

Change-Id: Ie55826e058c4614905ea8e9a68a3d083a49f0281
---
M History.md
M package.json
2 files changed, 36 insertions(+), 1 deletion(-)

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



diff --git a/History.md b/History.md
index 5e9e086..afbf42d 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,39 @@
 # OOjs UI Release History
+## v0.19.5 / 2017-03-07
+### Deprecations
+* [DEPRECATING CHANGE] icons: Move 'add' from core to 'interactions' pack 
(James D. Forrester)
+
+### Features
+* FloatableElement: Add config for `hideWhenOutOfView` (Moriel Schottlender)
+
+### Styles
+* MediaWiki theme: Add visual feedback on focussed Outlined Booklet Dialog 
(Volker E)
+* OutlinedBookletDialog: Bring visual order into levels (Volker E)
+* icons: Add 'highlight' to 'editing-styling' pack (Moriel Schottlender)
+* icons: Add 'substract' icon, in interactions pack (Volker E)
+* icons: Fix vertical alignment of 'journal' (Volker E)
+* icons: Remove 'teardrop' from MediaWiki theme 'close' icon (Volker E)
+
+### Code
+* CapsuleMultiselectWidget: Update popup position if height changed (Prateek 
Saxena)
+* ComboBoxInputWidget: Improve documentation example (Bartosz Dziewoński)
+* ListToolGroup: Re-clip when expanding/collapsing (Roan Kattouw)
+* MenuSelectWidget#filterFromInput: Clear MenuSectionOptionWidgets if empty 
(Roan Kattouw)
+* PopupElement: Set `$floatableContainer` to `this.$element` by default (Roan 
Kattouw)
+* PopupTool: For bottom toolbars, make the popup go up, like toolgroups 
(Bartosz Dziewoński)
+* PopupWidget: Make popups able to actually pop *up*, as well as sideways 
(Roan Kattouw)
+* PopupWidget: Position anchor relative to popup, not popup relative to anchor 
(Roan Kattouw)
+* TextInputWidget: Fix documentation for 'maxRows' type (Bartosz Dziewoński)
+* Use `options` in ComboBoxInputWidget demo (Moriel Schottlender)
+* Follow-up 442ffe73, 7f21350d, 9dfa5dd5: Mention in icon definitions they're 
deprecated (James D. Forrester)
+* demos: Make demo consoles LTR, even in the RTL demo (Roan Kattouw)
+* demos: Add demo/test for PopupWidget/PopupButtonWidget placements (Bartosz 
Dziewoński)
+* demos: Add sections to dialogs demo (Bartosz Dziewoński)
+* demos: Extract widgets, dialogs and layouts from dialogs.js (Bartosz 
Dziewoński)
+* demos: Reuse some widgets in the dialogs demo (Bartosz Dziewoński)
+* styles: Replace stylelint block with inline comments everywhere (Volker E)
+
+
 ## v0.19.4 / 2017-02-28
 ### Features
 * Add `OO.ui.Element.static.getScrollLeft` (Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 9175004..d202374 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.19.4",
+  "version": "0.19.5",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add trilogy payment_method to foreign checks import

2017-03-07 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/341703 )

Change subject: Add trilogy payment_method to foreign checks import
..

Add trilogy payment_method to foreign checks import

This seems like it makes sense to add here, but I wonder whether the method 
being used
has changed as I can't see this as a regression. Still, added test so 
code-forwards.

Bug: T159882
Change-Id: I4a891ca161654778d6f964a0246476b1a5d6e1ec
---
M sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
A sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
3 files changed, 20 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/03/341703/1

diff --git a/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php 
b/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
index 612bbcb..5c183b5 100644
--- a/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
+++ b/sites/all/modules/offline2civicrm/tests/ForeignChecksFileTest.php
@@ -9,6 +9,8 @@
 class ForeignChecksFileTest extends BaseChecksFileTest {
 function setUp() {
 parent::setUp();
+$this->epochtime = wmf_common_date_parse_string('2017-02-28');
+$this->setExchangeRates($this->epochtime, array('USD' => 1, 'GBP' => 
2));
 
 require_once __DIR__ . "/includes/ForeignChecksFileProbe.php";
 }
@@ -64,4 +66,16 @@
 $this->stripSourceData( $output );
 $this->assertEquals( $expected_normal, $output );
 }
+
+  /**
+   * Test that all imports fail if the organization does not pre-exist.
+   */
+  function testImportForeignCheckes() {
+civicrm_initialize();
+$importer = new ForeignChecksFile( __DIR__ . 
"/data/foreign_checks_trilogy.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('All rows were imported', $messages['Result']);
+  }
+
 }
diff --git 
a/sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv 
b/sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv
new file mode 100644
index 000..1d580c3
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/tests/data/foreign_checks_trilogy.csv
@@ -0,0 +1,2 @@
+Batch Number,Original Amount,Original Currency,Received Date,Payment 
Instrument,Check Number,First Name,Last Name,Street Address,Additional 
Address,City,State,Postal Code,Country,Email,Phone,No Thank You,Thank You 
Letter Date,Gift Source,Direct Mail Appeal,AC Flag,Restrictions,Notes,Do Not 
Email,Do Not Phone,Do Not Mail,Do Not SMS,Is Opt Out
+,100,GBP,2/28/17 17:50,Trilogy,,Mickey,Mouse,First mousehole on the 
left,,London,England,MIC KEY,United Kingdom,mic...@mouse.comCommunity 
Gift,
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index dd803c8..546824d 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -785,6 +785,10 @@
 $payment_instrument = 'Credit Card';
 }
 break;
+
+  case 'trilogy':
+$payment_instrument = 'Trilogy';
+break;
 }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a891ca161654778d6f964a0246476b1a5d6e1ec
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

  1   2   3   4   >