date:20151125

[MediaWiki-commits] [Gerrit] Added check if object is present - change (mediawiki...BlueSpiceExtensions)

2015-11-25 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

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

Change subject: Added check if object is present
..

Added check if object is present

If tiny is not yet loaded, SaferEdit still tries to access a property.
Added a check and if not loaded, reading the isDirty property is
skipped.

Change-Id: I7f07ec5305fe63771a508b8c7706c05a9db1715c
---
M SaferEdit/resources/bluespice.SaferEdit.editmode.js
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/SaferEdit/resources/bluespice.SaferEdit.editmode.js 
b/SaferEdit/resources/bluespice.SaferEdit.editmode.js
index fccc07f..361d360 100644
--- a/SaferEdit/resources/bluespice.SaferEdit.editmode.js
+++ b/SaferEdit/resources/bluespice.SaferEdit.editmode.js
@@ -141,6 +141,9 @@
},
hasUnsavedChanges: function ( mode ) {
if ( typeof ( VisualEditor ) !== "undefined" && 
VisualEditor._editorMode === "tiny" ) {
+   if (!tinyMCE.activeEditor ) {
+   return null;
+   }
BsSaferEditEditMode.isUnsaved = 
tinyMCE.activeEditor.isDirty();
return BsSaferEditEditMode.isUnsaved;
}

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

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

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

[MediaWiki-commits] [Gerrit] alerts: move icinga alerts away from reqstats.* - change (operations/puppet)

2015-11-25 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: alerts: move icinga alerts away from reqstats.*
..


alerts: move icinga alerts away from reqstats.*

Since we're decommissioning udp2log globally, we are also going to stop
relying on reqstats.* for any alarms.

We also add initial alarms for 5xx spikes per-datacenter and
per-cache-type, with the hope it will help debugging issues faster.

Bug: T118979
Change-Id: Ia5026cb25d67a9844947acc23ee7a457d0769549
---
M manifests/role/graphite.pp
M manifests/site.pp
2 files changed, 109 insertions(+), 14 deletions(-)

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



diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index c76fddd..a30d7b2 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -246,13 +246,13 @@
 }
 }
 
-# == Class: role::graphite::production::alerts
+# == Class: role::graphite::alerts
 #
 # Install icinga alerts on graphite metrics.
 # NOTE to be included only from one host, icinga will generate different alerts
 # for all hosts that include this class.
 #
-class role::graphite::production::alerts {
+class role::graphite::alerts {
 # Infer Kafka cluster configuration from this class
 include ::role::analytics::kafka::config
 
@@ -266,17 +266,6 @@
 
 swift::monitoring::graphite_alerts { 'eqiad-prod': }
 swift::monitoring::graphite_alerts { 'codfw-prod': }
-
-# Monitor production 5xx rates
-monitoring::graphite_threshold { 'reqstats-5xx-threshold':
-description => 'HTTP 5xx reqs/min threshold',
-metric  => 'reqstats.5xx',
-warning => 250,
-critical=> 500,
-from=> '15min',
-nagios_critical => false
-}
-
 
 # Use graphite's anomaly detection support.
 monitoring::graphite_anomaly { 'kafka-broker-MessagesIn-anomaly':
@@ -306,3 +295,109 @@
 }
 
 }
+
+class role::graphite::alerts::reqstats {
+
+# Global threshold alarm as we had with reqstats.5xx
+# Monitor production 5xx rates
+monitoring::graphite_threshold { 'reqstats-5xx-global':
+description => 'HTTP 5xx reqs/min 
(https://grafana.wikimedia.org/dashboard/db/varnish-http-errors)',
+metric  => 
'sumSeries(varnish.*.*.frontend.request.client.status.5xx.sum)',
+warning => 250,
+critical=> 500,
+from=> '15min',
+nagios_critical => false,
+}
+
+# sites aggregates
+monitoring::graphite_threshold { 'reqstats-5xx-eqiad':
+description => 'Eqiad HTTP 5xx reqs/min',
+metric  => 
'sumSeries(varnish.eqiad.*.frontend.request.client.status.5xx.sum)',
+warning => 75,
+critical=> 150,
+from=> '15min',
+nagios_critical => false,
+}
+
+monitoring::graphite_threshold { 'reqstats-5xx-esams':
+description => 'Esams HTTP 5xx reqs/min',
+metric  => 
'sumSeries(varnish.esams.*.frontend.request.client.status.5xx.sum)',
+warning => 75,
+critical=> 150,
+from=> '15min',
+nagios_critical => false,
+}
+
+monitoring::graphite_threshold { 'reqstats-5xx-codfw':
+description => 'Codfw HTTP 5xx reqs/min',
+metric  => 
'sumSeries(varnish.codfw.*.frontend.request.client.status.5xx.sum)',
+warning => 75,
+critical=> 150,
+from=> '15min',
+nagios_critical => false,
+}
+
+monitoring::graphite_threshold { 'reqstats-5xx-ulsfo':
+description => 'Ulsfo HTTP 5xx reqs/min',
+metric  => 
'sumSeries(varnish.ulsfo.*.frontend.request.client.status.5xx.sum)',
+warning => 75,
+critical=> 150,
+from=> '15min',
+nagios_critical => false,
+}
+
+# per-cache aggregates
+monitoring::graphite_threshold { 'reqstats-5xx-text':
+description => 'Text HTTP 5xx reqs/min',
+metric  => 
'sumSeries(varnish.*.text.frontend.request.client.status.5xx.sum)',
+warning => 75,
+critical=> 150,
+from=> '15min',
+nagios_critical => false,
+}
+
+monitoring::graphite_threshold { 'reqstats-5xx-mobile':
+description => 'Mobile HTTP 5xx reqs/min',
+metric  => 
'sumSeries(varnish.*.mobile.frontend.request.client.status.5xx.sum)',
+warning => 75,
+critical=> 150,
+from=> '15min',
+nagios_critical => false,
+}
+
+monitoring::graphite_threshold { 'reqstats-5xx-uploads':
+description => 'Uploads HTTP 5xx reqs/min',
+metric  =>

[MediaWiki-commits] [Gerrit] Labs resolv.conf: don't sort the array of resolvers. - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Labs resolv.conf:  don't sort the array of resolvers.
..

Labs resolv.conf:  don't sort the array of resolvers.

Sorting meant that we had no control over which was primary and which
was secondary.

Bug: T106303
Change-Id: Id0341728ae0b97b4d35708ab797a567b2746a32a
---
M modules/base/templates/resolv.conf.labs.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/base/templates/resolv.conf.labs.erb 
b/modules/base/templates/resolv.conf.labs.erb
index 12dd76f..973fe43 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -5,7 +5,7 @@
 
 domain <%= @labsproject %>.<%= @site %>.wmflabs
 search <%= @labsproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs
-<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
+<% scope.lookupvar('::nameservers').each do |nsip| -%>
 nameserver <%= nsip %>
 <% end -%>
 options timeout:2 ndots:2

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

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

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

[MediaWiki-commits] [Gerrit] RESTBase: Update to new specs & enable summary end point - change (operations/puppet)

2015-11-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: RESTBase: Update to new specs & enable summary end point
..


RESTBase: Update to new specs & enable summary end point

- RESTBase now supports passing down module parameters using its handler
  templating feature. This means that we now need to process template
  parameters against premature expansion by moving them to a new 'templates'
  object. This patch does this for a single apiRequest template.

- Enable the new page summary API end point developed with reading, which
  exposes a cacheable page summary & text extract.

- The graphoid spec is now loaded as a module, and the handler is inlined.
  This reflects what is tested in the RESTBase integration tests.

- The mathoid spec has been moved out of the main config file and is a
  now a spec-module.

Note: this patch creates 1 new CF per storage group and additional 2 CFs
for the global-domain storage group. After the completion of the deployment
process, however, 2 old CFs for the global domain will be dropped
manually.

Change-Id: I129bbd0a53db9584aa36ce9de6d927d9a67f0433
---
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
2 files changed, 76 insertions(+), 210 deletions(-)

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



diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 66a3a4f..26e8509 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -40,20 +40,6 @@
 name: Apache2
 url: http://www.apache.org/licenses/LICENSE-2.0
 
-# Override the base path for host-based (proxied) requests. In our case,
-# we proxy https://{domain}/api/rest_v1/ to the API.
-x-host-basePath: /api/rest_v1
-
-x-modules:
-  - name: mobileapps-public
-path: specs/mediawiki/v1/mobileapps
-type: spec
-options:
-  host: <%= @mobileapps_uri %>
-x-subspecs:
-  - mediawiki/v1/content
-  - mediawiki/v1/graphoid
-  - media/v1/mathoid
 securityDefinitions: /content-security/1.0.0
   mediawiki_auth:
 description: Checks permissions using MW api
@@ -73,6 +59,37 @@
 x-whitelists:
   internal:
 - /^(?::::)?(?:10|127)\./
+
+# Override the base path for host-based (proxied) requests. In our case,
+# we proxy https://{domain}/api/rest_v1/ to the API.
+x-host-basePath: /api/rest_v1
+
+x-modules:
+  - name: mobileapps-public
+path: specs/mediawiki/v1/mobileapps
+type: spec
+options:
+  host: <%= @mobileapps_uri %>
+
+  - path: wikimedia/v1/graphoid_v1
+options:
+  host: <%= @graphoid_uri %>
+
+  - name: page-summary
+path: wikimedia/v1/summary_v1.js
+options:
+  # One hour, for now.
+  response_cache-control: 'max-age: 3600, s-maxage: 3600'
+
+  - name: mathoid
+path: specs/media/v1/mathoid
+type: spec
+options:
+  host: <%= @mathoid_uri %>
+
+x-subspecs:
+  - mediawiki/v1/content
+
 
   wmf-sys-1.0.0: /sys/1.0.0
 info:
@@ -136,7 +153,7 @@
 x-modules:
   - name: action
 type: file
-options:
+templates:
   apiRequest:
 method: post
 uri: http://{domain}/w/api.php
@@ -156,13 +173,6 @@
 options:
   parsoidHost: <%= @parsoid_uri %>
 
-  /{module:graphoid}/v1/png/{title}/{revision}/{graph_id}:
-get:
-  x-request-handler:
-- get_from_graphoid:
-request:
-  uri: <%= @graphoid_uri 
%>/{domain}/v1/png/{title}/{revision}/{graph_id}
-
   /{module:mobileapps}:
 x-subspec:
   paths:
@@ -179,8 +189,12 @@
 info: *wp/content-info/1.0.0
 securityDefinitions: *wp/content-security/1.0.0
 x-host-basePath: /api/rest_v1
-x-subspecs:
-  - media/v1/mathoid
+x-modules:
+  - name: mathoid
+path: specs/media/v1/mathoid
+type: spec
+options:
+  host: <%= @mathoid_uri %>
 paths:
   /metrics:
 x-subspecs:
@@ -195,87 +209,6 @@
   /{module:table}: *wp/sys/table
   /{module:key_value}: *wp/sys/key_value
   /{module:post_data}: *wp/sys/post_data
-  /{module:mathoid}/v1/request/{format}:
-post:
-  x-request-handler:
-- store:
-request:
-  method: put
-  uri: /{domain}/sys/post_data/mathoid.request/
-  body:
-q: '{$.request.body.q}'
-type: '{$$.default($.request.body.type, "tex")}'
-- handle_req:
-request:
-  method: post
-

[MediaWiki-commits] [Gerrit] Labs instances: Exchange the order of the primary/secondary ... - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Labs instances: Exchange the order of the primary/secondary dns 
recursors.
..

Labs instances: Exchange the order of the primary/secondary dns recursors.

labs-recursor1 is assigned to labservices1001 which for the time being will
be the primary designate/dns box.

Also, change the timeout from 5 seconds to 2 seconds, because 5
was long enough to cause an alert storm when the primary went down.

Bug: T106303
Change-Id: I46ac38c344b53e772c3acf02d792a810fb6302f1
---
M hieradata/labs.yaml
M modules/base/templates/resolv.conf.labs.erb
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/255393/1

diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index b3135ad..3232470 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -49,8 +49,8 @@
   "${::fqdn}": 1
 nrpe::allowed_hosts: '10.68.16.195'
 
-labs_recursor: "labs-recursor0.wikimedia.org"
-labs_recursor_secondary: "labs-recursor1.wikimedia.org"
+labs_recursor: "labs-recursor1.wikimedia.org"
+labs_recursor_secondary: "labs-recursor0.wikimedia.org"
 nfs_mounts:
   project: true
   home: true
diff --git a/modules/base/templates/resolv.conf.labs.erb 
b/modules/base/templates/resolv.conf.labs.erb
index 7495e29..12dd76f 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -8,4 +8,4 @@
 <% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
 nameserver <%= nsip %>
 <% end -%>
-options timeout:5 ndots:2
+options timeout:2 ndots:2

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

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

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

[MediaWiki-commits] [Gerrit] Release Poem under CC0 1.0 public domain dedication - change (mediawiki...Poem)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Release Poem under CC0 1.0 public domain dedication
..


Release Poem under CC0 1.0 public domain dedication

Bug: T109963
Change-Id: Ic82c5cc4203fc238ff4f99f9e091a2c158d7ea81
(cherry picked from commit f3dc5531418b4316b6624155c68de106972d0018)
---
A LICENSE
M extension.json
2 files changed, 122 insertions(+), 0 deletions(-)

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



diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..0e259d4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or

[MediaWiki-commits] [Gerrit] Turn on the rest of the top 10 wikis (by size) for ES labs r... - change (operations/mediawiki-config)

2015-11-25 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Turn on the rest of the top 10 wikis (by size) for ES labs 
replica
..

Turn on the rest of the top 10 wikis (by size) for ES labs replica

This enables ruwiki, zhwiki, jawiki, ptwiki and plwiki for the ES
labs replica. This means the 10 largest wiki's are now writing
to the labs es cluster.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f644d24..24efca4 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15368,6 +15368,11 @@
'nlwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
'frwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
'eswiki' => array( 'eqiad', 'codfw', 'labsearch' ),
+   'ruwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
+   'zhwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
+   'jawiki' => array( 'eqiad', 'codfw', 'labsearch' ),
+   'ptwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
+   'plwiki' => array( 'eqiad', 'codfw', 'labsearch' ),
'testwiki' => array( 'eqiad', 'codfw', 'labsearch' )
 ),
 

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

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

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

[MediaWiki-commits] [Gerrit] Fixed Style/RegexpLiteral RuboCop offense - change (mediawiki...PageTriage)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Fixed Style/RegexpLiteral RuboCop offense
..


Fixed Style/RegexpLiteral RuboCop offense

Change-Id: I48129105ca804176e5cfafe75a28dccd39c4c78e
See: https://github.com/bbatsov/ruby-style-guide#percent-r
Bug: T117985
---
M .rubocop.yml
D .rubocop_todo.yml
M tests/browser/features/support/pages/page_triage_page.rb
3 files changed, 1 insertion(+), 17 deletions(-)

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



diff --git a/.rubocop.yml b/.rubocop.yml
index 3c8a650..84567a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   StyleGuideCopsOnly: true
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 56c3c7f..000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-11-25 15:37:03 +0100 using RuboCop version 0.35.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-Style/RegexpLiteral:
-  Exclude:
-- 'tests/browser/features/support/pages/page_triage_page.rb'
diff --git a/tests/browser/features/support/pages/page_triage_page.rb 
b/tests/browser/features/support/pages/page_triage_page.rb
index 3804fd3..e3d3927 100644
--- a/tests/browser/features/support/pages/page_triage_page.rb
+++ b/tests/browser/features/support/pages/page_triage_page.rb
@@ -17,7 +17,7 @@
   radio_button(:blocked, id: 'mwe-pt-filter-blocked')
   radio_button(:bots, id: 'mwe-pt-filter-bot-edits')
   checkbox(:deletion, id: 'mwe-pt-filter-nominated-for-deletion')
-  a(:learn_more, href: /Wikipedia:Page_Curation\/Help/, text: 'Learn more')
+  a(:learn_more, href: %r{Wikipedia:Page_Curation/Help}, text: 'Learn more')
   a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: 'Leave 
feedback')
   select(:namespace, id: 'mwe-pt-filter-namespace')
   radio_button(:new_editors, id: 'mwe-pt-filter-non-autoconfirmed')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I48129105ca804176e5cfafe75a28dccd39c4c78e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki...PdfHandler)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Fixed Style/StringLiterals RuboCop offense
..


Fixed Style/StringLiterals RuboCop offense

See:
https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
Bug: T117986

Change-Id: I60b1598831bbe9fe84c40bf82434cfd22cdd7eff
---
M .rubocop.yml
D .rubocop_todo.yml
M Gemfile
M Rakefile
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/random_page.rb
6 files changed, 14 insertions(+), 30 deletions(-)

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



diff --git a/.rubocop.yml b/.rubocop.yml
index 870a41b..84567a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   StyleGuideCopsOnly: true
 
@@ -15,9 +13,8 @@
 Style/SignalException:
   Enabled: false
 
-# uncomment when fixed
-# Style/StringLiterals:
-#   EnforcedStyle: single_quotes
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
 
 Style/TrivialAccessors:
   ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index f0de6d2..000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-11-25 15:48:57 +0100 using RuboCop version 0.35.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 15
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
diff --git a/Gemfile b/Gemfile
index 429c07d..b87770d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "https://rubygems.org;
+source 'https://rubygems.org'
 
-gem "mediawiki_selenium", "~> 1.6.2"
-gem "rubocop", "~> 0.35.1", require: false
+gem 'mediawiki_selenium', '~> 1.6.2'
+gem 'rubocop', '~> 0.35.1', require: false
diff --git a/Rakefile b/Rakefile
index 4835bcd..3342a96 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,14 @@
-require "bundler/setup"
+require 'bundler/setup'
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop) do |task|
   # If you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
   # The next line makes it explicit that you want .rubocop.yml from the
   # directory where `bundle exec rake` is executed:
-  task.options = ["-c", ".rubocop.yml"]
+  task.options = ['-c', '.rubocop.yml']
 end
 
 task default: [:test]
 
-desc "Run all build/tests commands (CI entry point)"
+desc 'Run all build/tests commands (CI entry point)'
 task test: [:rubocop]
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index 1760965..c1072b2 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1,3 +1,3 @@
-require "mediawiki_selenium/cucumber"
-require "mediawiki_selenium/pages"
-require "mediawiki_selenium/step_definitions"
+require 'mediawiki_selenium/cucumber'
+require 'mediawiki_selenium/pages'
+require 'mediawiki_selenium/step_definitions'
diff --git a/tests/browser/features/support/pages/random_page.rb 
b/tests/browser/features/support/pages/random_page.rb
index 8d77e97..8dc4e90 100644
--- a/tests/browser/features/support/pages/random_page.rb
+++ b/tests/browser/features/support/pages/random_page.rb
@@ -12,6 +12,6 @@
 class PdfPage
   include PageObject
 
-  a(:download_as_pdf, text: "Download as PDF")
-  a(:download_the_file, text: "Download the file")
+  a(:download_as_pdf, text: 'Download as PDF')
+  a(:download_the_file, text: 'Download the file')
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60b1598831bbe9fe84c40bf82434cfd22cdd7eff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PdfHandler
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki...PageTriage)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Fixed Style/StringLiterals RuboCop offense
..


Fixed Style/StringLiterals RuboCop offense

See:

https://github.com/bbatsov/ruby-style-guide#consistent-string-literals

Bug: T117985
Change-Id: I812b9a02d615dd32aa81a57d97f79f116d7b1a89
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Rakefile
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/page_triage_page.rb
6 files changed, 30 insertions(+), 37 deletions(-)

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



diff --git a/.rubocop.yml b/.rubocop.yml
index f5b99e8..3c8a650 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -15,9 +15,8 @@
 Style/SignalException:
   Enabled: false
 
-# uncomment when the offense is fixed
-# Style/StringLiterals:
-#   EnforcedStyle: single_quotes
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
 
 Style/TrivialAccessors:
   ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5464b70..56c3c7f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -12,9 +12,3 @@
 Style/RegexpLiteral:
   Exclude:
 - 'tests/browser/features/support/pages/page_triage_page.rb'
-
-# Offense count: 31
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
diff --git a/Gemfile b/Gemfile
index 429c07d..b87770d 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "https://rubygems.org;
+source 'https://rubygems.org'
 
-gem "mediawiki_selenium", "~> 1.6.2"
-gem "rubocop", "~> 0.35.1", require: false
+gem 'mediawiki_selenium', '~> 1.6.2'
+gem 'rubocop', '~> 0.35.1', require: false
diff --git a/Rakefile b/Rakefile
index d5823fa..6eef121 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,14 @@
-require "bundler/setup"
+require 'bundler/setup'
 
-require "rubocop/rake_task"
+require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop) do |task|
   # if you use mediawiki-vagrant, rubocop will by default use it's .rubocop.yml
   # the next line makes it explicit that you want .rubocop.yml from the 
directory
   # where `bundle exec rake` is executed
-  task.options = ["-c", ".rubocop.yml"]
+  task.options = ['-c', '.rubocop.yml']
 end
 
 task default: [:test]
 
-desc "Run all build/tests commands (CI entry point)"
+desc 'Run all build/tests commands (CI entry point)'
 task test: [:rubocop]
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index 1760965..c1072b2 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -1,3 +1,3 @@
-require "mediawiki_selenium/cucumber"
-require "mediawiki_selenium/pages"
-require "mediawiki_selenium/step_definitions"
+require 'mediawiki_selenium/cucumber'
+require 'mediawiki_selenium/pages'
+require 'mediawiki_selenium/step_definitions'
diff --git a/tests/browser/features/support/pages/page_triage_page.rb 
b/tests/browser/features/support/pages/page_triage_page.rb
index ff0fb34..3804fd3 100644
--- a/tests/browser/features/support/pages/page_triage_page.rb
+++ b/tests/browser/features/support/pages/page_triage_page.rb
@@ -12,23 +12,23 @@
 class PageTriagePage
   include PageObject
 
-  page_url "Special:NewPagesFeed"
+  page_url 'Special:NewPagesFeed'
 
-  radio_button(:blocked, id: "mwe-pt-filter-blocked")
-  radio_button(:bots, id: "mwe-pt-filter-bot-edits")
-  checkbox(:deletion, id: "mwe-pt-filter-nominated-for-deletion")
-  a(:learn_more, href: /Wikipedia:Page_Curation\/Help/, text: "Learn more")
-  a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: "Leave 
feedback")
-  select(:namespace, id: "mwe-pt-filter-namespace")
-  radio_button(:new_editors, id: "mwe-pt-filter-non-autoconfirmed")
-  radio_button(:no_categories, id: "mwe-pt-filter-no-categories")
-  radio_button(:orphan, id: "mwe-pt-filter-orphan")
-  checkbox(:redirects, id: "mwe-pt-filter-redirects")
-  a(:review, text: "Review")
-  checkbox(:reviewed_pages, id: "mwe-pt-filter-reviewed-edits")
-  span(:set_filters, id: "mwe-pt-filter-dropdown-control")
-  div(:status, class: "mwe-pt-status-icon")
-  checkbox(:unreviewed_pages, id: "mwe-pt-filter-unreviewed-edits")
-  radio_button(:user_selected, id: "mwe-pt-filter-user-selected")
-  text_field(:username, id: "mwe-pt-filter-user")
+  radio_button(:blocked, id: 'mwe-pt-filter-blocked')
+  radio_button(:bots, id: 'mwe-pt-filter-bot-edits')
+  checkbox(:deletion, id: 'mwe-pt-filter-nominated-for-deletion')
+  a(:learn_more, href: /Wikipedia:Page_Curation\/Help/, text: 'Learn more')
+  a(:leave_feedback, href: /Wikipedia_talk:Page_Curation/, text: 'Leave 
feedback')
+  select(:namespace, id: 'mwe-pt-filter-namespace')
+  radio_button(:new_editors, id: 'mwe-pt-filter-non-autoconfirmed')
+  radio_button(:no_categories, id: 'mwe-pt-filter-no-categories')
+  radio_button(:orphan, id: 'mwe-pt-filter-orphan')
+

[MediaWiki-commits] [Gerrit] Repool db1044 after maintenance - change (operations/mediawiki-config)

2015-11-25 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged.

Change subject: Repool db1044 after maintenance
..


Repool db1044 after maintenance

Also reduce db1027 load, which was causing problems
earlier due to: T113721

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

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 094d141..5f503dc 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -109,10 +109,10 @@
),
/* s3 */ 'DEFAULT' => array(
'db1038' => 0,   # 1.4TB  64GB
-   'db1027' => 50,  # 1.4TB  64GB, vslow, dump
+   'db1027' => 0,   # 1.4TB  64GB, vslow, dump
'db1015' => 50,  # 1.4TB  64GB, watchlist, recentchanges, 
contributions, logpager
'db1035' => 500, # 1.4TB  64GB
-#  'db1044' => 500, # 1.4TB  64GB
+   'db1044' => 500, # 1.4TB  64GB
),
's4' => array(
'db1040' => 0,   # 1.4TB  64GB

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

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

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

[MediaWiki-commits] [Gerrit] Have misc-web talk directly to etherpad-lite - change (operations/puppet)

2015-11-25 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Have misc-web talk directly to etherpad-lite
..

Have misc-web talk directly to etherpad-lite

Move misc-web to talking directly to the etherpad-lite nodejs process
instead of going via the apache2 reverse proxy layer sitting on
etherpad1001. While this removes some minimal latency, the main driving
factor is uniformity across the infrastructure and removal of a moving
part

Change-Id: Iaefd3d1fa6873e0d9877429412d12b325334defc
---
M modules/role/manifests/cache/misc.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/255406/1

diff --git a/modules/role/manifests/cache/misc.pp 
b/modules/role/manifests/cache/misc.pp
index b2e5efc..accc2e8 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -201,6 +201,11 @@
 'port'  => 8088,
 },
 {
+# etherpad nodejs listens on 9001
+'backend_match' => '^etherpad1001',
+'port'  => 9001,
+},
+{
 'port'  => 80,
 'connect_timeout'   => '5s',
 'first_byte_timeout'=> '35s',

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

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

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

[MediaWiki-commits] [Gerrit] Upgrade browser tests to the latest version of mediawiki_sel... - change (mediawiki...MultimediaViewer)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Upgrade browser tests to the latest version of 
mediawiki_selenium Ruby gem
..


Upgrade browser tests to the latest version of mediawiki_selenium Ruby gem

Bug: T99659
Change-Id: I57c9c73284ed856ee1d9a8f490cd511d07953f77
---
M Gemfile
M Gemfile.lock
A tests/browser/environments.yml
M tests/browser/features/step_definitions/mmv_performance_steps.rb
M tests/browser/features/step_definitions/mmv_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/commons_page.rb
M tests/browser/features/support/pages/e2e_test_page.rb
8 files changed, 71 insertions(+), 29 deletions(-)

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



diff --git a/Gemfile b/Gemfile
index 448719a..55e9abd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org;
 
-gem "mediawiki_selenium", "~> 0.4.0"
+gem "mediawiki_selenium", "~> 1.6.2"
 gem "rubocop", "~> 0.29.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index be8cdd0..9e9b714 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
-childprocess (0.5.6)
+childprocess (0.5.8)
   ffi (~> 1.0, >= 1.0.11)
 cucumber (1.3.20)
   builder (>= 2.1.2)
@@ -17,11 +17,11 @@
   faker (>= 1.1.2)
   yml_reader (>= 0.4)
 diff-lcs (1.2.5)
-domain_name (0.5.24)
+domain_name (0.5.25)
   unf (>= 0.0.5, < 1.0.0)
-faker (1.5.0)
+faker (1.6.1)
   i18n (~> 0.5)
-faraday (0.9.1)
+faraday (0.9.2)
   multipart-post (>= 1.2, < 3)
 faraday-cookie_jar (0.0.6)
   faraday (>= 0.7.4)
@@ -29,7 +29,7 @@
 ffi (1.9.10)
 gherkin (2.12.2)
   multi_json (~> 1.3)
-headless (1.0.2)
+headless (2.2.0)
 http-cookie (1.0.2)
   domain_name (~> 0.5)
 i18n (0.7.0)
@@ -37,27 +37,29 @@
 mediawiki_api (0.5.0)
   faraday (~> 0.9, >= 0.9.0)
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
-mediawiki_selenium (0.4.3)
-  cucumber (~> 1.3, >= 1.3.10)
-  headless (~> 1.0, >= 1.0.1)
+mediawiki_selenium (1.6.2)
+  cucumber (~> 1.3, >= 1.3.20)
+  headless (~> 2.0, >= 2.1.0)
   json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.2, >= 0.2.1)
+  mediawiki_api (~> 0.5, >= 0.5.0)
   page-object (~> 1.0)
   rest-client (~> 1.6, >= 1.6.7)
+  rspec-core (~> 2.14, >= 2.14.4)
   rspec-expectations (~> 2.14, >= 2.14.4)
   syntax (~> 1.2, >= 1.2.0)
-mime-types (2.6.2)
+  thor (~> 0.19, >= 0.19.1)
+mime-types (2.99)
 multi_json (1.11.2)
 multi_test (0.1.2)
 multipart-post (2.0.0)
-netrc (0.10.3)
+netrc (0.11.0)
 page-object (1.1.0)
   page_navigation (>= 0.9)
   selenium-webdriver (>= 2.44.0)
   watir-webdriver (>= 0.6.11)
 page_navigation (0.9)
   data_magic (>= 0.14)
-parser (2.2.2.6)
+parser (2.2.3.0)
   ast (>= 1.1, < 3.0)
 powerpack (0.1.1)
 rainbow (2.0.0)
@@ -65,6 +67,7 @@
   http-cookie (>= 1.0.2, < 2.0)
   mime-types (>= 1.16, < 3.0)
   netrc (~> 0.7)
+rspec-core (2.99.2)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
 rubocop (0.29.1)
@@ -75,16 +78,17 @@
   ruby-progressbar (~> 1.4)
 ruby-progressbar (1.7.5)
 rubyzip (1.1.7)
-selenium-webdriver (2.47.1)
+selenium-webdriver (2.48.1)
   childprocess (~> 0.5)
   multi_json (~> 1.0)
   rubyzip (~> 1.0)
   websocket (~> 1.0)
 syntax (1.2.0)
+thor (0.19.1)
 unf (0.1.4)
   unf_ext
 unf_ext (0.0.7.1)
-watir-webdriver (0.8.0)
+watir-webdriver (0.9.1)
   selenium-webdriver (>= 2.46.2)
 websocket (1.2.2)
 yml_reader (0.5)
@@ -93,5 +97,5 @@
   ruby
 
 DEPENDENCIES
-  mediawiki_selenium (~> 0.4.0)
+  mediawiki_selenium (~> 1.6.2)
   rubocop (~> 0.29.1)
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
new file mode 100644
index 000..35eb153
--- /dev/null
+++ b/tests/browser/environments.yml
@@ -0,0 +1,39 @@
+# Customize this configuration as necessary to provide defaults for various
+# test environments.
+#
+# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT
+# environment variable.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   bundle exec cucumber
+#
+# Additional variables set by the environment will override the corresponding
+# defaults defined here.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   export MEDIAWIKI_USER=Selenium_user2
+#   bundle exec cucumber
+#
+mw-vagrant-host: 
+  user_factory: true
+  mediawiki_url: http://127.0.0.1:8080/wiki/
+
+mw-vagrant-guest:
+  user_factory: true
+  mediawiki_url: http://127.0.0.1/wiki/
+
+beta:
+  mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/
+  mediawiki_user: Selenium_user
+  # mediawiki_password: SET THIS IN THE

[MediaWiki-commits] [Gerrit] Update ApiBase::PARAM_* comments - change (mediawiki/core)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Update ApiBase::PARAM_* comments
..


Update ApiBase::PARAM_* comments

Put them in a form that doxygen should recognize,[1] and document all the
types recognized for PARAM_TYPE.

Ideally we'd use some @-thing like @var to specify the types instead of
just a weird parenthetical, but looking at existing examples it seems
that putting @var on a class constant will instead make doxygen
completely ignore it.

 [1]: See https://doc.wikimedia.org/mediawiki-core/master/php/classApiBase.html

Change-Id: Iccfa1dc9a7a79313ff9acf71934264c115b3fa76
---
M includes/api/ApiBase.php
1 file changed, 124 insertions(+), 44 deletions(-)

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



diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 1227899..8e5cdcc 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -37,68 +37,148 @@
  * @ingroup API
  */
 abstract class ApiBase extends ContextSource {
-   // These constants allow modules to specify exactly how to treat 
incoming parameters.
 
-   // Default value of the parameter
+   /**
+* @name Constants for ::getAllowedParams() arrays
+* These constants are keys in the arrays returned by 
::getAllowedParams()
+* and accepted by ::getParameterFromSettings() that define how the
+* parameters coming in from the request are to be interpreted.
+* @{
+*/
+
+   /** (null|boolean|integer|string) Default value of the parameter. */
const PARAM_DFLT = 0;
-   // Boolean, do we accept more than one item for this parameter (e.g.: 
titles)?
+
+   /** (boolean) Accept multiple pipe-separated values for this parameter 
(e.g. titles)? */
const PARAM_ISMULTI = 1;
-   // Can be either a string type (e.g.: 'integer') or an array of allowed 
values
+
+   /**
+* (string|string[]) Either an array of allowed value strings, or a 
string
+* type as described below. If not specified, will be determined from 
the
+* type of PARAM_DFLT.
+*
+* Supported string types are:
+* - boolean: A boolean parameter, returned as false if the parameter is
+*   omitted and true if present (even with a falsey value, i.e. it 
works
+*   like HTML checkboxes). PARAM_DFLT must be boolean false, if 
specified.
+*   Cannot be used with PARAM_ISMULTI.
+* - integer: An integer value. See also PARAM_MIN, PARAM_MAX, and
+*   PARAM_RANGE_ENFORCE.
+* - limit: An integer or the string 'max'. Default lower limit is 0 
(but
+*   see PARAM_MIN), and requires that PARAM_MAX and PARAM_MAX2 be
+*   specified. Cannot be used with PARAM_ISMULTI.
+* - namespace: An integer representing a MediaWiki namespace.
+* - NULL: Any string.
+* - password: Any non-empty string. Input value is private or 
sensitive.
+*would be an appropriate HTML form field.
+* - string: Any non-empty string, not expected to be very long or 
contain newlines.
+*would be an appropriate HTML form field.
+* - submodule: The name of a submodule of this module, see 
PARAM_SUBMODULE_MAP.
+* - text: Any non-empty string, expected to be very long or contain 
newlines.
+*would be an appropriate HTML form field.
+* - timestamp: A timestamp in any format recognized by MWTimestamp, or 
the
+*   string 'now' representing the current timestamp. Will be returned 
in
+*   TS_MW format.
+* - user: A MediaWiki username. Will be returned normalized but not 
canonicalized.
+* - upload: An uploaded file. Will be returned as a WebRequestUpload 
object.
+*   Cannot be used with PARAM_ISMULTI.
+*/
const PARAM_TYPE = 2;
-   // Max value allowed for a parameter. Only applies if TYPE='integer'
+
+   /** (integer) Max value allowed for the parameter, for PARAM_TYPE 
'integer' and 'limit'. */
const PARAM_MAX = 3;
-   // Max value allowed for a parameter for bots and sysops. Only applies 
if TYPE='integer'
+
+   /**
+* (integer) Max value allowed for the parameter for users with the
+* apihighlimits right, for PARAM_TYPE 'limit'.
+*/
const PARAM_MAX2 = 4;
-   // Lowest value allowed for a parameter. Only applies if TYPE='integer'
+
+   /** (integer) Lowest value allowed for the parameter, for PARAM_TYPE 
'integer' and 'limit'. */
const PARAM_MIN = 5;
-   // Boolean, do we allow the same value to be set more than once when 
ISMULTI=true
+
+   /** (boolean) Allow the same value to be set more than once when 
PARAM_MULTI is true? */
const PARAM_ALLOW_DUPLICATES = 6;
-   // Boolean, is the parameter deprecated (will show a warning)
+
+   /** (boolean) Is the

[MediaWiki-commits] [Gerrit] Release Poem under CC0 1.0 public domain dedication - change (mediawiki...Poem)

2015-11-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Release Poem under CC0 1.0 public domain dedication
..

Release Poem under CC0 1.0 public domain dedication

Bug: T109963
Change-Id: Ic82c5cc4203fc238ff4f99f9e091a2c158d7ea81
(cherry picked from commit f3dc5531418b4316b6624155c68de106972d0018)
---
A LICENSE
M extension.json
2 files changed, 122 insertions(+), 0 deletions(-)


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

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..0e259d4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission,

[MediaWiki-commits] [Gerrit] Bring etherpad-lite configuration up to date with upstream - change (operations/puppet)

2015-11-25 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Bring etherpad-lite configuration up to date with upstream
..

Bring etherpad-lite configuration up to date with upstream

Set all etherpad-lite configuration items as upstream. All of these are
imported straight from
https://github.com/ether/etherpad-lite/blob/develop/settings.json.template
and are the default values. etherpad-lite will just default to these
values if not specified.
We also remove sessionKey since it's unused these days and etherpad-lite
instead uses the SESSIONKEY.txt file for it

Change-Id: Ie1ecbade8f135c02ceb7d74824b7918024423b66
---
M modules/etherpad/templates/settings.json.erb
1 file changed, 38 insertions(+), 1 deletion(-)


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

diff --git a/modules/etherpad/templates/settings.json.erb 
b/modules/etherpad/templates/settings.json.erb
index 9bcb4f6..7b8611a 100644
--- a/modules/etherpad/templates/settings.json.erb
+++ b/modules/etherpad/templates/settings.json.erb
@@ -13,15 +13,52 @@
},
 
"defaultPadText": "",
-   "sessionKey" : "",
+   "padOptions": {
+   "noColors": false,
+   "showControls": true,
+   "showChat": true,
+   "showLineNumbers": true,
+   "useMonospaceFont": false,
+   "userName": false,
+   "userColor": false,
+   "rtl": false,
+   "alwaysShowChat": false,
+   "chatAndUsers": false,
+   "lang": "en-gb"
+   },
+   "suppressErrorsInPadText" : false,
"requireSession" : false,
"editOnly" : false,
+   "sessionNoPassword" : false,
"minify": true,
"maxAge" : 21600, // 60 * 60 * 6 = 6 hours
"abiword": null,
+   "soffice": null,
+   "tidyHtml" : null,
+   "allowUnknownFileEnds" : false,
"requireAuthentication": false,
"requireAuthorization": false,
+   "trustProxy" : false,
+   "disableIPlogging" : false,
"socketTransportProtocols" : ["xhr-polling", "jsonp-polling", 
"htmlfile"],
+   "loadTest": false,
+   "indentationOnNewLine": false,
+   "toolbar": {
+ "left": [
+   ["bold", "italic", "underline", "strikethrough"],
+   ["orderedlist", "unorderedlist", "indent", "outdent"],
+   ["undo", "redo"],
+   ["clearauthorship"]
+ ],
+ "right": [
+   ["importexport", "timeslider", "savedrevision"],
+   ["settings", "embed"],
+   ["showusers"]
+ ],
+ "timeslider": [
+   ["timeslider_export", "timeslider_returnToPad"]
+ ]
+   },
"loglevel": "INFO",
"logconfig" : {
"appenders": [

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

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

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

[MediaWiki-commits] [Gerrit] Trust the upstream proxy to have the correct client IP - change (operations/puppet)

2015-11-25 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Trust the upstream proxy to have the correct client IP
..

Trust the upstream proxy to have the correct client IP

This enables express.js "trust proxy" feature that makes express
consider the left most IP in the X-Forwaded-For header as the client IP.
Also start listening on 0.0.0.0 to allow varnish to connect directly to
etherpad instead of going via an Apache2 reverse proxy layer

Change-Id: Ie4f669b735eddfa1ca59eae7096e49567bf41c38
---
M manifests/role/etherpad.pp
M modules/etherpad/templates/settings.json.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/255404/1

diff --git a/manifests/role/etherpad.pp b/manifests/role/etherpad.pp
index 37b56e8..3bb35f7 100644
--- a/manifests/role/etherpad.pp
+++ b/manifests/role/etherpad.pp
@@ -8,7 +8,7 @@
 description => 'Etherpad-lite server'
 }
 
-$etherpad_ip = '127.0.0.1'
+$etherpad_ip = '0.0.0.0'
 $etherpad_port = '9001'
 
 case $::realm {
diff --git a/modules/etherpad/templates/settings.json.erb 
b/modules/etherpad/templates/settings.json.erb
index 5891f79..db82490 100644
--- a/modules/etherpad/templates/settings.json.erb
+++ b/modules/etherpad/templates/settings.json.erb
@@ -38,7 +38,7 @@
"allowUnknownFileEnds" : false,
"requireAuthentication": false,
"requireAuthorization": false,
-   "trustProxy" : false,
+   "trustProxy" : true,
"disableIPlogging" : false,
"socketTransportProtocols" : ["xhr-polling", "jsonp-polling", 
"htmlfile"],
"loadTest": false,

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

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

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

[MediaWiki-commits] [Gerrit] Set a standard defaultPadText for etherpad - change (operations/puppet)

2015-11-25 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Set a standard defaultPadText for etherpad
..

Set a standard defaultPadText for etherpad

A welcoming message, informing users that anyone can see all past and
current context in any pad. This is more polite than the current blank
page and does inform users that the content is not private

Change-Id: I49f32fde87e0919ac4e85ce0ace42b7ae95eca48
---
M modules/etherpad/templates/settings.json.erb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/etherpad/templates/settings.json.erb 
b/modules/etherpad/templates/settings.json.erb
index 7b8611a..5891f79 100644
--- a/modules/etherpad/templates/settings.json.erb
+++ b/modules/etherpad/templates/settings.json.erb
@@ -12,7 +12,7 @@
"database": "<%= @etherpad_db_name %>"
},
 
-   "defaultPadText": "",
+   "defaultPadText": "Welcome to WMF etherpad installation. Please keep in 
mind all current as well as past content in any pad is public. Removing content 
from a pad does not mean it is deleted",
"padOptions": {
"noColors": false,
"showControls": true,

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

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

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

[MediaWiki-commits] [Gerrit] misc-web: Force HTTPS for etherpad.wikimedia.org - change (operations/puppet)

2015-11-25 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: misc-web: Force HTTPS for etherpad.wikimedia.org
..

misc-web: Force HTTPS for etherpad.wikimedia.org

Instead of relying on the apache2 proxy layer sitting in front of the
etherpad-lite nodejs process to redirect to HTTPS, do it in the misc-web
varnish frontend layer. This should remove some (minimal) latency for
various requests and it also has the added bonus of making the
infrastructure more uniform

Change-Id: I7a2b14b6b62f5a05ddb84ffb0482f0c4baaef1f5
---
M templates/varnish/misc-frontend.inc.vcl.erb
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/templates/varnish/misc-frontend.inc.vcl.erb 
b/templates/varnish/misc-frontend.inc.vcl.erb
index 3000164..3e5f761 100644
--- a/templates/varnish/misc-frontend.inc.vcl.erb
+++ b/templates/varnish/misc-frontend.inc.vcl.erb
@@ -19,6 +19,7 @@
 || req.http.Host == "otrs-test.wikimedia.org"
 || req.http.Host == "hue.wikimedia.org"
 || req.http.Host == "yarn.wikimedia.org"
+|| req.http.Host == "etherpad.wikimedia.org"
 ) {
 if (req.http.X-Forwarded-Proto != "https") {
 set req.http.Location = "https://; + req.http.Host + req.url;

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

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

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

[MediaWiki-commits] [Gerrit] Add active_users tracking back - change (analytics/limn-wikidata-data)

2015-11-25 Thread Addshore (Code Review)

Addshore has submitted this change and it was merged.

Change subject: Add active_users tracking back
..


Add active_users tracking back

Change-Id: Ifadd3670c73ebea52cc73040067826423ec0034e
---
M daily_site_stats.sh
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/daily_site_stats.sh b/daily_site_stats.sh
index 093a087..0791562 100755
--- a/daily_site_stats.sh
+++ b/daily_site_stats.sh
@@ -3,6 +3,7 @@
 ~/wikidata-data/graphite/site_stats/good_articles.sh
 ~/wikidata-data/graphite/site_stats/total_edits.sh
 ~/wikidata-data/graphite/site_stats/total_pages.sh
+~/wikidata-data/graphite/site_stats/active_users.sh
 ~/wikidata-data/graphite/site_stats/users.sh
 ~/wikidata-data/graphite/site_stats/admins.sh
 ~/wikidata-data/graphite/site_stats/bureaucrats.sh

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifadd3670c73ebea52cc73040067826423ec0034e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 

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

[MediaWiki-commits] [Gerrit] Link query endpoint - change (wikidata...rdf)

2015-11-25 Thread Jonas Kress (WMDE) (Code Review)

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

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

Change subject: Link query endpoint
..

Link query endpoint

Change-Id: I758d2275e47369a73e4628c080b818c4e3338b0e
---
M gui/index.html
M gui/wikibase/queryService/api/Sparql.js
M gui/wikibase/queryService/ui/App.js
3 files changed, 24 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/13/255413/1

diff --git a/gui/index.html b/gui/index.html
index f14bb55..e76012e 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -99,6 +99,7 @@
Full JSON

ShortUrl
+   Query



diff --git a/gui/wikibase/queryService/api/Sparql.js 
b/gui/wikibase/queryService/api/Sparql.js
index 2de8db1..f86b8e7 100644
--- a/gui/wikibase/queryService/api/Sparql.js
+++ b/gui/wikibase/queryService/api/Sparql.js
@@ -45,6 +45,13 @@
SELF.prototype._rawData = null;
 
/**
+* @property {string}
+* @private
+**/
+   SELF.prototype._queryUri = null;
+
+
+   /**
 * Submit a query to the API
 *
 * @return {jQuery.Promise}
@@ -86,16 +93,16 @@
 * @return {jQuery.Promise}
 */
SELF.prototype.query = function(query) {
-   var deferred = $.Deferred(), self = this;
-
-   var url = SERVICE + '?' + query, settings = {
+   var deferred = $.Deferred(), self = this, settings = {
'headers' : {
'Accept' : 'application/sparql-results+json'
},
};
 
+   this._queryUri = SERVICE + '?' + query;
+
this._executionTime = Date.now();
-   $.ajax( url, settings ).done(function( data, textStatus, jqXHR 
) {
+   $.ajax( this._queryUri, settings ).done(function( data, 
textStatus, jqXHR ) {
self._executionTime = Date.now() - self._executionTime;
self._resultLength = data.results.bindings.length || 
null;
self._rawData = data;
@@ -179,6 +186,15 @@
};
 
/**
+* Get query URI
+*
+* @return {string}
+*/
+   SELF.prototype.getQueryUri = function() {
+   return this._queryUri;
+   };
+
+   /**
 * Get the result as table
 *
 * @return {jQuery}
diff --git a/gui/wikibase/queryService/ui/App.js 
b/gui/wikibase/queryService/ui/App.js
index a20faff..e7761c3 100644
--- a/gui/wikibase/queryService/ui/App.js
+++ b/gui/wikibase/queryService/ui/App.js
@@ -259,6 +259,7 @@
}
$( '#shorturl' ).attr( 'href', SHORTURL + encodeURIComponent( 
window.location ) );
 
+
$( '#query-result' ).empty( '' );
$( '#query-result' ).hide();
$( '#total' ).hide();
@@ -267,6 +268,8 @@
 
var query = $( '#query-form' ).serialize(), api = 
this._sparqlApi;
this._sparqlApi.query(query).done(function(){
+
+   $( '.queryUri' ).attr( 
'href',self._sparqlApi.getQueryUri() );
$( '#total-results' ).text( api.getResultLength() );
$( '#query-time' ).text( api.getExecutionTime() );
$( '#total' ).show();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I758d2275e47369a73e4628c080b818c4e3338b0e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] Upgrade browser tests to the latest version of mediawiki_sel... - change (mediawiki...MultimediaViewer)

2015-11-25 Thread Zfilipin (Code Review)

Zfilipin has uploaded a new change for review.

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

Change subject: Upgrade browser tests to the latest version of 
mediawiki_selenium Ruby gem
..

Upgrade browser tests to the latest version of mediawiki_selenium Ruby gem

Bug: T99659
Change-Id: I57c9c73284ed856ee1d9a8f490cd511d07953f77
---
M Gemfile
M Gemfile.lock
A tests/browser/environments.yml
M tests/browser/features/step_definitions/mmv_performance_steps.rb
M tests/browser/features/step_definitions/mmv_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/commons_page.rb
M tests/browser/features/support/pages/e2e_test_page.rb
8 files changed, 71 insertions(+), 29 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer 
refs/changes/95/255395/1

diff --git a/Gemfile b/Gemfile
index 448719a..55e9abd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org;
 
-gem "mediawiki_selenium", "~> 0.4.0"
+gem "mediawiki_selenium", "~> 1.6.2"
 gem "rubocop", "~> 0.29.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index be8cdd0..9e9b714 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
-childprocess (0.5.6)
+childprocess (0.5.8)
   ffi (~> 1.0, >= 1.0.11)
 cucumber (1.3.20)
   builder (>= 2.1.2)
@@ -17,11 +17,11 @@
   faker (>= 1.1.2)
   yml_reader (>= 0.4)
 diff-lcs (1.2.5)
-domain_name (0.5.24)
+domain_name (0.5.25)
   unf (>= 0.0.5, < 1.0.0)
-faker (1.5.0)
+faker (1.6.1)
   i18n (~> 0.5)
-faraday (0.9.1)
+faraday (0.9.2)
   multipart-post (>= 1.2, < 3)
 faraday-cookie_jar (0.0.6)
   faraday (>= 0.7.4)
@@ -29,7 +29,7 @@
 ffi (1.9.10)
 gherkin (2.12.2)
   multi_json (~> 1.3)
-headless (1.0.2)
+headless (2.2.0)
 http-cookie (1.0.2)
   domain_name (~> 0.5)
 i18n (0.7.0)
@@ -37,27 +37,29 @@
 mediawiki_api (0.5.0)
   faraday (~> 0.9, >= 0.9.0)
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
-mediawiki_selenium (0.4.3)
-  cucumber (~> 1.3, >= 1.3.10)
-  headless (~> 1.0, >= 1.0.1)
+mediawiki_selenium (1.6.2)
+  cucumber (~> 1.3, >= 1.3.20)
+  headless (~> 2.0, >= 2.1.0)
   json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.2, >= 0.2.1)
+  mediawiki_api (~> 0.5, >= 0.5.0)
   page-object (~> 1.0)
   rest-client (~> 1.6, >= 1.6.7)
+  rspec-core (~> 2.14, >= 2.14.4)
   rspec-expectations (~> 2.14, >= 2.14.4)
   syntax (~> 1.2, >= 1.2.0)
-mime-types (2.6.2)
+  thor (~> 0.19, >= 0.19.1)
+mime-types (2.99)
 multi_json (1.11.2)
 multi_test (0.1.2)
 multipart-post (2.0.0)
-netrc (0.10.3)
+netrc (0.11.0)
 page-object (1.1.0)
   page_navigation (>= 0.9)
   selenium-webdriver (>= 2.44.0)
   watir-webdriver (>= 0.6.11)
 page_navigation (0.9)
   data_magic (>= 0.14)
-parser (2.2.2.6)
+parser (2.2.3.0)
   ast (>= 1.1, < 3.0)
 powerpack (0.1.1)
 rainbow (2.0.0)
@@ -65,6 +67,7 @@
   http-cookie (>= 1.0.2, < 2.0)
   mime-types (>= 1.16, < 3.0)
   netrc (~> 0.7)
+rspec-core (2.99.2)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
 rubocop (0.29.1)
@@ -75,16 +78,17 @@
   ruby-progressbar (~> 1.4)
 ruby-progressbar (1.7.5)
 rubyzip (1.1.7)
-selenium-webdriver (2.47.1)
+selenium-webdriver (2.48.1)
   childprocess (~> 0.5)
   multi_json (~> 1.0)
   rubyzip (~> 1.0)
   websocket (~> 1.0)
 syntax (1.2.0)
+thor (0.19.1)
 unf (0.1.4)
   unf_ext
 unf_ext (0.0.7.1)
-watir-webdriver (0.8.0)
+watir-webdriver (0.9.1)
   selenium-webdriver (>= 2.46.2)
 websocket (1.2.2)
 yml_reader (0.5)
@@ -93,5 +97,5 @@
   ruby
 
 DEPENDENCIES
-  mediawiki_selenium (~> 0.4.0)
+  mediawiki_selenium (~> 1.6.2)
   rubocop (~> 0.29.1)
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
new file mode 100644
index 000..35eb153
--- /dev/null
+++ b/tests/browser/environments.yml
@@ -0,0 +1,39 @@
+# Customize this configuration as necessary to provide defaults for various
+# test environments.
+#
+# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT
+# environment variable.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   bundle exec cucumber
+#
+# Additional variables set by the environment will override the corresponding
+# defaults defined here.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   export MEDIAWIKI_USER=Selenium_user2
+#   bundle exec cucumber
+#
+mw-vagrant-host: 
+  user_factory: true
+  mediawiki_url: http://127.0.0.1:8080/wiki/
+
+mw-vagrant-guest:
+  user_factory: true
+  mediawiki_url: http://127.0.0.1/wiki/
+
+beta:
+  mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/
+  mediawiki_user:

[MediaWiki-commits] [Gerrit] Release Poem under CC0 1.0 public domain dedication - change (mediawiki...Poem)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Release Poem under CC0 1.0 public domain dedication
..


Release Poem under CC0 1.0 public domain dedication

Bug: T109963
Change-Id: Ic82c5cc4203fc238ff4f99f9e091a2c158d7ea81
---
A LICENSE
M extension.json
2 files changed, 122 insertions(+), 0 deletions(-)

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

Objections:
  Hashar: There's a problem with this change, please improve



diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..0e259d4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or

[MediaWiki-commits] [Gerrit] Updated RuboCop to the latest version - change (mediawiki...PageTriage)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Updated RuboCop to the latest version
..


Updated RuboCop to the latest version

Added recommended configuration and regenerated TODO file.

See:

https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#Base_confi
guration

Bug: T117985
Change-Id: I6effe8523ad47d76e1acb4df94232a5cdd0e8d97
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
4 files changed, 40 insertions(+), 18 deletions(-)

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



diff --git a/.rubocop.yml b/.rubocop.yml
index cc32da4..f5b99e8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,23 @@
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+  StyleGuideCopsOnly: true
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+# uncomment when the offense is fixed
+# Style/StringLiterals:
+#   EnforcedStyle: single_quotes
+
+Style/TrivialAccessors:
+  ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b13264f..5464b70 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,21 +1,19 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-10-21 15:48:50 +0200 using RuboCop version 0.26.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-11-25 15:37:03 +0100 using RuboCop version 0.35.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 82
-
-# Offense count: 2
 # Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Enabled: false
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+Style/RegexpLiteral:
+  Exclude:
+- 'tests/browser/features/support/pages/page_triage_page.rb'
 
-# Offense count: 22
+# Offense count: 31
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
 Style/StringLiterals:
diff --git a/Gemfile b/Gemfile
index 45f75d7..429c07d 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org;
 
 gem "mediawiki_selenium", "~> 1.6.2"
-gem "rubocop", "~> 0.26.1", require: false
+gem "rubocop", "~> 0.35.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7afed8e..47934de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,9 +59,9 @@
   watir-webdriver (>= 0.6.11)
 page_navigation (0.9)
   data_magic (>= 0.14)
-parser (2.3.0.pre.3)
+parser (2.2.3.0)
   ast (>= 1.1, < 3.0)
-powerpack (0.0.9)
+powerpack (0.1.1)
 rainbow (2.0.0)
 rest-client (1.8.0)
   http-cookie (>= 1.0.2, < 2.0)
@@ -70,12 +70,13 @@
 rspec-core (2.99.2)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
-rubocop (0.26.1)
+rubocop (0.35.1)
   astrolabe (~> 1.3)
-  parser (>= 2.2.0.pre.4, < 3.0)
-  powerpack (~> 0.0.6)
+  parser (>= 2.2.3.0, < 3.0)
+  powerpack (~> 0.1)
   rainbow (>= 1.99.1, < 3.0)
-  ruby-progressbar (~> 1.4)
+  ruby-progressbar (~> 1.7)
+  tins (<= 1.6.0)
 ruby-progressbar (1.7.5)
 rubyzip (1.1.7)
 selenium-webdriver (2.48.1)
@@ -85,6 +86,7 @@
   websocket (~> 1.0)
 syntax (1.2.0)
 thor (0.19.1)
+tins (1.6.0)
 unf (0.1.4)
   unf_ext
 unf_ext (0.0.7.1)
@@ -98,4 +100,4 @@
 
 DEPENDENCIES
   mediawiki_selenium (~> 1.6.2)
-  rubocop (~> 0.26.1)
+  rubocop (~> 0.35.1)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6effe8523ad47d76e1acb4df94232a5cdd0e8d97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Updated mediawiki_selenium Ruby gem to the latest version - change (mediawiki...PageTriage)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Updated mediawiki_selenium Ruby gem to the latest version
..


Updated mediawiki_selenium Ruby gem to the latest version

Bug: T117979
Change-Id: Idd1bf4ecf062219e106b0ffcccf5315c0ebd1f07
---
M Gemfile
M Gemfile.lock
A tests/browser/environments.yml
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/page_triage_page.rb
5 files changed, 64 insertions(+), 31 deletions(-)

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



diff --git a/Gemfile b/Gemfile
index 6e43b73..45f75d7 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org;
 
-gem "mediawiki_selenium", "~> 0.2.20"
+gem "mediawiki_selenium", "~> 1.6.2"
 gem "rubocop", "~> 0.26.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 646fa6f..7afed8e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,7 @@
 astrolabe (1.3.1)
   parser (~> 2.2)
 builder (3.2.2)
-childprocess (0.5.6)
+childprocess (0.5.8)
   ffi (~> 1.0, >= 1.0.11)
 cucumber (1.3.20)
   builder (>= 2.1.2)
@@ -17,11 +17,11 @@
   faker (>= 1.1.2)
   yml_reader (>= 0.4)
 diff-lcs (1.2.5)
-domain_name (0.5.24)
+domain_name (0.5.25)
   unf (>= 0.0.5, < 1.0.0)
-faker (1.5.0)
+faker (1.6.1)
   i18n (~> 0.5)
-faraday (0.9.1)
+faraday (0.9.2)
   multipart-post (>= 1.2, < 3)
 faraday-cookie_jar (0.0.6)
   faraday (>= 0.7.4)
@@ -29,35 +29,37 @@
 ffi (1.9.10)
 gherkin (2.12.2)
   multi_json (~> 1.3)
-headless (1.0.2)
+headless (2.2.0)
 http-cookie (1.0.2)
   domain_name (~> 0.5)
 i18n (0.7.0)
 json (1.8.3)
-mediawiki_api (0.1.4)
+mediawiki_api (0.5.0)
   faraday (~> 0.9, >= 0.9.0)
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
-mediawiki_selenium (0.2.26)
-  cucumber (~> 1.3, >= 1.3.10)
-  headless (~> 1.0, >= 1.0.1)
+mediawiki_selenium (1.6.2)
+  cucumber (~> 1.3, >= 1.3.20)
+  headless (~> 2.0, >= 2.1.0)
   json (~> 1.8, >= 1.8.1)
-  mediawiki_api (~> 0.1.3)
+  mediawiki_api (~> 0.5, >= 0.5.0)
   page-object (~> 1.0)
   rest-client (~> 1.6, >= 1.6.7)
+  rspec-core (~> 2.14, >= 2.14.4)
   rspec-expectations (~> 2.14, >= 2.14.4)
   syntax (~> 1.2, >= 1.2.0)
-mime-types (2.6.2)
+  thor (~> 0.19, >= 0.19.1)
+mime-types (2.99)
 multi_json (1.11.2)
 multi_test (0.1.2)
 multipart-post (2.0.0)
-netrc (0.10.3)
+netrc (0.11.0)
 page-object (1.1.0)
   page_navigation (>= 0.9)
   selenium-webdriver (>= 2.44.0)
   watir-webdriver (>= 0.6.11)
 page_navigation (0.9)
   data_magic (>= 0.14)
-parser (2.3.0.pre.2)
+parser (2.3.0.pre.3)
   ast (>= 1.1, < 3.0)
 powerpack (0.0.9)
 rainbow (2.0.0)
@@ -65,6 +67,7 @@
   http-cookie (>= 1.0.2, < 2.0)
   mime-types (>= 1.16, < 3.0)
   netrc (~> 0.7)
+rspec-core (2.99.2)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
 rubocop (0.26.1)
@@ -75,16 +78,17 @@
   ruby-progressbar (~> 1.4)
 ruby-progressbar (1.7.5)
 rubyzip (1.1.7)
-selenium-webdriver (2.47.1)
+selenium-webdriver (2.48.1)
   childprocess (~> 0.5)
   multi_json (~> 1.0)
   rubyzip (~> 1.0)
   websocket (~> 1.0)
 syntax (1.2.0)
+thor (0.19.1)
 unf (0.1.4)
   unf_ext
 unf_ext (0.0.7.1)
-watir-webdriver (0.8.0)
+watir-webdriver (0.9.1)
   selenium-webdriver (>= 2.46.2)
 websocket (1.2.2)
 yml_reader (0.5)
@@ -93,5 +97,5 @@
   ruby
 
 DEPENDENCIES
-  mediawiki_selenium (~> 0.2.20)
+  mediawiki_selenium (~> 1.6.2)
   rubocop (~> 0.26.1)
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
new file mode 100644
index 000..35eb153
--- /dev/null
+++ b/tests/browser/environments.yml
@@ -0,0 +1,39 @@
+# Customize this configuration as necessary to provide defaults for various
+# test environments.
+#
+# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT
+# environment variable.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   bundle exec cucumber
+#
+# Additional variables set by the environment will override the corresponding
+# defaults defined here.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   export MEDIAWIKI_USER=Selenium_user2
+#   bundle exec cucumber
+#
+mw-vagrant-host: 
+  user_factory: true
+  mediawiki_url: http://127.0.0.1:8080/wiki/
+
+mw-vagrant-guest:
+  user_factory: true
+  mediawiki_url: http://127.0.0.1/wiki/
+
+beta:
+  mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/
+  mediawiki_user: Selenium_user
+  # mediawiki_password: SET THIS IN THE ENVIRONMENT!
+
+test2:
+  mediawiki_url: http://test2.wikipedia.org/wiki/
+  mediawiki_user: Selenium_user
+  # mediawiki_password: SET THIS IN THE ENVIRONMENT!
+
+integration:
+

[MediaWiki-commits] [Gerrit] Prep REL1_26 for general release - change (mediawiki/core)

2015-11-25 Thread Chad (Code Review)

Chad has uploaded a new change for review.

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

Change subject: Prep REL1_26 for general release
..

Prep REL1_26 for general release

Change-Id: Ia26f820c14891b97ee9a7c3cebf490273d8e6c7d
---
M RELEASE-NOTES-1.26
M includes/DefaultSettings.php
2 files changed, 1 insertion(+), 6 deletions(-)


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

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index ac2f947..81405f5 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -3,11 +3,6 @@
 
 == MediaWiki 1.26 ==
 
-THIS IS NOT A RELEASE YET
-
-MediaWiki 1.26 is an alpha-quality branch and is not recommended for use in
-production.
-
 === Configuration changes in 1.26 ===
 * $wgPasswordResetRoutes['email'] = true by default.
 * $wgEnableParserCache was deprecated, set $wgParserCacheType to CACHE_NONE
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0efcb03..268a8d1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.26alpha';
+$wgVersion = '1.26.0';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia26f820c14891b97ee9a7c3cebf490273d8e6c7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Chad 

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

[MediaWiki-commits] [Gerrit] Token constructor shouldn't be a Number - change (mediawiki...parsoid)

2015-11-25 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review.

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

Change subject: Token constructor shouldn't be a Number
..

Token constructor shouldn't be a Number

 * The blacklist change is because of the String() wrap of the namespace
   number. In the Sanitizer, there is a test for the method
   token.isHTMLTag, which is a little smelly considering we're
   adding to a native object's prototype. Turns out, for the that
   NAMESPACENUMBER magic word, the token was being emitted as Number,
   and thus taking a different path than expected.

Change-Id: I57211d9e75b4c0448bd2a86a3d5f86ea5a714a27
---
M lib/wt2html/tt/ParserFunctions.js
M tests/parserTests-blacklist.js
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/09/255409/1

diff --git a/lib/wt2html/tt/ParserFunctions.js 
b/lib/wt2html/tt/ParserFunctions.js
index 5e7519b..ab34f35 100644
--- a/lib/wt2html/tt/ParserFunctions.js
+++ b/lib/wt2html/tt/ParserFunctions.js
@@ -829,7 +829,7 @@
 };
 ParserFunctions.prototype.pf_namespacenumber = function(token, frame, cb, 
args) {
var target = args[0].k.split(':').pop();
-   cb({ tokens: [this.env.conf.wiki.namespaceIds[target]] });
+   cb({ tokens: [String(this.env.conf.wiki.namespaceIds[target])] });
 };
 ParserFunctions.prototype.pf_pagename = function(token, frame, cb, args) {
cb({ tokens: [this.env.page.name || ''] });
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index afe39e9..6c7e6a2 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -76,7 +76,7 @@
 add("wt2html", "Magic Word: {{SUBJECTSPACEE}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTSPACEE");
 add("wt2html", "Magic Word: {{NAMESPACE}}", "Main");
 add("wt2html", "Magic Word: {{NAMESPACEE}}", "Main");
-add("wt2html", "Magic Word: {{NAMESPACENUMBER}}", "");
+add("wt2html", "Magic Word: {{NAMESPACENUMBER}}", "0");
 add("wt2html", "Magic Word: {{SUBPAGENAME}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAME");
 add("wt2html", "Magic Word: {{SUBPAGENAMEE}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAMEE");
 add("wt2html", "Magic Word: {{ROOTPAGENAME}}", "Warning:
 Page/template fetching disabled, and no cache for 
Template:ROOTPAGENAME");
@@ -189,7 +189,7 @@
 add("wt2html", "Transclusion of MediaWiki message with underscore", "Warning:
 Page/template fetching disabled, and no cache for 
MediaWiki:History_short");
 add("wt2html", "Transclusion of MediaWiki message with space", "Warning:
 Page/template fetching disabled, and no cache for 
MediaWiki:History_short");
 add("wt2html", "Special:Search page linking.", "Parser
 function implementation for pf_special missing in Parsoid.");
-add("wt2html", "Say the magic word", " 
Parser
 test\n \n Parser
 test\n Parser
 test\n Warning:
 Page/template fetching disabled, and no cache for 
Template:BASEPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:BASEPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:ROOTPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:ROOTPAGENAMEE\n 
Parser
 test\n Warning:
 Page/template fetching disabled, and no cache for 
Template:TALKPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTPAGENAME\n Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTPAGENAMEE\n Main\n Main\n \n Talk\n Warning:
 Page/template fetching disabled, and no cache for 
Template:TALKSPACEE\n 
Main\n Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTSPACEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:Dynamic");
+add("wt2html", "Say the magic word", " 
Parser
 test\n \n Parser
 test\n Parser
 test\n Warning:
 Page/template fetching disabled, and no cache for 
Template:BASEPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:BASEPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:ROOTPAGENAME\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:ROOTPAGENAMEE\n 
Parser
 test\n Warning:
 Page/template fetching disabled, and no cache for 
Template:TALKPAGENAMEE\n 
Warning:
 Page/template fetching disabled, and no cache for 
Template:SUBJECTPAGENAME\n Warning:
 Page/template fetching disabled, and no cache for

[MediaWiki-commits] [Gerrit] Labs instances: Exchange the order of the primary/secondary ... - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Labs instances: Exchange the order of the primary/secondary dns 
recursors.
..


Labs instances: Exchange the order of the primary/secondary dns recursors.

labs-recursor1 is assigned to labservices1001 which for the time being will
be the primary designate/dns box.

Also, change the timeout from 5 seconds to 2 seconds, because 5
was long enough to cause an alert storm when the primary went down.

Bug: T106303
Change-Id: I46ac38c344b53e772c3acf02d792a810fb6302f1
---
M hieradata/labs.yaml
M modules/base/templates/resolv.conf.labs.erb
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  coren: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index b3135ad..3232470 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -49,8 +49,8 @@
   "${::fqdn}": 1
 nrpe::allowed_hosts: '10.68.16.195'
 
-labs_recursor: "labs-recursor0.wikimedia.org"
-labs_recursor_secondary: "labs-recursor1.wikimedia.org"
+labs_recursor: "labs-recursor1.wikimedia.org"
+labs_recursor_secondary: "labs-recursor0.wikimedia.org"
 nfs_mounts:
   project: true
   home: true
diff --git a/modules/base/templates/resolv.conf.labs.erb 
b/modules/base/templates/resolv.conf.labs.erb
index 7495e29..12dd76f 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -8,4 +8,4 @@
 <% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
 nameserver <%= nsip %>
 <% end -%>
-options timeout:5 ndots:2
+options timeout:2 ndots:2

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

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

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

[MediaWiki-commits] [Gerrit] Set explicit referrer policy for WMF sites - change (operations/mediawiki-config)

2015-11-25 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: Set explicit referrer policy for WMF sites
..

Set explicit referrer policy for WMF sites

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index f644d24..310d52e 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11012,6 +11012,10 @@
'enwiktionary' => '/static/apple-touch/wiktionary/en.png', // T48431
 ),
 
+'wgReferrerPolicy' => array(
+   default => 'Origin When Cross-Origin',
+),
+
 'wgUserEmailUseReplyTo' => array(
'default' => false, // T14655
 ),

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

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

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

[MediaWiki-commits] [Gerrit] Fix issue with Accept-Language header for certain system lan... - change (apps...wikipedia)

2015-11-25 Thread Dbrant (Code Review)

Dbrant has uploaded a new change for review.

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

Change subject: Fix issue with Accept-Language header for certain system 
languages.
..

Fix issue with Accept-Language header for certain system languages.

The proper Locale was not being used when calling String.format(), which
was causing the resulting HTTP requests to fail.

Bug: T118910
Change-Id: I09e8c57d92eb969de816ed5025ad17f66aec386c
---
M app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java
1 file changed, 3 insertions(+), 1 deletion(-)


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

diff --git 
a/app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java 
b/app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java
index c8213f5..446a6ec 100644
--- a/app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java
+++ b/app/src/main/java/org/wikipedia/interlanguage/AcceptLanguageUtil.java
@@ -2,6 +2,8 @@
 
 import android.support.annotation.NonNull;
 
+import java.util.Locale;
+
 public final class AcceptLanguageUtil {
 private static final float APP_LANGUAGE_QUALITY = .9f;
 private static final float SYSTEM_LANGUAGE_QUALITY = .8f;
@@ -33,7 +35,7 @@
 }
 
 // Accept-language is nonempty, append the language.
-return String.format("%s,%s;q=%.1f", acceptLanguage, languageCode, 
quality);
+return String.format(Locale.ROOT, "%s,%s;q=%.1f", acceptLanguage, 
languageCode, quality);
 }
 
 private AcceptLanguageUtil() { }

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

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

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

[MediaWiki-commits] [Gerrit] Blog: Changed query assembly - change (mediawiki...BlueSpiceExtensions)

2015-11-25 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

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

Change subject: Blog: Changed query assembly
..

Blog: Changed query assembly

Changed the order of the query assembly because otherwise a the JOIN
condition for 'page_props' table would be applied to 'categorylinks'
table.

A SQL error would be the result.

Change-Id: Idf9c93ce92b2bab100f6feb4defcd81c4716e900
---
M Blog/Blog.class.php
1 file changed, 11 insertions(+), 11 deletions(-)


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

diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index d9a0d14..1b46ec4 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -537,6 +537,17 @@
 
$dbr = wfGetDB( DB_SLAVE );
 
+   if ( $argsSCategory ) {
+   $aTables[] = 'categorylinks';
+   $aConditions['cl_to'] = $argsSCategory;
+   $aConditions[] = 'cl_from = page_id';
+   } else {
+   if ( $argsModeNamespace === 'ns' ) {
+   $aConditions['page_id'] = $aArticleIds;
+   }
+   $aConditions['page_namespace'] = $argsINamespace;
+   }
+
// get blog entries
if( $argsSSortBy == 'title' ) {
$aOptions['ORDER BY'] = 'page_title ASC';
@@ -569,17 +580,6 @@
$aTables[] = 'page_props';
$aConditions[] = 'rev_page = page_id';
$aJoins['page_props'] = array( 'LEFT JOIN', "pp_page = 
rev_page AND pp_propname = 'blogtime'" );
-   }
-
-   if ( $argsSCategory ) {
-   $aTables[] = 'categorylinks';
-   $aConditions['cl_to'] = $argsSCategory;
-   $aConditions[] = 'cl_from = page_id';
-   } else {
-   if ( $argsModeNamespace === 'ns' ) {
-   $aConditions['page_id'] = $aArticleIds;
-   }
-   $aConditions['page_namespace'] = $argsINamespace;
}
 
$res = $dbr->select(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf9c93ce92b2bab100f6feb4defcd81c4716e900
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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

[MediaWiki-commits] [Gerrit] Add extension.json, empty PHP entry point - change (mediawiki...ConfirmEdit)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Add extension.json, empty PHP entry point
..


Add extension.json, empty PHP entry point

Changed README to README.md

Moved changelog from README.md to CHANGELOG.md

Bumped version to 1.4.0. And start following semver-notation.

Bug: T88047
Change-Id: I21f417d9f5985598358d53a0afae815543f001ee
(Cherry-picked from I21f417d9f5985598358d53a0afae815543f001ee)
---
A CHANGELOG.md
M ConfirmEdit.php
D README
A README.md
A extension.json
5 files changed, 303 insertions(+), 221 deletions(-)

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



diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..328ef15
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+ConfirmEdit Changelog
+=
+
+### Changelog
+
+ Version 1.2
+
+Fixes bug 46132 - ConfirmEdit fatal error when using MathCaptcha and current 
Math extension.
+See .
diff --git a/ConfirmEdit.php b/ConfirmEdit.php
index 0990a66..8116e5a 100755
--- a/ConfirmEdit.php
+++ b/ConfirmEdit.php
@@ -30,181 +30,17 @@
  * @ingroup Extensions
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'ConfirmEdit' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
+   $wgExtensionMessagesFiles['ConfirmEditAlias'] = __DIR__ . 
'/ConfirmEdit.alias.php';
+   /* wfWarn(
+   'Deprecated PHP entry point used for ConfirmEdit extension. ' .
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   ); */
+   return;
+} else {
+   die( 'This version of the ConfirmEdit extension requires MediaWiki 
1.25+' );
 }
-if ( !defined( 'MW_SUPPORTS_CONTENTHANDLER' ) ) {
-   throw new Exception( 'This version of ConfirmEdit requires MediaWiki 
1.21 or later' );
-}
-
-$wgExtensionCredits['antispam'][] = array(
-   'path' => __FILE__,
-   'name' => 'ConfirmEdit',
-   'author' => array( 'Brion Vibber', '...' ),
-   'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-   'version' => '1.3',
-   'descriptionmsg' => 'captcha-desc',
-   'license-name' => 'GPL-2.0+',
-);
-
-/**
- * The 'skipcaptcha' permission key can be given out to
- * let known-good users perform triggering actions without
- * having to go through the captcha.
- *
- * By default, sysops and registered bot accounts will be
- * able to skip, while others have to go through it.
- */
-$wgGroupPermissions['*']['skipcaptcha'] = false;
-$wgGroupPermissions['user' ]['skipcaptcha'] = false;
-$wgGroupPermissions['autoconfirmed']['skipcaptcha'] = false;
-$wgGroupPermissions['bot'  ]['skipcaptcha'] = true; // registered bots
-$wgGroupPermissions['sysop']['skipcaptcha'] = true;
-$wgAvailableRights[] = 'skipcaptcha';
-
-/**
- * List of IP ranges to allow to skip the captcha, similar to the group 
setting:
- * "$wgGroupPermission[...]['skipcaptcha'] = true"
- *
- * Specific IP addresses or CIDR-style ranges may be used,
- * for instance:
- * $wgCaptchaWhitelistIP = array('192.168.1.0/24', '10.1.0.0/16');
- */
-$wgCaptchaWhitelistIP = false;
-
-$wgCaptcha = null;
-$wgCaptchaClass = 'SimpleCaptcha';
-
-/**
- * Actions which can trigger a captcha
- *
- * If the 'edit' trigger is on, *every* edit will trigger the captcha.
- * This may be useful for protecting against vandalbot attacks.
- *
- * If using the default 'addurl' trigger, the captcha will trigger on
- * edits that include URLs that aren't in the current version of the page.
- * This should catch automated linkspammers without annoying people when
- * they make more typical edits.
- *
- * The captcha code should not use $wgCaptchaTriggers, but CaptchaTriggers()
- * which also takes into account per namespace triggering.
- */
-$wgCaptchaTriggers = array();
-$wgCaptchaTriggers['edit']  = false; // Would check on every edit
-$wgCaptchaTriggers['create']= false; // Check on page creation.
-$wgCaptchaTriggers['sendemail'] = false; // Special:Emailuser
-$wgCaptchaTriggers['addurl']= true;  // Check on edits that add URLs
-$wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin=signup
-$wgCaptchaTriggers['badlogin']  = true;  // Special:Userlogin after failure
-
-/**
- * You may wish to apply special rules for captcha triggering on some 
namespaces.
- * $wgCaptchaTriggersOnNamespace[][] forces an always 
on /
- * always off configuration with that trigger for the given namespace.
- * Leave unset to use the global options ($wgCaptchaTriggers).
- *
- * Shall not be used with 'createaccount' (it is not checked).
- */

[MediaWiki-commits] [Gerrit] Use mediawiki/vendor repository to fetch composer dependencies - change (mediawiki...release)

2015-11-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Use mediawiki/vendor repository to fetch composer dependencies
..

Use mediawiki/vendor repository to fetch composer dependencies

Bug: T108634
Change-Id: I58f0aee9f443fc08222053c841f3d7740da34382
---
M make-release/make-release.py
1 file changed, 2 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/01/255401/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index ed18e63..1ab5896 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -110,11 +110,6 @@
 help='Do not perform actions (e.g. git pull) that require the network'
 )
 parser.add_argument(
-'--composer', dest='composer',
-default='composer',
-help='Location to composer executable, defaults to `composer`'
-)
-parser.add_argument(
 '--list-bundled', dest='list_bundled',
 action='store_true',
 help='List all bundled extensions for the given version and quit'
@@ -450,22 +445,6 @@
 
 os.chdir(oldDir)
 
-def install_composer_dependencies(self, directory):
-if self.options.offline:
-logging.warning(
-'Composer dependencies cannot be fetched in offline mode')
-return
-cwd = os.getcwd()
-os.chdir(directory)
-logging.debug('Installing composer dependencies...')
-proc = subprocess.Popen([self.options.composer, 'install', '--no-dev'])
-if proc.wait() != 0:
-logging.error("Installing composer dependencies failed, exiting")
-sys.exit(1)
-
-os.chdir(cwd)
-logging.info("Fetched external composer dependencies")
-
 def export(self, gitRef, module, exportDir, patches=[]):
 
 gitRoot = self.options.gitroot
@@ -476,9 +455,9 @@
 self.getGit(gitRoot + '/core', dir, "core", gitRef)
 for patch in patches:
 self.applyPatch(patch, dir)
-# 1.25+ has composer dependencies.
+# 1.25+ has composer dependencies and needs mediawiki/vendor.
 if self.version.major >= '1.25' or self.version.major == 'snapshot':
-self.install_composer_dependencies(dir)
+self.getGit(gitRoot + '/vendor', dir, 'vendor', 
self.version.branch)
 
 logging.info('Done with exporting core')
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58f0aee9f443fc08222053c841f3d7740da34382
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] [WIP] BsInserFile/Image: Catched duplicate warning for equal... - change (mediawiki...BlueSpiceExtensions)

2015-11-25 Thread Pwirth (Code Review)

Pwirth has uploaded a new change for review.

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

Change subject: [WIP] BsInserFile/Image: Catched duplicate warning for equal 
files with different titles
..

[WIP] BsInserFile/Image: Catched duplicate warning for equal files with 
different titles

Change-Id: I0c357d72c9a65a45cf2b651b21b12620c6aae839
---
M InsertFile/resources/BS.InsertFile/UploadPanel.js
1 file changed, 39 insertions(+), 0 deletions(-)


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

diff --git a/InsertFile/resources/BS.InsertFile/UploadPanel.js 
b/InsertFile/resources/BS.InsertFile/UploadPanel.js
index 6589008..24d2a17 100644
--- a/InsertFile/resources/BS.InsertFile/UploadPanel.js
+++ b/InsertFile/resources/BS.InsertFile/UploadPanel.js
@@ -314,8 +314,47 @@
//create a suitable JS object from the XML response to be 
compatible
var uploadTag = response.responseXML
.documentElement.getElementsByTagName('upload').item(0);
+
var imageinfoTag = 
uploadTag.getElementsByTagName('imageinfo').item(0);
 
+   var warningsTag = 
uploadTag.getElementsByTagName('warnings').item(0);
+   if( warningsTag !== null && imageinfoTag === null ) {
+   var duplicate = 
warningsTag.getElementsByTagName('duplicate');
+   if( duplicate !== null && duplicate.length > 0 ) {
+   var dupUrls = '';
+   $.each(duplicate, function() {
+   //get urls to images
+   dupUrls = 
dupUrls+this.innerHTML+"";
+   console.log(this.innerHTML);
+   });
+   bs.util.alert(
+   this.getId()+'-existswarning',
+   {
+   titleMsg: 
'bs-extjs-title-warning',
+   text: 'duplicate message:' 
+ dupUrls
+   },
+   {
+   ok: function() {
+   //User is noticed. Now 
let's set the
+   //ignore warnings flag 
automatically
+   
this.cbxWarnings.setValue(true);
+   },
+   scope: this
+   }
+   );
+   return;
+   }
+   // Unknown warnings
+   bs.util.alert(
+   this.getId()+'-warning',
+   {
+   title: 
mw.message('bs-insertfile-error').plain(),
+   text: $(warningsTag).html()
+   }
+   );
+   return;
+   }
+
var imageinfo = {};
if( imageinfoTag.attributes ) {
for( var i = 0; i < imageinfoTag.attributes.length; i++ 
) {

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

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

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

[MediaWiki-commits] [Gerrit] Add throttle for newsletter creations - change (mediawiki...Newsletter)

2015-11-25 Thread Glaisher (Code Review)

Glaisher has uploaded a new change for review.

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

Change subject: Add throttle for newsletter creations
..

Add throttle for newsletter creations

Autoconfirmed users are allowed to create newsletters by default. This is a
pretty low user access level and could be abused easily. For instance, a
determined vandal could create lots of newsletters with abusive content
in a short period of time. To reduce the number of such cases, add a rate limit
for newsletter creations. By default, it is limited to 3 newsletter creations 
per hour.

Change-Id: Ia8da7055340163f4bdb4eb32857fd60952b400b3
---
M extension.json
M includes/specials/SpecialNewsletterCreate.php
2 files changed, 15 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/00/255400/1

diff --git a/extension.json b/extension.json
index 6a83a20..c10598f 100644
--- a/extension.json
+++ b/extension.json
@@ -23,6 +23,12 @@
"newsletter-manage": true
}
},
+"RateLimits": {
+   "newsletter":
+   {
+   "user": [ 3, 3600 ]
+   }
+   },
"SpecialPages": {
"NewsletterCreate": "SpecialNewsletterCreate",
"NewsletterManage": "SpecialNewsletterManage",
diff --git a/includes/specials/SpecialNewsletterCreate.php 
b/includes/specials/SpecialNewsletterCreate.php
index 8994823..b7e6db0 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -8,7 +8,6 @@
  */
 class SpecialNewsletterCreate extends FormSpecialPage {
 
-
public function __construct() {
parent::__construct( 'NewsletterCreate', 'newsletter-create' );
}
@@ -68,6 +67,13 @@
return array( 'newsletter-create-mainpage-error' );
}
 
+   $user = $this->getUser();
+   if ( $user->pingLimiter( 'newsletter' ) ) {
+   // Default user access level for creating a newsletter 
is quite low
+   // so add a throttle here to prevent abuse (eg. mass 
vandalism spree)
+   throw new ThrottledError;
+   }
+
$articleId = $mainTitle->getArticleId();
 
if ( isset( $data['name'] ) &&
@@ -83,12 +89,13 @@
);
 
if ( !$newsletterAdded ) {
+   // @todo FIXME: This shouldn't be thrown for 
main page key collisions
return array( 'newsletter-exist-error' );
}
 
$newsletter = $db->getNewsletterForPageId( $articleId );
 
-   $this->autoSubscribe( $newsletter->getId(), 
$this->getUser()->getId() );
+   $this->autoSubscribe( $newsletter->getId(), 
$user->getId() );
 
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8da7055340163f4bdb4eb32857fd60952b400b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher 

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

[MediaWiki-commits] [Gerrit] Add active_users tracking back - change (analytics/limn-wikidata-data)

2015-11-25 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Add active_users tracking back
..

Add active_users tracking back

Change-Id: Ifadd3670c73ebea52cc73040067826423ec0034e
---
M daily_site_stats.sh
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-wikidata-data 
refs/changes/07/255407/1

diff --git a/daily_site_stats.sh b/daily_site_stats.sh
index 093a087..0791562 100755
--- a/daily_site_stats.sh
+++ b/daily_site_stats.sh
@@ -3,6 +3,7 @@
 ~/wikidata-data/graphite/site_stats/good_articles.sh
 ~/wikidata-data/graphite/site_stats/total_edits.sh
 ~/wikidata-data/graphite/site_stats/total_pages.sh
+~/wikidata-data/graphite/site_stats/active_users.sh
 ~/wikidata-data/graphite/site_stats/users.sh
 ~/wikidata-data/graphite/site_stats/admins.sh
 ~/wikidata-data/graphite/site_stats/bureaucrats.sh

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifadd3670c73ebea52cc73040067826423ec0034e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Use mediawiki/vendor repository to fetch composer dependencies - change (mediawiki...release)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Use mediawiki/vendor repository to fetch composer dependencies
..


Use mediawiki/vendor repository to fetch composer dependencies

Bug: T108634
Change-Id: I58f0aee9f443fc08222053c841f3d7740da34382
---
M make-release/make-release.py
1 file changed, 3 insertions(+), 23 deletions(-)

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



diff --git a/make-release/make-release.py b/make-release/make-release.py
index ed18e63..86cfb42 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -110,11 +110,6 @@
 help='Do not perform actions (e.g. git pull) that require the network'
 )
 parser.add_argument(
-'--composer', dest='composer',
-default='composer',
-help='Location to composer executable, defaults to `composer`'
-)
-parser.add_argument(
 '--list-bundled', dest='list_bundled',
 action='store_true',
 help='List all bundled extensions for the given version and quit'
@@ -450,22 +445,6 @@
 
 os.chdir(oldDir)
 
-def install_composer_dependencies(self, directory):
-if self.options.offline:
-logging.warning(
-'Composer dependencies cannot be fetched in offline mode')
-return
-cwd = os.getcwd()
-os.chdir(directory)
-logging.debug('Installing composer dependencies...')
-proc = subprocess.Popen([self.options.composer, 'install', '--no-dev'])
-if proc.wait() != 0:
-logging.error("Installing composer dependencies failed, exiting")
-sys.exit(1)
-
-os.chdir(cwd)
-logging.info("Fetched external composer dependencies")
-
 def export(self, gitRef, module, exportDir, patches=[]):
 
 gitRoot = self.options.gitroot
@@ -476,9 +455,10 @@
 self.getGit(gitRoot + '/core', dir, "core", gitRef)
 for patch in patches:
 self.applyPatch(patch, dir)
-# 1.25+ has composer dependencies.
+# 1.25+ has composer dependencies and needs mediawiki/vendor.
 if self.version.major >= '1.25' or self.version.major == 'snapshot':
-self.install_composer_dependencies(dir)
+self.getGit(gitRoot + '/vendor', dir + '/vendor',
+'vendor', self.version.branch)
 
 logging.info('Done with exporting core')
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58f0aee9f443fc08222053c841f3d7740da34382
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Chad 
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] Updated RuboCop to the latest version - change (mediawiki...PdfHandler)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Updated RuboCop to the latest version
..


Updated RuboCop to the latest version

Updated config file with recommended configuration. Regenerated TODO
file.

See:
https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#Base_confi
guration
Bug: T117986

Change-Id: Id3047b5dc2c9d6db520ba2863646f618a30537ac
---
M .rubocop.yml
M .rubocop_todo.yml
M Gemfile
M Gemfile.lock
4 files changed, 36 insertions(+), 16 deletions(-)

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



diff --git a/.rubocop.yml b/.rubocop.yml
index cc32da4..870a41b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1 +1,23 @@
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+  StyleGuideCopsOnly: true
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
+Style/SignalException:
+  Enabled: false
+
+# uncomment when fixed
+# Style/StringLiterals:
+#   EnforcedStyle: single_quotes
+
+Style/TrivialAccessors:
+  ExactNameMatch: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index da767e2..f0de6d2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,16 +1,12 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-10-21 15:55:46 +0200 using RuboCop version 0.26.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-11-25 15:48:57 +0100 using RuboCop version 0.35.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/LeadingCommentSpace:
-  Enabled: false
-
-# Offense count: 6
+# Offense count: 15
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles.
 Style/StringLiterals:
diff --git a/Gemfile b/Gemfile
index 45f75d7..429c07d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
 source "https://rubygems.org;
 
 gem "mediawiki_selenium", "~> 1.6.2"
-gem "rubocop", "~> 0.26.1", require: false
+gem "rubocop", "~> 0.35.1", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7afed8e..47934de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,9 +59,9 @@
   watir-webdriver (>= 0.6.11)
 page_navigation (0.9)
   data_magic (>= 0.14)
-parser (2.3.0.pre.3)
+parser (2.2.3.0)
   ast (>= 1.1, < 3.0)
-powerpack (0.0.9)
+powerpack (0.1.1)
 rainbow (2.0.0)
 rest-client (1.8.0)
   http-cookie (>= 1.0.2, < 2.0)
@@ -70,12 +70,13 @@
 rspec-core (2.99.2)
 rspec-expectations (2.99.2)
   diff-lcs (>= 1.1.3, < 2.0)
-rubocop (0.26.1)
+rubocop (0.35.1)
   astrolabe (~> 1.3)
-  parser (>= 2.2.0.pre.4, < 3.0)
-  powerpack (~> 0.0.6)
+  parser (>= 2.2.3.0, < 3.0)
+  powerpack (~> 0.1)
   rainbow (>= 1.99.1, < 3.0)
-  ruby-progressbar (~> 1.4)
+  ruby-progressbar (~> 1.7)
+  tins (<= 1.6.0)
 ruby-progressbar (1.7.5)
 rubyzip (1.1.7)
 selenium-webdriver (2.48.1)
@@ -85,6 +86,7 @@
   websocket (~> 1.0)
 syntax (1.2.0)
 thor (0.19.1)
+tins (1.6.0)
 unf (0.1.4)
   unf_ext
 unf_ext (0.0.7.1)
@@ -98,4 +100,4 @@
 
 DEPENDENCIES
   mediawiki_selenium (~> 1.6.2)
-  rubocop (~> 0.26.1)
+  rubocop (~> 0.35.1)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3047b5dc2c9d6db520ba2863646f618a30537ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PdfHandler
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs resolv.conf: don't sort the array of resolvers. - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Labs resolv.conf:  don't sort the array of resolvers.
..


Labs resolv.conf:  don't sort the array of resolvers.

Sorting meant that we had no control over which was primary and which
was secondary.

Bug: T106303
Change-Id: Id0341728ae0b97b4d35708ab797a567b2746a32a
---
M modules/base/templates/resolv.conf.labs.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  coren: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/base/templates/resolv.conf.labs.erb 
b/modules/base/templates/resolv.conf.labs.erb
index 12dd76f..973fe43 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -5,7 +5,7 @@
 
 domain <%= @labsproject %>.<%= @site %>.wmflabs
 search <%= @labsproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs
-<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
+<% scope.lookupvar('::nameservers').each do |nsip| -%>
 nameserver <%= nsip %>
 <% end -%>
 options timeout:2 ndots:2

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

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

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

[MediaWiki-commits] [Gerrit] openstack: catch nodepool up with manifest reorg - change (operations/puppet)

2015-11-25 Thread Rush (Code Review)

Rush has submitted this change and it was merged.

Change subject: openstack: catch nodepool up with manifest reorg
..


openstack: catch nodepool up with manifest reorg

Change-Id: I75250bc36be660f6dfa49cca47971c1ecd6c19f5
---
R hieradata/role/eqiad/labs/openstack/nodepool.yaml
M manifests/site.pp
R modules/role/manifests/labs/openstack/nodepool.pp
3 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/role/common/nodepool.yaml 
b/hieradata/role/eqiad/labs/openstack/nodepool.yaml
similarity index 100%
rename from hieradata/role/common/nodepool.yaml
rename to hieradata/role/eqiad/labs/openstack/nodepool.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index c003a8f..31714c3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1204,7 +1204,7 @@
 
 node 'labnodepool1001.eqiad.wmnet' {
 $nagios_contact_group = 'admins,contint'
-role nodepool
+role labs::openstack::nodepool
 include standard
 include base::firewall
 }
diff --git a/manifests/role/nodepool.pp 
b/modules/role/manifests/labs/openstack/nodepool.pp
similarity index 97%
rename from manifests/role/nodepool.pp
rename to modules/role/manifests/labs/openstack/nodepool.pp
index a5f4e0e..2a03cc5 100644
--- a/manifests/role/nodepool.pp
+++ b/modules/role/manifests/labs/openstack/nodepool.pp
@@ -4,9 +4,10 @@
 # https://wikitech.wikimedia.org/wiki/Nodepool
 # http://docs.openstack.org/infra/nodepool/
 #
-class role::nodepool {
+class role::labs::openstack::nodepool {
 
 system::role { 'role::nodepool': description => 'CI Nodepool' }
+
 include passwords::nodepool
 $nova_controller = hiera('labs_nova_controller')
 

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

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

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

[MediaWiki-commits] [Gerrit] Remove old getclaims script - change (analytics/limn-wikidata-data)

2015-11-25 Thread Addshore (Code Review)

Addshore has submitted this change and it was merged.

Change subject: Remove old getclaims script
..


Remove old getclaims script

Change-Id: Ibf59226835ebf1fd8a76de4c302ab722b0f2dd47
---
M cron
D graphite/api/getclaims_property_use.sh
2 files changed, 1 insertion(+), 44 deletions(-)

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



diff --git a/cron b/cron
index b39b3a6..1c75d59 100644
--- a/cron
+++ b/cron
@@ -13,4 +13,4 @@
 
 # Logrotate is at 6:25, + time for rsync (hourly?), 12 gives us roughly 6 hours
 # This MUST be run on stat1002
-0 12 * * * ~/wikidata-data/graphite/api/getclaims_property_use.sh
+0 12 * * * php ~/wikidata-data/graphite/api/logScanner.php
diff --git a/graphite/api/getclaims_property_use.sh 
b/graphite/api/getclaims_property_use.sh
deleted file mode 100755
index d32572c..000
--- a/graphite/api/getclaims_property_use.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# @author Addshore
-#
-# This shows the number of calls to the wbgetclaims api module broken down by 
property for a 24 hour period.
-# This metric is taken from the api.log file archives generated on fluorine 
that are rsynced to stat1002.
-# The 24 hour period is from 00:00 to 23:59 UTC.
-
-# Run for date given, or yesterday
-if [ $# -eq 0 ]; then
-dateISO=`date --date=yesterday --iso-8601=date`
-else
-dateISO=$1
-fi
-nextDateISO=`date --date="$dateISO + 1 day" --iso-8601=date`
-
-# Get a date stamp to be used later
-dateStamp=`echo $dateISO | tr -d '-'`
-nextDateStamp=`echo $nextDateISO | tr -d '-'`
-
-# Get the location of the last api log
-apilog="/a/mw-log/archive/api/api.log-$dateStamp.gz"
-nextapilog="/a/mw-log/archive/api/api.log-$nextDateStamp.gz"
-
-# Make sure the files we want exist
-if [ ! -f $apilog ]; then
-echo "File not found: (apilog) $apilog"
-exit;
-fi
-if [ ! -f $nextApilog ]; then
-echo "File not found: (nextapilog) $nextapilog"
-exit;
-fi
-
-# Run the main command
-output=`zgrep $dateISO $apilog $nextapilog | grep action=wbgetclaims | grep 
wikidatawiki | egrep -o 'property=P[0-9]+' | sort | uniq -c | sort -nr`
-
-# Iterate over each line and add to graphite
-while read -r line; do
-property=`cut -d "=" -f 2 <<< "$line"`
-value=`cut -d " " -f 1 <<< "$line"`
-echo "daily.wikidata.api.wbgetclaims.properties.$property 
$value `date -d \"$dateStamp\" +%s`" | nc -q0 graphite.eqiad.wmnet 2003
-done <<< "$output"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf59226835ebf1fd8a76de4c302ab722b0f2dd47
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 

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

[MediaWiki-commits] [Gerrit] Modify updateMwData in MathDialog to update display and id a... - change (mediawiki...Math)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Modify updateMwData in MathDialog to update display and id 
attributes
..


Modify updateMwData in MathDialog to update display and id attributes

Also populate the options form with pre-existing values and add event
handlers.

Bug: T119663
Change-Id: I32fbecdb9b204fa33e309662f1f670942968fee7
---
M modules/ve-math/ve.ui.MWMathDialog.js
1 file changed, 31 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-math/ve.ui.MWMathDialog.js 
b/modules/ve-math/ve.ui.MWMathDialog.js
index a23f51b..ef9612a 100644
--- a/modules/ve-math/ve.ui.MWMathDialog.js
+++ b/modules/ve-math/ve.ui.MWMathDialog.js
@@ -203,9 +203,18 @@
 ve.ui.MWMathDialog.prototype.getSetupProcess = function ( data ) {
return ve.ui.MWMathDialog.super.prototype.getSetupProcess.call( this, 
data )
.next( function () {
-   var display = ( this.selectedNode && 
this.selectedNode.getAttribute( 'mw' ).attrs.display ) || 'default';
-   this.input.on( 'change', this.onChangeHandler );
+   var attributes = this.selectedNode && 
this.selectedNode.getAttribute( 'mw' ).attrs,
+   display = attributes && attributes.display || 
'default',
+   id = attributes && attributes.id || '';
+
+   // Populate form
this.displaySelect.selectItemByData( display );
+   this.idInput.setValue( id );
+
+   // Add event handlers
+   this.input.on( 'change', this.onChangeHandler );
+   this.displaySelect.on( 'choose', this.onChangeHandler );
+   this.idInput.on( 'change', this.onChangeHandler );
}, this );
 };
 
@@ -226,12 +235,32 @@
return ve.ui.MWMathDialog.super.prototype.getTeardownProcess.call( 
this, data )
.first( function () {
this.input.off( 'change', this.onChangeHandler );
+   this.displaySelect.off( 'choose', this.onChangeHandler 
);
+   this.idInput.off( 'change', this.onChangeHandler );
}, this );
 };
 
 /**
  * @inheritdoc
  */
+ ve.ui.MWMathDialog.prototype.updateMwData = function ( mwData ) {
+   var display, id;
+
+   // Parent method
+   ve.ui.MWMathDialog.super.prototype.updateMwData.call( this, mwData );
+
+   // Get data from dialog
+   display = this.displaySelect.getSelectedItem().getData();
+   id = this.idInput.getValue();
+
+   // Update attributes
+   mwData.attrs.display = display !== 'default' ? display : undefined;
+   mwData.attrs.id = id || undefined;
+ };
+
+/**
+ * @inheritdoc
+ */
 ve.ui.MWMathDialog.prototype.getBodyHeight = function () {
return 600;
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32fbecdb9b204fa33e309662f1f670942968fee7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Ensure the formula preview in MathDialog is vertically centered - change (mediawiki...Math)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Ensure the formula preview in MathDialog is vertically centered
..


Ensure the formula preview in MathDialog is vertically centered

The formula preview is not centered when the display attribute
is set to block. Correct this by enforcing display: inline-block
when the math image is inside the preview element.

Bug: T119670
Change-Id: I77d9b213a31d3005212c8c11874112ddb64aa74a
---
M modules/ve-math/ve.ui.MWMathDialog.css
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve-math/ve.ui.MWMathDialog.css 
b/modules/ve-math/ve.ui.MWMathDialog.css
index 7098c57..00bbe1b 100644
--- a/modules/ve-math/ve.ui.MWMathDialog.css
+++ b/modules/ve-math/ve.ui.MWMathDialog.css
@@ -70,6 +70,11 @@
height: 10em;
 }
 
+/* Ensures the preview image is vertically centred */
+.ve-ui-mwMathDialog-preview .mwe-math-fallback-image-display {
+   display: inline-block;
+}
+
 .ve-ui-mwMathPage-outline {
padding: 0.5em;
color: #555;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77d9b213a31d3005212c8c11874112ddb64aa74a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] api log scanner format whitelist - change (analytics/limn-wikidata-data)

2015-11-25 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: api log scanner format whitelist
..

api log scanner format whitelist

Also move checks of validity to
just before writing to graphite.

Change-Id: Ic701035a06d66d6b357d3694ec426b263069ec38
---
M graphite/api/logScanner.php
1 file changed, 19 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-wikidata-data 
refs/changes/64/255464/1

diff --git a/graphite/api/logScanner.php b/graphite/api/logScanner.php
index 8a90541..81283e2 100644
--- a/graphite/api/logScanner.php
+++ b/graphite/api/logScanner.php
@@ -18,6 +18,17 @@
private $dayAfter;
private $targetDate;
 
+   private $formatWhitelist = array(
+   'dbg', 'dbgfm',
+   'json', 'jsonfm',
+   'php', 'phpfm',
+   'raw', 'rawfm',
+   'txt', 'txtfm',
+   'xmlk', 'xmlfm',
+   'yaml', 'yamlfm',
+   'none',
+   );
+
/**
 * @param string $targetDate must be parse-able by PHP
 */
@@ -66,9 +77,7 @@
// Extract the property 
(if set)
if( $propertyStart = ( 
strpos( $line, ' property=' ) + 10 ) ) {
$property = 
strtoupper( substr( $line, $propertyStart, strpos( $line, ' ', $propertyStart ) 
- $propertyStart ) );
-   if( strpos( 
$property, 'P' ) === 0 ) {
-   
@$counters['wbgetclaims.properties'][$property]++;
-   }
+   
@$counters['wbgetclaims.properties'][$property]++;
}
 
}
@@ -79,9 +88,7 @@
// Extract the format (if set)
if( $formatStart = ( strpos( $line, ' format=' 
) + 8 ) ) {
$format = strtolower( substr( $line, 
$formatStart, strpos( $line, ' ', $formatStart ) - $formatStart ) );
-   if( $format !== '' ) {
-   
@$counters['formats'][$format]++;
-   }
+   @$counters['formats'][$format]++;
}
 
}
@@ -91,6 +98,12 @@
// Send everything to graphite!
foreach( $counters as $name => $counter ) {
foreach( $counter as $key => $value ) {
+   if(
+   ( $name == 'wbgetclaims.properties' && 
strpos( $key, 'P' ) !== 0 ) ||
+   ( $name == 'formats' && !in_array( 
$key, $this->formatWhitelist ) )
+   ) {
+   continue;
+   }
$this->sendMetric(
'daily.wikidata.api.' . $name . '.' . 
$key,
$value

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic701035a06d66d6b357d3694ec426b263069ec38
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Migrate rdb1007 to jobqueue_redis - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Migrate rdb1007 to jobqueue_redis
..

Migrate rdb1007 to jobqueue_redis

Change-Id: If438ab38415ceaccec92a50aac176a5841714882
---
D hieradata/hosts/rdb1007.yaml
M manifests/role/redisdb.pp
M manifests/site.pp
3 files changed, 10 insertions(+), 73 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/255470/1

diff --git a/hieradata/hosts/rdb1007.yaml b/hieradata/hosts/rdb1007.yaml
deleted file mode 100644
index 315f3cd..000
--- a/hieradata/hosts/rdb1007.yaml
+++ /dev/null
@@ -1 +0,0 @@
-role::db::redis::dir: "/srv/redis"
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index 0dabdb0..38f9088 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -15,81 +15,19 @@
 
 ferm::service { 'redis-server':
 proto  => 'tcp',
-port   => '(6379 6380 6381)',
+port   => '6379',
 srange => '$ALL_NETWORKS',
 }
 
-$defaults = {
-bind=> '0.0.0.0',
-appendonly  => true,
-auto_aof_rewrite_min_size   => '512mb',
-client_output_buffer_limit  => 'slave 512mb 200mb 60',
-dir => '/srv/redis',
-masterauth  => $passwords::redis::main_password,
-maxmemory   => '10Gb',
-no_appendfsync_on_rewrite   => true,
-requirepass => $passwords::redis::main_password,
-save=> '',
-stop_writes_on_bgsave_error => false,
-slave_read_only => false,
+class { '::redis::legacy':
+maxmemory => $maxmemory,
+dir   => $dir,
+persist   => 'aof',
+redis_replication => $redis_replication,
+password  => $passwords::redis::main_password,
 }
 
-if $::hostname == 'rdb1008' {
-redis::instance { 6379:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6379.aof",
-dbfilename  => "${::hostname}-6379.rdb",
-slaveof => 'rdb1007 6379',
-}),
-}
-
-redis::instance { 6380:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6380.aof",
-dbfilename  => "${::hostname}-6380.rdb",
-slaveof => 'rdb1007 6380',
-}),
-}
-
-redis::instance { 6381:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6381.aof",
-dbfilename  => "${::hostname}-6381.rdb",
-slaveof => 'rdb1007 6381',
-}),
-}
-} elsif $::hostname == 'rdb1007' {
-redis::instance { 6379:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6379.aof",
-dbfilename  => "${::hostname}-6379.rdb",
-}),
-}
-
-redis::instance { 6380:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6380.aof",
-dbfilename  => "${::hostname}-6380.rdb",
-}),
-}
-
-redis::instance { 6381:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6381.aof",
-dbfilename  => "${::hostname}-6381.rdb",
-}),
-}
-} else {
-class { '::redis::legacy':
-maxmemory => $maxmemory,
-dir   => $dir,
-persist   => 'aof',
-redis_replication => $redis_replication,
-password  => $passwords::redis::main_password,
-}
-
-if $::standard::has_ganglia {
-include redis::ganglia
-}
+if $::standard::has_ganglia {
+include redis::ganglia
 }
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index 3a0e997..7596016 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2166,7 +2166,7 @@
 role rcstream
 }
 
-node 'rdb1008.eqiad.wmnet' {
+node 'rdb1007.eqiad.wmnet', 'rdb1008.eqiad.wmnet' {
 role jobqueue_redis
 }
 

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

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

___
MediaWiki-commits

[MediaWiki-commits] [Gerrit] Make it possible to download a MW tarball without 2 301s and... - change (mediawiki...release)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Make it possible to download a MW tarball without 2 301s and a 
302
..


Make it possible to download a MW tarball without 2 301s and a 302

Change-Id: I40104da2882ee2efc1d53c00dbdd756ceb6ed17e
---
M make-release/make-release.py
1 file changed, 6 insertions(+), 10 deletions(-)

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



diff --git a/make-release/make-release.py b/make-release/make-release.py
index 86cfb42..be9b4cf 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -670,30 +670,26 @@
 print()
 print('*' * 70)
 
+releaseServer = 'https://releases.wikimedia.org/mediawiki/'
 print('Download:')
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + package + '.tar.gz')
+print(releaseServer + dir + '/' + package + '.tar.gz')
 print()
 
 if prevVersion is not None:
 if haveI18n:
 print("Patch to previous version (" + prevVersion +
   "), without interface text:")
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + package + '.patch.gz')
+print(releaseServer + dir + '/' + package + '.patch.gz')
 print("Interface text changes:")
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + i18nPatch)
+print(releaseServer + dir + '/' + i18nPatch)
 else:
 print("Patch to previous version (" + prevVersion + "):")
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + package + '.patch.gz')
+print(releaseServer + dir + '/' + package + '.patch.gz')
 print()
 
 print('GPG signatures:')
 for fileName in outFiles:
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + fileName + '.sig')
+print(releaseServer + dir + '/' + fileName + '.sig')
 print()
 
 print('Public keys:')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40104da2882ee2efc1d53c00dbdd756ceb6ed17e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Implement vega 2.0 support - change (mediawiki...Graph)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Implement vega 2.0 support
..


Implement vega 2.0 support

By default, use the $wgGraphDefaultVegaVer version,
but if the default is 1 and any of the graphs on a page
contain "version" tag higher than 1, use vega2.

Note: js/graph1.js and js/graph2.js are almost identical on purpose:
the graph1 should go away as soon as we migrate to Vega 2.0.

the d3.layout.cloud.js was removed as it wasn't being used at the moment.

Bug: T106103
Change-Id: I562080995111af8aee652842e360fe456326150e
---
M Graph.body.php
M extension.json
R js/graph1.js
A js/graph2.js
M lib/d3.js
D lib/d3.layout.cloud.js
R lib/vega1/vega.js
A lib/vega2/vega.js
8 files changed, 21,631 insertions(+), 546 deletions(-)

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




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

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

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

[MediaWiki-commits] [Gerrit] Split out WikiPage 'page' field for EditPage - change (mediawiki/core)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Split out WikiPage 'page' field for EditPage
..


Split out WikiPage 'page' field for EditPage

* This fixes numerous IDEA warnings
* Also fixed some other warnings by fixing documentation

Change-Id: I2a76ce79c0d04a28a6cd74116dfce4e67435f44a
---
M includes/EditPage.php
M includes/page/WikiPage.php
2 files changed, 29 insertions(+), 19 deletions(-)

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



diff --git a/includes/EditPage.php b/includes/EditPage.php
index 2bddc3e..96db74d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -201,6 +201,8 @@
 
/** @var Article */
public $mArticle;
+   /** @var WikiPage */
+   private $page;
 
/** @var Title */
public $mTitle;
@@ -399,6 +401,7 @@
 */
public function __construct( Article $article ) {
$this->mArticle = $article;
+   $this->page = $article->getPage(); // model object
$this->mTitle = $article->getTitle();
 
$this->contentModel = $this->mTitle->getContentModel();
@@ -1002,6 +1005,7 @@
 * for saving, preview parsing and so on...
 *
 * @param WebRequest $request
+* @return string|null
 */
protected function importContentFormData( &$request ) {
return; // Don't do anything, EditPage already extracted 
wpTextbox1
@@ -1014,7 +1018,7 @@
 */
function initialiseForm() {
global $wgUser;
-   $this->edittime = $this->mArticle->getTimestamp();
+   $this->edittime = $this->page->getTimestamp();
 
$content = $this->getContentObject( false ); # TODO: track 
content object?!
if ( $content === false ) {
@@ -1098,13 +1102,13 @@
!$undorev->isDeleted( 
Revision::DELETED_TEXT ) &&
!$oldrev->isDeleted( 
Revision::DELETED_TEXT )
) {
-   $content = 
$this->mArticle->getUndoContent( $undorev, $oldrev );
+   $content = 
$this->page->getUndoContent( $undorev, $oldrev );
 
if ( $content === false ) {
# Warn the user that 
something went wrong
$undoMsg = 'failure';
} else {
-   $oldContent = 
$this->mArticle->getPage()->getContent( Revision::RAW );
+   $oldContent = 
$this->page->getContent( Revision::RAW );
$popts = 
ParserOptions::newFromUserAndLang( $wgUser, $wgContLang );
$newContent = 
$content->preSaveTransform( $this->mTitle, $wgUser, $popts );
 
@@ -1207,7 +1211,7 @@
 * @return Content
 */
protected function getCurrentContent() {
-   $rev = $this->mArticle->getRevision();
+   $rev = $this->page->getRevision();
$content = $rev ? $rev->getContent( Revision::RAW ) : null;
 
if ( $content === false || $content === null ) {
@@ -1337,7 +1341,7 @@
 * @param int $statusValue The status value (to check for new article 
status)
 */
protected function setPostEditCookie( $statusValue ) {
-   $revisionId = $this->mArticle->getLatest();
+   $revisionId = $this->page->getLatest();
$postEditKey = self::POST_EDIT_COOKIE_KEY_PREFIX . $revisionId;
 
$val = 'saved';
@@ -1760,8 +1764,8 @@
 
# Load the page data from the master. If anything changes in 
the meantime,
# we detect it by using page_latest like a token in a 1 try 
compare-and-swap.
-   $this->mArticle->loadPageData( 'fromdbmaster' );
-   $new = !$this->mArticle->exists();
+   $this->page->loadPageData( 'fromdbmaster' );
+   $new = !$this->page->exists();
 
if ( $new ) {
// Late check for create permission, just in case 
*PARANOIA*
@@ -1813,16 +1817,16 @@
 
# Article exists. Check for edit conflict.
 
-   $this->mArticle->clear(); # Force reload of dates, etc.
-   $timestamp = $this->mArticle->getTimestamp();
+   $this->page->clear(); # Force reload of dates, etc.
+   $timestamp = $this->page->getTimestamp();
 
wfDebug( "timestamp: {$timestamp}, edittime:

[MediaWiki-commits] [Gerrit] isBlockedTrigger should use meta+ for macs, not cmd+ - change (VisualEditor/VisualEditor)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: isBlockedTrigger should use meta+ for macs, not cmd+
..


isBlockedTrigger should use meta+ for macs, not cmd+

Change-Id: I75ccbb4c9ed80beefd48866431d316fc09065dff
---
M src/ce/ve.ce.Surface.js
1 file changed, 1 insertion(+), 1 deletion(-)

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

Objections:
  Esanders: There's a problem with this change, please improve



diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 5d6ec68..d8b4f30 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1082,7 +1082,7 @@
 ve.ce.Surface.prototype.isBlockedTrigger = function ( trigger ) {
var platformKey = ve.getSystemPlatform() === 'mac' ? 'mac' : 'pc',
blocked = {
-   mac: [ 'cmd+b', 'cmd+i', 'cmd+u', 'cmd+z', 'cmd+y', 
'cmd+shift+z', 'tab', 'shift+tab' ],
+   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab' ],
pc: [ 'ctrl+b', 'ctrl+i', 'ctrl+u', 'ctrl+z', 'ctrl+y', 
'ctrl+shift+z', 'tab', 'shift+tab' ]
};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75ccbb4c9ed80beefd48866431d316fc09065dff
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 
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] [proof of concept] Make ContextSource traitable - change (mediawiki/core)

2015-11-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: [proof of concept] Make ContextSource traitable
..

[proof of concept] Make ContextSource traitable

As discussed in 
https://tools.wmflabs.org/meetbot/wikimedia-office/2015/wikimedia-office.2015-11-25-22.00.html
 ,
this is a demo of how traits can be used. Not to be merged, of course :)

Change-Id: I6f6faaeabe8f71820031e69627114b402d43dad1
---
M autoload.php
M includes/OutputPage.php
M includes/context/ContextSource.php
A includes/context/TContextSource.php
M includes/utils/AutoloadGenerator.php
M tests/phpunit/structure/AutoLoaderTest.php
6 files changed, 184 insertions(+), 174 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/255484/1

diff --git a/autoload.php b/autoload.php
index 2844dc7..ff9389e 100644
--- a/autoload.php
+++ b/autoload.php
@@ -164,8 +164,8 @@
'BenchIfSwitch' => __DIR__ . 
'/maintenance/benchmarks/bench_if_switch.php',
'BenchStrtrStrReplace' => __DIR__ . 
'/maintenance/benchmarks/bench_strtr_str_replace.php',
'BenchUtf8TitleCheck' => __DIR__ . 
'/maintenance/benchmarks/bench_utf8_title_check.php',
-   'BenchWikimediaBaseConvert' => __DIR__ . 
'/maintenance/benchmarks/bench_Wikimedia_base_convert.php',
'BenchWfIsWindows' => __DIR__ . 
'/maintenance/benchmarks/bench_wfIsWindows.php',
+   'BenchWikimediaBaseConvert' => __DIR__ . 
'/maintenance/benchmarks/bench_Wikimedia_base_convert.php',
'BenchmarkDeleteTruncate' => __DIR__ . 
'/maintenance/benchmarks/bench_delete_truncate.php',
'BenchmarkHooks' => __DIR__ . 
'/maintenance/benchmarks/benchmarkHooks.php',
'BenchmarkParse' => __DIR__ . 
'/maintenance/benchmarks/benchmarkParse.php',
@@ -1232,6 +1232,7 @@
'SwiftFileOpHandle' => __DIR__ . 
'/includes/filebackend/SwiftFileBackend.php',
'SwiftVirtualRESTService' => __DIR__ . 
'/includes/libs/virtualrest/SwiftVirtualRESTService.php',
'SyncFileBackend' => __DIR__ . '/maintenance/syncFileBackend.php',
+   'TContextSource' => __DIR__ . '/includes/context/TContextSource.php',
'TableCleanup' => __DIR__ . '/maintenance/cleanupTable.inc',
'TableCleanupTest' => __DIR__ . '/maintenance/cleanupTable.inc',
'TableDiffFormatter' => __DIR__ . 
'/includes/diff/TableDiffFormatter.php',
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c35204d..c869147 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -38,7 +38,9 @@
  *
  * @todo document
  */
-class OutputPage extends ContextSource {
+class OutputPage implements IContextSource {
+   use TContextSource;
+
/** @var array Should be private. Used with addMeta() which adds 
"" */
protected $mMetatags = array();
 
diff --git a/includes/context/ContextSource.php 
b/includes/context/ContextSource.php
index a8850fc..3d50c85 100644
--- a/includes/context/ContextSource.php
+++ b/includes/context/ContextSource.php
@@ -26,175 +26,5 @@
  * @since 1.18
  */
 abstract class ContextSource implements IContextSource {
-   /**
-* @var IContextSource
-*/
-   private $context;
-
-   /**
-* Get the base IContextSource object
-* @since 1.18
-* @return IContextSource
-*/
-   public function getContext() {
-   if ( $this->context === null ) {
-   $class = get_class( $this );
-   wfDebug( __METHOD__ . " ($class): called and \$context 
is null. " .
-   "Using RequestContext::getMain() for sanity\n" 
);
-   $this->context = RequestContext::getMain();
-   }
-
-   return $this->context;
-   }
-
-   /**
-* Set the IContextSource object
-*
-* @since 1.18
-* @param IContextSource $context
-*/
-   public function setContext( IContextSource $context ) {
-   $this->context = $context;
-   }
-
-   /**
-* Get the Config object
-*
-* @since 1.23
-* @return Config
-*/
-   public function getConfig() {
-   return $this->getContext()->getConfig();
-   }
-
-   /**
-* Get the WebRequest object
-*
-* @since 1.18
-* @return WebRequest
-*/
-   public function getRequest() {
-   return $this->getContext()->getRequest();
-   }
-
-   /**
-* Get the Title object
-*
-* @since 1.18
-* @return Title|null
-*/
-   public function getTitle() {
-   return $this->getContext()->getTitle();
-   }
-
-   /**
-* Check whether a WikiPage object can be get with getWikiPage().
-* Callers should expect that an exception is thrown from getWikiPage()
-* if this method returns false.

[MediaWiki-commits] [Gerrit] Migrate rdb1004 to jobqueue_redis role - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

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

Change subject: Migrate rdb1004 to jobqueue_redis role
..


Migrate rdb1004 to jobqueue_redis role

Change-Id: Id834e26eb6ce20cc2ff52dbcd54ef04b1ac847c5
---
A hieradata/hosts/rdb1004.yaml
M manifests/site.pp
2 files changed, 3 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/hosts/rdb1004.yaml b/hieradata/hosts/rdb1004.yaml
new file mode 100644
index 000..fb3d0a6
--- /dev/null
+++ b/hieradata/hosts/rdb1004.yaml
@@ -0,0 +1 @@
+jobqueue_redis_slaveof: rdb1003
diff --git a/manifests/site.pp b/manifests/site.pp
index cbdfe16..043476c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2164,11 +2164,11 @@
 role rcstream
 }
 
-node 'rdb1007.eqiad.wmnet', 'rdb1008.eqiad.wmnet' {
+node 'rdb1004.eqiad.wmnet', 'rdb1007.eqiad.wmnet', 'rdb1008.eqiad.wmnet' {
 role jobqueue_redis
 }
 
-node /^rdb100[0-7]\.eqiad\.wmnet/ {
+node /^rdb100[0-3]\.eqiad\.wmnet/ {
 role redisdb
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id834e26eb6ce20cc2ff52dbcd54ef04b1ac847c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] api log scanner format whitelist - change (analytics/limn-wikidata-data)

2015-11-25 Thread Addshore (Code Review)

Addshore has submitted this change and it was merged.

Change subject: api log scanner format whitelist
..


api log scanner format whitelist

Also move checks of validity to
just before writing to graphite.

Change-Id: Ic701035a06d66d6b357d3694ec426b263069ec38
---
M graphite/api/logScanner.php
1 file changed, 19 insertions(+), 6 deletions(-)

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



diff --git a/graphite/api/logScanner.php b/graphite/api/logScanner.php
index 8a90541..81283e2 100644
--- a/graphite/api/logScanner.php
+++ b/graphite/api/logScanner.php
@@ -18,6 +18,17 @@
private $dayAfter;
private $targetDate;
 
+   private $formatWhitelist = array(
+   'dbg', 'dbgfm',
+   'json', 'jsonfm',
+   'php', 'phpfm',
+   'raw', 'rawfm',
+   'txt', 'txtfm',
+   'xmlk', 'xmlfm',
+   'yaml', 'yamlfm',
+   'none',
+   );
+
/**
 * @param string $targetDate must be parse-able by PHP
 */
@@ -66,9 +77,7 @@
// Extract the property 
(if set)
if( $propertyStart = ( 
strpos( $line, ' property=' ) + 10 ) ) {
$property = 
strtoupper( substr( $line, $propertyStart, strpos( $line, ' ', $propertyStart ) 
- $propertyStart ) );
-   if( strpos( 
$property, 'P' ) === 0 ) {
-   
@$counters['wbgetclaims.properties'][$property]++;
-   }
+   
@$counters['wbgetclaims.properties'][$property]++;
}
 
}
@@ -79,9 +88,7 @@
// Extract the format (if set)
if( $formatStart = ( strpos( $line, ' format=' 
) + 8 ) ) {
$format = strtolower( substr( $line, 
$formatStart, strpos( $line, ' ', $formatStart ) - $formatStart ) );
-   if( $format !== '' ) {
-   
@$counters['formats'][$format]++;
-   }
+   @$counters['formats'][$format]++;
}
 
}
@@ -91,6 +98,12 @@
// Send everything to graphite!
foreach( $counters as $name => $counter ) {
foreach( $counter as $key => $value ) {
+   if(
+   ( $name == 'wbgetclaims.properties' && 
strpos( $key, 'P' ) !== 0 ) ||
+   ( $name == 'formats' && !in_array( 
$key, $this->formatWhitelist ) )
+   ) {
+   continue;
+   }
$this->sendMetric(
'daily.wikidata.api.' . $name . '.' . 
$key,
$value

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic701035a06d66d6b357d3694ec426b263069ec38
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Remove old getclaims script - change (analytics/limn-wikidata-data)

2015-11-25 Thread Addshore (Code Review)

Addshore has uploaded a new change for review.

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

Change subject: Remove old getclaims script
..

Remove old getclaims script

Change-Id: Ibf59226835ebf1fd8a76de4c302ab722b0f2dd47
---
M cron
D graphite/api/getclaims_property_use.sh
2 files changed, 1 insertion(+), 44 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-wikidata-data 
refs/changes/65/255465/1

diff --git a/cron b/cron
index b39b3a6..1c75d59 100644
--- a/cron
+++ b/cron
@@ -13,4 +13,4 @@
 
 # Logrotate is at 6:25, + time for rsync (hourly?), 12 gives us roughly 6 hours
 # This MUST be run on stat1002
-0 12 * * * ~/wikidata-data/graphite/api/getclaims_property_use.sh
+0 12 * * * php ~/wikidata-data/graphite/api/logScanner.php
diff --git a/graphite/api/getclaims_property_use.sh 
b/graphite/api/getclaims_property_use.sh
deleted file mode 100755
index d32572c..000
--- a/graphite/api/getclaims_property_use.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# @author Addshore
-#
-# This shows the number of calls to the wbgetclaims api module broken down by 
property for a 24 hour period.
-# This metric is taken from the api.log file archives generated on fluorine 
that are rsynced to stat1002.
-# The 24 hour period is from 00:00 to 23:59 UTC.
-
-# Run for date given, or yesterday
-if [ $# -eq 0 ]; then
-dateISO=`date --date=yesterday --iso-8601=date`
-else
-dateISO=$1
-fi
-nextDateISO=`date --date="$dateISO + 1 day" --iso-8601=date`
-
-# Get a date stamp to be used later
-dateStamp=`echo $dateISO | tr -d '-'`
-nextDateStamp=`echo $nextDateISO | tr -d '-'`
-
-# Get the location of the last api log
-apilog="/a/mw-log/archive/api/api.log-$dateStamp.gz"
-nextapilog="/a/mw-log/archive/api/api.log-$nextDateStamp.gz"
-
-# Make sure the files we want exist
-if [ ! -f $apilog ]; then
-echo "File not found: (apilog) $apilog"
-exit;
-fi
-if [ ! -f $nextApilog ]; then
-echo "File not found: (nextapilog) $nextapilog"
-exit;
-fi
-
-# Run the main command
-output=`zgrep $dateISO $apilog $nextapilog | grep action=wbgetclaims | grep 
wikidatawiki | egrep -o 'property=P[0-9]+' | sort | uniq -c | sort -nr`
-
-# Iterate over each line and add to graphite
-while read -r line; do
-property=`cut -d "=" -f 2 <<< "$line"`
-value=`cut -d " " -f 1 <<< "$line"`
-echo "daily.wikidata.api.wbgetclaims.properties.$property 
$value `date -d \"$dateStamp\" +%s`" | nc -q0 graphite.eqiad.wmnet 2003
-done <<< "$output"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf59226835ebf1fd8a76de4c302ab722b0f2dd47
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-wikidata-data
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] Openstack: Removed redundant admin_token settings in a coupl... - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Openstack: Removed redundant admin_token settings in a couple 
of places.
..

Openstack: Removed redundant admin_token settings in a couple of places.

I don't see how these can have been doing anything; testing suggests
they weren't.

Change-Id: I2d17b342b171ce30e3cb8c5782621e4be3b50bd4
---
M modules/openstack/templates/kilo/designate/designate.conf.erb
M modules/openstack/templates/kilo/glance/glance-api.conf.erb
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/255466/1

diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 1a37051..b57efd3 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -103,7 +103,6 @@
 auth_host = <%= @designateconfig["keystone_auth_host"] %>
 auth_port = <%= @designateconfig["keystone_auth_port"] %>
 auth_protocol = <%= @designateconfig["keystone_auth_protocol"] %>
-admin_token = ADMIN
 admin_token = <%= @designateconfig["keystone_admin_token"] %>
 auth_uri = <%= @designateconfig["auth_uri"] %>
 
diff --git a/modules/openstack/templates/kilo/glance/glance-api.conf.erb 
b/modules/openstack/templates/kilo/glance/glance-api.conf.erb
index b1e397d..c3c6faf 100644
--- a/modules/openstack/templates/kilo/glance/glance-api.conf.erb
+++ b/modules/openstack/templates/kilo/glance/glance-api.conf.erb
@@ -284,7 +284,6 @@
 service_host = <%= @glanceconfig["keystone_auth_host"] %>
 service_port = 5000
 identity_uri = <%= @glanceconfig["keystone_auth_protocol"] %>://<%= 
@glanceconfig["keystone_auth_host"] %>:<%= @glanceconfig["keystone_auth_port"] 
%>
-admin_token = ADMIN
 admin_token = <%= @glanceconfig["keystone_admin_token"] %>
 auth_uri = <%= @glanceconfig["auth_uri"] %>/v2.0
 

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

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

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

[MediaWiki-commits] [Gerrit] Change behavior of keydownhandler execution - change (VisualEditor/VisualEditor)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Change behavior of keydownhandler execution
..


Change behavior of keydownhandler execution

Now returns whether it thinks it actually did something, rather than
whether a handler exists at all. This is mostly relevant for the list
tab trigger, which would otherwise be suppressed if we added a linear
tab handler for table movement.

Change-Id: Ie9cbcda90ba5658d6864ddd88cb0a777b174a5a5
---
M src/ce/keydownhandlers/ve.ce.LinearArrowKeyDownHandler.js
M src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
M src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js
M src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js
M src/ce/keydownhandlers/ve.ce.TableArrowKeyDownHandler.js
M src/ce/keydownhandlers/ve.ce.TableDeleteKeyDownHandler.js
M src/ce/keydownhandlers/ve.ce.TableEnterKeyDownHandler.js
M src/ce/ve.ce.KeyDownHandler.js
M src/ce/ve.ce.KeyDownHandlerFactory.js
9 files changed, 33 insertions(+), 18 deletions(-)

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



diff --git a/src/ce/keydownhandlers/ve.ce.LinearArrowKeyDownHandler.js 
b/src/ce/keydownhandlers/ve.ce.LinearArrowKeyDownHandler.js
index 13021e3..7398cba 100644
--- a/src/ce/keydownhandlers/ve.ce.LinearArrowKeyDownHandler.js
+++ b/src/ce/keydownhandlers/ve.ce.LinearArrowKeyDownHandler.js
@@ -70,7 +70,7 @@
);
surface.model.setLinearSelection( range );
e.preventDefault();
-   return;
+   return true;
}
 
if ( surface.focusedNode ) {
@@ -99,7 +99,7 @@
);
surface.model.setLinearSelection( range );
e.preventDefault();
-   return;
+   return true;
}
// Else inline focusable node
 
@@ -120,7 +120,7 @@
if ( !upOrDown ) {
// un-shifted left/right: we've already moved 
so preventDefault
e.preventDefault();
-   return;
+   return true;
}
// Else keep going with the cursor in the new place
}
@@ -196,6 +196,8 @@
surface.updateActiveLink();
surface.surfaceObserver.pollOnce();
} } );
+
+   return true;
 };
 
 /* Registration */
diff --git a/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js 
b/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
index 6432ffa..3f99649 100644
--- a/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
+++ b/src/ce/keydownhandlers/ve.ce.LinearDeleteKeyDownHandler.js
@@ -73,7 +73,7 @@
surface.eventSequencer.afterOne( {
keydown: surface.surfaceObserver.pollOnce.bind( 
surface.surfaceObserver )
} );
-   return;
+   return true;
}
 
// If the native action would delete an outside nail, move 
*two* cursor positions
@@ -91,7 +91,7 @@
surface.nativeSelection.addRange( range );
surface.updateActiveLink();
e.preventDefault();
-   return;
+   return true;
}
 
// If inside an empty link, delete it and preventDefault
@@ -135,7 +135,7 @@
surface.nativeSelection.addRange( range );
surface.updateActiveLink();
e.preventDefault();
-   return;
+   return true;
}
 
// If the native action would delete an inside nail, move *two* 
cursor positions
@@ -153,7 +153,7 @@
surface.nativeSelection.addRange( range );
surface.updateActiveLink();
e.preventDefault();
-   return;
+   return true;
}
 
offset = rangeToRemove.start;
@@ -164,7 +164,7 @@
surface.eventSequencer.afterOne( {
keydown: surface.surfaceObserver.pollOnce.bind( 
surface.surfaceObserver )
} );
-   return;
+   return true;
}
}
 
@@ -175,7 +175,7 @@
tableEditingRange = surface.getActiveTableNode() ? 
surface.getActiveTableNode().getEditingRange() : null;
if ( tableEditingRange && !tableEditingRange.containsRange( 
rangeToRemove ) ) {
e.preventDefault();
-   return;
+   return true;
}

[MediaWiki-commits] [Gerrit] Pass actual message keys to MWOAuthException - change (mediawiki...OAuth)

2015-11-25 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Pass actual message keys to MWOAuthException
..

Pass actual message keys to MWOAuthException

For some reason MWOAuthServer was passing things that weren't defined
message keys in several cases.

Change-Id: I72f9a011bf138345abf9b578e4ea01ad5aaed493
---
M backend/MWOAuthServer.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth 
refs/changes/71/255471/1

diff --git a/backend/MWOAuthServer.php b/backend/MWOAuthServer.php
index be5b5a5..c0ba27a 100644
--- a/backend/MWOAuthServer.php
+++ b/backend/MWOAuthServer.php
@@ -28,7 +28,7 @@
 
// Consumer must have a key for us to verify
if ( !$consumer->get( 'secretKey' ) && !$consumer->get( 
'rsaKey' ) ) {
-   throw new MWOAuthException( 'invalid-consumer' );
+   throw new MWOAuthException( 
'mwoauthserver-consumer-no-secret' );
}
 
$this->checkSourceIP( $consumer, $request );
@@ -68,26 +68,26 @@
private function checkCallback( $consumer, $callback ) {
if ( !$consumer->get( 'callbackIsPrefix' ) ) {
if ( $callback !== 'oob' ) {
-   throw new MWOAuthException( 'callback-not-oob' 
);
+   throw new MWOAuthException( 
'mwoauth-callback-not-oob' );
}
 
return;
}
 
if ( !$callback ) {
-   throw new MWOAuthException( 
'callback-not-oob-or-prefix' );
+   throw new MWOAuthException( 
'mwoauth-callback-not-oob-or-prefix' );
}
if ( $callback === 'oob' ) {
return;
}
 
if ( wfParseUrl( $callback ) === null ) {
-   throw new MWOAuthException( 
'callback-not-oob-or-prefix' );
+   throw new MWOAuthException( 
'mwoauth-callback-not-oob-or-prefix' );
}
 
$consumerCallback = $consumer->get( 'callbackUrl' );
if ( substr( $callback, 0, strlen( $consumerCallback ) ) !== 
$consumerCallback ) {
-   throw new MWOAuthException( 
'callback-not-oob-or-prefix' );
+   throw new MWOAuthException( 
'mwoauth-callback-not-oob-or-prefix' );
}
 
return;
@@ -108,7 +108,7 @@
 
// Consumer must have a key for us to verify
if ( !$consumer->get( 'secretKey' ) && !$consumer->get( 
'rsaKey' ) ) {
-   throw new MWOAuthException( 'invalid-consumer' );
+   throw new MWOAuthException( 
'mwoauthserver-consumer-no-secret' );
}
 
$this->checkSourceIP( $consumer, $request );
@@ -118,7 +118,7 @@
 
if ( !$token->secret ) {
// This token has a blank secret.. something is wrong
-   throw new MWOAuthException( 'bad-token' );
+   throw new MWOAuthException( 
'mwoauthdatastore-bad-token' );
}
 
$this->check_signature( $request, $consumer, $token );
@@ -155,7 +155,7 @@
$requestIP = $request->getSourceIP();
 
if ( !isset( $restrictions['IPAddresses'] ) ) {
-   throw new MWOAuthException( 'bad-source-ip' ); // 
sanity; should not happen
+   throw new MWOAuthException( 
'mwoauthdatastore-bad-source-ip' ); // sanity; should not happen
}
 
foreach ( $restrictions['IPAddresses'] as $range ) {
@@ -164,7 +164,7 @@
}
}
 
-   throw new MWOAuthException( 'bad-source-ip' );
+   throw new MWOAuthException( 'mwoauthdatastore-bad-source-ip' );
}
 
/**
diff --git a/i18n/en.json b/i18n/en.json
index 1e5f1e1..8616f1d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -198,6 +198,7 @@
"mwoauthserver-insufficient-rights": "Your account is not allowed to 
use Connected Apps, contact your site administrator to find out why.\n\nInsufficient OAuth user rights, 
[https://www.mediawiki.org/wiki/Help:OAuth/Errors#E007 E007]",
"mwoauthserver-invalid-request-token": "Invalid token in your request.",
"mwoauthserver-invalid-user": "To use Connected Apps on this site, you 
must have an account across all projects. When you have an account on all 
projects, you can try to connect \"$1\" again.\n\nUnified login needed, 
[https://www.mediawiki.org/wiki/Help:OAuth/Errors#E008 E008]",
+   "mwoauthserver-consumer-no-secret": "Sorry, something went wrong 
connecting this application.\n\nConsumer has no secret

[MediaWiki-commits] [Gerrit] add the redis instance on rdb1007:6381 to queue servers config - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: add the redis instance on rdb1007:6381 to queue servers config
..

add the redis instance on rdb1007:6381 to queue servers config

Change-Id: I6d1b8db95a816a5fc9d7e64f389e3db5216b1492
---
M hieradata/eqiad/mediawiki/jobrunner.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/255475/1

diff --git a/hieradata/eqiad/mediawiki/jobrunner.yaml 
b/hieradata/eqiad/mediawiki/jobrunner.yaml
index 3ebf3e3..a56186d 100644
--- a/hieradata/eqiad/mediawiki/jobrunner.yaml
+++ b/hieradata/eqiad/mediawiki/jobrunner.yaml
@@ -3,6 +3,7 @@
   - rdb1003.eqiad.wmnet
   - rdb1007.eqiad.wmnet
   - rdb1007.eqiad.wmnet:6380
+  - rdb1007.eqiad.wmnet:6381
 aggr_servers:
   - rdb1001.eqiad.wmnet
   - rdb1003.eqiad.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] Fix typo in comment - change (mediawiki...ExtensionDistributor)

2015-11-25 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Fix typo in comment
..

Fix typo in comment

Change-Id: If35908e0520ab3c4c6b0d9102d7cefdf987d793c
---
M resources/ext.extensiondistributor.special.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExtensionDistributor 
refs/changes/76/255476/1

diff --git a/resources/ext.extensiondistributor.special.js 
b/resources/ext.extensiondistributor.special.js
index 1b1a7ee..9df8d13 100644
--- a/resources/ext.extensiondistributor.special.js
+++ b/resources/ext.extensiondistributor.special.js
@@ -75,7 +75,7 @@
params = {
action: 'query',
list: 'extdistbranches',
-   // Set maxage of 30 minutes, which is same as 
server-side cach
+   // Set maxage of 30 minutes, which is same as 
server-side cache
maxage: 30 * 60,
smaxage: 30 * 60
};

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

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

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

[MediaWiki-commits] [Gerrit] add the redis instance on rdb1007:6381 to queue servers config - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

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

Change subject: add the redis instance on rdb1007:6381 to queue servers config
..


add the redis instance on rdb1007:6381 to queue servers config

Change-Id: I6d1b8db95a816a5fc9d7e64f389e3db5216b1492
---
M hieradata/eqiad/mediawiki/jobrunner.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/eqiad/mediawiki/jobrunner.yaml 
b/hieradata/eqiad/mediawiki/jobrunner.yaml
index 3ebf3e3..a56186d 100644
--- a/hieradata/eqiad/mediawiki/jobrunner.yaml
+++ b/hieradata/eqiad/mediawiki/jobrunner.yaml
@@ -3,6 +3,7 @@
   - rdb1003.eqiad.wmnet
   - rdb1007.eqiad.wmnet
   - rdb1007.eqiad.wmnet:6380
+  - rdb1007.eqiad.wmnet:6381
 aggr_servers:
   - rdb1001.eqiad.wmnet
   - rdb1003.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d1b8db95a816a5fc9d7e64f389e3db5216b1492
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Draft steps 4-6 - change (mediawiki...MathSearch)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Draft steps 4-6
..


Draft steps 4-6

Change-Id: I709317c40a4c522e4161cb26fee0c4e2b5a8fc7e
---
M includes/special/SpecialMlpEval.php
1 file changed, 8 insertions(+), 0 deletions(-)

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



diff --git a/includes/special/SpecialMlpEval.php 
b/includes/special/SpecialMlpEval.php
index 6f0e429..a03e27c 100644
--- a/includes/special/SpecialMlpEval.php
+++ b/includes/special/SpecialMlpEval.php
@@ -276,10 +276,18 @@
$this->DisplayRendering( 
$mo->getUserInputTex(), 'png' );
break;
case self::STEP_IDENTIFIERS:
+   $this->enableMathStyles();
+   $mo = MathObject::newFromRevisionText( 
$this->oldId, $this->fId );
+   $md = $mo->getTexInfo();
+   $this->printSource( var_export( 
$md->getIdentifiers(), true ) );
break;
case self::STEP_DEFINITIONS:
+   $this->enableMathStyles();
+   $mo = MathObject::newFromRevisionText( 
$this->oldId, $this->fId );
+   $this->printSource( var_export( 
$mo->getRelations(), true ) );
break;
case self::STEP_FINISHED:
+   $out->addWikiText( 'thank you' );
}
 
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I709317c40a4c522e4161cb26fee0c4e2b5a8fc7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt 
Gerrit-Reviewer: Dyiop 
Gerrit-Reviewer: Hcohl 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: Whyameri 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] We're always doing releases > 1.17 now - change (mediawiki...release)

2015-11-25 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: We're always doing releases > 1.17 now
..

We're always doing releases > 1.17 now

Change-Id: I2e9f959ed0d9100c422a969d3f6135e118f890b3
---
M make-release/make-release.py
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/79/255479/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index be9b4cf..b3b3609 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -660,9 +660,7 @@
 print()
 print("Full release notes:")
 url = ('https://git.wikimedia.org/blob/mediawiki%2Fcore.git/' +
-   branch + '/RELEASE-NOTES')
-if dir > '1.17':
-url += '-' + dir
+   branch + '/RELEASE-NOTES' + dir)
 
 print(url)
 print('https://www.mediawiki.org/wiki/Release_notes/' + dir)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e9f959ed0d9100c422a969d3f6135e118f890b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
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] Improved "images in table" handling - change (mediawiki...BlueSpiceExtensions)

2015-11-25 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

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

Change subject: Improved "images in table" handling
..

Improved "images in table" handling

Images or links in tables may contain | in their attributes,
esp. in bs-data-*. These need to be properly escaped in order
not to interfere with table syntax

Change-Id: I9774710fc5b150aa1faa915c543bdd71ee87ed10
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js 
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index dd7e88d..67dfb1e 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -752,6 +752,13 @@
// in first pass, some double empty lines remain, therefore, a 
second pass is necessary
text = text.replace(/\n\n/gmi, "\n@@blindline@@\n");
text = text.replace(/\n\n/gmi, "\n@@blindline@@\n");
+
+   // images or links in tables may contain | in their attributes, 
esp. in bs-data-*. These
+   // need to be properly escaped in order not to interfere with 
table syntax
+   while (text.match(/(\<[^\>]*?)(\|)([^\>]*?\>)/g)) {
+   text = text.replace(/(\<[^\>]*?)(\|)([^\>]*?\>)/g, 
"$1@@pipe@@$3");
+   }
+
lines = text.split(/\n/);
 
for (var i = 0; i < lines.length; i++) {
@@ -931,6 +938,7 @@
 
text = lines.join("\n");
text = text.replace(/@@blindline@@/gmi, '');
+   text = text.replace(/@@pipe@@/gmi, '|');
 
return text;
}

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

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

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (3163552) - change (mediawiki...VisualEditor)

2015-11-25 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Update VE core submodule to master (3163552)
..

Update VE core submodule to master (3163552)

New changes:
cd57cf5 Do not skip past adjacent unicorn in different branch node
6c6780a Add documentation to setupOutlineItem in SpecialCharacterPage
6f6d4a8 DimensionsWidget: Check for numeric-ness of inputs
d2cd646 Fix range mapping logic for node merging on deletion
6891355 build: Be more consistent in globs' applicability
1a420be Localisation updates from https://translatewiki.net.
8e562c6 Add parameter to SpecialCharacterDialog onListClick documentation
5087b94 Localisation updates from https://translatewiki.net.
d9961d7 Update OOjs UI to v0.14.0
b89ea54 Add tab and shift+tab to blocked triggers list
5510f84 Change behavior of keydownhandler execution
3163552 isBlockedTrigger should use meta+ for macs, not cmd+

Change-Id: I3b856fc21c63b3af3ebfd6be8852c5f7f2d11461
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/lib/ve b/lib/ve
index 0e19dde..3163552 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 0e19dde01de640caf7807aa6826933ce941c398b
+Subproject commit 31635528d05f244853df689102aa09e9bcadfb59

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b856fc21c63b3af3ebfd6be8852c5f7f2d11461
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] Merge master into deployment - change (wikimedia...crm)

2015-11-25 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: Merge master into deployment
..

Merge master into deployment

88a79666ee63073d58537262754033fbca5a04bb update civicrm submodule

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


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/89/255489/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia522cf44b6fbccbde1eb4a14f2aae220598b11ba
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] BsExtendedSearch: Fixed Fatal in indexCrawledDocuments - change (mediawiki...BlueSpiceExtensions)

2015-11-25 Thread Pwirth (Code Review)

Pwirth has uploaded a new change for review.

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

Change subject: BsExtendedSearch: Fixed Fatal in indexCrawledDocuments
..

BsExtendedSearch: Fixed Fatal in indexCrawledDocuments

* Added is_null after wfLocalFile before proccessing

Change-Id: If2a221efd5d3642399b982f882653adbf6e13afc
---
M ExtendedSearch/includes/BuildIndex/BuildIndexMwRepository.class.php
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git 
a/ExtendedSearch/includes/BuildIndex/BuildIndexMwRepository.class.php 
b/ExtendedSearch/includes/BuildIndex/BuildIndexMwRepository.class.php
index 90ef0e1..810340c 100644
--- a/ExtendedSearch/includes/BuildIndex/BuildIndexMwRepository.class.php
+++ b/ExtendedSearch/includes/BuildIndex/BuildIndexMwRepository.class.php
@@ -97,6 +97,9 @@
 
$oTitle = Title::newFromText( $document->img_name, 
NS_FILE );
$oFile = wfLocalFile( $oTitle );
+   if( is_null($oFile) ) {
+   continue;
+   }
$sVirtualPath = $oFile->getPath();
$oFileRepoLocalRef = 
$oFile->getRepo()->getLocalReference( $sVirtualPath );
if ( is_null( $oFileRepoLocalRef ) ) continue;

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

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

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

[MediaWiki-commits] [Gerrit] Add grunt-jscs - change (mediawiki...CodeReview)

2015-11-25 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Add grunt-jscs
..

Add grunt-jscs

Change-Id: Ifc164690132a85808ad5301754e276b63915ddd6
---
A .jscsrc
M Gruntfile.js
M package.json
3 files changed, 14 insertions(+), 2 deletions(-)


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

diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..b1232a3
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,7 @@
+{
+   "preset": "wikimedia",
+   "validateQuoteMarks": null,
+   "requireVarDeclFirst": null,
+   "requireMultipleVarDecl": null,
+   "requireCamelCaseOrUpperCaseIdentifiers": null
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 9725424..4a46bae 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,6 +11,7 @@
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
 
grunt.initConfig( {
jshint: {
@@ -22,6 +23,9 @@
'!node_modules/**'
]
},
+   jscs: {
+   src: '<%= jshint.all %>'
+   },
banana: conf.MessagesDirs,
jsonlint: {
all: [
@@ -31,6 +35,6 @@
}
} );
 
-   grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 94fd835..f7d6059 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
 "grunt-cli": "0.1.13",
 "grunt-contrib-jshint": "0.11.3",
 "grunt-banana-checker": "0.4.0",
-"grunt-jsonlint": "1.0.6"
+"grunt-jsonlint": "1.0.6",
+"grunt-jscs": "2.3.0"
   }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Improve layout and Logic of MLP eval interface - change (mediawiki...MathSearch)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Improve layout and Logic of MLP eval interface
..


Improve layout and Logic of MLP eval interface

* Update to modern OOUIHTMLForm
* Seperate form handling and specialclass logic
* Remove page completion for non OOUI controls

Change-Id: I84533407b9db6062a5c01c6760e7173dbd95a870
---
M extension.json
A includes/MathHighlighter.php
M includes/MathIdGenerator.php
A includes/MlpEvalForm.php
M includes/special/SpecialMlpEval.php
D modules/ext.MathSearch.autocomplete.js
6 files changed, 280 insertions(+), 216 deletions(-)

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



diff --git a/extension.json b/extension.json
index fcd58d6..9d5035f 100644
--- a/extension.json
+++ b/extension.json
@@ -30,7 +30,9 @@
"SpecialMathDownloadResult": "SpecialMathDownloadResult.php",
"MathoidDriver": "includes/MathoidDriver.php",
"MathosphereDriver": "includes/MathosphereDriver.php",
-   "MathIdGenerator": "includes/MathIdGenerator.php"
+   "MathIdGenerator": "includes/MathIdGenerator.php",
+   "MathHighlighter": "includes/MathHighlighter.php",
+   "MlpEvalForm": "includes/MlpEvalForm.php"
},
"AvailableRights": [
"mathwmcsubmit"
@@ -85,17 +87,9 @@
"desktop",
"mobile"
]
-   },
-   "ext.MathSearch.special": {
-   "scripts": [
-   "ext.MathSearch.autocomplete.js"
-   ],
-   "dependencies": [
-   "jquery.ui.autocomplete"
-   ]
}
-
},
+
"ResourceFileModulePaths": {
"localBasePath": "modules",
"remoteExtPath": "MathSearch/modules"
diff --git a/includes/MathHighlighter.php b/includes/MathHighlighter.php
new file mode 100644
index 000..88dd84e
--- /dev/null
+++ b/includes/MathHighlighter.php
@@ -0,0 +1,78 @@
+getUniqueFromId( $fId );
+   $wikiText = $gen->getWikiText();
+   $tagPos = strpos( $wikiText, $unique );
+   $startPos = $this->getStartPos( $tagPos, $wikiText );
+   $length = $this->getEndPos( $tagPos, $wikiText ) - $startPos;
+   $wikiText = substr( $wikiText, $startPos, $length );
+   $tag = $gen->getTagFromId( $fId );
+   $wikiText = str_replace( $unique,
+   '' . $tag[3] . '',
+   $wikiText );
+   foreach ( $gen->getMathTags() as $key => $content ) {
+   $wikiText = str_replace( $key, $content[3], $wikiText );
+   }
+   $this->wikiText = "== Extract ==\nStart of the 
extract...\n\n$wikiText\n\n...end of the extract";
+   }
+
+   /**
+* @param $tagPos
+* @param $wikiText
+* @return int
+*/
+   private function getStartPos( $tagPos, $wikiText ) {
+   $startPos = max( $tagPos - round( self::WINDOW_SIZE / 2 ), 0 );
+   if ( $startPos > 0 ) {
+   // Heuristics to find a reasonable cutting point
+   $newPos = strpos( $wikiText, "\n", $startPos );
+   if ( $newPos !== false && ( $newPos - $startPos ) < 
round( self::WINDOW_SIZE / 4 ) ) {
+   // only change startPos, if it seems reasonable
+   $startPos = $newPos;
+   }
+   }
+   return $startPos;
+   }
+
+   /**
+* @param $wikiText
+* @param $tagPos
+* @return bool|int|mixed
+*/
+   private function getEndPos( $tagPos, $wikiText ) {
+   $halfWindow = round( self::WINDOW_SIZE / 2 );
+   $distance2End = strlen( $wikiText ) - $tagPos;
+   if ( $distance2End > $halfWindow ) {
+   $newPos = strpos( $wikiText, "\n", $tagPos + 
$halfWindow );
+   if ( $newPos !== false && ( $newPos - $tagPos ) < 
round( 3 / 4 * self::WINDOW_SIZE ) ) {
+   // only change startPos, if it seems reasonable
+   return $newPos;
+   } else {
+   return $tagPos + $halfWindow;
+   }
+   } else {
+   return strlen( $wikiText );
+   }
+   }
+
+   /**
+* @return string
+*/
+   public function getWikiText() {
+   return $this->wikiText;
+   }
+
+}
diff --git a/includes/MathIdGenerator.php b/includes/MathIdGenerator.php
index 500bd1e..b98a298 100644
--- a/includes/MathIdGenerator.php
+++

[MediaWiki-commits] [Gerrit] Prep REL1_26 for general release - change (mediawiki/core)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Prep REL1_26 for general release
..


Prep REL1_26 for general release

Change-Id: Ia26f820c14891b97ee9a7c3cebf490273d8e6c7d
---
M RELEASE-NOTES-1.26
M includes/DefaultSettings.php
2 files changed, 1 insertion(+), 6 deletions(-)

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



diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index ac2f947..81405f5 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -3,11 +3,6 @@
 
 == MediaWiki 1.26 ==
 
-THIS IS NOT A RELEASE YET
-
-MediaWiki 1.26 is an alpha-quality branch and is not recommended for use in
-production.
-
 === Configuration changes in 1.26 ===
 * $wgPasswordResetRoutes['email'] = true by default.
 * $wgEnableParserCache was deprecated, set $wgParserCacheType to CACHE_NONE
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0efcb03..268a8d1 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.26alpha';
+$wgVersion = '1.26.0';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia26f820c14891b97ee9a7c3cebf490273d8e6c7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
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] Added support for underline - change (mediawiki...BlueSpiceExtensions)

2015-11-25 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

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

Change subject: Added support for underline
..

Added support for underline

Underline tag  is now parsed correctly on roundtrips. Was converted
to  before.

Change-Id: Ib71d9bcef4ba2f27ab9f7174b73e01ab0ff77300
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js 
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index 4196872..dd7e88d 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -1412,6 +1412,7 @@
//underline needs no conversion
text = text.replace(/(.*?)<\/strike>/gi, "$1");
text = text.replace(/(.*?)<\/span>/gi, "$1");
+   text = text.replace(/(.*?)<\/span>/gi, "$1");
//sub and sup need no conversion
 
text = text.replace(/]*>/gmi, 
"@@br_emptyline_first@@");

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

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

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

[MediaWiki-commits] [Gerrit] Focus input and move cursor to end when MathDialog opens - change (mediawiki...Math)

2015-11-25 Thread Tchanders (Code Review)

Tchanders has uploaded a new change for review.

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

Change subject: Focus input and move cursor to end when MathDialog opens
..

Focus input and move cursor to end when MathDialog opens

Change-Id: Ie963913723b8c5f8ffb32701477627387c77eb85
---
M modules/ve-math/ve.ui.MWMathDialog.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/ve-math/ve.ui.MWMathDialog.js 
b/modules/ve-math/ve.ui.MWMathDialog.js
index ef9612a..7d22f6c 100644
--- a/modules/ve-math/ve.ui.MWMathDialog.js
+++ b/modules/ve-math/ve.ui.MWMathDialog.js
@@ -224,6 +224,7 @@
 ve.ui.MWMathDialog.prototype.getReadyProcess = function ( data ) {
return ve.ui.MWMathDialog.super.prototype.getReadyProcess.call( this, 
data )
.next( function () {
+   this.input.focus().moveCursorToEnd();
return this.symbolsPromise;
}, this );
 };

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

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

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

[MediaWiki-commits] [Gerrit] Simplify multi-instance redis jobqueue server configuration - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Simplify multi-instance redis jobqueue server configuration
..

Simplify multi-instance redis jobqueue server configuration

Add a jobqueue_redis role that configures three instances and that allows the
master to be specified in one place.

Change-Id: I058a24cdeb24fcad511e69c2e3a0be352838dda8
---
M hieradata/hosts/rdb1008.yaml
A manifests/role/jobqueue_redis.pp
M manifests/site.pp
A modules/mediawiki/manifests/jobqueue_redis.pp
4 files changed, 75 insertions(+), 2 deletions(-)


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

diff --git a/hieradata/hosts/rdb1008.yaml b/hieradata/hosts/rdb1008.yaml
index 315f3cd..cfbe4e7 100644
--- a/hieradata/hosts/rdb1008.yaml
+++ b/hieradata/hosts/rdb1008.yaml
@@ -1 +1 @@
-role::db::redis::dir: "/srv/redis"
+jobqueue_redis_slaveof: rdb1007
diff --git a/manifests/role/jobqueue_redis.pp b/manifests/role/jobqueue_redis.pp
new file mode 100644
index 000..4f7d0d0
--- /dev/null
+++ b/manifests/role/jobqueue_redis.pp
@@ -0,0 +1,11 @@
+class role::jobqueue_redis {
+include ::standard
+
+system::role { 'role::jobqueue_redis': }
+
+$slaveof = hiera('jobqueue_redis_slaveof', undef)
+
+mediawiki::jobqueue_redis { 6379: slaveof => $slaveof }
+mediawiki::jobqueue_redis { 6380: slaveof => $slaveof }
+mediawiki::jobqueue_redis { 6381: slaveof => $slaveof }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 04d489d..3a0e997 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2166,7 +2166,11 @@
 role rcstream
 }
 
-node /^rdb100[0-9]\.eqiad\.wmnet/ {
+node 'rdb1008.eqiad.wmnet' {
+role jobqueue_redis
+}
+
+node /^rdb100[0-7]\.eqiad\.wmnet/ {
 role redisdb
 }
 
diff --git a/modules/mediawiki/manifests/jobqueue_redis.pp 
b/modules/mediawiki/manifests/jobqueue_redis.pp
new file mode 100644
index 000..d00d197
--- /dev/null
+++ b/modules/mediawiki/manifests/jobqueue_redis.pp
@@ -0,0 +1,58 @@
+# == Define: mediawiki::jobqueue_redis
+#
+# Provisions a redis queue server instance for the MediaWiki job queue.
+#
+# === Parameters
+#
+# [*port*]
+#   Port Redis should listen on. Defaults to the resource title.
+#
+# [*slaveof*]
+#   Can be either unset (the default) if this instance should be a master,
+#   or set to a string with format "host" or "host port", to make this
+#   instance a slave.
+#
+# === Example
+#
+#  mediawiki::jobqueue_redis { 6379:
+#slaveof => 'rdb1007',
+#  }
+#
+define mediawiki::jobqueue_redis(
+$port= $title,
+$slaveof = undef
+) {
+include ::passwords::redis
+
+ferm::service { "redis-server-${port}":
+proto  => 'tcp',
+port   => $port,
+srange => '$ALL_NETWORKS',
+}
+
+$slaveof_actual = $slaveof ? {
+/^\S+ \d+$/ => $slaveof,
+/^\S+$/ => "${slaveof} ${port}",
+default => undef,
+}
+
+redis::instance { $port:
+settings => {
+bind=> '0.0.0.0',
+appendonly  => true,
+auto_aof_rewrite_min_size   => '512mb',
+client_output_buffer_limit  => 'slave 512mb 200mb 60',
+dir => '/srv/redis',
+masterauth  => $passwords::redis::main_password,
+maxmemory   => '10Gb',
+no_appendfsync_on_rewrite   => true,
+requirepass => $passwords::redis::main_password,
+save=> '',
+stop_writes_on_bgsave_error => false,
+slave_read_only => false,
+appendfilename  => "${::hostname}-${port}.aof",
+dbfilename  => "${::hostname}-${port}.rdb",
+slaveof => $slaveof_actual,
+},
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] openstack: refactor glance role/module - change (operations/puppet)

2015-11-25 Thread Rush (Code Review)

Rush has submitted this change and it was merged.

Change subject: openstack: refactor glance role/module
..


openstack: refactor glance role/module

* remove openstack::database-server
* This is legacy and openstack on labs is obsolete.

Change-Id: I77fc50d0a4c37453fe14309b57e23f08881bcc67
---
D modules/openstack/manifests/database-server.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/templates/kilo/glance/glance-api.conf.erb
M modules/openstack/templates/kilo/glance/glance-registry.conf.erb
M modules/role/manifests/labs/openstack/designate.pp
M modules/role/manifests/labs/openstack/glance.pp
6 files changed, 54 insertions(+), 251 deletions(-)

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



diff --git a/modules/openstack/manifests/database-server.pp 
b/modules/openstack/manifests/database-server.pp
deleted file mode 100644
index 2536e43..000
--- a/modules/openstack/manifests/database-server.pp
+++ /dev/null
@@ -1,180 +0,0 @@
-#  These classes are no longer used in production.  The manifests remain in 
puppet
-#  because they'll be useful for creating a DB for labs-on-labs.
-
-
-class openstack::database-server(
-$novaconfig,
-$keystoneconfig,
-$glanceconfig
-) {
-$nova_db_name = $novaconfig['db_name']
-$nova_db_user = $novaconfig['db_user']
-$nova_db_pass = $novaconfig['db_pass']
-$controller_mysql_root_pass = $novaconfig['controller_mysql_root_pass']
-$puppet_db_name = $novaconfig['puppet_db_name']
-$puppet_db_user = $novaconfig['puppet_db_user']
-$puppet_db_pass = $novaconfig['puppet_db_pass']
-$glance_db_name = $glanceconfig['db_name']
-$glance_db_user = $glanceconfig['db_user']
-$glance_db_pass = $glanceconfig['db_pass']
-$keystone_db_name = $keystoneconfig['db_name']
-$keystone_db_user = $keystoneconfig['db_user']
-$keystone_db_pass = $keystoneconfig['db_pass']
-
-class {'openstack::database-server::mysql': controller_mysql_root_pass => 
$controller_mysql_root_pass}
-
-# TODO: This expects the services to be installed in the same location
-exec {
-'create_nova_db_user':
-unless  => "/usr/bin/mysql --defaults-file=/etc/nova/nova-user.cnf 
-e 'exit'",
-command => '/usr/bin/mysql -uroot < /etc/nova/nova-user.sql',
-require => [Class['mysql'], File['/etc/nova/nova-user.sql', 
'/etc/nova/nova-user.cnf', '/root/.my.cnf']];
-'create_nova_db':
-unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${nova_db_name} -e 'exit'",
-command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${nova_db_name};\"",
-require => [Class['mysql'], File['/root/.my.cnf']],
-before  => Exec['create_nova_db_user'];
-'create_puppet_db_user':
-unless  => "/usr/bin/mysql 
--defaults-file=/etc/puppet/puppet-user.cnf -e 'exit'",
-command => '/usr/bin/mysql -uroot < /etc/puppet/puppet-user.sql',
-require => [Class['mysql'], File['/etc/puppet/puppet-user.sql', 
'/etc/puppet/puppet-user.cnf', '/root/.my.cnf']];
-'create_puppet_db':
-unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${puppet_db_name} -e 'exit'",
-command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${puppet_db_name};\"",
-require => [Class['mysql'], File['/root/.my.cnf']],
-before  => Exec['create_puppet_db_user'];
-'create_glance_db_user':
-unless  => "/usr/bin/mysql 
--defaults-file=/etc/glance/glance-user.cnf -e 'exit'",
-command => '/usr/bin/mysql -uroot < /etc/glance/glance-user.sql',
-require => [Class['mysql'], 
File['/etc/glance/glance-user.sql','/etc/glance/glance-user.cnf','/root/.my.cnf']];
-'create_glance_db':
-unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${glance_db_name} -e 'exit'",
-command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${glance_db_name};\"",
-require => [Class['mysql'], File['/root/.my.cnf']],
-before  => Exec['create_glance_db_user'];
-}
-
-exec {
-'create_keystone_db_user':
-unless  => "/usr/bin/mysql 
--defaults-file=/etc/keystone/keystone-user.cnf -e 'exit'",
-command => '/usr/bin/mysql -uroot < 
/etc/keystone/keystone-user.sql',
-require => [Class['mysql'], 
File['/etc/keystone/keystone-user.sql', '/etc/keystone/keystone-user.cnf', 
'/root/.my.cnf']];
-'create_keystone_db':
-unless  => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot 
${keystone_db_name} -e 'exit'",
-command => "/usr/bin/mysql --defaults-file=/root/.my.cnf -uroot -e 
\"create database ${keystone_db_name};\"",
-require => [Class['mysql'],

[MediaWiki-commits] [Gerrit] Draft Step 3 Layout evaluation - change (mediawiki...MathSearch)

2015-11-25 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Draft Step 3 Layout evaluation
..

Draft Step 3 Layout evaluation

Change-Id: I05c9335382ed855737afa3da1a23b5249f0d3313
---
M includes/MlpEvalForm.php
M includes/special/SpecialMlpEval.php
2 files changed, 38 insertions(+), 12 deletions(-)


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

diff --git a/includes/MlpEvalForm.php b/includes/MlpEvalForm.php
index cd2b9e5..108c263 100644
--- a/includes/MlpEvalForm.php
+++ b/includes/MlpEvalForm.php
@@ -40,6 +40,9 @@
$formDescriptor['evalPage'] = $s;
break;
case SpecialMlpEval::STEP_FORMULA:
+   case SpecialMlpEval::STEP_STYLE:
+   case SpecialMlpEval::STEP_IDENTIFIERS:
+   case SpecialMlpEval::STEP_DEFINITIONS:
$formDescriptor['snippetSelector'] = array(
'type'=> 'radio',
'label'   => 'Page to evaluate',
diff --git a/includes/special/SpecialMlpEval.php 
b/includes/special/SpecialMlpEval.php
index 89b8a9a..6f0e429 100644
--- a/includes/special/SpecialMlpEval.php
+++ b/includes/special/SpecialMlpEval.php
@@ -90,7 +90,8 @@
if ( $this->setFId( $fId ) === false ) {
return $this->setStep( 2 );
}
-   if ( $req->getInt( 'oldStep' ) === 2 ){
+   // @TODO: Switch back to === 2
+   if ( $req->getInt( 'oldStep' ) > 1 ){
switch ( $req->getInt( 'wpsnippetSelector' ) ){
case MlpEvalForm::OPT_BACK;
return $this->resetPage();
@@ -100,7 +101,7 @@
$this->writeLog( "pgRst: User 
selects formula $fId" );
}
}
-   return $this->setStep( 3 );
+   return $this->setStep( $req->getInt( 'oldStep' ) + 1 );
}
 
/**
@@ -203,16 +204,6 @@
}
 
 
-   /**
-*
-* @param String $src
-* @param String $lang the language of the source snippet
-*/
-   public function printSource( $src, $lang = "xml" ) {
-   $out = $this->getOutput();
-   $out->addWikiText( '' . $src . 
'' );
-   }
-
protected function getGroupName() {
return 'mathsearch';
}
@@ -275,6 +266,14 @@
$this->getOutput()->addWikiText( 
$hl->getWikiText() );
break;
case self::STEP_STYLE:
+   $this->enableMathStyles();
+   $mo = MathObject::newFromRevisionText( 
$this->oldId, $this->fId );
+   $this->printSource( $mo->getUserInputTex(), 
'TeX (original user input)', 'latex' );
+   $texInfo = $mo->getTexInfo();
+   $this->printSource( $texInfo->getChecked(), 
'TeX (checked)', 'latex' );
+   $this->DisplayRendering( 
$mo->getUserInputTex(), 'latexml' );
+   $this->DisplayRendering( 
$mo->getUserInputTex(), 'mathml' );
+   $this->DisplayRendering( 
$mo->getUserInputTex(), 'png' );
break;
case self::STEP_IDENTIFIERS:
break;
@@ -312,4 +311,28 @@
return $this->setStep( 2 );
}
 
+   private function printSource( $source, $description = "", $language = 
"text", $linestart = true ) {
+   if ( $description ) {
+   $description .= ": ";
+   }
+   $this->getOutput()->addWikiText( "$description" .
+   $source . '', $linestart );
+   }
+
+   private function DisplayRendering( $tex, $mode ) {
+   global $wgMathValidModes;
+   if ( !in_array( $mode, $wgMathValidModes ) ) {
+   return;
+   }
+   $out = $this->getOutput();
+   $names = MathHooks::getMathNames();
+   $name = $names[$mode];
+   $out->addWikiText( "=== $name rendering === " );
+   $renderer = MathRenderer::getRenderer( $tex, array(), $mode );
+   $renderer->checkTex();
+   $renderer->render();
+   $out->addHTML( $renderer->getHtmlOutput() );
+   $renderer->writeCache();
+
+   }
 }

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

[MediaWiki-commits] [Gerrit] isBlockedTrigger should use meta+ for macs, not cmd+ - change (VisualEditor/VisualEditor)

2015-11-25 Thread DLynch (Code Review)

DLynch has uploaded a new change for review.

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

Change subject: isBlockedTrigger should use meta+ for macs, not cmd+
..

isBlockedTrigger should use meta+ for macs, not cmd+

Change-Id: I75ccbb4c9ed80beefd48866431d316fc09065dff
---
M src/ce/ve.ce.Surface.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/74/255474/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 5d6ec68..d8b4f30 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1082,7 +1082,7 @@
 ve.ce.Surface.prototype.isBlockedTrigger = function ( trigger ) {
var platformKey = ve.getSystemPlatform() === 'mac' ? 'mac' : 'pc',
blocked = {
-   mac: [ 'cmd+b', 'cmd+i', 'cmd+u', 'cmd+z', 'cmd+y', 
'cmd+shift+z', 'tab', 'shift+tab' ],
+   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab' ],
pc: [ 'ctrl+b', 'ctrl+i', 'ctrl+u', 'ctrl+z', 'ctrl+y', 
'ctrl+shift+z', 'tab', 'shift+tab' ]
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I75ccbb4c9ed80beefd48866431d316fc09065dff
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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

[MediaWiki-commits] [Gerrit] pool rdb1007:6381 - change (operations/mediawiki-config)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: pool rdb1007:6381
..


pool rdb1007:6381

Change-Id: I1e0d0ed8215f9991327b809dd8d3472399546075
---
M wmf-config/jobqueue-eqiad.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php
index 1773301..6519a97 100644
--- a/wmf-config/jobqueue-eqiad.php
+++ b/wmf-config/jobqueue-eqiad.php
@@ -38,6 +38,10 @@
'redisServer' => 'rdb1007.eqiad.wmnet:6380', # 
master
#'redisServer' => 'rdb1008.eqiad.wmnet:6380', # 
slave
) + $wmgRedisQueueBaseConfig,
+   'rdb3-6381' => array(
+   'redisServer' => 'rdb1007.eqiad.wmnet:6381', # 
master
+   #'redisServer' => 'rdb1008.eqiad.wmnet:6381', # 
slave
+   ) + $wmgRedisQueueBaseConfig,
),
'sectionsByWiki' => array(), // default
'partitionsBySection' => array(
@@ -46,6 +50,7 @@
'rdb2-6379' => 50,
'rdb3-6379' => 50,
'rdb3-6380' => 50,
+   'rdb3-6381' => 50,
),
)
 );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e0d0ed8215f9991327b809dd8d3472399546075
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] pool rdb1007:6381 - change (operations/mediawiki-config)

2015-11-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: pool rdb1007:6381
..

pool rdb1007:6381

Change-Id: I1e0d0ed8215f9991327b809dd8d3472399546075
---
M wmf-config/jobqueue-eqiad.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php
index 1773301..6519a97 100644
--- a/wmf-config/jobqueue-eqiad.php
+++ b/wmf-config/jobqueue-eqiad.php
@@ -38,6 +38,10 @@
'redisServer' => 'rdb1007.eqiad.wmnet:6380', # 
master
#'redisServer' => 'rdb1008.eqiad.wmnet:6380', # 
slave
) + $wmgRedisQueueBaseConfig,
+   'rdb3-6381' => array(
+   'redisServer' => 'rdb1007.eqiad.wmnet:6381', # 
master
+   #'redisServer' => 'rdb1008.eqiad.wmnet:6381', # 
slave
+   ) + $wmgRedisQueueBaseConfig,
),
'sectionsByWiki' => array(), // default
'partitionsBySection' => array(
@@ -46,6 +50,7 @@
'rdb2-6379' => 50,
'rdb3-6379' => 50,
'rdb3-6380' => 50,
+   'rdb3-6381' => 50,
),
)
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e0d0ed8215f9991327b809dd8d3472399546075
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh 

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

[MediaWiki-commits] [Gerrit] Use phab for release notes, not gitblit - change (mediawiki...release)

2015-11-25 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Use phab for release notes, not gitblit
..

Use phab for release notes, not gitblit

Change-Id: Ibf3a8305ede2a458c3e7ff6bf90af2f711fea9a0
---
M make-release/make-release.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/81/255481/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index b3b3609..2d8c181 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -659,7 +659,7 @@
 # Write email template
 print()
 print("Full release notes:")
-url = ('https://git.wikimedia.org/blob/mediawiki%2Fcore.git/' +
+url = ('https://phabricator.wikimedia.org/diffusion/MW/browse/' +
branch + '/RELEASE-NOTES' + dir)
 
 print(url)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf3a8305ede2a458c3e7ff6bf90af2f711fea9a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
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] Merge master into deployment - change (wikimedia...crm)

2015-11-25 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: Merge master into deployment
..


Merge master into deployment

88a79666ee63073d58537262754033fbca5a04bb update civicrm submodule

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

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia522cf44b6fbccbde1eb4a14f2aae220598b11ba
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Openstack: Removed redundant admin_token settings in a coupl... - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged.

Change subject: Openstack: Removed redundant admin_token settings in a couple 
of places.
..


Openstack: Removed redundant admin_token settings in a couple of places.

I don't see how these can have been doing anything; testing suggests
they weren't.

Change-Id: I2d17b342b171ce30e3cb8c5782621e4be3b50bd4
---
M modules/openstack/templates/kilo/designate/designate.conf.erb
M modules/openstack/templates/kilo/glance/glance-api.conf.erb
2 files changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  Rush: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb 
b/modules/openstack/templates/kilo/designate/designate.conf.erb
index 1a37051..b57efd3 100644
--- a/modules/openstack/templates/kilo/designate/designate.conf.erb
+++ b/modules/openstack/templates/kilo/designate/designate.conf.erb
@@ -103,7 +103,6 @@
 auth_host = <%= @designateconfig["keystone_auth_host"] %>
 auth_port = <%= @designateconfig["keystone_auth_port"] %>
 auth_protocol = <%= @designateconfig["keystone_auth_protocol"] %>
-admin_token = ADMIN
 admin_token = <%= @designateconfig["keystone_admin_token"] %>
 auth_uri = <%= @designateconfig["auth_uri"] %>
 
diff --git a/modules/openstack/templates/kilo/glance/glance-api.conf.erb 
b/modules/openstack/templates/kilo/glance/glance-api.conf.erb
index b1e397d..c3c6faf 100644
--- a/modules/openstack/templates/kilo/glance/glance-api.conf.erb
+++ b/modules/openstack/templates/kilo/glance/glance-api.conf.erb
@@ -284,7 +284,6 @@
 service_host = <%= @glanceconfig["keystone_auth_host"] %>
 service_port = 5000
 identity_uri = <%= @glanceconfig["keystone_auth_protocol"] %>://<%= 
@glanceconfig["keystone_auth_host"] %>:<%= @glanceconfig["keystone_auth_port"] 
%>
-admin_token = ADMIN
 admin_token = <%= @glanceconfig["keystone_admin_token"] %>
 auth_uri = <%= @glanceconfig["auth_uri"] %>/v2.0
 

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

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

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

[MediaWiki-commits] [Gerrit] Focus input and move cursor to end when MathDialog opens - change (mediawiki...Math)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Focus input and move cursor to end when MathDialog opens
..


Focus input and move cursor to end when MathDialog opens

Change-Id: Ie963913723b8c5f8ffb32701477627387c77eb85
---
M modules/ve-math/ve.ui.MWMathDialog.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/modules/ve-math/ve.ui.MWMathDialog.js 
b/modules/ve-math/ve.ui.MWMathDialog.js
index ef9612a..7d22f6c 100644
--- a/modules/ve-math/ve.ui.MWMathDialog.js
+++ b/modules/ve-math/ve.ui.MWMathDialog.js
@@ -224,6 +224,7 @@
 ve.ui.MWMathDialog.prototype.getReadyProcess = function ( data ) {
return ve.ui.MWMathDialog.super.prototype.getReadyProcess.call( this, 
data )
.next( function () {
+   this.input.focus().moveCursorToEnd();
return this.symbolsPromise;
}, this );
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie963913723b8c5f8ffb32701477627387c77eb85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Tchanders 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Make it possible to download a MW tarball without 2 301s and... - change (mediawiki...release)

2015-11-25 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

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

Change subject: Make it possible to download a MW tarball without 2 301s and a 
302
..

Make it possible to download a MW tarball without 2 301s and a 302

Change-Id: I40104da2882ee2efc1d53c00dbdd756ceb6ed17e
---
M make-release/make-release.py
1 file changed, 6 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/72/255472/1

diff --git a/make-release/make-release.py b/make-release/make-release.py
index 86cfb42..f2146ec 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -670,30 +670,26 @@
 print()
 print('*' * 70)
 
+releaseServer = 'https://releases.wikimedia.org/mediawiki'
 print('Download:')
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + package + '.tar.gz')
+print(releaseServer + dir + '/' + package + '.tar.gz')
 print()
 
 if prevVersion is not None:
 if haveI18n:
 print("Patch to previous version (" + prevVersion +
   "), without interface text:")
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + package + '.patch.gz')
+print(releaseServer + dir + '/' + package + '.patch.gz')
 print("Interface text changes:")
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + i18nPatch)
+print(releaseServer + dir + '/' + i18nPatch)
 else:
 print("Patch to previous version (" + prevVersion + "):")
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + package + '.patch.gz')
+print(releaseServer + dir + '/' + package + '.patch.gz')
 print()
 
 print('GPG signatures:')
 for fileName in outFiles:
-print('http://download.wikimedia.org/mediawiki/' +
-  dir + '/' + fileName + '.sig')
+print(releaseServer + dir + '/' + fileName + '.sig')
 print()
 
 print('Public keys:')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40104da2882ee2efc1d53c00dbdd756ceb6ed17e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
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] Migrate rdb1007 to jobqueue_redis - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

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

Change subject: Migrate rdb1007 to jobqueue_redis
..


Migrate rdb1007 to jobqueue_redis

Change-Id: If438ab38415ceaccec92a50aac176a5841714882
---
D hieradata/hosts/rdb1007.yaml
M manifests/role/redisdb.pp
M manifests/site.pp
3 files changed, 10 insertions(+), 73 deletions(-)

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



diff --git a/hieradata/hosts/rdb1007.yaml b/hieradata/hosts/rdb1007.yaml
deleted file mode 100644
index 315f3cd..000
--- a/hieradata/hosts/rdb1007.yaml
+++ /dev/null
@@ -1 +0,0 @@
-role::db::redis::dir: "/srv/redis"
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index 0dabdb0..38f9088 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -15,81 +15,19 @@
 
 ferm::service { 'redis-server':
 proto  => 'tcp',
-port   => '(6379 6380 6381)',
+port   => '6379',
 srange => '$ALL_NETWORKS',
 }
 
-$defaults = {
-bind=> '0.0.0.0',
-appendonly  => true,
-auto_aof_rewrite_min_size   => '512mb',
-client_output_buffer_limit  => 'slave 512mb 200mb 60',
-dir => '/srv/redis',
-masterauth  => $passwords::redis::main_password,
-maxmemory   => '10Gb',
-no_appendfsync_on_rewrite   => true,
-requirepass => $passwords::redis::main_password,
-save=> '',
-stop_writes_on_bgsave_error => false,
-slave_read_only => false,
+class { '::redis::legacy':
+maxmemory => $maxmemory,
+dir   => $dir,
+persist   => 'aof',
+redis_replication => $redis_replication,
+password  => $passwords::redis::main_password,
 }
 
-if $::hostname == 'rdb1008' {
-redis::instance { 6379:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6379.aof",
-dbfilename  => "${::hostname}-6379.rdb",
-slaveof => 'rdb1007 6379',
-}),
-}
-
-redis::instance { 6380:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6380.aof",
-dbfilename  => "${::hostname}-6380.rdb",
-slaveof => 'rdb1007 6380',
-}),
-}
-
-redis::instance { 6381:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6381.aof",
-dbfilename  => "${::hostname}-6381.rdb",
-slaveof => 'rdb1007 6381',
-}),
-}
-} elsif $::hostname == 'rdb1007' {
-redis::instance { 6379:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6379.aof",
-dbfilename  => "${::hostname}-6379.rdb",
-}),
-}
-
-redis::instance { 6380:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6380.aof",
-dbfilename  => "${::hostname}-6380.rdb",
-}),
-}
-
-redis::instance { 6381:
-settings => merge($defaults, {
-appendfilename  => "${::hostname}-6381.aof",
-dbfilename  => "${::hostname}-6381.rdb",
-}),
-}
-} else {
-class { '::redis::legacy':
-maxmemory => $maxmemory,
-dir   => $dir,
-persist   => 'aof',
-redis_replication => $redis_replication,
-password  => $passwords::redis::main_password,
-}
-
-if $::standard::has_ganglia {
-include redis::ganglia
-}
+if $::standard::has_ganglia {
+include redis::ganglia
 }
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index 963baeb..cbdfe16 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2164,7 +2164,7 @@
 role rcstream
 }
 
-node 'rdb1008.eqiad.wmnet' {
+node 'rdb1007.eqiad.wmnet', 'rdb1008.eqiad.wmnet' {
 role jobqueue_redis
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If438ab38415ceaccec92a50aac176a5841714882
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] update civicrm submodule - change (wikimedia...crm)

2015-11-25 Thread Awight (Code Review)

Awight has uploaded a new change for review.

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

Change subject: update civicrm submodule
..

update civicrm submodule

Change-Id: I0970604150a1188191498ab8cb1dba43308785f3
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/85/255485/1

diff --git a/civicrm b/civicrm
index 488d66d..d385e34 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 488d66d1b3a88605466b45d821c5224464f7a09c
+Subproject commit d385e34c775aec50a5c17357c8a11cb0244123ce

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0970604150a1188191498ab8cb1dba43308785f3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
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] Add owner-only consumers - change (mediawiki...OAuth)

2015-11-25 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Add owner-only consumers
..

Add owner-only consumers

An owner-only consumer is automatically approved, automatically
accepted by the owner, cannot be used by anyone other than the owner,
cannot use the usual authorization flow, and does not tag changes.

Bug: T87395
Change-Id: I3c791b949e19eb476968e5f9dd1511d485e52810
---
M api/MWOAuthAPI.setup.php
M backend/MWOAuthConsumer.php
M backend/MWOAuthServer.php
M backend/schema/MWOAuthUpdater.hooks.php
M backend/schema/mysql/OAuth.sql
A backend/schema/mysql/owner_only.sql
M backend/schema/sqlite/OAuth.sql
A backend/schema/sqlite/owner_only.sql
M control/MWOAuthConsumerAcceptanceSubmitControl.php
M control/MWOAuthConsumerSubmitControl.php
M frontend/specialpages/SpecialMWOAuth.php
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M frontend/specialpages/SpecialMWOAuthManageConsumers.php
M i18n/en.json
M i18n/qqq.json
15 files changed, 199 insertions(+), 49 deletions(-)


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

diff --git a/api/MWOAuthAPI.setup.php b/api/MWOAuthAPI.setup.php
index b2d80e8..02c2b72 100755
--- a/api/MWOAuthAPI.setup.php
+++ b/api/MWOAuthAPI.setup.php
@@ -115,9 +115,7 @@
 
// The consumer is approved or owned by 
$localUser, and is for this wiki.
$consumer = MWOAuthConsumer::newFromId( $dbr, 
$access->get( 'consumerId' ) );
-   if ( $consumer->get( 'stage' ) !== 
MWOAuthConsumer::STAGE_APPROVED
-   && !$consumer->isPendingAndOwnedBy( 
$localUser ) // let publisher test this
-   ) {
+   if ( !$consumer->isUsableBy( $localUser ) ) {
throw self::makeException( 
'mwoauth-invalid-authorization-not-approved' );
} elseif ( $consumer->get( 'wiki' ) !== '*'
&& $consumer->get( 'wiki' ) !== $wiki
@@ -301,12 +299,15 @@
$dbr = MWOAuthUtils::getCentralDB( DB_SLAVE );
$access = MWOAuthConsumerAcceptance::newFromToken( 
$dbr, $accesstoken->key );
$consumerId = $access->get( 'consumerId' );
-   \ChangeTags::addTags(
-   "OAuth CID: $consumerId",
-   $rc->mAttribs['rc_id'],
-   $rc->mAttribs['rc_this_oldid'],
-   $rc->mAttribs['rc_logid']
-   );
+   $consumer = MWOAuthConsumer::newFromId( $dbr, 
$consumerId );
+   if ( !$consumer->get( 'ownerOnly' ) ) {
+   \ChangeTags::addTags(
+   "OAuth CID: $consumerId",
+   $rc->mAttribs['rc_id'],
+   $rc->mAttribs['rc_this_oldid'],
+   $rc->mAttribs['rc_logid']
+   );
+   }
}
return true;
}
diff --git a/backend/MWOAuthConsumer.php b/backend/MWOAuthConsumer.php
index 76631fb..20b5460 100644
--- a/backend/MWOAuthConsumer.php
+++ b/backend/MWOAuthConsumer.php
@@ -47,6 +47,8 @@
protected $emailAuthenticated;
/** @var int User accepted the developer agreement */
protected $developerAgreement;
+   /** @var int Consumer is for use by the owner only */
+   protected $ownerOnly;
/** @var string Wiki ID the application can be used on (or "*" for all) 
*/
protected $wiki;
/** @var string TS_MW timestamp of proposal */
@@ -88,6 +90,7 @@
'email'  => 'oarc_email',
'emailAuthenticated' => 
'oarc_email_authenticated',
'developerAgreement' => 
'oarc_developer_agreement',
+   'ownerOnly'  => 'oarc_owner_only',
'wiki'   => 'oarc_wiki',
'grants' => 'oarc_grants',
'registration'   => 'oarc_registration',
@@ -220,8 +223,10 @@
 * @param \User $user
 * @return boolean
 */
-   public function isPendingAndOwnedBy( \User $user ) {
-   if ( $this->stage === self::STAGE_PROPOSED ) {
+   public function isUsableBy( \User $user ) {
+   if ( $this->stage === self::STAGE_APPROVED && !$this->get( 
'ownerOnly' ) ) {
+   return true;
+   } elseif ( $this->stage === self::STAGE_PROPOSED || 
$this->stage ===

[MediaWiki-commits] [Gerrit] Fix DAO brokenness with respect to auto-increment fields - change (mediawiki...OAuth)

2015-11-25 Thread Anomie (Code Review)

Anomie has uploaded a new change for review.

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

Change subject: Fix DAO brokenness with respect to auto-increment fields
..

Fix DAO brokenness with respect to auto-increment fields

The auto-increment field's value needs to be updated on insert, not on
update.

Not touching the fact that correct operation really requires a call to
$dbw->nextSequenceValue(), since this extension currently only seems to
support MySQL and SQLite and neither of those care.

Change-Id: I26c18729297db4c70f0f4f8501a44fe0689913e9
---
M backend/MWOAuthDAO.php
1 file changed, 5 insertions(+), 4 deletions(-)


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

diff --git a/backend/MWOAuthDAO.php b/backend/MWOAuthDAO.php
index 2da10a2..70d2180 100644
--- a/backend/MWOAuthDAO.php
+++ b/backend/MWOAuthDAO.php
@@ -167,10 +167,6 @@
array( $idColumn => $uniqueId ),
__METHOD__
);
-   $afield = static::getAutoIncrField();
-   if ( $afield !== null ) { // update field for 
auto-increment field
-   $this->$afield = $dbw->insertId();
-   }
$this->daoPending = false;
return $dbw->affectedRows() > 0;
} else {
@@ -179,11 +175,16 @@
}
} else {
$this->logger->debug( get_class( $this ) . ': 
performing DB update; new object.' );
+   $afield = static::getAutoIncrField();
+   // TODO: $this->$afield = $dbw->nextSequenceValue( ??? )
$dbw->insert(
static::getTable(),
$this->getRowArray( $dbw ),
__METHOD__
);
+   if ( $afield !== null ) { // update field for 
auto-increment field
+   $this->$afield = $dbw->insertId();
+   }
$this->daoPending = false;
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26c18729297db4c70f0f4f8501a44fe0689913e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie 

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

[MediaWiki-commits] [Gerrit] Archive extension - change (mediawiki...UserDailyContribs)

2015-11-25 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Archive extension
..

Archive extension

Change-Id: I3f8f6851c1f77d7ac7474e6cd3d5d9d4e1908480
---
D .gitignore
D COPYING
D Gruntfile.js
A OBSOLETE
D README
D UserDailyContribs.hooks.php
D UserDailyContribs.i18n.php
D UserDailyContribs.php
D api/ApiUserDailyContribs.php
D i18n/af.json
D i18n/aln.json
D i18n/an.json
D i18n/ar.json
D i18n/arz.json
D i18n/ast.json
D i18n/ba.json
D i18n/be-tarask.json
D i18n/be.json
D i18n/bjn.json
D i18n/bn.json
D i18n/bpy.json
D i18n/br.json
D i18n/bs.json
D i18n/ca.json
D i18n/ce.json
D i18n/cs.json
D i18n/da.json
D i18n/de.json
D i18n/diq.json
D i18n/dsb.json
D i18n/el.json
D i18n/en.json
D i18n/eo.json
D i18n/es.json
D i18n/eu.json
D i18n/fa.json
D i18n/fi.json
D i18n/fr.json
D i18n/frp.json
D i18n/gd.json
D i18n/gl.json
D i18n/gsw.json
D i18n/he.json
D i18n/hr.json
D i18n/hsb.json
D i18n/hu.json
D i18n/ia.json
D i18n/id.json
D i18n/it.json
D i18n/ja.json
D i18n/jv.json
D i18n/ka.json
D i18n/ko.json
D i18n/krc.json
D i18n/ksh.json
D i18n/lb.json
D i18n/li.json
D i18n/min.json
D i18n/mk.json
D i18n/ml.json
D i18n/ms.json
D i18n/mt.json
D i18n/nb.json
D i18n/nds-nl.json
D i18n/nl.json
D i18n/oc.json
D i18n/pl.json
D i18n/pms.json
D i18n/pt-br.json
D i18n/pt.json
D i18n/qqq.json
D i18n/qu.json
D i18n/ro.json
D i18n/roa-tara.json
D i18n/ru.json
D i18n/rue.json
D i18n/sah.json
D i18n/si.json
D i18n/sk.json
D i18n/sl.json
D i18n/su.json
D i18n/sv.json
D i18n/tl.json
D i18n/tr.json
D i18n/uk.json
D i18n/vec.json
D i18n/vep.json
D i18n/vi.json
D i18n/yue.json
D i18n/zh-hans.json
D i18n/zh-hant.json
D package.json
D patches/UserDailyContribs.sql
93 files changed, 1 insertion(+), 1,470 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserDailyContribs 
refs/changes/68/255468/1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 4bf4869..000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.svn
-*~
-*.kate-swp
-.*.swp
-node_modules/
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d159169..000
--- a/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-   Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have

[MediaWiki-commits] [Gerrit] Simplify multi-instance redis jobqueue server configuration - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

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

Change subject: Simplify multi-instance redis jobqueue server configuration
..


Simplify multi-instance redis jobqueue server configuration

Add a jobqueue_redis role that configures three instances and that allows the
master to be specified in one place.

Change-Id: I058a24cdeb24fcad511e69c2e3a0be352838dda8
---
M hieradata/hosts/rdb1008.yaml
A hieradata/role/codfw/jobqueue_redis.yaml
A hieradata/role/common/jobqueue_redis.yaml
A hieradata/role/eqiad/jobqueue_redis.yaml
A manifests/role/jobqueue_redis.pp
M manifests/site.pp
A modules/mediawiki/manifests/jobqueue_redis.pp
7 files changed, 87 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/hosts/rdb1008.yaml b/hieradata/hosts/rdb1008.yaml
index 315f3cd..cfbe4e7 100644
--- a/hieradata/hosts/rdb1008.yaml
+++ b/hieradata/hosts/rdb1008.yaml
@@ -1 +1 @@
-role::db::redis::dir: "/srv/redis"
+jobqueue_redis_slaveof: rdb1007
diff --git a/hieradata/role/codfw/jobqueue_redis.yaml 
b/hieradata/role/codfw/jobqueue_redis.yaml
new file mode 100644
index 000..56c5bbb
--- /dev/null
+++ b/hieradata/role/codfw/jobqueue_redis.yaml
@@ -0,0 +1,8 @@
+role::redisdb::redis_replication:
+  rdb2003: rdb2001
+  rdb2004: rdb2002
+role::redisdb::dir: "/srv/redis"
+debdeploy::grains:
+  debdeploy-redis-codfw:
+value: standard
+
diff --git a/hieradata/role/common/jobqueue_redis.yaml 
b/hieradata/role/common/jobqueue_redis.yaml
new file mode 100644
index 000..1136271
--- /dev/null
+++ b/hieradata/role/common/jobqueue_redis.yaml
@@ -0,0 +1 @@
+cluster: redis
diff --git a/hieradata/role/eqiad/jobqueue_redis.yaml 
b/hieradata/role/eqiad/jobqueue_redis.yaml
new file mode 100644
index 000..84e5cdc
--- /dev/null
+++ b/hieradata/role/eqiad/jobqueue_redis.yaml
@@ -0,0 +1,3 @@
+debdeploy::grains:
+  debdeploy-redis-eqiad:
+value: standard
diff --git a/manifests/role/jobqueue_redis.pp b/manifests/role/jobqueue_redis.pp
new file mode 100644
index 000..4f7d0d0
--- /dev/null
+++ b/manifests/role/jobqueue_redis.pp
@@ -0,0 +1,11 @@
+class role::jobqueue_redis {
+include ::standard
+
+system::role { 'role::jobqueue_redis': }
+
+$slaveof = hiera('jobqueue_redis_slaveof', undef)
+
+mediawiki::jobqueue_redis { 6379: slaveof => $slaveof }
+mediawiki::jobqueue_redis { 6380: slaveof => $slaveof }
+mediawiki::jobqueue_redis { 6381: slaveof => $slaveof }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 5b922a0..963baeb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2164,7 +2164,11 @@
 role rcstream
 }
 
-node /^rdb100[0-9]\.eqiad\.wmnet/ {
+node 'rdb1008.eqiad.wmnet' {
+role jobqueue_redis
+}
+
+node /^rdb100[0-7]\.eqiad\.wmnet/ {
 role redisdb
 }
 
diff --git a/modules/mediawiki/manifests/jobqueue_redis.pp 
b/modules/mediawiki/manifests/jobqueue_redis.pp
new file mode 100644
index 000..d00d197
--- /dev/null
+++ b/modules/mediawiki/manifests/jobqueue_redis.pp
@@ -0,0 +1,58 @@
+# == Define: mediawiki::jobqueue_redis
+#
+# Provisions a redis queue server instance for the MediaWiki job queue.
+#
+# === Parameters
+#
+# [*port*]
+#   Port Redis should listen on. Defaults to the resource title.
+#
+# [*slaveof*]
+#   Can be either unset (the default) if this instance should be a master,
+#   or set to a string with format "host" or "host port", to make this
+#   instance a slave.
+#
+# === Example
+#
+#  mediawiki::jobqueue_redis { 6379:
+#slaveof => 'rdb1007',
+#  }
+#
+define mediawiki::jobqueue_redis(
+$port= $title,
+$slaveof = undef
+) {
+include ::passwords::redis
+
+ferm::service { "redis-server-${port}":
+proto  => 'tcp',
+port   => $port,
+srange => '$ALL_NETWORKS',
+}
+
+$slaveof_actual = $slaveof ? {
+/^\S+ \d+$/ => $slaveof,
+/^\S+$/ => "${slaveof} ${port}",
+default => undef,
+}
+
+redis::instance { $port:
+settings => {
+bind=> '0.0.0.0',
+appendonly  => true,
+auto_aof_rewrite_min_size   => '512mb',
+client_output_buffer_limit  => 'slave 512mb 200mb 60',
+dir => '/srv/redis',
+masterauth  => $passwords::redis::main_password,
+maxmemory   => '10Gb',
+no_appendfsync_on_rewrite   => true,
+requirepass => $passwords::redis::main_password,
+save=> '',
+stop_writes_on_bgsave_error => false,
+slave_read_only => false,
+appendfilename  => "${::hostname}-${port}.aof",
+dbfilename  => "${::hostname}-${port}.rdb",
+slaveof => $slaveof_actual,
+},
+}
+}

[MediaWiki-commits] [Gerrit] Draft steps 4-6 - change (mediawiki...MathSearch)

2015-11-25 Thread Physikerwelt (Code Review)

Physikerwelt has uploaded a new change for review.

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

Change subject: Draft steps 4-6
..

Draft steps 4-6

Change-Id: I709317c40a4c522e4161cb26fee0c4e2b5a8fc7e
---
M includes/special/SpecialMlpEval.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/includes/special/SpecialMlpEval.php 
b/includes/special/SpecialMlpEval.php
index 6f0e429..a03e27c 100644
--- a/includes/special/SpecialMlpEval.php
+++ b/includes/special/SpecialMlpEval.php
@@ -276,10 +276,18 @@
$this->DisplayRendering( 
$mo->getUserInputTex(), 'png' );
break;
case self::STEP_IDENTIFIERS:
+   $this->enableMathStyles();
+   $mo = MathObject::newFromRevisionText( 
$this->oldId, $this->fId );
+   $md = $mo->getTexInfo();
+   $this->printSource( var_export( 
$md->getIdentifiers(), true ) );
break;
case self::STEP_DEFINITIONS:
+   $this->enableMathStyles();
+   $mo = MathObject::newFromRevisionText( 
$this->oldId, $this->fId );
+   $this->printSource( var_export( 
$mo->getRelations(), true ) );
break;
case self::STEP_FINISHED:
+   $out->addWikiText( 'thank you' );
}
 
}

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

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

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

[MediaWiki-commits] [Gerrit] Draft Step 3 Layout evaluation - change (mediawiki...MathSearch)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Draft Step 3 Layout evaluation
..


Draft Step 3 Layout evaluation

Change-Id: I05c9335382ed855737afa3da1a23b5249f0d3313
---
M includes/MlpEvalForm.php
M includes/special/SpecialMlpEval.php
2 files changed, 38 insertions(+), 12 deletions(-)

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



diff --git a/includes/MlpEvalForm.php b/includes/MlpEvalForm.php
index cd2b9e5..108c263 100644
--- a/includes/MlpEvalForm.php
+++ b/includes/MlpEvalForm.php
@@ -40,6 +40,9 @@
$formDescriptor['evalPage'] = $s;
break;
case SpecialMlpEval::STEP_FORMULA:
+   case SpecialMlpEval::STEP_STYLE:
+   case SpecialMlpEval::STEP_IDENTIFIERS:
+   case SpecialMlpEval::STEP_DEFINITIONS:
$formDescriptor['snippetSelector'] = array(
'type'=> 'radio',
'label'   => 'Page to evaluate',
diff --git a/includes/special/SpecialMlpEval.php 
b/includes/special/SpecialMlpEval.php
index 89b8a9a..6f0e429 100644
--- a/includes/special/SpecialMlpEval.php
+++ b/includes/special/SpecialMlpEval.php
@@ -90,7 +90,8 @@
if ( $this->setFId( $fId ) === false ) {
return $this->setStep( 2 );
}
-   if ( $req->getInt( 'oldStep' ) === 2 ){
+   // @TODO: Switch back to === 2
+   if ( $req->getInt( 'oldStep' ) > 1 ){
switch ( $req->getInt( 'wpsnippetSelector' ) ){
case MlpEvalForm::OPT_BACK;
return $this->resetPage();
@@ -100,7 +101,7 @@
$this->writeLog( "pgRst: User 
selects formula $fId" );
}
}
-   return $this->setStep( 3 );
+   return $this->setStep( $req->getInt( 'oldStep' ) + 1 );
}
 
/**
@@ -203,16 +204,6 @@
}
 
 
-   /**
-*
-* @param String $src
-* @param String $lang the language of the source snippet
-*/
-   public function printSource( $src, $lang = "xml" ) {
-   $out = $this->getOutput();
-   $out->addWikiText( '' . $src . 
'' );
-   }
-
protected function getGroupName() {
return 'mathsearch';
}
@@ -275,6 +266,14 @@
$this->getOutput()->addWikiText( 
$hl->getWikiText() );
break;
case self::STEP_STYLE:
+   $this->enableMathStyles();
+   $mo = MathObject::newFromRevisionText( 
$this->oldId, $this->fId );
+   $this->printSource( $mo->getUserInputTex(), 
'TeX (original user input)', 'latex' );
+   $texInfo = $mo->getTexInfo();
+   $this->printSource( $texInfo->getChecked(), 
'TeX (checked)', 'latex' );
+   $this->DisplayRendering( 
$mo->getUserInputTex(), 'latexml' );
+   $this->DisplayRendering( 
$mo->getUserInputTex(), 'mathml' );
+   $this->DisplayRendering( 
$mo->getUserInputTex(), 'png' );
break;
case self::STEP_IDENTIFIERS:
break;
@@ -312,4 +311,28 @@
return $this->setStep( 2 );
}
 
+   private function printSource( $source, $description = "", $language = 
"text", $linestart = true ) {
+   if ( $description ) {
+   $description .= ": ";
+   }
+   $this->getOutput()->addWikiText( "$description" .
+   $source . '', $linestart );
+   }
+
+   private function DisplayRendering( $tex, $mode ) {
+   global $wgMathValidModes;
+   if ( !in_array( $mode, $wgMathValidModes ) ) {
+   return;
+   }
+   $out = $this->getOutput();
+   $names = MathHooks::getMathNames();
+   $name = $names[$mode];
+   $out->addWikiText( "=== $name rendering === " );
+   $renderer = MathRenderer::getRenderer( $tex, array(), $mode );
+   $renderer->checkTex();
+   $renderer->render();
+   $out->addHTML( $renderer->getHtmlOutput() );
+   $renderer->writeCache();
+
+   }
 }

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

Gerrit-MessageType: merged

[MediaWiki-commits] [Gerrit] Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger - change (VisualEditor/VisualEditor)

2015-11-25 Thread DLynch (Code Review)

DLynch has uploaded a new change for review.

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

Change subject: Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger
..

Add cmd+[ / cmd+] as extra bindings for indent/outdent trigger

Change-Id: Iacb5bb7fd2fd5ba65f47ce3e78d053481938afcd
---
M src/ce/ve.ce.Surface.js
M src/ui/ve.ui.TriggerRegistry.js
2 files changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/82/255482/1

diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index d8b4f30..3314713 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1082,7 +1082,7 @@
 ve.ce.Surface.prototype.isBlockedTrigger = function ( trigger ) {
var platformKey = ve.getSystemPlatform() === 'mac' ? 'mac' : 'pc',
blocked = {
-   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab' ],
+   mac: [ 'meta+b', 'meta+i', 'meta+u', 'meta+z', 
'meta+y', 'meta+shift+z', 'tab', 'shift+tab', 'meta+[', 'meta+]' ],
pc: [ 'ctrl+b', 'ctrl+i', 'ctrl+u', 'ctrl+z', 'ctrl+y', 
'ctrl+shift+z', 'tab', 'shift+tab' ]
};
 
diff --git a/src/ui/ve.ui.TriggerRegistry.js b/src/ui/ve.ui.TriggerRegistry.js
index 4602c88..db4d529 100644
--- a/src/ui/ve.ui.TriggerRegistry.js
+++ b/src/ui/ve.ui.TriggerRegistry.js
@@ -131,10 +131,28 @@
'superscript', { mac: new ve.ui.Trigger( 'cmd+.' ), pc: new 
ve.ui.Trigger( 'ctrl+.' ) }
 );
 ve.ui.triggerRegistry.register(
-   'indent', new ve.ui.Trigger( 'tab' )
+   'indent', {
+   mac: [
+   new ve.ui.Trigger( 'tab' ),
+   new ve.ui.Trigger( 'cmd+]' )
+   ],
+   pc: [
+   new ve.ui.Trigger( 'tab' ),
+   new ve.ui.Trigger( 'ctrl+]' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
-   'outdent', new ve.ui.Trigger( 'shift+tab' )
+   'outdent', {
+   mac: [
+   new ve.ui.Trigger( 'shift+tab' ),
+   new ve.ui.Trigger( 'cmd+[' )
+   ],
+   pc: [
+   new ve.ui.Trigger( 'shift+tab' ),
+   new ve.ui.Trigger( 'ctrl+[' )
+   ]
+   }
 );
 ve.ui.triggerRegistry.register(
'commandHelp', {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacb5bb7fd2fd5ba65f47ce3e78d053481938afcd
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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

[MediaWiki-commits] [Gerrit] Migrate rdb1004 to jobqueue_redis role - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Migrate rdb1004 to jobqueue_redis role
..

Migrate rdb1004 to jobqueue_redis role

Change-Id: Id834e26eb6ce20cc2ff52dbcd54ef04b1ac847c5
---
A hieradata/hosts/rdb1004.yaml
M manifests/site.pp
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/255483/1

diff --git a/hieradata/hosts/rdb1004.yaml b/hieradata/hosts/rdb1004.yaml
new file mode 100644
index 000..fb3d0a6
--- /dev/null
+++ b/hieradata/hosts/rdb1004.yaml
@@ -0,0 +1 @@
+jobqueue_redis_slaveof: rdb1003
diff --git a/manifests/site.pp b/manifests/site.pp
index cbdfe16..043476c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2164,11 +2164,11 @@
 role rcstream
 }
 
-node 'rdb1007.eqiad.wmnet', 'rdb1008.eqiad.wmnet' {
+node 'rdb1004.eqiad.wmnet', 'rdb1007.eqiad.wmnet', 'rdb1008.eqiad.wmnet' {
 role jobqueue_redis
 }
 
-node /^rdb100[0-7]\.eqiad\.wmnet/ {
+node /^rdb100[0-3]\.eqiad\.wmnet/ {
 role redisdb
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] update civicrm submodule - change (wikimedia...crm)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: update civicrm submodule
..


update civicrm submodule

Change-Id: I0970604150a1188191498ab8cb1dba43308785f3
---
M civicrm
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/civicrm b/civicrm
index 488d66d..d385e34 16
--- a/civicrm
+++ b/civicrm
-Subproject commit 488d66d1b3a88605466b45d821c5224464f7a09c
+Subproject commit d385e34c775aec50a5c17357c8a11cb0244123ce

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0970604150a1188191498ab8cb1dba43308785f3
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update liuggio/statsd-php-client to 1.0.18 - change (mediawiki/core)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Update liuggio/statsd-php-client to 1.0.18
..


Update liuggio/statsd-php-client to 1.0.18

Depends-On: I81a7d7da30374072c78c51d1a7fe8229cd70d42c
Change-Id: Ibf06b3b97eb6002c1ad2666f38764b44fc716ef3
---
M RELEASE-NOTES-1.27
M composer.json
2 files changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index c66da4f..262bbbc 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -89,6 +89,7 @@
  Upgraded external libraries 
 * Updated oojs/oojs-ui from v0.12.12 to v0.13.3.
 * Updated composer/semver from v1.0.0 to v1.2.0.
+* Update liuggio/statsd-php-client to 1.0.18.
 
  New external libraries 
 * Added wikimedia/base-convert v1.0.1.
diff --git a/composer.json b/composer.json
index d90d8fc..0f8da12 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
"composer/semver": "1.2.0",
"cssjanus/cssjanus": "1.1.1",
"ext-iconv": "*",
-   "liuggio/statsd-php-client": "1.0.16",
+   "liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
"oojs/oojs-ui": "0.14.0",
"oyejorge/less.php": "1.7.0.9",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf06b3b97eb6002c1ad2666f38764b44fc716ef3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Daniel Friesen 
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] Update liuggio/statsd-php-client to 1.0.18 - change (mediawiki/vendor)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Update liuggio/statsd-php-client to 1.0.18
..


Update liuggio/statsd-php-client to 1.0.18

Change-Id: I81a7d7da30374072c78c51d1a7fe8229cd70d42c
---
M composer.json
M composer.lock
M composer/installed.json
M liuggio/statsd-php-client/.travis.yml
M liuggio/statsd-php-client/README.md
M liuggio/statsd-php-client/composer.json
M liuggio/statsd-php-client/phpunit.xml
M 
liuggio/statsd-php-client/src/Liuggio/StatsdClient/Monolog/Formatter/StatsDFormatter.php
D liuggio/statsd-php-client/tests/bootstrap.php
9 files changed, 114 insertions(+), 112 deletions(-)

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



diff --git a/composer.json b/composer.json
index 1cc8ca3..9358c23 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
"cssjanus/cssjanus": "1.1.1",
"firebase/php-jwt": "3.0.0",
"kzykhys/pygments": "1.0",
-   "liuggio/statsd-php-client": "1.0.16",
+   "liuggio/statsd-php-client": "1.0.18",
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.17.2",
"nmred/kafka-php": "0.1.4",
diff --git a/composer.lock b/composer.lock
index 70b2784..e36ccc0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "ab6216f9a7d51cb1f038b4f983538af3",
-"content-hash": "677901bc2f50774abb7c23a0f4abd3cd",
+"hash": "192f9652aa8b83ab88155466ea11f781",
+"content-hash": "7377c2362d6d1deb0432280e73e8f85a",
 "packages": [
 {
 "name": "composer/semver",
@@ -180,23 +180,24 @@
 },
 {
 "name": "liuggio/statsd-php-client",
-"version": "v1.0.16",
+"version": "v1.0.18",
 "source": {
 "type": "git",
 "url": "https://github.com/liuggio/statsd-php-client.git;,
-"reference": "a84fbef1a7afbfafd0ca4f1ebae4935bd1a7d920"
+"reference": "c42e6d6687b7b2d7683186ec7f4f03351cc3dbca"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/liuggio/statsd-php-client/zipball/a84fbef1a7afbfafd0ca4f1ebae4935bd1a7d920;,
-"reference": "a84fbef1a7afbfafd0ca4f1ebae4935bd1a7d920",
+"url": 
"https://api.github.com/repos/liuggio/statsd-php-client/zipball/c42e6d6687b7b2d7683186ec7f4f03351cc3dbca;,
+"reference": "c42e6d6687b7b2d7683186ec7f4f03351cc3dbca",
 "shasum": ""
 },
 "require": {
 "php": ">=5.3.2"
 },
 "require-dev": {
-"monolog/monolog": ">=1.2.0"
+"monolog/monolog": ">=1.2.0",
+"phpunit/phpunit": "^4.7"
 },
 "suggest": {
 "monolog/monolog": "Monolog, in order to do generate statistic 
from log >=1.2.0)"
@@ -225,7 +226,7 @@
 "php",
 "statsd"
 ],
-"time": "2015-04-27 08:12:26"
+"time": "2015-07-23 23:12:45"
 },
 {
 "name": "mediawiki/at-ease",
diff --git a/composer/installed.json b/composer/installed.json
index 012ec48..3228766 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -206,57 +206,6 @@
 "description": "A Thin Wrapper for the Python Pygments"
 },
 {
-"name": "liuggio/statsd-php-client",
-"version": "v1.0.16",
-"version_normalized": "1.0.16.0",
-"source": {
-"type": "git",
-"url": "https://github.com/liuggio/statsd-php-client.git;,
-"reference": "a84fbef1a7afbfafd0ca4f1ebae4935bd1a7d920"
-},
-"dist": {
-"type": "zip",
-"url": 
"https://api.github.com/repos/liuggio/statsd-php-client/zipball/a84fbef1a7afbfafd0ca4f1ebae4935bd1a7d920;,
-"reference": "a84fbef1a7afbfafd0ca4f1ebae4935bd1a7d920",
-"shasum": ""
-},
-"require": {
-"php": ">=5.3.2"
-},
-"require-dev": {
-"monolog/monolog": ">=1.2.0"
-},
-"suggest": {
-"monolog/monolog": "Monolog, in order to do generate statistic 
from log >=1.2.0)"
-},
-"time": "2015-04-27 08:12:26",
-"type": "library",
-"installation-source": "dist",
-"autoload": {
-"psr-0": {
-"Liuggio": "src/"
-}
-},
-"notification-url": "https://packagist.org/downloads/;,
-"license": [
-"MIT"
-],
-"authors": [
-{
-"name":

[MediaWiki-commits] [Gerrit] Collapse table selection when pressing escape - change (VisualEditor/VisualEditor)

2015-11-25 Thread DLynch (Code Review)

DLynch has uploaded a new change for review.

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

Change subject: Collapse table selection when pressing escape
..

Collapse table selection when pressing escape

This only matters for merged selections, where future cell-selection
movement via arrow keys is affected by the "intended" selection
covering the entire merged cell range. It seems more intuitive to
reset the selection to the top-left point of the merged cell instead.

Change-Id: I7d602d2ab1e4ff214a5d8b0e08789a7d977f902e
---
M src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/94/255494/1

diff --git a/src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js 
b/src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js
index a26a963..d492712 100644
--- a/src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js
+++ b/src/ce/keydownhandlers/ve.ce.LinearEscapeKeyDownHandler.js
@@ -42,7 +42,9 @@
e.preventDefault();
e.stopPropagation();
tableNode.setEditing( false );
-
+   // if this was a merged cell, we're going to have unexpected 
behavior when the selection moves,
+   // so pre-emptatively collapse to the top-left point of the 
merged cell.
+   surface.getModel().setSelection( 
surface.getModel().getSelection().collapseToStart() );
return true;
}
return false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d602d2ab1e4ff214a5d8b0e08789a7d977f902e
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch 

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

[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)

2015-11-25 Thread Awight (Code Review)

Awight has submitted this change and it was merged.

Change subject: update DonationInterface submodule
..


update DonationInterface submodule

Change-Id: I8f625503686d3426025389ae80cd8931ca3ded20
---
M extensions/DonationInterface
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index f969588..76da8de 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit f9695883b352b26486f1d49e5017869a157a0bc9
+Subproject commit 76da8ded59f4a31f5cfa7ff3399fb6cbacd55dc7

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f625503686d3426025389ae80cd8931ca3ded20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Awight 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Drop duplicate SQL files - change (mediawiki...OAuth)

2015-11-25 Thread Code Review

Gergő Tisza has uploaded a new change for review.

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

Change subject: Drop duplicate SQL files
..

Drop duplicate SQL files

With minimal exception, SQL files for MySQL and SQLite support are
the same. Prevent code duplication by falling back to the generic
version an SQL-dialect-specific version is not available.

This mirrors how patchfiles are handled in core.

Bug: T110267
Change-Id: I6853be84d212bf4738a1def3365f2676a3d36676
---
M backend/schema/MWOAuthUpdater.hooks.php
R backend/schema/OAuth.sql
R backend/schema/callback_is_prefix.sql
R backend/schema/developer_agreement.sql
D backend/schema/sqlite/OAuth.sql
D backend/schema/sqlite/developer_agreement.sql
6 files changed, 19 insertions(+), 89 deletions(-)


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

diff --git a/backend/schema/MWOAuthUpdater.hooks.php 
b/backend/schema/MWOAuthUpdater.hooks.php
index 611b508..0df3c57 100644
--- a/backend/schema/MWOAuthUpdater.hooks.php
+++ b/backend/schema/MWOAuthUpdater.hooks.php
@@ -14,20 +14,19 @@
if ( !MWOAuthUtils::isCentralWiki() ) {
return true; // no tables to add
}
-   $base = dirname( __FILE__ );
 
$dbType = $updater->getDB()->getType();
 
if ( $dbType == 'mysql' or $dbType == 'sqlite' ) {
-   $base = "$base/$dbType";
 
-   $updater->addExtensionTable( 
'oauth_registered_consumer', "$base/OAuth.sql" );
+   $updater->addExtensionTable( 
'oauth_registered_consumer',
+   self::getPath( 'OAuth.sql', $dbType ) );
 
$updater->addExtensionUpdate( array(
'addField',
'oauth_registered_consumer',
'oarc_callback_is_prefix',
-   "$base/callback_is_prefix.sql",
+   self::getPath( 'callback_is_prefix.sql', 
$dbType ),
true
) );
 
@@ -35,15 +34,28 @@
'addField',
'oauth_registered_consumer',
'oarc_developer_agreement',
-   "$base/developer_agreement.sql",
+   self::getPath( 'developer_agreement.sql', 
$dbType ),
true
) );
 
} elseif ( $dbType == 'postgres' ) {
-   //$base = "$base/postgres";
-
// @TODO
}
return true;
}
+
+   /**
+* @param string $filename Name of the patch file (without path).
+*The file should be in the backend/schema// directory
+*or the backend/schema directory.
+* @param string $dbType 'mysql' or 'sqlite'
+* @return string
+*/
+   protected static function getPath( $filename, $dbType ) {
+   $base = dirname( __FILE__ );
+   if ( file_exists( "$base/$dbType/$filename" ) ) {
+   return "$base/$dbType/$filename";
+   }
+   return "$base/$filename";
+   }
 }
diff --git a/backend/schema/mysql/OAuth.sql b/backend/schema/OAuth.sql
similarity index 100%
rename from backend/schema/mysql/OAuth.sql
rename to backend/schema/OAuth.sql
diff --git a/backend/schema/sqlite/callback_is_prefix.sql 
b/backend/schema/callback_is_prefix.sql
similarity index 100%
rename from backend/schema/sqlite/callback_is_prefix.sql
rename to backend/schema/callback_is_prefix.sql
diff --git a/backend/schema/mysql/developer_agreement.sql 
b/backend/schema/developer_agreement.sql
similarity index 100%
rename from backend/schema/mysql/developer_agreement.sql
rename to backend/schema/developer_agreement.sql
diff --git a/backend/schema/sqlite/OAuth.sql b/backend/schema/sqlite/OAuth.sql
deleted file mode 100644
index a043a2e..000
--- a/backend/schema/sqlite/OAuth.sql
+++ /dev/null
@@ -1,81 +0,0 @@
--- (c) Aaron Schulz, 2013
-
--- Replace /*_*/ with the proper prefix
-
--- These tables should belong in one central DB per wiki-farm
-
--- Client consumers (proposed as well as and accepted)
-CREATE TABLE IF NOT EXISTS /*_*/oauth_registered_consumer (
--- Immutable fields below:
--- Consumer ID (1:1 with oarc_consumer_key)
-oarc_id integer unsigned NOT NULL PRIMARY KEY auto_increment,
--- OAuth consumer key and secret (or RSA key)
-oarc_consumer_key varbinary(32) NOT NULL,
--- Name of the application
-oarc_name varchar(128) binary NOT NULL,
--- Key to the user who proposed the application
-oarc_user_id integer unsigned NOT NULL,
--- Version of the application
-oarc_version varbinary(32) NOT NULL,
-

[MediaWiki-commits] [Gerrit] Migrate rdb1003 to jobqueue_redis role - change (operations/puppet)

2015-11-25 Thread Ori.livneh (Code Review)

Ori.livneh has uploaded a new change for review.

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

Change subject: Migrate rdb1003 to jobqueue_redis role
..

Migrate rdb1003 to jobqueue_redis role

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


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 043476c..32b3fd4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2164,11 +2164,11 @@
 role rcstream
 }
 
-node 'rdb1004.eqiad.wmnet', 'rdb1007.eqiad.wmnet', 'rdb1008.eqiad.wmnet' {
+node /^rdb100[3-9]\.eqiad\.wmnet/ {
 role jobqueue_redis
 }
 
-node /^rdb100[0-3]\.eqiad\.wmnet/ {
+node /^rdb100[0-2]\.eqiad\.wmnet/ {
 role redisdb
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Remove labs_ldap_dns_ip_override hiera setting - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Remove labs_ldap_dns_ip_override hiera setting
..

Remove labs_ldap_dns_ip_override hiera setting

I'm pretty sure this was only needed during transition; removing
should be a no-op.

Change-Id: I95f8f7848042967446caca63a2bf8df5e4ac3011
---
D hieradata/hosts/labcontrol1001.yaml
M manifests/role/dns.pp
2 files changed, 1 insertion(+), 7 deletions(-)


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

diff --git a/hieradata/hosts/labcontrol1001.yaml 
b/hieradata/hosts/labcontrol1001.yaml
deleted file mode 100644
index 8a2b9ee..000
--- a/hieradata/hosts/labcontrol1001.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-labs_ldap_dns_ip_override: 208.80.154.94
-cluster: virt
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index be838d9..2baa971 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -5,11 +5,7 @@
 
 $ldapconfig = $ldap::role::config::labs::ldapconfig
 
-if hiera('labs_ldap_dns_ip_override', undef) == undef {
-$primary_ldap_dns = ipresolve(hiera('labs_ldap_dns_host'),4)
-} else {
-$primary_ldap_dns = hiera('labs_ldap_dns_ip_override')
-}
+$primary_ldap_dns = ipresolve(hiera('labs_ldap_dns_host'),4)
 
 interface::ip { 'role::dns::ldap':
 interface => 'eth0',

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

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

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

[MediaWiki-commits] [Gerrit] Remove proxyunbannable - change (mediawiki...OAuth)

2015-11-25 Thread jenkins-bot (Code Review)

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

Change subject: Remove proxyunbannable
..


Remove proxyunbannable

Bug: T75414
Change-Id: Id9195a88f5d3db053f85ca724dc331b431ef0d77
---
M OAuth.config.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/OAuth.config.php b/OAuth.config.php
index 64c15dd..4667082 100644
--- a/OAuth.config.php
+++ b/OAuth.config.php
@@ -55,7 +55,6 @@
 $wgMWOAuthGrantPermissions['useoauth']['ipblock-exempt'] = true;
 $wgMWOAuthGrantPermissions['useoauth']['nominornewtalk'] = true;
 $wgMWOAuthGrantPermissions['useoauth']['patrolmarks'] = true;
-$wgMWOAuthGrantPermissions['useoauth']['proxyunbannable'] = true;
 $wgMWOAuthGrantPermissions['useoauth']['purge'] = true;
 $wgMWOAuthGrantPermissions['useoauth']['read'] = true;
 $wgMWOAuthGrantPermissions['useoauth']['skipcaptcha'] = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9195a88f5d3db053f85ca724dc331b431ef0d77
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Cenarium 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 3 4 >

1 - 100 of 319 matches

Mail list logo