[MediaWiki-commits] [Gerrit] [WIP] Sanitize pageview_hourly table - change (analytics...source)

[Mforns (Code Review)]

Mforns has uploaded a new change for review.

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

Change subject: [WIP] Sanitize pageview_hourly table
..

[WIP] Sanitize pageview_hourly table

*This code is a draft of the actual job, it is on gerrit to
make interaction with the team easier.*

To execute this:
1) Ssh into stat1002
2) spark-shell --master yarn --num-executors 8 \
   --executor-memory 4G --driver-memory 2G
   # You can try with different params
3) Copy the file's code and paste it into the spark-shell.
   # You should subtitute the temporary output paths to
   # a location within your user folder in hdfs!
4) Call main()
5) Go to: yarn.wikimedia.org
6) Search for your username in the search box.
7) Click in the corresponding ApplicationMaster link.
   This will give an ERR_NAME_NOT_RESOLVED.
8) You have to replace analytics1001.eqiad.wmnet:8088/ by
   yarn.wikimedia.org
9) Here you can follow the execution of the job. You can
   also follow the logs in the spark-shell.

Bug: T118838
Change-Id: I31dd21be64d90b5f33e32abbaa6a6d612f4ac25c
---
A 
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewHourlySanitization.scala
1 file changed, 303 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/08/260408/1

diff --git 
a/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewHourlySanitization.scala
 
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewHourlySanitization.scala
new file mode 100644
index 000..be65183
--- /dev/null
+++ 
b/refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/PageviewHourlySanitization.scala
@@ -0,0 +1,303 @@
+
+import org.apache.spark.sql._
+import org.apache.spark.Accumulator
+import org.apache.spark.rdd.RDD
+import org.apache.spark.broadcast.Broadcast
+import org.apache.spark.sql.DataFrame
+import scala.math.log
+
+type RowMap = Map[String, Any]
+type DimensionStats = Map[(String, Any), Long]
+type AnonymizationStats = Map[String, Accumulator[Long]]
+
+val kAnonymityThreshold: Long = 20L
+
+val dimensions: Map[String, (Set[String], String, String)] = Map(
+// dimension name -> (
+// set of related dimensions to anonymize,
+// garbage value to use for anonymization,
+// field name in table for select statement
+// )
+"zero_carrier" -> (
+Set("zero_carrier"),
+"unknown",
+"zero_carrier"
+),
+"continent" -> (
+Set("continent", "country_code", "country", "subdivision", "city"),
+"unknown",
+"continent"
+),
+"country_code" -> (
+Set("country_code", "country", "subdivision", "city"),
+"unknown",
+"country_code"
+),
+"country" -> (
+Set("country", "country_code", "subdivision", "city"),
+"unknown",
+"country"
+),
+"subdivision" -> (
+Set("subdivision", "city"),
+"unknown",
+"subdivision"
+),
+"city" -> (
+Set("city"),
+"unknown",
+"city"
+),
+"ua_device_family" -> (
+Set("ua_device_family"),
+"unknown",
+"user_agent_map['device_family']"
+),
+"ua_os_family" -> (
+Set("ua_os_family", "ua_os_major", "ua_os_minor"),
+"unknown",
+"user_agent_map['os_family']"
+),
+"ua_os_major" -> (
+Set("ua_os_major", "ua_os_minor"),
+"unknown",
+"user_agent_map['os_major']"
+),
+"ua_os_minor" -> (
+Set("ua_os_minor"),
+"unknown",
+"user_agent_map['os_minor']"
+),
+"ua_browser_family" -> (
+Set("ua_browser_family", "ua_browser_major"),
+"unknown",
+"user_agent_map['browser_family']"
+),
+"ua_browser_major" -> (
+Set("ua_browser_major"),
+"unknown",
+"user_agent_map['browser_major']"
+),
+"ua_wmf_app_version" -> (
+Set("ua_wmf_app_version"),
+"unknown",
+"user_agent_map['wmf_app_version']"
+)
+)
+
+def rowToRowMap(row: Row): RowMap = {
+try {
+val userAgentMap: RowMap = row.get(12).asInstanceOf[RowMap]
+Map(
+"project" -> row.get(0),
+"language_variant" -> row.get(1),
+"page_title" -> row.get(2),
+"access_method" -> row.get(3),
+"zero_carrier" -> row.get(4),
+"agent_type" -> row.get(5),
+"referer_class" -> row.get(6),
+"continent" -> row.get(7),
+"country_code" -> row.get(8),
+"country" -> row.get(9),
+"subdivision" -> row.get(10),
+"city" -> row.get(11),
+"ua_device_family" -> userAgentMap("device_family"),
+"ua_os_family" -> userAgentMap("os_family"),
+"ua_os_major" -> userAgentMap("os_major"),
+"ua_os_minor" -> userAgentMap("os_minor"),
+

[MediaWiki-commits] [Gerrit] API: Improve description for ApiQueryPrefixSearch - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: API: Improve description for ApiQueryPrefixSearch
..


API: Improve description for ApiQueryPrefixSearch

Make it clear that the purpose of ApiQueryPrefixSearch is ''search'',
not to be an equivalent of Special:PrefixIndex.

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

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



diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 263f137..ea85411 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -916,7 +916,7 @@
"apihelp-query+pageswithprop-example-simple": "List the first 10 pages 
using DISPLAYTITLE:.",
"apihelp-query+pageswithprop-example-generator": "Get additional 
information about the first 10 pages using _NOTOC_.",
 
-   "apihelp-query+prefixsearch-description": "Perform a prefix search for 
page titles.",
+   "apihelp-query+prefixsearch-description": "Perform a prefix search for 
page titles.\n\nDespite the similarity in names, this module is not intended to 
be equivalent to [[Special:PrefixIndex]]; for that, see 
[[Special:ApiHelp/query+allpages|action=query=allpages]] with 
the apprefix parameter. The purpose of this module is similar to 
[[Special:ApiHelp/opensearch|action=opensearch]]: to take user input 
and provide the best-matching titles. Depending on the search engine backend, 
this might include typo correction, redirect avoidance, or other heuristics.",
"apihelp-query+prefixsearch-param-search": "Search string.",
"apihelp-query+prefixsearch-param-namespace": "Namespaces to search.",
"apihelp-query+prefixsearch-param-limit": "Maximum number of results to 
return.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5012d8e99b3250723d875fbb9ed5fbc08e53ca17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add i18n message apihelp-query+revisions-paramvalue-prop-fla... - change (mediawiki...FlaggedRevs)

[jenkins-bot (Code Review)]

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

Change subject: Add i18n message apihelp-query+revisions-paramvalue-prop-flagged
..


Add i18n message apihelp-query+revisions-paramvalue-prop-flagged

Change-Id: Ib13db0c4e59f14f4f5377aa61bc2491f379f63e1
---
M i18n/api/en.json
M i18n/api/qqq.json
2 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/i18n/api/en.json b/i18n/api/en.json
index 44c1e8e..ac30663 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -36,6 +36,7 @@
"apihelp-query+reviewedpages-param-limit": "How many total pages to 
return.",
"apihelp-query+reviewedpages-example-1": "Show a list of reviewed 
pages",
"apihelp-query+reviewedpages-example-2": "Show info about some reviewed 
pages",
+   "apihelp-query+revisions-paramvalue-prop-flagged": "Flagged status of 
the revision.",
"apihelp-query+unreviewedpages-description": "Enumerates pages that 
have not been reviewed to a given quality level.",
"apihelp-query+unreviewedpages-param-start": "Start listing at this 
page title.",
"apihelp-query+unreviewedpages-param-end": "Stop listing at this page 
title.",
diff --git a/i18n/api/qqq.json b/i18n/api/qqq.json
index e7f1802..81d5607 100644
--- a/i18n/api/qqq.json
+++ b/i18n/api/qqq.json
@@ -39,6 +39,7 @@
"apihelp-query+reviewedpages-param-limit": 
"{{doc-apihelp-param|query+reviewedpages|limit}}",
"apihelp-query+reviewedpages-example-1": 
"{{doc-apihelp-example|query+reviewedpages}}",
"apihelp-query+reviewedpages-example-2": 
"{{doc-apihelp-example|query+reviewedpages}}",
+   "apihelp-query+revisions-paramvalue-prop-flagged": 
"{{doc-apihelp-paramvalue|query+revisions|prop|flagged}}",
"apihelp-query+unreviewedpages-description": 
"{{doc-apihelp-description|query+unreviewedpages}}",
"apihelp-query+unreviewedpages-param-start": 
"{{doc-apihelp-param|query+unreviewedpages|start}}",
"apihelp-query+unreviewedpages-param-end": 
"{{doc-apihelp-param|query+unreviewedpages|end}}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib13db0c4e59f14f4f5377aa61bc2491f379f63e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] cassandra: add restbase100[3456] instances to seeds - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: add restbase100[3456] instances to seeds
..

cassandra: add restbase100[3456] instances to seeds

Change-Id: I7f4053b9b222c501c4b7baf76fba524440bd19af
---
M hieradata/role/common/cassandra.yaml
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/260414/1

diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 9012b3c..d73631c 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -14,9 +14,21 @@
 - restbase1002-b.eqiad.wmnet
 - restbase1002-c.eqiad.wmnet
 - restbase1003.eqiad.wmnet
+- restbase1003-a.eqiad.wmnet
+- restbase1003-b.eqiad.wmnet
+- restbase1003-c.eqiad.wmnet
 - restbase1004.eqiad.wmnet
+- restbase1004-a.eqiad.wmnet
+- restbase1004-b.eqiad.wmnet
+- restbase1004-c.eqiad.wmnet
 - restbase1005.eqiad.wmnet
+- restbase1005-a.eqiad.wmnet
+- restbase1005-b.eqiad.wmnet
+- restbase1005-c.eqiad.wmnet
 - restbase1006.eqiad.wmnet
+- restbase1006-a.eqiad.wmnet
+- restbase1006-b.eqiad.wmnet
+- restbase1006-c.eqiad.wmnet
 - restbase1007.eqiad.wmnet
 - restbase1007-a.eqiad.wmnet
 - restbase1008.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f4053b9b222c501c4b7baf76fba524440bd19af
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] mustache l10n - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: mustache l10n
..


mustache l10n

Bug: T120992
Change-Id: I75fcbcbd4d97341110a79a61082cfba9ab5a7e4d
---
M DonationInterface.php
M gateway_forms/Mustache.php
D gateway_forms/includes/ProvinceAbbreviations.php
D gateway_forms/includes/StateAbbreviations.php
A gateway_forms/includes/Subdivisions.php
M gateway_forms/mustache/forms.css
M gateway_forms/mustache/personal_info.html.mustache
M gateway_forms/mustache/state_dropdown.html.mustache
8 files changed, 143 insertions(+), 159 deletions(-)

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



diff --git a/DonationInterface.php b/DonationInterface.php
index 5e6864c..29bed19 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -66,8 +66,7 @@
 $wgAutoloadClasses['Gateway_Form_Mustache'] = __DIR__ . 
'/gateway_forms/Mustache.php';
 $wgAutoloadClasses['Gateway_Form_RapidHtml'] = __DIR__ . 
'/gateway_forms/RapidHtml.php';
 $wgAutoloadClasses['CountryCodes'] = __DIR__ . 
'/gateway_forms/includes/CountryCodes.php';
-$wgAutoloadClasses['ProvinceAbbreviations'] = __DIR__ . 
'/gateway_forms/includes/ProvinceAbbreviations.php';
-$wgAutoloadClasses['StateAbbreviations'] = __DIR__ . 
'/gateway_forms/includes/StateAbbreviations.php';
+$wgAutoloadClasses['Subdivisions'] = __DIR__ . 
'/gateway_forms/includes/Subdivisions.php';
 
 //GlobalCollect gateway classes
 $wgAutoloadClasses['GlobalCollectGateway'] = __DIR__ . 
'/globalcollect_gateway/globalcollect_gateway.body.php';
diff --git a/gateway_forms/Mustache.php b/gateway_forms/Mustache.php
index 37e3f8a..5ca42d3 100644
--- a/gateway_forms/Mustache.php
+++ b/gateway_forms/Mustache.php
@@ -109,6 +109,28 @@
$required_fields = $this->gateway->getRequiredFields();
foreach( $required_fields as $field ) {
$data["{$field}_required"] = true;
+
+   // If address is required, decide what to display based 
on country.
+   // FIXME this is conflating the meaning of 'address' 
with another
+   // definition in getRequiredFields.  These validation 
structures
+   // should be pulled out into config.
+   if ( $field === 'address' ) {
+   $data['city_required'] = true;
+   $data['postal_code_required'] = true;
+   $data['address_css_class'] = 'halfwidth';
+
+   // Does this country require a subdivision 
input?
+   $state_list = Subdivisions::getByCountry( 
$data['country'] );
+   if ( $state_list ) {
+   $data['address_css_class'] = 
'thirdwidth';
+   $data['state_required'] = true;
+   $data['state_options'] = array();
+   foreach ( $state_list as $abbr => $name 
) {
+   $data['state_options'][] = 
array( 'abbr' => $abbr, 'name' => $name );
+   }
+   }
+
+   }
}
 
foreach( $this->gateway->getCurrencies() as $currency ) {
diff --git a/gateway_forms/includes/ProvinceAbbreviations.php 
b/gateway_forms/includes/ProvinceAbbreviations.php
deleted file mode 100644
index 72f17ef..000
--- a/gateway_forms/includes/ProvinceAbbreviations.php
+++ /dev/null
@@ -1,28 +0,0 @@
- 'Select a Province',
-   'XX' => 'Outside Canada',
-   'AB' => 'Alberta',
-   'BC' => 'British Columbia',
-   'MB' => 'Manitoba',
-   'NB' => 'New Brunswick',
-   'NL' => 'Newfoundland and Labrador',
-   'NT' => 'Northwest Territories',
-   'NS' => 'Nova Scotia',
-   'NU' => 'Nunavut',
-   'ON' => 'Ontario',
-   'PE' => 'Prince Edward Island',
-   'QC' => 'Quebec',
-   'SK' => 'Saskatchewan',
-   'YT' => 'Yukon',
-   );
-
-   return $states;
-   }
-}
diff --git a/gateway_forms/includes/StateAbbreviations.php 
b/gateway_forms/includes/StateAbbreviations.php
deleted file mode 100644
index 62fdc82..000
--- a/gateway_forms/includes/StateAbbreviations.php
+++ /dev/null
@@ -1,70 +0,0 @@
- 'Select a State',
-   'XX' => 'Outside the U.S.',
-   'AK' => 'Alaska',
-   'AL' => 'Alabama',
-   'AR' => 'Arkansas',
-   'AZ' => 'Arizona',
-   'CA' => 'California',
-   

[MediaWiki-commits] [Gerrit] Don't block logins if localuser table is out of sync - change (mediawiki...CentralAuth)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Don't block logins if localuser table is out of sync
..

Don't block logins if localuser table is out of sync

Bug: T119736
Change-Id: I0843fd44c65b9d5e6dd0ee33ff9f36168ffe83b0
---
M includes/CentralAuthHooks.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index 926e84e..69d35a5 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -2243,8 +2243,10 @@
// wiki account can cause this Exception from
// CentralAuthUser::localUserData. Allow the 
password for now, and
// we'll catch them next login if their 
password isn't valid.
-   if ( $user->idForName() === 0
-   && substr( $e->getMessage(), 0 , 34 ) 
=== 'Could not find local user data for'
+   // And T119736 - if localuser table gets out of 
sync, don't
+   // deny logins
+   if ( substr( $e->getMessage(), 0 , 34 )
+   === 'Could not find local user data for'
) {
wfDebugLog(
'CentralAuth',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0843fd44c65b9d5e6dd0ee33ff9f36168ffe83b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
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] Switch dashboard for Maps over to detect automata - change (wikimedia...wetzel)

[OliverKeyes (Code Review)]

OliverKeyes has uploaded a new change for review.

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

Change subject: Switch dashboard for Maps over to detect automata
..

Switch dashboard for Maps over to detect automata

Pairs with the patch to the data retrieval scripts.
Don't deploy it yet, I need to smush the datasets
together.

Bug: T121758
Change-Id: If021bd521afa7b32c474526daeb5c0fbc20d39a6
---
M server.R
M ui.R
M utils.R
3 files changed, 42 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wetzel 
refs/changes/28/260428/1

diff --git a/server.R b/server.R
index 457b2cd..c3de516 100644
--- a/server.R
+++ b/server.R
@@ -18,7 +18,7 @@
   }
   
   output$tiles_summary_series <- renderDygraph({
-temp <- ddply(tiles_data, .(date), summarize,
+temp <- ddply(data_select(input$tile_summary_automata_check, 
new_tiles_automata, new_tiles_no_automata), .(date), summarize,
   `total tiles` = sum(total),
   `total users` = sum(users),
   `average tiles per user` = `total tiles` / `total users`)
@@ -36,8 +36,10 @@
tooltip = "Maps launch announcement",
width = 100, height = 25, attachAtBottom = TRUE)
   })
+  
   output$tiles_style_series <- renderDygraph({
-ddply(tiles_data, .(date, style), summarize, `total tiles` = sum(total)) 
%>%
+ddply(data_select(input$tile_style_automata_check, new_tiles_automata, 
new_tiles_no_automata),
+  .(date, style), summarize, `total tiles` = sum(total)) %>%
   tidyr::spread(style, `total tiles`) %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_tiles_style_series)) %>%
   
polloi::subset_by_date_range(time_frame_range(input$tiles_style_series_timeframe,
 input$tiles_style_series_timeframe_daterange)) %>%
@@ -47,8 +49,10 @@
tooltip = "Maps launch announcement",
width = 100, height = 25, attachAtBottom = TRUE)
   })
+  
   output$tiles_users_series <- renderDygraph({
-ddply(tiles_data, .(date, style), summarize, `total users` = sum(users)) 
%>%
+ddply(data_select(input$tile_users_automata_check, new_tiles_automata, 
new_tiles_no_automata),
+  .(date, style), summarize, `total users` = sum(users)) %>%
   tidyr::spread(style, `total users`) %>%
   polloi::smoother(smooth_level = 
polloi::smooth_switch(input$smoothing_global, 
input$smoothing_tiles_users_series)) %>%
   
polloi::subset_by_date_range(time_frame_range(input$tiles_users_series_timeframe,
 input$tiles_users_series_timeframe_daterange)) %>%
@@ -58,13 +62,15 @@
tooltip = "Maps launch announcement",
width = 100, height = 25, attachAtBottom = TRUE)
   })
+  
   output$zoom_level_selector_container <- renderUI({
 selectInput("zoom_level_selector", "Zoom level",
 multiple = TRUE, selected = "0", selectize = FALSE, size = 19,
 choices = as.character(sort(unique(tiles_data$zoom
   })
+  
   output$tiles_zoom_series <- renderDygraph({
-tiles_data %>%
+data_select(input$tile_zoom_automata_check, new_tiles_automata, 
new_tiles_no_automata) %>%
   subset(zoom %in% as.numeric(input$zoom_level_selector)) %>%
   ddply(.(date, zoom), summarize, `total tiles` = sum(total)) %>%
   tidyr::spread(zoom, `total tiles`) %>%
diff --git a/ui.R b/ui.R
index 965e375..8996079 100644
--- a/ui.R
+++ b/ui.R
@@ -4,6 +4,10 @@
 
 header <- dashboardHeader(title = "Wikimedia Maps", 
dropdownMenuOutput("message_menu"), disable = FALSE)
 
+spider_check <- function(id_name){
+  shiny::checkboxInput(id_name, label = "Include automata", value = TRUE)
+}
+
 sidebar <- dashboardSidebar(
   tags$head(
 tags$link(rel = "stylesheet", type = "text/css", href = "stylesheet.css"),
@@ -42,6 +46,7 @@
   column(polloi::smooth_select("smoothing_tiles_summary_series"), 
width = 3),
   
column(polloi::timeframe_select("tiles_summary_series_timeframe"), width = 3),
   
column(polloi::timeframe_daterange("tiles_summary_series_timeframe"), width = 
4)),
+spider_check("tile_summary_automata_check"),
 dygraphOutput("tiles_summary_series"),
 div(id = "tiles_summary_series_legend", style = "text-align: 
right;"),
 includeMarkdown("./tab_documentation/tiles_summary.md")),
@@ -50,6 +55,7 @@
   column(polloi::smooth_select("smoothing_tiles_style_series"), 
width = 4),
   column(polloi::timeframe_select("tiles_style_series_timeframe"), 
width = 4),
   
column(polloi::timeframe_daterange("tiles_style_series_timeframe"), width = 4)),
+spider_check("tile_style_automata_check"),
 dygraphOutput("tiles_style_series"),
 div(id = "tiles_style_series_legend", style = "text-align: 
right;"),
 

[MediaWiki-commits] [Gerrit] add wikimania2017, regular and .m. - change (operations/dns)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: add wikimania2017, regular and .m.
..


add wikimania2017, regular and .m.

Bug:T122062
Change-Id: Ic71eea25b791745d4d97f4dbfe4c88fa30ecfd29
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 5655de2..08f15d1 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -319,6 +319,7 @@
 wikimania2014.m 600 IN DYNA geoip!mobile-addrs
 wikimania2015.m 600 IN DYNA geoip!mobile-addrs
 wikimania2016.m 600 IN DYNA geoip!mobile-addrs
+wikimania2017.m 600 IN DYNA geoip!mobile-addrs
 wikitech.m  600 IN DYNA geoip!mobile-addrs
 
 ; Networking
@@ -605,6 +606,7 @@
 wikimania2014600 IN DYNA geoip!text-addrs
 wikimania2015600 IN DYNA geoip!text-addrs
 wikimania2016600 IN DYNA geoip!text-addrs
+wikimania2017600 IN DYNA geoip!text-addrs
 wikimaniateam600 IN DYNA geoip!text-addrs
 www  600 IN DYNA geoip!text-addrs
 zero 600 IN DYNA geoip!text-addrs

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

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

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

[MediaWiki-commits] [Gerrit] Fix static warning - change (wikimedia...crm)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Fix static warning
..


Fix static warning

Bug: T122021
Change-Id: I0d1a0586a317adca94aace865e24cde78bde4177
---
M sites/all/modules/wmf_reports/CRM/BAO/WmfContributionExtra.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/sites/all/modules/wmf_reports/CRM/BAO/WmfContributionExtra.php 
b/sites/all/modules/wmf_reports/CRM/BAO/WmfContributionExtra.php
index 3b35e8d..0da777b 100644
--- a/sites/all/modules/wmf_reports/CRM/BAO/WmfContributionExtra.php
+++ b/sites/all/modules/wmf_reports/CRM/BAO/WmfContributionExtra.php
@@ -1,7 +1,7 @@
  array(
 'title' => 'Deposit Date',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d1a0586a317adca94aace865e24cde78bde4177
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
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] Prevent blocked users from changing user rights through the API - change (mediawiki/core)

[Unicornisaurous (Code Review)]

Unicornisaurous has uploaded a new change for review.

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

Change subject: Prevent blocked users from changing user rights through the API
..

Prevent blocked users from changing user rights through the API

Prevent blocked users only if they do not have full userrights privleges,
which is the same behavior as implemented in Special:UserRights.

Change-Id: I69557b0951c8fb8b4e7d3ba571b0e5d30782ab4c
---
M includes/api/ApiUserrights.php
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/260436/1

diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index 3ccdde2..c268c77 100644
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -49,6 +49,29 @@
}
 
public function execute() {
+   $pUser = $this->getUser(); // Get the user try performing the 
action (for permission checks)
+   // Check blocks (Same behavior as Special:UserRights)
+   if ( $pUser->isBlocked() && !$pUser->isAllowed( 'userrights' ) 
) {
+   $block = $pUser->getBlock();
+
+   // Die using the appropriate message depending on block 
type
+   if ( $block->getType() == TYPE_AUTO ) {
+   $this->dieUsage(
+   'Your IP address has been blocked 
automatically, because it was used by a blocked user',
+   'autoblocked',
+   0,
+   array( 'blockinfo' => 
ApiQueryUserInfo::getBlockInfo( $block ) )
+   );
+   } else {
+   $this->dieUsage(
+   'You have been blocked from editing',
+   'blocked',
+   0,
+   array( 'blockinfo' => 
ApiQueryUserInfo::getBlockInfo( $block ) )
+   );
+   }
+   }
+
$params = $this->extractRequestParams();
 
$user = $this->getUrUser( $params );

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

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

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

[MediaWiki-commits] [Gerrit] Fix currency column format on Lybunt - change (wikimedia...crm)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Fix currency column format on Lybunt
..


Fix currency column format on Lybunt

Bug: T122027
Change-Id: I163b7772550135f027e86b4e9362d54b843a3c7a
---
M sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git 
a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php 
b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
index 8be20be..54fbd49 100644
--- a/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
+++ b/sites/all/modules/wmf_reports/CRM/Report/Form/Contribute/WmfLybunt.php
@@ -215,12 +215,14 @@
   ),
   'lifetime_usd_total' => array(
 'default' => true,
+'type' => CRM_Utils_Type::T_MONEY,
   ),
   'last_donation_date' => array(
 'default' => true,
   ),
   'last_donation_usd' => array(
 'default' => true,
+'type' => CRM_Utils_Type::T_MONEY,
   ),
 ),
   ),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I163b7772550135f027e86b4e9362d54b843a3c7a
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
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] ores: Have the redises listen on 0.0.0.0 - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: ores: Have the redises listen on 0.0.0.0
..

ores: Have the redises listen on 0.0.0.0

Change-Id: I7d2015d8b737de979b550b27d3f9a9ba6245a282
---
M modules/ores/manifests/redis.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/260440/1

diff --git a/modules/ores/manifests/redis.pp b/modules/ores/manifests/redis.pp
index 4798f84..827f5fd 100644
--- a/modules/ores/manifests/redis.pp
+++ b/modules/ores/manifests/redis.pp
@@ -16,6 +16,7 @@
 # For the queue
 redis::instance { '6379':
 settings => {
+bind   => '0.0.0.0',
 dir=> '/srv/redis/queue',
 maxmemory  => $queue_maxmemory,
 tcp_keepalive  => 60,
@@ -26,6 +27,7 @@
 # For the cache
 redis::instance { '6380':
 settings => {
+bind   => '0.0.0.0',
 dir=> '/srv/redis/cache',
 maxmemory  => $cache_maxmemory,
 tcp_keepalive  => 60,

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

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

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

[MediaWiki-commits] [Gerrit] setting up shell access for Casey Dentinger - change (operations/puppet)

[RobH (Code Review)]

RobH has uploaded a new change for review.

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

Change subject: setting up shell access for Casey Dentinger
..

setting up shell access for Casey Dentinger

Casey Dentinger works in FR tech and needs access to pageview data in
the course of their job duties.

T121916

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/260442/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 4888265..5e85b8c 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -67,7 +67,7 @@
   bastiononly:
 gid: 707
 description: these folks are allowed bastion _only_ access
-members: [jforrester, jmorgan, msyed, jkrauska, dfoy, junikowski,
+members: [jforrester, jmorgan, msyed, jkrauska, dfoy, junikowski, cwdent,
   haithams, mhurd, dbrant, kleduc, bsitzmann, deskana, chedasaurus,
   jzerebecki, declerambaul, ellery, dduvall, nettrom, mforns, 
jkatz,
   bmansurov, west1, jhernandez, smalyshev, tbayer, zfilipin,
@@ -230,7 +230,7 @@
  Hadoop NameNodes.  Some files in HDFS have sensitive data in 
them.
  Those files are group readable by the 
analytics-privatedata-users group.
 members: [dartar, milimetric, yurik, dfoy,
-  halfak, dr0ptp4kt, tnegrin, ironholds, bearloga,
+  halfak, dr0ptp4kt, tnegrin, ironholds, bearloga, cwdent,
   kleduc, nuria, haithams, otto, deskana, zhousquared,
   bsitzmann, dbrant, declerambaul, ellery, nettrom, leila,
   ezachte, mforns, reedy, west1, phuedx, awight, spage, junikowski,
@@ -1724,3 +1724,10 @@
 realname: Bartosz Dziewonski
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCvoVABbR0lV0QYcyviYSzkjwSwIsvLsLpomvJGX6CsVAXa8b7q8TMhcXRxEdcVv50JE+wE0PqCetLtNxRYVOPOMVZibt/w3jCZyVTio0bsdkYVDK0YT5UECfB9B+TI/gs2DRfDyeOIRjK8CqSSIqXsc7LeWQE3AZaFqAOXgtX+mTUIFfye3+yhs23mFWRx6LMUYkhiEviRlbHW83yMRRGZXPOLqsBGmAfusogv5g7+Xfr03LwEdLvOjXc+PxMNVZ1eUT3BQ+FOol93l0p/jCtME8ODiLbyhvaPbOOy5zbeqieRz0+xpgcfMWo9mOx6cVNUwL4FKD7D4Y0cYdaEq0QKdpeGh23lUDwVP2cnAgYgOE0Foon3QZV2q25fDprsnaNmYN6/YFCfmmQTy+YSI7K4gCahS1Wy7lJEAT/iKD5siPLkNKxCvQfgNFBQAJjfZbom9xeZdGHO0wwPlS2/FvwvlGIEf5v+b3bVLSKp2+J1HBRzqg26lcNtK3zehh+BuTOtBoWXaoE5gzIY1FhIRxcIiXqmYjPmb9DGMeX9QYeZ8AwV3SVPc8GI6mtBW6hsMNPvPNIBlIaINWX/dbAYmxhS4IolSWK5naXtKM3ZdnlfkJEI0HBvTLPIGEPYB1Dp31d1NuATO3SNtPsSbfWedufX3S+b6yqrO//sUIfhvKkJAQ==
 a@T500]
 uid: 2501
+  cwdent:
+ensure: present
+gid: 500
+name: cwdent
+realname: Casey Dentinger
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDhB5NxsYxf82q8N2/xUZXRUJNlgUB8moiLxFnrS8989pXs4wiilEFpYgMIZ0V30lu7xIeHzCWdJYEq0ySeQ8Wm5BVdM8APpiLZ4YNheG+gTtRaESSjyj6x/VcCxLjiXwzuXSEikmwXKhXeVFIO8s2FaOrb3JYizaWJxbA6DAQiD3ILR8pjuJtaUkZcmVO86qjdOFGqeRMMB1kVye9JYDRYow8QM13v0TDeP+5EY+6yTG5jlGNscTwYO6Xn/BPi+LS/X1AJYQ6qmWjUky3g6TJEREDmpZBmSfl5bGWBVohOZLuQWTxXAuQ/a5tuCbF+fVsJLZv4dRlEINgxyuEbTSwN]
+uid: 12179

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

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

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

[MediaWiki-commits] [Gerrit] T122054: Strip nowiki spans from templated / extension content - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

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

Change subject: T122054: Strip nowiki spans from templated / extension content
..


T122054: Strip nowiki spans from templated / extension content

Change-Id: I06353fafac9c8a6efa063302727df5815842607f
---
M lib/wt2html/pp/cleanup.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 21 insertions(+), 6 deletions(-)

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



diff --git a/lib/wt2html/pp/cleanup.js b/lib/wt2html/pp/cleanup.js
index 808b41a..fe82e16 100644
--- a/lib/wt2html/pp/cleanup.js
+++ b/lib/wt2html/pp/cleanup.js
@@ -50,6 +50,7 @@
if (!atTopLevel || !tplInfo || !DU.isElt(node)) {
return true;
}
+
// Cannot delete if:
// * it is the first node since that carries the transclusion
//   information (typeof, data-mw). We could delete and migrate
@@ -87,6 +88,7 @@
if (!DU.isElt(node)) { return true; }
 
var dp = DU.getDataParsoid(node);
+   var next;
 
// Delete empty auto-inserted elements
if (dp.autoInsertedStart && dp.autoInsertedEnd &&
@@ -96,7 +98,7 @@
/^\s*$/.test(node.textContent)
)
)) {
-   var next = node.nextSibling;
+   next = node.nextSibling;
if (node.firstChild) {
// migrate the ws out
node.parentNode.insertBefore(node.firstChild, node);
@@ -105,9 +107,9 @@
return next;
}
 
+   // Strip invalid data-mw attributes
var validDataMW = !!Object.keys(DU.getDataMw(node)).length;
if (!validDataMW) {
-   // Strip it
DU.setDataMw(node, undefined);
}
 
@@ -139,11 +141,24 @@
//
// But, do not zero it out if the node has template encapsulation
// information.  That will be disastrous (see T54638, T54488).
-   if (dp.fostered && dp.dsr && !DU.isFirstEncapsulationWrapperNode(node)) 
{
+   if (dp.fostered && dp.dsr && !(tplInfo && tplInfo.first === node)) {
dp.dsr[0] = dp.dsr[1];
}
 
if (atTopLevel) {
+   // Strip nowiki spans from templated content
+   // but leave behind wrappers on root nodes (they have valid 
about ids)
+   if (tplInfo && !DU.isTplOrExtToplevelNode(node) &&
+   /^mw:Nowiki$/.test(node.getAttribute('typeof'))) {
+   next = node.nextSibling;
+   DU.migrateChildren(node, node.parentNode, next);
+
+   // Replace the span with an empty text node.
+   // (better for perf instead of deleting the node)
+   
node.parentNode.replaceChild(node.ownerDocument.createTextNode(''), node);
+   return next;
+   }
+
// Strip data-parsoid from templated content, where unnecessary.
if (env.discardDataParsoid ||
(tplInfo
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 61c9637..a039543 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -381,7 +381,7 @@
 add("wt2wt", "Ref: 5. body should accept generic wikitext", "A This is a 
'''[[bolded link]]''' and this is a 
{{echo|transclusion}}\n\n\n");
 add("wt2wt", "Ref: 6. indent-pres should not be output in ref-body", "A 
foo\n bar\n baz\n\n\n");
 add("wt2wt", "Ref: 7. No p-wrapping in ref-body", "A 
foo\nbar\nbaz\nbooz\n\n\n");
-add("wt2wt", "Ref: 8. transclusion wikitext has lower precedence", "A foo 
{{echo| B C}}\n\n");
+add("wt2wt", "Ref: 8. transclusion wikitext has lower precedence", "A foo 
{{echo| B C}}\n\n");
 add("wt2wt", "Ref: 9. unclosed comments should not leak out of ref-body", "A 
foo  B C\n");
 add("wt2wt", "Ref: 10. Unclosed HTML tags should not leak out of ref-body", "A 
 foo  B C\n\n");
 add("wt2wt", "Ref: 19. ref-tags with identical name encodings should get 
identical indexes", "1 foo 2 \n\n");
@@ -1306,7 +1306,7 @@
 add("html2wt", "Ref: 5. body should accept generic wikitext", "A This is 
a '''[[bolded link]]''' and this is a 
{{echo|transclusion}}\n\n\n");
 add("html2wt", "Ref: 6. indent-pres should not be output in ref-body", "A 
foo\n bar\n baz\n\n\n");
 add("html2wt", "Ref: 7. No p-wrapping in ref-body", "A 
foo\nbar\nbaz\nbooz\n\n\n");
-add("html2wt", "Ref: 8. transclusion wikitext has lower precedence", "A 
foo {{echo| B C}}\n");
+add("html2wt", "Ref: 8. transclusion wikitext has lower precedence", "A 
foo {{echo| B C}}\n");
 add("html2wt", "Ref: 9. unclosed comments should not leak out of ref-body", "A 
foo  B C\n");
 add("html2wt", "Ref: 10. Unclosed HTML tags should not leak out of ref-body", 
"A  foo  B C\n\n");
 add("html2wt", "Ref: 19. ref-tags with identical name 

[MediaWiki-commits] [Gerrit] Add missing API i18n messages - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: Add missing API i18n messages
..


Add missing API i18n messages

Change-Id: Ia7e36294158eac740b778f39b4436e231c223d47
---
M amazon_gateway/i18n/en.json
M amazon_gateway/i18n/qqq.json
M worldpay_gateway/i18n/en.json
M worldpay_gateway/i18n/qqq.json
4 files changed, 29 insertions(+), 5 deletions(-)

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



diff --git a/amazon_gateway/i18n/en.json b/amazon_gateway/i18n/en.json
index 5f5c4e7..40dd64f 100644
--- a/amazon_gateway/i18n/en.json
+++ b/amazon_gateway/i18n/en.json
@@ -3,5 +3,12 @@
"authors": []
},
"amazongateway": "Make your donation now",
-   "amazon_gateway-desc": "Amazon payment processing"
-}
\ No newline at end of file
+   "amazon_gateway-desc": "Amazon payment processing",
+   "apihelp-di_amazon_bill-description": "",
+   "apihelp-di_amazon_bill-param-amount": "",
+   "apihelp-di_amazon_bill-param-billingAgreementId": "",
+   "apihelp-di_amazon_bill-param-currency_code": "",
+   "apihelp-di_amazon_bill-param-orderReferenceId": "",
+   "apihelp-di_amazon_bill-param-recurring": "",
+   "apihelp-di_amazon_bill-param-token": ""
+}
diff --git a/amazon_gateway/i18n/qqq.json b/amazon_gateway/i18n/qqq.json
index e4d2b40..1eb6e5b 100644
--- a/amazon_gateway/i18n/qqq.json
+++ b/amazon_gateway/i18n/qqq.json
@@ -5,5 +5,12 @@
]
},
"amazongateway": "{{Identical|Make your donation now}}",
-   "amazon_gateway-desc": "{{desc}}"
+   "amazon_gateway-desc": "{{desc}}",
+   "apihelp-di_amazon_bill-description": 
"{{doc-apihelp-description|di_amazon_bill}}",
+   "apihelp-di_amazon_bill-param-amount": 
"{{doc-apihelp-param|di_amazon_bill|amount}}",
+   "apihelp-di_amazon_bill-param-billingAgreementId": 
"{{doc-apihelp-param|di_amazon_bill|billingAgreementId}}",
+   "apihelp-di_amazon_bill-param-currency_code": 
"{{doc-apihelp-param|di_amazon_bill|currency_code}}",
+   "apihelp-di_amazon_bill-param-orderReferenceId": 
"{{doc-apihelp-param|di_amazon_bill|orderReferenceId}}",
+   "apihelp-di_amazon_bill-param-recurring": 
"{{doc-apihelp-param|di_amazon_bill|recurring}}",
+   "apihelp-di_amazon_bill-param-token": 
"{{doc-apihelp-param|di_amazon_bill|token}}"
 }
diff --git a/worldpay_gateway/i18n/en.json b/worldpay_gateway/i18n/en.json
index 4ea6649..9bf3020 100644
--- a/worldpay_gateway/i18n/en.json
+++ b/worldpay_gateway/i18n/en.json
@@ -22,5 +22,10 @@
"apihelp-di_wp_validate-param-zip": "",
"apihelp-di_wp_validate-param-country": "",
"apihelp-di_wp_validate-param-city": "",
-   "apihelp-di_wp_validate-param-cvc": ""
+   "apihelp-di_wp_validate-param-cvc": "",
+   "apihelp-di_wp_validate-param-email": "",
+   "apihelp-di_wp_validate-param-payment_submethod": "",
+   "apihelp-di_wp_validate-param-token": "",
+   "apihelp-di_wp_validate-param-amount": "",
+   "apihelp-di_wp_validate-param-ffname": ""
 }
diff --git a/worldpay_gateway/i18n/qqq.json b/worldpay_gateway/i18n/qqq.json
index a31da39..c2e873b 100644
--- a/worldpay_gateway/i18n/qqq.json
+++ b/worldpay_gateway/i18n/qqq.json
@@ -20,5 +20,10 @@
"apihelp-di_wp_validate-param-zip": 
"{{doc-apihelp-param|di_wp_validate|zip}}",
"apihelp-di_wp_validate-param-country": 
"{{doc-apihelp-param|di_wp_validate|country}}",
"apihelp-di_wp_validate-param-city": 
"{{doc-apihelp-param|di_wp_validate|city}}",
-   "apihelp-di_wp_validate-param-cvc": 
"{{doc-apihelp-param|di_wp_validate|cvc}}"
+   "apihelp-di_wp_validate-param-cvc": 
"{{doc-apihelp-param|di_wp_validate|cvc}}",
+   "apihelp-di_wp_validate-param-amount": 
"{{doc-apihelp-param|di_wp_validate|amount}}",
+   "apihelp-di_wp_validate-param-email": 
"{{doc-apihelp-param|di_wp_validate|email}}",
+   "apihelp-di_wp_validate-param-ffname": 
"{{doc-apihelp-param|di_wp_validate|ffname}}",
+   "apihelp-di_wp_validate-param-payment_submethod": 
"{{doc-apihelp-param|di_wp_validate|payment_submethod}}",
+   "apihelp-di_wp_validate-param-token": 
"{{doc-apihelp-param|di_wp_validate|token}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7e36294158eac740b778f39b4436e231c223d47
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 

[MediaWiki-commits] [Gerrit] add state dropdown to mustache form - change (mediawiki...DonationInterface)

[jenkins-bot (Code Review)]

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

Change subject: add state dropdown to mustache form
..


add state dropdown to mustache form

Bug: T119585
Change-Id: Ifdaaf108ece45bae1897a0016af4e27e7e54ac44
---
M gateway_forms/mustache/forms.css
M gateway_forms/mustache/personal_info.html.mustache
A gateway_forms/mustache/state_dropdown.html.mustache
3 files changed, 60 insertions(+), 1 deletion(-)

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



diff --git a/gateway_forms/mustache/forms.css b/gateway_forms/mustache/forms.css
index 2aa4046..2524673 100644
--- a/gateway_forms/mustache/forms.css
+++ b/gateway_forms/mustache/forms.css
@@ -16,6 +16,12 @@
 text-align: right;
 width: 94px;
 }
+
+/*  is annoyingly too wide at .thirdwidth */
+#state {
+   width: 30.25%;
+}
+
 .payment-cc-form-section {
 float: none;
 margin-right: 0;
diff --git a/gateway_forms/mustache/personal_info.html.mustache 
b/gateway_forms/mustache/personal_info.html.mustache
index c0d6854..8ce4b38 100644
--- a/gateway_forms/mustache/personal_info.html.mustache
+++ b/gateway_forms/mustache/personal_info.html.mustache
@@ -13,7 +13,7 @@



-   
+   {{> state_dropdown 
}}


 {{/ address_required }}
diff --git a/gateway_forms/mustache/state_dropdown.html.mustache 
b/gateway_forms/mustache/state_dropdown.html.mustache
new file mode 100644
index 000..4f381d0
--- /dev/null
+++ b/gateway_forms/mustache/state_dropdown.html.mustache
@@ -0,0 +1,53 @@
+
+   Alabama
+   Alaska
+   Arizona
+   Arkansas
+   California
+   Colorado
+   Connecticut
+   Delaware
+   District Of Columbia
+   Florida
+   Georgia
+   Hawaii
+   Idaho
+   Illinois
+   Indiana
+   Iowa
+   Kansas
+   Kentucky
+   Louisiana
+   Maine
+   Maryland
+   Massachusetts
+   Michigan
+   Minnesota
+   Mississippi
+   Missouri
+   Montana
+   Nebraska
+   Nevada
+   New Hampshire
+   New Jersey
+   New Mexico
+   New York
+   North Carolina
+   North Dakota
+   Ohio
+   Oklahoma
+   Oregon
+   Pennsylvania
+   Rhode Island
+   South Carolina
+   South Dakota
+   Tennessee
+   Texas
+   Utah
+   Vermont
+   Virginia
+   Washington
+   West Virginia
+   Wisconsin
+   Wyoming
+

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

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

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

[MediaWiki-commits] [Gerrit] Use new kafka role in role::cache::kafka - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Use new kafka role in role::cache::kafka
..


Use new kafka role in role::cache::kafka

Bug: T121659
Change-Id: I755e1422b35e8b0b04cbd9a6c4fbd9091f6c861f
---
M modules/role/manifests/cache/kafka.pp
M modules/role/manifests/kafka/analytics/config.pp
2 files changed, 5 insertions(+), 19 deletions(-)

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



diff --git a/modules/role/manifests/cache/kafka.pp 
b/modules/role/manifests/cache/kafka.pp
index c93f8ff..bb7fb84 100644
--- a/modules/role/manifests/cache/kafka.pp
+++ b/modules/role/manifests/cache/kafka.pp
@@ -2,19 +2,8 @@
 # Base class for instances of varnishkafka on cache servers.
 #
 class role::cache::kafka {
-require role::analytics::kafka::config
-
-# Get a list of kafka brokers for the currently configured 
$kafka_cluster_name.
-# In production this will be 'eqiad' always, since we only have one Kafka 
cluster there.
-# Even though $kafka_cluster_name should hardcoded to 'eqiad' in 
...kafka::config,
-# we hardcode it again here, just to be sure it doesn't accidentally get 
changed
-# if we add new Kafka clusters later.
-$kafka_cluster_name = $::realm ? {
-'production' => 'eqiad',
-'labs'   => $role::analytics::kafka::config::kafka_cluster_name,
-}
-
-$kafka_brokers = 
keys($role::analytics::kafka::config::cluster_config[$kafka_cluster_name])
+require role::kafka::analytics::config
+$kafka_brokers = $::role::kafka::analytics::config::brokers_array
 
 # Make sure varnishkafka rsyslog file is in place properly.
 rsyslog::conf { 'varnishkafka':
diff --git a/modules/role/manifests/kafka/analytics/config.pp 
b/modules/role/manifests/kafka/analytics/config.pp
index 049bc18..786cc6d 100644
--- a/modules/role/manifests/kafka/analytics/config.pp
+++ b/modules/role/manifests/kafka/analytics/config.pp
@@ -11,12 +11,9 @@
 # in labs or production.
 $cluster_name = hiera('kafka_cluster_name', $::realm ? {
 'labs'   => "analytics-${::labsproject}",
-'production' => $::site ? {
-# Production analytics Kafka cluster is called 'eqiad'
-# for historical reasons.
-'eqiad' => 'eqiad',
-default => "analytics-${::site}",
-}
+# Analytics Kafka cluster in production is called 'eqiad'
+# for historical reasons.
+'production' => 'eqiad',
 })
 
 # Use this default cluster config if none is found in hiera.

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

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

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

[MediaWiki-commits] [Gerrit] HistoryRevisionTools and DiffRevisionTools no longer use $wg... - change (mediawiki...Thanks)

[jenkins-bot (Code Review)]

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

Change subject: HistoryRevisionTools and DiffRevisionTools no longer use $wgUser
..


HistoryRevisionTools and DiffRevisionTools no longer use $wgUser

Modified insertThankLink to use passed in $user object instead
of $wgUser.

Bug: T121369
Change-Id: I1c9d1ff211bcec7815369509c5c50fad60d74643
---
M Thanks.hooks.php
1 file changed, 4 insertions(+), 6 deletions(-)

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



diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index bce2849..8989237 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -40,9 +40,7 @@
 * @param $oldRev Revision object of the "old" revision when viewing a 
diff
 * @return bool
 */
-   public static function insertThankLink( $rev, &$links, $oldRev = null ) 
{
-   global $wgUser;
-
+   public static function insertThankLink( $rev, &$links, $oldRev = null, 
User $user ) {
$recipientId = $rev->getUser();
$recipient = User::newFromId( $recipientId );
// Make sure Echo is turned on.
@@ -51,9 +49,9 @@
// Exclude users who are blocked.
// Check whether bots are allowed to receive thanks.
if ( class_exists( 'EchoNotifier' )
-   && !$wgUser->isAnon()
-   && $recipientId !== $wgUser->getId()
-   && !$wgUser->isBlocked()
+   && !$user->isAnon()
+   && $recipientId !== $user->getId()
+   && !$user->isBlocked()
&& self::canReceiveThanks( $recipient )
&& !$rev->isDeleted( Revision::DELETED_TEXT )
&& ( !$oldRev || $rev->getParentId() == 
$oldRev->getId() )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c9d1ff211bcec7815369509c5c50fad60d74643
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Mhutti1 
Gerrit-Reviewer: Florianschmidtwelzow 
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] Use new kafka role in eventlogging alerts - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Use new kafka role in eventlogging alerts
..


Use new kafka role in eventlogging alerts

Bug: T121659
Change-Id: I258b008834854ca246136663480819af915a8e2d
---
M manifests/role/graphite.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index b90c663..0f42f75 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -254,14 +254,14 @@
 #
 class role::graphite::alerts {
 # Infer Kafka cluster configuration from this class
-include ::role::analytics::kafka::config
+include ::role::kafka::analytics::config
 
 include ::mediawiki::monitoring::graphite
 include ::graphite::monitoring::graphite
 
 # Alerts for EventLogging metrics in Kafka.
 class { '::eventlogging::monitoring::graphite':
-kafka_brokers_graphite_wildcard =>  
$::role::analytics::kafka::config::brokers_graphite_wildcard
+kafka_brokers_graphite_wildcard =>  
$::role::kafka::analytics::config::brokers_graphite_wildcard
 }
 
 swift::monitoring::graphite_alerts { 'eqiad-prod': }

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

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

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

[MediaWiki-commits] [Gerrit] Redirect Special:UserProfile/Username to User:Username in beta - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Redirect Special:UserProfile/Username to User:Username in beta
..


Redirect Special:UserProfile/Username to User:Username in beta

Bug: T119412
Change-Id: I481574df53e0c2f61793e06863d4676e90583d9a
---
M includes/specials/SpecialUserProfile.php
1 file changed, 13 insertions(+), 7 deletions(-)

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



diff --git a/includes/specials/SpecialUserProfile.php 
b/includes/specials/SpecialUserProfile.php
index de21587..baf357a 100644
--- a/includes/specials/SpecialUserProfile.php
+++ b/includes/specials/SpecialUserProfile.php
@@ -174,13 +174,19 @@
$out->setPageTitle( $pageTitle );
// Make sure this is a valid registered user and not an 
invalid username (e.g. ip see bug 56822)
if ( $this->targetUser && $this->targetUser->getId() ) {
-
-   // Prepare content
-   $templateParser = new TemplateParser( __DIR__ );
-   $this->userInfo = new MobileUserInfo( 
$this->targetUser );
-   $html = $templateParser->processTemplate( 
'userprofile',
-   $this->getTemplateData( $templateParser 
) );
-   $out->addHtml( $html );
+   $context = MobileContext::singleton();
+   // if in beta redirect to the user page, i.e. 
User:Username
+   if ( $context->isBetaGroupMember() ) {
+   $redirectTitle = Title::makeTitle( 
NS_USER, $this->targetUser->getName() );
+   $out->redirect( 
$redirectTitle->getLocalURL() );
+   } else {
+   // Prepare content
+   $templateParser = new TemplateParser( 
__DIR__ );
+   $this->userInfo = new MobileUserInfo( 
$this->targetUser );
+   $html = 
$templateParser->processTemplate( 'userprofile',
+   $this->getTemplateData( 
$templateParser ) );
+   $out->addHtml( $html );
+   }
} else {
$this->displayNoUserError( 
'mobile-frontend-profile-nouser' );
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I481574df53e0c2f61793e06863d4676e90583d9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add more documentation to SpecialGadgetUsage::getQueryInfo() - change (mediawiki...Gadgets)

[jenkins-bot (Code Review)]

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

Change subject: Add more documentation to SpecialGadgetUsage::getQueryInfo()
..


Add more documentation to SpecialGadgetUsage::getQueryInfo()

Change-Id: I69dacb13034dd051534ff9d3700597f778f5bcb1
---
M SpecialGadgetUsage.php
1 file changed, 10 insertions(+), 1 deletion(-)

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



diff --git a/SpecialGadgetUsage.php b/SpecialGadgetUsage.php
index 34abe26..3208cda 100644
--- a/SpecialGadgetUsage.php
+++ b/SpecialGadgetUsage.php
@@ -50,7 +50,16 @@
}
 
/**
-* SQL Query being used:
+* Define the database query that is used to generate the stats table.
+* This uses 1 of 2 possible queries, depending on 
$wgSpecialGadgetUsageActiveUsers.
+*
+* The simple query is essentially:
+* SELECT up_property, SUM(up_value)
+* FROM user_properties
+* WHERE up_property LIKE 'gadget-%'
+* GROUP BY up_property;
+*
+* The more expensive query is:
 * SELECT up_property, SUM(up_value), count(qcc_title)
 * FROM user_properties
 * LEFT JOIN user ON up_user = user_id

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69dacb13034dd051534ff9d3700597f778f5bcb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Converting README to Markdown file and adding config documen... - change (mediawiki...Gadgets)

[jenkins-bot (Code Review)]

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

Change subject: Converting README to Markdown file and adding config 
documentation
..


Converting README to Markdown file and adding config documentation

Change-Id: I24814b8236cef0eaf7b9e0628d92912cbc2924a6
---
D README
A README.md
2 files changed, 43 insertions(+), 43 deletions(-)

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



diff --git a/README b/README
deleted file mode 100644
index ac85d70..000
--- a/README
+++ /dev/null
@@ -1,43 +0,0 @@
---
-README for the Gadgets extension
-Copyright © 2007 Daniel Kinzler
-Licenses: GNU General Public Licence (GPL)
-  GNU Free Documentation License (GFDL)
---
-
-The Gadgets extension provides a way for users to pick JavaScript or CSS
-based "gadgets" that other wiki users provide.
-
-
-
-The Gadgets extension was originally written by Daniel Kinzler in 2007
-and is released under the GNU General Public Licence (GPL).
-The internationalization files may contain contributions by several people;
-they should be mentioned in each file individually.
-
-== Prerequisites ==
-This version of Gadgets requires MediaWiki 1.27 or later. To get a version
-compatible with earlier MediaWiki release, visit
-https://www.mediawiki.org/wiki/Special:ExtensionDistributor/Gadgets
-
-== Installing ==
-Copy the Gadgets directory into the extensions folder of your
-MediaWiki installation. Then add the following lines to your
-LocalSettings.php file (near the end):
-
-  require_once "$IP/extensions/Gadgets/Gadgets.php";
-
-== Usage ==
-See http://www.mediawiki.org/wiki/Extension:Gadgets#Usage
-
-== Caveats ==
-
-* Gadgets do not apply to Special:Preferences, Special:UserLogin and
-  Special:ResetPass so users can always disable any broken gadgets they
-  may have enabled, and malicious gadgets will be unable to steal passwords.
-
-== Configuration settings ==
-* $wgGadgetsRepoClass configures which GadgetRepo implementation will be used
-  to source gadgets from. Currently, "MediaWikiGadgetsDefinitionRepo" is the
-  recommended setting and default. The "GadgetDefinitionNamespaceRepo" is not
-  ready for production usage yet.
diff --git a/README.md b/README.md
new file mode 100644
index 000..dde5aca
--- /dev/null
+++ b/README.md
@@ -0,0 +1,43 @@
+Gadgets
+=
+
+The Gadgets extension provides a way for users to pick JavaScript or CSS
+based "gadgets" that other wiki users provide.
+
+See https://www.mediawiki.org/wiki/Extension:Gadgets for more documentation.
+
+The Gadgets extension was originally written by Daniel Kinzler in 2007
+and is released under the GNU General Public Licence (GPL).
+
+Prerequisites
+-
+This version of Gadgets requires MediaWiki 1.27 or later. To get a version
+compatible with an earlier MediaWiki release, visit
+[ExtensionDistributor/Gadgets](https://www.mediawiki.org/wiki/Special:ExtensionDistributor/Gadgets).
+
+Installing
+-
+Copy the Gadgets directory into the extensions folder of your
+MediaWiki installation. Then add the following lines to your
+LocalSettings.php file (near the end):
+
+   require_once "$IP/extensions/Gadgets/Gadgets.php";
+
+Usage
+-
+See http://www.mediawiki.org/wiki/Extension:Gadgets#Usage
+
+Caveats
+-
+* Gadgets do not apply to Special:Preferences, Special:UserLogin and
+  Special:ResetPass so users can always disable any broken gadgets they
+  may have enabled, and malicious gadgets will be unable to steal passwords.
+
+Configuration
+-
+* `$wgGadgetsRepoClass`:  configures which GadgetRepo implementation will be 
used
+  to source gadgets from. Currently, "MediaWikiGadgetsDefinitionRepo" is the
+  recommended setting and default. The "GadgetDefinitionNamespaceRepo" is not
+  ready for production usage yet.
+* `$wgSpecialGadgetUsageActiveUsers`:  configures whether or not to show active
+  user stats on Special:GadgetUsage. True by default.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24814b8236cef0eaf7b9e0628d92912cbc2924a6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gadgets
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Niharika29 
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 VE core for I293442a6 - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Update VE core for I293442a6
..

Update VE core for I293442a6

Change-Id: Id0563a14366713e5cb6dac0991078433a71c9ae8
---
M extension.json
M lib/ve
2 files changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/extension.json b/extension.json
index 0b51478..8813f10 100644
--- a/extension.json
+++ b/extension.json
@@ -772,6 +772,7 @@

"lib/ve/src/ce/styles/nodes/ve.ce.FocusableNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.AlienNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.BranchNode.css",
+   
"lib/ve/src/ce/styles/nodes/ve.ce.ContentBranchNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.DocumentNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.GeneratedContentNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.HorizontalRuleNode.css",
diff --git a/lib/ve b/lib/ve
index 5fd7ed6..9d3def2 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 5fd7ed6e8b03ed21392938aa90bb923bd8910a7c
+Subproject commit 9d3def267ec7ccae466bb562899b8a2fa1c91039

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0563a14366713e5cb6dac0991078433a71c9ae8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.9
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] cassandra: add restbase1004-a instance - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: add restbase1004-a instance
..


cassandra: add restbase1004-a instance

Change-Id: I319814807eca300f20262a76c7e8a83a8bcb5f4f
---
M hieradata/hosts/restbase1004.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/hosts/restbase1004.yaml 
b/hieradata/hosts/restbase1004.yaml
index 422643c..d49c8c9 100644
--- a/hieradata/hosts/restbase1004.yaml
+++ b/hieradata/hosts/restbase1004.yaml
@@ -1 +1,7 @@
 cassandra::rack: 'b'
+cassandra::instances:
+  a:
+jmx_port: 7189
+listen_address: 10.64.32.192
+rpc_address: 10.64.32.192
+rpc_interface: eth0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I319814807eca300f20262a76c7e8a83a8bcb5f4f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] SpecialWatchlist: Avoid double space between checkbox and label - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: SpecialWatchlist: Avoid double space between checkbox and label
..


SpecialWatchlist: Avoid double space between checkbox and label

Add a separate message 'wlshowhidecategorization' without parameter.

Change-Id: I02a302f90e5c275559118698e31a46237b4b1cb1
---
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialWatchlist.php 
b/includes/specials/SpecialWatchlist.php
index 68dc9ab..c894a79 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -444,7 +444,7 @@
);
 
if ( $this->getConfig()->get( 'RCWatchCategoryMembership' ) ) {
-   $filters['hidecategorization'] = 
'rcshowhidecategorization';
+   $filters['hidecategorization'] = 
'wlshowhidecategorization';
}
 
foreach ( $this->getCustomFilters() as $key => $params ) {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0c72d77..000b4ae 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1960,6 +1960,7 @@
"wlshowhideanons": "anonymous users",
"wlshowhidepatr": "patrolled edits",
"wlshowhidemine": "my edits",
+   "wlshowhidecategorization": "page categorization",
"watchlist-options": "Watchlist options",
"watching": "Watching...",
"unwatching": "Unwatching...",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 329e901..d21718e 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2135,6 +2135,7 @@
"wlshowhideanons": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhideanons}}.\n{{Identical|Anonymous user}}",
"wlshowhidepatr": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhidepatr}}.",
"wlshowhidemine": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhidemine}}.",
+   "wlshowhidecategorization": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhidecategorization}}.",
"watchlist-options": "Legend of the fieldset of 
[[Special:Watchlist]]\n\nSee also:\n* {{msg-mw|Watchlist-details|watchlist 
header}}\n* {{msg-mw|Wlheader-enotif|watchlist header}}\n* {{msg-mw|enotif 
reset|Submit button text}}",
"watching": "Text displayed when clicked on the watch tab: 
{{msg-mw|Watch}}. It means the wiki is adding that page to your watchlist.",
"unwatching": "Text displayed when clicked on the unwatch tab: 
{{msg-mw|Unwatch}}. It means the wiki is removing that page from your 
watchlist.",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02a302f90e5c275559118698e31a46237b4b1cb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mw.ForeignStructuredUpload: Prevent 'null' author name if di... - change (mediawiki/core)

[Code Review]

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

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

Change subject: mw.ForeignStructuredUpload: Prevent 'null' author name if 
dialog opened when not logged in
..

mw.ForeignStructuredUpload: Prevent 'null' author name if dialog opened when 
not logged in

Bug: T121097
Change-Id: Ifb178161fabe3adf0a76543a1226eb91adfe1b1d
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/260402/1

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js 
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index 768efc3..c03c0d1 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -197,9 +197,18 @@
 * @return {string}
 */
ForeignStructuredUpload.prototype.getUser = function () {
-   var username = mw.config.get( 'wgUserName' );
-   // Do not localise 'User:', we don't know the language of 
target wiki
-   return '[[User:' + username + '|' + username + ']]';
+   var username, namespace;
+   // Do not localise, we don't know the language of target wiki
+   namespace = 'User';
+   username = mw.config.get( 'wgUserName' );
+   if ( !username ) {
+   // The user is not logged in locally. However, they 
might be logged in on the foreign wiki.
+   // We should record their username there. (If they're 
not logged in there either, this will
+   // record the IP address.) It's also possible that the 
user opened this dialog, got an error
+   // about not being logged in, logged in in another 
browser tab, then continued uploading.
+   username = '{{subst:REVISIONUSER}}';
+   }
+   return '[[' + namespace + ':' + username + '|' + username + 
']]';
};
 
mw.ForeignStructuredUpload = ForeignStructuredUpload;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb178161fabe3adf0a76543a1226eb91adfe1b1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] Remove unused ganglia kafka views - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Remove unused ganglia kafka views
..


Remove unused ganglia kafka views

Bug: T121659
Change-Id: I063cdfe16a32963c9d9cfd33f00e923b074e52dc
---
M manifests/misc/monitoring.pp
M modules/role/manifests/zookeeper/client.pp
2 files changed, 1 insertion(+), 123 deletions(-)

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



diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index 7da3aae..9312c23 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -3,14 +3,6 @@
 # Ganglia views that should be
 # avaliable on ganglia.wikimedia.org
 class misc::monitoring::views {
-include role::analytics::kafka::config
-
-$kafka_log_disks_regex = 
join($::role::analytics::kafka::config::log_disks, '|')
-$kafka_broker_host_regex = 
join($::role::analytics::kafka::config::brokers_array, '|')
-misc::monitoring::view::kafka { 'kafka':
-kafka_broker_host_regex => $kafka_broker_host_regex,
-kafka_log_disks_regex   => $kafka_log_disks_regex,
-}
 misc::monitoring::view::varnishkafka { 'webrequest':
 topic_regex => 'webrequest_.+',
 }
@@ -119,120 +111,6 @@
 ]
 }
 }
-
-# == Define misc:monitoring::view::kafka
-# Installs a ganglia::web::view for a group of nodes
-# running kafka broker servers.  This is just a wrapper for
-# kafka specific metrics to include in kafka
-#
-# == Parameters:
-# $kafka_broker_host_regex   - regex matching kafka broker hosts
-# $log_disk_regex- regex matching disks that have Kafka log 
directories
-#
-define misc::monitoring::view::kafka($kafka_broker_host_regex, 
$kafka_log_disks_regex = '.+', $ensure = 'present') {
-ganglia::web::view { $name:
-ensure => $ensure,
-graphs => [
-# Messages In
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-MessagesInPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Bytes In
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-BytesInPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# BytesOut
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-BytesOutPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Produce Requests
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.network.RequestMetrics.Produce-RequestsPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Failed Produce Requests
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-FailedProduceRequestsPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Replica Max Lag
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaFetcherManager.Replica-MaxLag.Value',
-'type' => 'line',
-},
-# Under Replicated Partitions
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaManager.UnderReplicatedPartitions.Value',
-'type' => 'line',
-},
-
-# ISR Shrinks
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaManager.ISRShrinks.FiveMinuteRate',
-'type' => 'line',
-},
-# ISR Expands
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaManager.ISRExpands.FiveMinuteRate',
-'type' => 'line',
-},
-# /proc/diskstat bytes written per second
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_write_bytes_per_sec",
-'type' => 'stack',
-},
-# /proc/diskstat bytes read per second
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_read_bytes_per_sec",
-'type' => 'stack',
-},
-# /proc/diskstat disk utilization %
-{
-'host_regex'   => 

[MediaWiki-commits] [Gerrit] Fix globs in global and mw-selenium teardown scripts - change (integration/jenkins)

[jenkins-bot (Code Review)]

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

Change subject: Fix globs in global and mw-selenium teardown scripts
..


Fix globs in global and mw-selenium teardown scripts

The * glob pattern was incorrectly quoted, resulting in no TMPDIR files
from actually being deleted during teardown.

Fixes regression in I7803395f7f1774d501b60df42e2d7b6628352738

Bug: T120824
Change-Id: I4edf7099acfeb0f06ea2042902bef03097137d6e
---
M bin/global-teardown.sh
M bin/mw-selenium-teardown.sh
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/bin/global-teardown.sh b/bin/global-teardown.sh
index 6399f4d..329cc9d 100755
--- a/bin/global-teardown.sh
+++ b/bin/global-teardown.sh
@@ -13,5 +13,5 @@
 
 # Have bash '*' to expand dot files as well
 shopt -s dotglob
-rm -v -rf "${TMPDIR_FS}/*"
-rm -v -rf "${TMPDIR_REGULAR}/*"
+rm -v -rf "$TMPDIR_FS"/*
+rm -v -rf "$TMPDIR_REGULAR"/*
diff --git a/bin/mw-selenium-teardown.sh b/bin/mw-selenium-teardown.sh
index 4c48c68..3cde013 100755
--- a/bin/mw-selenium-teardown.sh
+++ b/bin/mw-selenium-teardown.sh
@@ -5,4 +5,4 @@
 # Have bash '*' to expand dot files as well.
 # We keep the directory see bin/global-teardown.sh and T120824
 shopt -s dotglob
-rm -v -rf "$TMPDIR/*"
+rm -v -rf "$TMPDIR"/*

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4edf7099acfeb0f06ea2042902bef03097137d6e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Dduvall 
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] Conceptmapping needs two vailable data sets - change (mediawiki...WikiLexicalData)

[Kipcool (Code Review)]

Kipcool has submitted this change and it was merged.

Change subject: Conceptmapping needs two vailable data sets
..


Conceptmapping needs two vailable data sets

Bug: T118716
Change-Id: I3f316ee7c19baad47c0615972d22c020cc9f5fc5
---
M OmegaWiki/SpecialConceptMapping.php
M i18n/lexicaldata/en.json
M i18n/lexicaldata/qqq.json
3 files changed, 7 insertions(+), 0 deletions(-)

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



diff --git a/OmegaWiki/SpecialConceptMapping.php 
b/OmegaWiki/SpecialConceptMapping.php
index f320508..bb6d1f5 100644
--- a/OmegaWiki/SpecialConceptMapping.php
+++ b/OmegaWiki/SpecialConceptMapping.php
@@ -30,6 +30,11 @@
$wgOut->addHTML( wfMessage( "ow_Permission_denied" 
)->text() );
return false;
}
+   $sets = wdGetDataSets();
+   if ( count( $set ) < 2 ) {
+   $wgOut->addHTML( wfMessage( "ow-conceptmapping-too-few" 
)->text() );
+   return false;
+   }
$action = $wgRequest->getText( 'action' );
if ( !$action ) {
$this->ui();
diff --git a/i18n/lexicaldata/en.json b/i18n/lexicaldata/en.json
index 6719414..4f9ce90 100644
--- a/i18n/lexicaldata/en.json
+++ b/i18n/lexicaldata/en.json
@@ -91,6 +91,7 @@
"ow_transaction_second_dm": "Second defined meaning",
"ow_transaction_summary": "Summary",
"conceptmapping": "Concept mapping",
+   "ow-onceptmapping-too-few": "Two or more data sets are needed.",
"ow_conceptmapping_title": "Concept Mapping",
"ow_conceptmapping_help": "possible actions: 
\n=insert&=&... insert a 
mapping\n=get= read a mapping 
back\n=list_sets return a list of possible data context 
prefixes and what they refer 
to.\n=get_associated==
 for one defined meaning in a concept, return all others\n=help 
Show helpful help.\n",
"ow_conceptmapping_uitext": "Concept Mapping allows you to identify 
which defined meaning in one dataset is identical to defined meanings in other 
datasets.",
diff --git a/i18n/lexicaldata/qqq.json b/i18n/lexicaldata/qqq.json
index eb07cd1..3e6c6b2 100644
--- a/i18n/lexicaldata/qqq.json
+++ b/i18n/lexicaldata/qqq.json
@@ -69,6 +69,7 @@
"ow_transaction_object": "{{Identical|Object}}",
"ow_transaction_summary": "{{Identical|Summary}}",
"conceptmapping": "{{doc-special|ConceptMapping}}",
+   "ow-onceptmapping-too-few": "Informs the user that 
Special:ConceptMapping requires at least two data sets. Else there is nothing 
to map between.",
"ow_conceptmapping_title": "{{doc-special|ConceptMapping}}",
"ow_conceptmapping_uitext": "A \"dataset\" is an independant collection 
of data, such as an ontology, a thesaurus, or a specific dictionary.",
"ow_conceptmapping_no_action_specified": "Parameters:\n* $1 - 
unsupported action. It can be anything that has been provided by a 
client.\nSupported actions are: insert, get, help, get_associated",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f316ee7c19baad47c0615972d22c020cc9f5fc5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Purodha 
Gerrit-Reviewer: Hiong3-eng5 
Gerrit-Reviewer: Kipcool 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add canonical namespace names. - change (mediawiki...WikiLexicalData)

[Kipcool (Code Review)]

Kipcool has submitted this change and it was merged.

Change subject: Add canonical namespace names.
..


Add canonical namespace names.

Change-Id: I9eadb8aa04a591a4b7402b751b623b92c264378f
---
M App.php
M Database scripts/Convenience/wikidataCoreTables.sql
M OmegaWiki.hooks.php
3 files changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/App.php b/App.php
index f2710aa..37125e4 100644
--- a/App.php
+++ b/App.php
@@ -179,6 +179,7 @@
 # $wgHooks['ParserBeforeStrip'][] = 
'OmegaWikiHooks::onInternalParseBeforeLinks';
 # $wgHooks['ParserBeforeInternalParse'][] = 
'OmegaWikiHooks::onInternalParseBeforeLinks';
 $wgHooks['InternalParseBeforeSanitize'][] = 
'OmegaWikiHooks::onInternalParseBeforeLinks';
+$wgHooks['CanonicalNamespaces'][] = 'OmegaWikiHooks::addCanonicalNamespaces';
 
 // Jobs
 require_once( $wgWldSetupScriptPath . "OWJobs.php" );
diff --git a/Database scripts/Convenience/wikidataCoreTables.sql b/Database 
scripts/Convenience/wikidataCoreTables.sql
index 69170d3..0fce6d9 100644
--- a/Database scripts/Convenience/wikidataCoreTables.sql
+++ b/Database scripts/Convenience/wikidataCoreTables.sql
@@ -1,3 +1,6 @@
+-- This script is outdated. There is no table 'namespace' any more. Purodha 
2015-11-20.
+--
+
 --
 -- Add the wikidata specific namespaces
 --
@@ -126,4 +129,4 @@
   set_dmid int(10) default NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
- 
\ No newline at end of file
+ 
diff --git a/OmegaWiki.hooks.php b/OmegaWiki.hooks.php
index 21cb9f8..5e2ed47 100644
--- a/OmegaWiki.hooks.php
+++ b/OmegaWiki.hooks.php
@@ -61,4 +61,15 @@
return True;
}
 
+   /**
+* Adds canonical namespaces.
+*/
+   public static function addCanonicalNamespaces( &$list ) {
+   $list[NS_DEFINEDMEANING] = 'DefinedMeaning';
+   $list[NS_DEFINEDMEANING + 1] = 'DefinedMeaning_talk';
+   $list[NS_EXPRESSION] = 'Expression';
+   $list[NS_EXPRESSION + 1] = 'Expression_talk';
+   return true;
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9eadb8aa04a591a4b7402b751b623b92c264378f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Purodha 
Gerrit-Reviewer: Hiong3-eng5 
Gerrit-Reviewer: Kipcool 
Gerrit-Reviewer: Springle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] setting tegmen dns entries - change (operations/dns)

[RobH (Code Review)]

RobH has submitted this change and it was merged.

Change subject: setting tegmen dns entries
..


setting tegmen dns entries

updating mgmt for new hostname and adding production dns entries for
tegmen, slated as a monitoring server in codfw

T121583

Change-Id: I6ff82b86e1b3982f930155e0eb4c2c9d4f7dfdc5
---
M templates/10.in-addr.arpa
M templates/153.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
4 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 6c8d827..15d73fb 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3230,6 +3230,7 @@
 25  1H IN PTR  kafka2002.mgmt.codfw.wmnet.
 25  1H IN PTR  wmf6379.mgmt.codfw.wmnet.
 26  1H IN PTR  wmf6380.mgmt.codfw.wmnet.
+27  1H IN PTR  tegmen.mgmt.codfw.wmnet.
 27  1H IN PTR  wmf6381.mgmt.codfw.wmnet.
 28  1H IN PTR  wmf6382.mgmt.codfw.wmnet.
 29  1H IN PTR  wmf6383.mgmt.codfw.wmnet.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index 7b11f7b..8db692c 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -60,6 +60,7 @@
 71  1H  IN PTR  vl2003-eth2.lvs2004.codfw.wmnet.
 72  1H  IN PTR  vl2003-eth2.lvs2005.codfw.wmnet.
 73  1H  IN PTR  vl2003-eth2.lvs2006.codfw.wmnet.
+74  1H  IN PTR  tegmen.wikimedia.org.
 
 ; 208.80.153.96/27 (public1-d-codfw)
 97  1H  IN PTR  vrrp-gw-2004.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index b63389e..5655de2 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -182,6 +182,7 @@
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136
 1H  IN  2620:0:861:2:208:80:154:136
+tegmen  1H  IN A208.80.153.74
 tellurium   1H  IN A208.80.155.9
 titanium1H  IN A208.80.154.154
 uranium 1H  IN A208.80.154.53
diff --git a/templates/wmnet b/templates/wmnet
index ced6b97..78ec743 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3300,6 +3300,7 @@
 restbase20041H IN A 10.193.2.227
 restbase20051H IN A 10.193.2.228
 restbase20061H IN A 10.193.2.229
+tegmen  1H  IN A10.193.1.27
 tmh2001 1H  IN A10.193.1.8
 tmh2002 1H  IN A10.193.1.9
 wtp2001 1H  IN A10.193.2.15

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

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

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

[MediaWiki-commits] [Gerrit] Use new kafka role in role::logstash::eventlogging - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Use new kafka role in role::logstash::eventlogging
..

Use new kafka role in role::logstash::eventlogging

Bug: T121659

Change-Id: I4763836fce6ff563be7cba7b00c2ebcba8e37bef
---
M manifests/role/logstash.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/260413/1

diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 2f8da5f..e7278d5 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -388,14 +388,14 @@
 #
 class role::logstash::eventlogging {
 include ::role::logstash
-include ::role::analytics::kafka::config
+include ::role::kafka::analytics::config
 
 $topic = 'eventlogging_EventError'
 
 logstash::input::kafka { $topic:
 tags   => [$topic, 'kafka'],
 type   => 'eventlogging',
-zk_connect => $role::analytics::kafka::config::zookeeper_url,
+zk_connect => $role::kafka::analytics::config::zookeeper_url,
 }
 
 logstash::conf { 'filter_eventlogging':

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

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

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

[MediaWiki-commits] [Gerrit] setting tegmen install parameters - change (operations/puppet)

[RobH (Code Review)]

RobH has submitted this change and it was merged.

Change subject: setting tegmen install parameters
..


setting tegmen install parameters

setting the install_server updates for new system install

T121583

Change-Id: Icfebfc696e5ca89046a83fd098125c8908bb4059
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 8 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 78a4864..8be1d97 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -72,7 +72,7 @@
elastic20[0-2][0-9]|elastic203[0-1]) echo 
partman/elasticsearch-raid1.cfg ;; \

bromine|dubnium|etherpad[12]001|fermium|krypton|mendelevium|planet1001|pollux|rutherfordium|seaborgium|serpens|technetium|cygnus)
 echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
-   francium|nobelium) echo partman/raid10-gpt.cfg ;; \
+   francium|nobelium|tegmen) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
ganeti200[1-9]) echo partman/ganeti.cfg ;; \
graphite1002) echo partman/graphite-dmcache.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 85a3b05..391155c 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6247,6 +6247,13 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host tegmen {
+   hardware ethernet 14:18:77:33:42:F8;
+   fixed-address tegmen.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host restbase-test2001 {
hardware ethernet 90:B1:1C:2A:2F:0A;
fixed-address restbase-test2001.codfw.wmnet;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfebfc696e5ca89046a83fd098125c8908bb4059
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] checkLocalUser: Fix --delete option - change (mediawiki...CentralAuth)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: checkLocalUser: Fix --delete option
..

checkLocalUser: Fix --delete option

getOption() isn't going to return a boolean true, change the check to
make sure that it's not boolean false.

Change-Id: I009e5110afe77904eda1c6f256b2561736f75761
---
M maintenance/checkLocalUser.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/maintenance/checkLocalUser.php b/maintenance/checkLocalUser.php
index a47c012..45de2fc 100644
--- a/maintenance/checkLocalUser.php
+++ b/maintenance/checkLocalUser.php
@@ -28,7 +28,7 @@
$centralMaster = CentralAuthUser::getCentralDB();
$centralSlave = CentralAuthUser::getCentralSlaveDB();
 
-   if ( $this->getOption( 'delete', false ) === true ) {
+   if ( $this->getOption( 'delete', false ) !== false ) {
$this->dryrun = false;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I009e5110afe77904eda1c6f256b2561736f75761
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
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] checkLocalUser: Fix --delete option - change (mediawiki...CentralAuth)

[Alex Monk (Code Review)]

Alex Monk has submitted this change and it was merged.

Change subject: checkLocalUser: Fix --delete option
..


checkLocalUser: Fix --delete option

getOption() isn't going to return a boolean true, change the check to
make sure that it's not boolean false.

Change-Id: I009e5110afe77904eda1c6f256b2561736f75761
---
M maintenance/checkLocalUser.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alex Monk: Verified; Looks good to me, approved



diff --git a/maintenance/checkLocalUser.php b/maintenance/checkLocalUser.php
index a47c012..45de2fc 100644
--- a/maintenance/checkLocalUser.php
+++ b/maintenance/checkLocalUser.php
@@ -28,7 +28,7 @@
$centralMaster = CentralAuthUser::getCentralDB();
$centralSlave = CentralAuthUser::getCentralSlaveDB();
 
-   if ( $this->getOption( 'delete', false ) === true ) {
+   if ( $this->getOption( 'delete', false ) !== false ) {
$this->dryrun = false;
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I009e5110afe77904eda1c6f256b2561736f75761
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 

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

[MediaWiki-commits] [Gerrit] toollabs: Remove NFS dependency from proxies - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: toollabs: Remove NFS dependency from proxies
..


toollabs: Remove NFS dependency from proxies

Should just do manual deploys for tools.admin

Change-Id: I80b6d0054c1831664d23108dd23872f4095011b3
---
A modules/toollabs/files/favicon.ico
M modules/toollabs/manifests/proxy.pp
2 files changed, 2 insertions(+), 18 deletions(-)

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



diff --git a/modules/toollabs/files/favicon.ico 
b/modules/toollabs/files/favicon.ico
new file mode 100644
index 000..656d807
--- /dev/null
+++ b/modules/toollabs/files/favicon.ico
Binary files differ
diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 1e56fb4..469b9a2 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -76,26 +76,10 @@
 desc   => 'Proxylistener port, open to just labs'
 }
 
-# Deploy root web.
-git::clone { 'labs/toollabs':
-ensure=> latest,
-directory => '/data/project/admin/toollabs',
-owner => "${::labsproject}.admin",
-group => "${::labsproject}.admin",
-mode  => '2755',
-}
-
-file { '/data/project/admin/public_html':
-ensure  => link,
-force   => true,
-target  => 'toollabs/www',
-require => Git::Clone['labs/toollabs'],
-}
-
 file { '/var/www/error/favicon.ico':
 ensure  => file,
-source  => '/data/project/admin/toollabs/www/favicon.ico',
-require => [File['/var/www/error'], Git::Clone['labs/toollabs']]
+source  => 'puppet:///modules/toollabs/favico.ico',
+require => File['/var/www/error'],
 }
 
 file { '/var/www/error/tool-labs-logo.png':

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

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

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

[MediaWiki-commits] [Gerrit] Fix inheritance of ve.ui.MWTransclusionDialogTool - change (mediawiki...VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Fix inheritance of ve.ui.MWTransclusionDialogTool
..

Fix inheritance of ve.ui.MWTransclusionDialogTool

From the description of the commit message[1] for WindowTool and
FragmentWindowTool, the ve.ui.MWTransclusionDialogTool should be
a FragmentWindowTool, and not a WindowTool.

In fact, the bug is caused by the missing isCompatibleWith method
in WindowTool.

[1] I3a0e761f0d6e942d503ec

Follow up: I676af9c50b09ef007926240eb2327d1a0fdd80f5

Bug: T121596
Change-Id: I9a47e5d67fcd7a94155b7cf77c734c94b0ed69e1
(cherry picked from commit 5627701cb1899ca751d609ca7f57f86e0cca8cc2)
---
M modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
1 file changed, 5 insertions(+), 5 deletions(-)


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

diff --git a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
index 4ee8ed8..eecfe95 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
@@ -9,18 +9,18 @@
  * MediaWiki UserInterface transclusion tool.
  *
  * @class
- * @extends ve.ui.WindowTool
+ * @extends ve.ui.FragmentWindowTool
  * @constructor
  * @param {OO.ui.ToolGroup} toolGroup
  * @param {Object} [config] Configuration options
  */
-ve.ui.MWTransclusionDialogTool = function VeUiMWTransclusionDialogTool( 
toolGroup, config ) {
-   ve.ui.WindowTool.call( this, toolGroup, config );
+ve.ui.MWTransclusionDialogTool = function VeUiMWTransclusionDialogTool() {
+   ve.ui.MWTransclusionDialogTool.super.apply( this, arguments );
 };
 
 /* Inheritance */
 
-OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.WindowTool );
+OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.FragmentWindowTool );
 
 /* Static Properties */
 
@@ -55,7 +55,7 @@
var compatible;
 
// Parent method
-   compatible = ve.ui.WindowTool.static.isCompatibleWith.call( this, model 
);
+   compatible = 
ve.ui.MWTransclusionDialogTool.super.static.isCompatibleWith.call( this, model 
);
 
if ( compatible && this.template ) {
return model.isSingleTemplate( this.template );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a47e5d67fcd7a94155b7cf77c734c94b0ed69e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.9
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 

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

[MediaWiki-commits] [Gerrit] Avoid "Unable to set value to APCBagOStuff" exceptions - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Avoid "Unable to set value to APCBagOStuff" exceptions
..

Avoid "Unable to set value to APCBagOStuff" exceptions

* This can happen due to incr/add races. Use incrWithInit()
  instead to handle such cases.
* Also made BagOStuff:incrWithInit() return the new value like incr().

Change-Id: I0e3b02a4cff7c20544a9db2eaabd3f61e5a470b1
---
M includes/libs/objectcache/BagOStuff.php
M includes/utils/UIDGenerator.php
2 files changed, 15 insertions(+), 9 deletions(-)


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

diff --git a/includes/libs/objectcache/BagOStuff.php 
b/includes/libs/objectcache/BagOStuff.php
index 703c195..b9be43d 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -507,18 +507,27 @@
/**
 * Increase stored value of $key by $value while preserving its TTL
 *
-* This will create the key with value $init and TTL $ttl if not present
+* This will create the key with value $init and TTL $ttl instead if 
not present
 *
 * @param string $key
 * @param int $ttl
 * @param int $value
 * @param int $init
-* @return bool
+* @return int|bool New value or false on failure
 * @since 1.24
 */
public function incrWithInit( $key, $ttl, $value = 1, $init = 1 ) {
-   return $this->incr( $key, $value ) ||
-   $this->add( $key, (int)$init, $ttl ) || $this->incr( 
$key, $value );
+   $newValue = $this->incr( $key, $value );
+   if ( $newValue === false ) {
+   // No key set; initialize
+   $newValue = $this->add( $key, (int)$init, $ttl ) ? 
$init : false;
+   }
+   if ( $newValue === false ) {
+   // Raced out initializing; increment
+   $newValue = $this->incr( $key, $value );
+   }
+
+   return $newValue;
}
 
/**
diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index e2de900..ed7ddb8 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -373,12 +373,9 @@
$cache = ObjectCache::getLocalServerInstance();
}
if ( $cache ) {
-   $counter = $cache->incr( $bucket, $count );
+   $counter = $cache->incrWithInit( $bucket, 
$cache::TTL_INDEFINITE, $count, $count );
if ( $counter === false ) {
-   if ( !$cache->add( $bucket, (int)$count ) ) {
-   throw new RuntimeException( 'Unable to 
set value to ' . get_class( $cache ) );
-   }
-   $counter = $count;
+   throw new RuntimeException( 'Unable to set 
value to ' . get_class( $cache ) );
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e3b02a4cff7c20544a9db2eaabd3f61e5a470b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Fix inheritance of ve.ui.MWTransclusionDialogTool - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Fix inheritance of ve.ui.MWTransclusionDialogTool
..


Fix inheritance of ve.ui.MWTransclusionDialogTool

From the description of the commit message[1] for WindowTool and
FragmentWindowTool, the ve.ui.MWTransclusionDialogTool should be
a FragmentWindowTool, and not a WindowTool.

In fact, the bug is caused by the missing isCompatibleWith method
in WindowTool.

[1] I3a0e761f0d6e942d503ec

Follow up: I676af9c50b09ef007926240eb2327d1a0fdd80f5

Bug: T121596
Change-Id: I9a47e5d67fcd7a94155b7cf77c734c94b0ed69e1
(cherry picked from commit 5627701cb1899ca751d609ca7f57f86e0cca8cc2)
---
M modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
index 4ee8ed8..eecfe95 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js
@@ -9,18 +9,18 @@
  * MediaWiki UserInterface transclusion tool.
  *
  * @class
- * @extends ve.ui.WindowTool
+ * @extends ve.ui.FragmentWindowTool
  * @constructor
  * @param {OO.ui.ToolGroup} toolGroup
  * @param {Object} [config] Configuration options
  */
-ve.ui.MWTransclusionDialogTool = function VeUiMWTransclusionDialogTool( 
toolGroup, config ) {
-   ve.ui.WindowTool.call( this, toolGroup, config );
+ve.ui.MWTransclusionDialogTool = function VeUiMWTransclusionDialogTool() {
+   ve.ui.MWTransclusionDialogTool.super.apply( this, arguments );
 };
 
 /* Inheritance */
 
-OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.WindowTool );
+OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.FragmentWindowTool );
 
 /* Static Properties */
 
@@ -55,7 +55,7 @@
var compatible;
 
// Parent method
-   compatible = ve.ui.WindowTool.static.isCompatibleWith.call( this, model 
);
+   compatible = 
ve.ui.MWTransclusionDialogTool.super.static.isCompatibleWith.call( this, model 
);
 
if ( compatible && this.template ) {
return model.isSingleTemplate( this.template );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a47e5d67fcd7a94155b7cf77c734c94b0ed69e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.9
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 39d762e..dd85041 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

Change subject: Syncronize VisualEditor: 39d762e..dd85041
..


Syncronize VisualEditor: 39d762e..dd85041

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

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



diff --git a/VisualEditor b/VisualEditor
index 39d762e..dd85041 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 39d762e8448fa3b3146c8886ce9002ee4e79292c
+Subproject commit dd85041a297c4731ca56db504943e2a9c586ecad

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

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

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

[MediaWiki-commits] [Gerrit] Make a group of OmegaWiki special pages. - change (mediawiki...WikiLexicalData)

[Kipcool (Code Review)]

Kipcool has submitted this change and it was merged.

Change subject: Make a group of OmegaWiki special pages.
..


Make a group of OmegaWiki special pages.

Along the way some typos and bugs in the special pages
were fixed.

Patch 2&3: rebase.

Change-Id: Ia4eb6a8c5556fba1d859dba89553c4376341520a
---
M App.php
M OmegaWiki/SpecialAddCollection.php
M OmegaWiki/SpecialConceptMapping.php
M OmegaWiki/SpecialCopy.php
M OmegaWiki/SpecialImportLangNames.php
M OmegaWiki/SpecialNeedsTranslation.php
M OmegaWiki/SpecialPopupEditor.php
M OmegaWiki/SpecialSelect.php
M OmegaWiki/SpecialSuggest.php
M OmegaWiki/SpecialTransaction.php
M SpecialLanguages.php
A WikiLexicalData.i18n.alias.php
M i18n/lexicaldata/en.json
M i18n/lexicaldata/qqq.json
M includes/setup/OWSpecials.php
M includes/specials/SpecialDatasearch.php
M includes/specials/SpecialExportTSV.php
M includes/specials/SpecialImportTSV.php
M includes/specials/SpecialOWAddFromExternalAPI.php
M includes/specials/SpecialOWDownloads.php
M includes/specials/SpecialOWStatistics.php
21 files changed, 92 insertions(+), 24 deletions(-)

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



diff --git a/App.php b/App.php
index 05b9a4e..f2710aa 100644
--- a/App.php
+++ b/App.php
@@ -42,6 +42,7 @@
 );
 
 $wgMessagesDirs['LexicalData'] = __DIR__ . '/i18n/lexicaldata';
+$wgExtensionMessagesFiles['WikiLexicalDataTextAlias'] = __DIR__ . 
'/WikiLexicalData.i18n.alias.php' ;
 $wgExtensionMessagesFiles['LexicalData'] = $dir . 'Wikidata.i18n.php';
 
 // Resource modules
diff --git a/OmegaWiki/SpecialAddCollection.php 
b/OmegaWiki/SpecialAddCollection.php
index 029d204..4a0ab67 100644
--- a/OmegaWiki/SpecialAddCollection.php
+++ b/OmegaWiki/SpecialAddCollection.php
@@ -64,7 +64,7 @@
}
 
protected function getGroupName() {
-   return 'other';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
 
diff --git a/OmegaWiki/SpecialConceptMapping.php 
b/OmegaWiki/SpecialConceptMapping.php
index e70203b..f320508 100644
--- a/OmegaWiki/SpecialConceptMapping.php
+++ b/OmegaWiki/SpecialConceptMapping.php
@@ -190,7 +190,7 @@
}
 
protected function getGroupName() {
-   return 'other';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
 
diff --git a/OmegaWiki/SpecialCopy.php b/OmegaWiki/SpecialCopy.php
index 8b4f976..c1bd4f9 100644
--- a/OmegaWiki/SpecialCopy.php
+++ b/OmegaWiki/SpecialCopy.php
@@ -160,6 +160,9 @@
# }
 
return true; # seems everything went ok.
+   }
 
+   protected function getGroupName() {
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
diff --git a/OmegaWiki/SpecialImportLangNames.php 
b/OmegaWiki/SpecialImportLangNames.php
index 569d2d2..2b99ec9 100644
--- a/OmegaWiki/SpecialImportLangNames.php
+++ b/OmegaWiki/SpecialImportLangNames.php
@@ -16,7 +16,7 @@
// These operations should always be on the community database.
$dbr = wfGetDB( DB_SLAVE );
$dbw = wfGetDB( DB_MASTER );
-   $dc = "uw";
+   $dc = wdGetDataSetContext();
$output = $this->getOutput();
 
$output->setPageTitle( wfMessage( 'importlangnames_title' 
)->text() );
@@ -25,7 +25,6 @@
$output->addHTML( wfMessage( 
'importlangnames_not_allowed' )->text() );
return false;
}
-
/* Get defined meaning IDs and ISO codes for languages in 
collection. */
// wgIso639_3CollectionId is normally defined in 
LocalSettings.php
$lang_res = $dbr->select(
@@ -38,11 +37,9 @@
);
$editable = '';
$first = true;
-
foreach ( $lang_res as $lang_row ) {
$iso_code = $lang_row->internal_member_id;
$dm_id = $lang_row->member_mid;
-
/*  Get the language ID for the current language. */
$lang_id = getLanguageIdForIso639_3( $iso_code ) ;
 
@@ -113,6 +110,6 @@
}
 
protected function getGroupName() {
-   return 'other';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
diff --git a/OmegaWiki/SpecialNeedsTranslation.php 
b/OmegaWiki/SpecialNeedsTranslation.php
index 4c5dd76..3975469 100644
--- a/OmegaWiki/SpecialNeedsTranslation.php
+++ b/OmegaWiki/SpecialNeedsTranslation.php
@@ -196,8 +196,6 @@
}
 
protected function getGroupName() {
-   return 'maintenance';
+   return 'omegawiki'; // message 
'specialpages-group-omegawiki'
}
 }
-
-
diff --git a/OmegaWiki/SpecialPopupEditor.php b/OmegaWiki/SpecialPopupEditor.php
index f4e6051..403b4c6 100644
--- 

[MediaWiki-commits] [Gerrit] ext.centralNotice.geoIP: Document situation around cookies - change (mediawiki...CentralNotice)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: ext.centralNotice.geoIP: Document situation around cookies
..

ext.centralNotice.geoIP: Document situation around cookies

The previous comment was somewhat confusing.

I intially thought the comment was wrong and that the cookie-update works fine.
Because the 'en.wikipedia.org' cookie would override (shadow) the
'.wikipedia.org' cookie and things should be fine.

But alas, cookies don't work that way. There is no concept of shadowing.
The 'document.cookies' interface contains them all and it's up to the client
to decide which one to use. Which is difficult since the interface doesn't
expose any meta data about the cookies (their path or their domain etc.).
It ends up like this:

> document.cookies = "GeoIP=:v6; * GeoIP=US:CA:*:v4;"

Change-Id: I645255803fe1c011901b4be2c24da20dcbeed91a
---
M resources/subscribing/ext.centralNotice.geoIP.js
1 file changed, 10 insertions(+), 3 deletions(-)


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

diff --git a/resources/subscribing/ext.centralNotice.geoIP.js 
b/resources/subscribing/ext.centralNotice.geoIP.js
index 864ea97..1fb454e 100644
--- a/resources/subscribing/ext.centralNotice.geoIP.js
+++ b/resources/subscribing/ext.centralNotice.geoIP.js
@@ -180,9 +180,16 @@
 
cookieValue = serializeCookieValue( window.Geo 
);
 
-   // TODO The following *does not work* with the 
curent WMF setup
-   // because the server doesn't set Geo cookies 
on the full
-   // host domain (ex., 'en.wikipedia.org'), which 
is the default.
+   // Update the cookie so we don't need to fetch 
it next time.
+   // FIXME: This doesn't work in WMF production, 
because Varnish sets its initial
+   // Geo cookie with a wildcard domain (e.g. 
'.wikipedia.org'). This avoids sending
+   // the client a cookie for each domain. But, 
doesn't work with this function
+   // because cookies vary on path and domain. 
This doesn't update the '.wikipedia.org'
+   // cookie but creates a new 'en.wikipedia.org' 
cookie.
+   // TODO: Update retreival code above to bypass 
$.cookie() and use document.cookie
+   // directly to find the better entry instead of 
the first one. Both cookies will
+   // be available through document.cookie.
+   // 
http://blog.jasoncust.com/2012/01/problem-with-documentcookie.html
$.cookie( COOKIE_NAME, cookieValue, { path: '/' 
} );
 
mw.geoIP.deferred.resolve();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I645255803fe1c011901b4be2c24da20dcbeed91a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] cassandra: add restbase100[3456] instances - change (operations/dns)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: add restbase100[3456] instances
..

cassandra: add restbase100[3456] instances

Change-Id: I62844e4c8b722602b8081dd36eed4a690f277dd3
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/11/260411/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0b73edc..6c8d827 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -854,6 +854,12 @@
 186 1H IN PTR   iridium-vcs.eqiad.wmnet.
 187 1H IN PTR   restbase1008-a.eqiad.wmnet.
 188 1H IN PTR   technetium.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
+189 1H IN PTR   restbase1003-a.eqiad.wmnet.
+190 1H IN PTR   restbase1003-b.eqiad.wmnet.
+191 1H IN PTR   restbase1003-c.eqiad.wmnet.
+192 1H IN PTR   restbase1004-a.eqiad.wmnet.
+193 1H IN PTR   restbase1004-b.eqiad.wmnet.
+194 1H IN PTR   restbase1004-c.eqiad.wmnet.
 
 201 1H IN PTR   d-i-test.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 
@@ -1071,6 +1077,12 @@
 119 1H  IN PTR  elastic1006.eqiad.wmnet.
 120 1H  IN PTR  restbase1009-a.eqiad.wmnet.
 121 1H  IN PTR  auth1001.eqiad.wmnet.
+122 1H  IN PTR  restbase1005-a.eqiad.wmnet.
+123 1H  IN PTR  restbase1005-b.eqiad.wmnet.
+124 1H  IN PTR  restbase1005-c.eqiad.wmnet.
+125 1H  IN PTR  restbase1006-a.eqiad.wmnet.
+126 1H  IN PTR  restbase1006-b.eqiad.wmnet.
+127 1H  IN PTR  restbase1006-c.eqiad.wmnet.
 
 $ORIGIN 49.64.{{ zonename }}.
 1   1H IN PTR   vl1020-eth3.lvs1001.wikimedia.org.
diff --git a/templates/wmnet b/templates/wmnet
index f198fde..ced6b97 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -740,9 +740,21 @@
 restbase1002-b  1H  IN A10.64.0.228 ; cassandra instance
 restbase1002-c  1H  IN A10.64.0.229 ; cassandra instance
 restbase10031H  IN A10.64.32.159
+restbase1003-a  1H  IN A10.64.32.189 ; cassandra instance
+restbase1003-b  1H  IN A10.64.32.190 ; cassandra instance
+restbase1003-c  1H  IN A10.64.32.191 ; cassandra instance
 restbase10041H  IN A10.64.32.160
+restbase1004-a  1H  IN A10.64.32.192 ; cassandra instance
+restbase1004-b  1H  IN A10.64.32.193 ; cassandra instance
+restbase1004-c  1H  IN A10.64.32.194 ; cassandra instance
 restbase10051H  IN A10.64.48.99
+restbase1005-a  1H  IN A10.64.48.122 ; cassandra instance
+restbase1005-b  1H  IN A10.64.48.123 ; cassandra instance
+restbase1005-c  1H  IN A10.64.48.124 ; cassandra instance
 restbase10061H  IN A10.64.48.100
+restbase1006-a  1H  IN A10.64.48.125 ; cassandra instance
+restbase1006-b  1H  IN A10.64.48.126 ; cassandra instance
+restbase1006-c  1H  IN A10.64.48.127 ; cassandra instance
 restbase10071H  IN A10.64.0.223
 restbase1007-a  1H  IN A10.64.0.230 ; cassandra instance
 restbase10081H  IN A10.64.32.178

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62844e4c8b722602b8081dd36eed4a690f277dd3
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] setting tegmen dns entries - change (operations/dns)

[RobH (Code Review)]

RobH has uploaded a new change for review.

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

Change subject: setting tegmen dns entries
..

setting tegmen dns entries

updating mgmt for new hostname and adding production dns entries for
tegmen, slated as a monitoring server in codfw

T121583

Change-Id: I6ff82b86e1b3982f930155e0eb4c2c9d4f7dfdc5
---
M templates/10.in-addr.arpa
M templates/153.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
4 files changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/12/260412/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 6c8d827..15d73fb 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -3230,6 +3230,7 @@
 25  1H IN PTR  kafka2002.mgmt.codfw.wmnet.
 25  1H IN PTR  wmf6379.mgmt.codfw.wmnet.
 26  1H IN PTR  wmf6380.mgmt.codfw.wmnet.
+27  1H IN PTR  tegmen.mgmt.codfw.wmnet.
 27  1H IN PTR  wmf6381.mgmt.codfw.wmnet.
 28  1H IN PTR  wmf6382.mgmt.codfw.wmnet.
 29  1H IN PTR  wmf6383.mgmt.codfw.wmnet.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index 7b11f7b..8db692c 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -60,6 +60,7 @@
 71  1H  IN PTR  vl2003-eth2.lvs2004.codfw.wmnet.
 72  1H  IN PTR  vl2003-eth2.lvs2005.codfw.wmnet.
 73  1H  IN PTR  vl2003-eth2.lvs2006.codfw.wmnet.
+74  1H  IN PTR  tegmen.wikimedia.org.
 
 ; 208.80.153.96/27 (public1-d-codfw)
 97  1H  IN PTR  vrrp-gw-2004.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index b63389e..5655de2 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -182,6 +182,7 @@
 serpens 1H  IN A208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet 
cluster
 silver  1H  IN A208.80.154.136
 1H  IN  2620:0:861:2:208:80:154:136
+tegmen  1H  IN A208.80.153.74
 tellurium   1H  IN A208.80.155.9
 titanium1H  IN A208.80.154.154
 uranium 1H  IN A208.80.154.53
diff --git a/templates/wmnet b/templates/wmnet
index ced6b97..78ec743 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3300,6 +3300,7 @@
 restbase20041H IN A 10.193.2.227
 restbase20051H IN A 10.193.2.228
 restbase20061H IN A 10.193.2.229
+tegmen  1H  IN A10.193.1.27
 tmh2001 1H  IN A10.193.1.8
 tmh2002 1H  IN A10.193.1.9
 wtp2001 1H  IN A10.193.2.15

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

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

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

[MediaWiki-commits] [Gerrit] setting tegmen install parameters - change (operations/puppet)

[RobH (Code Review)]

RobH has uploaded a new change for review.

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

Change subject: setting tegmen install parameters
..

setting tegmen install parameters

setting the install_server updates for new system install

T121583

Change-Id: Icfebfc696e5ca89046a83fd098125c8908bb4059
---
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/260417/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 6b4c05f..7df6853 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -72,7 +72,7 @@
elastic20[0-2][0-9]|elastic203[0-1]) echo 
partman/elasticsearch-raid1.cfg ;; \

bromine|dubnium|etherpad[12]001|fermium|krypton|mendelevium|planet1001|pollux|rutherfordium|seaborgium|serpens|technetium|cygnus)
 echo partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2]) 
echo partman/raid1.cfg ;; \
-   francium|nobelium) echo partman/raid10-gpt.cfg ;; \
+   francium|nobelium|tegmen) echo partman/raid10-gpt.cfg ;; \
ganeti100[1-9]) echo partman/ganeti-raid1.cfg ;; \
ganeti200[1-9]) echo partman/ganeti.cfg ;; \
graphite1002) echo partman/graphite-dmcache.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 85a3b05..391155c 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -6247,6 +6247,13 @@
filename "jessie-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host tegmen {
+   hardware ethernet 14:18:77:33:42:F8;
+   fixed-address tegmen.wikimedia.org;
+   option pxelinux.pathprefix "jessie-installer/";
+   filename "jessie-installer/debian-installer/amd64/pxelinux.0";
+}
+
 host restbase-test2001 {
hardware ethernet 90:B1:1C:2A:2F:0A;
fixed-address restbase-test2001.codfw.wmnet;

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

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

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

[MediaWiki-commits] [Gerrit] Log files as we upload them - change (wikimedia...tools)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Log files as we upload them
..


Log files as we upload them

Bug: T121415
Change-Id: I8c86b76c11059fcd5b7df9a26ca7151cbd84b9b4
---
M silverpop_export/export.py
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/silverpop_export/export.py b/silverpop_export/export.py
index 607f56a..cd3ab48 100644
--- a/silverpop_export/export.py
+++ b/silverpop_export/export.py
@@ -104,6 +104,7 @@
 log.info("Uploading to silverpop")
 sftpc = SftpClient()
 for path in files:
+log.info("Putting file %s" % path)
 sftpc.put(path, os.path.basename(path))
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8c86b76c11059fcd5b7df9a26ca7151cbd84b9b4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
Gerrit-Branch: master
Gerrit-Owner: Awight 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Pcoombe 
Gerrit-Reviewer: XenoRyet 

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

[MediaWiki-commits] [Gerrit] [WikiLexicalData] Register alias file - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [WikiLexicalData] Register alias file
..

[WikiLexicalData] Register alias file

https://gerrit.wikimedia.org/r/#/c/253323/

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/34/260434/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 099a15d..9321def 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2574,6 +2574,7 @@
 
 Wiki Lexical Data
 file = WikiLexicalData/i18n/lexicaldata/%CODE%.json
+aliasfile = WikiLexicalData/WikiLexicalData.i18n.alias.php
 descmsg = wikidata-desc
 optional = ow_editing_policy_url, ow_URL, prefs-omegawiki, ow-stat-percent
 

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

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

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

[MediaWiki-commits] [Gerrit] Replace burrow kafka config with new role - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Replace burrow kafka config with new role
..


Replace burrow kafka config with new role

Bug: T121659
Change-Id: I7409dc28fd3f797753d56796793e681fc5c635e2
---
M manifests/role/analytics/burrow.pp
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/manifests/role/analytics/burrow.pp 
b/manifests/role/analytics/burrow.pp
index 635f247..0be5255 100644
--- a/manifests/role/analytics/burrow.pp
+++ b/manifests/role/analytics/burrow.pp
@@ -4,15 +4,15 @@
 class role::analytics::burrow {
 
 # Include the kafka config role to get all configuration data
-include role::analytics::kafka::config
+include role::kafka::analytics::config
 
 # One of the params for Class: burrow is consumer_groups, this is 
configured
 # through hiera and hence not explicitly passed here
 class { '::burrow':
-zookeeper_hosts=> $role::analytics::kafka::config::zookeeper_hosts,
-zookeeper_path => 
$role::analytics::kafka::config::zookeeper_chroot,
-kafka_cluster_name => 
$role::analytics::kafka::config::kafka_cluster_name,
-kafka_brokers  => $role::analytics::kafka::config::brokers_array,
+zookeeper_hosts=> $role::kafka::analytics::config::zookeeper_hosts,
+zookeeper_path => 
$role::kafka::analytics::config::zookeeper_chroot,
+kafka_cluster_name => $role::kafka::analytics::config::cluster_name,
+kafka_brokers  => $role::kafka::analytics::config::brokers_array,
 smtp_server=> 'mx1001.wikimedia.org',
 from_email => "burrow@${::fqdn}",
 to_emails  => ['analytics-ale...@wikimedia.org']

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

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

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

[MediaWiki-commits] [Gerrit] Setup celery task workflow to handle running reports for the... - change (analytics/wikimetrics)

[Milimetric (Code Review)]

Milimetric has submitted this change and it was merged.

Change subject: Setup celery task workflow to handle running reports for the 
ProgramMetrics API
..


Setup celery task workflow to handle running reports for the ProgramMetrics API

The form to trigger the Program Metrics reports can be found at
/reports/program-global-metrics

Bug:T118308
Change-Id: I1d4a6bba9f81962d01990754299a22a077ba61df
---
M tests/test_controllers/test_reports.py
A tests/test_models/test_run_program_metrics_report.py
M wikimetrics/api/__init__.py
M wikimetrics/api/cohorts.py
A wikimetrics/api/reports.py
M wikimetrics/controllers/cohorts.py
M wikimetrics/controllers/reports.py
M wikimetrics/forms/__init__.py
D wikimetrics/forms/global_metrics_form.py
A wikimetrics/forms/program_metrics_form.py
M wikimetrics/models/report_nodes/__init__.py
M wikimetrics/models/report_nodes/report.py
A wikimetrics/models/report_nodes/run_program_metrics_report.py
M wikimetrics/models/report_nodes/run_report.py
M wikimetrics/models/report_nodes/sum_aggregate_by_user_report.py
A wikimetrics/models/report_nodes/validate_program_metrics_report.py
R wikimetrics/static/js/programMetricsReportUpload.js
R wikimetrics/templates/forms/program_metrics_report_upload.html
R wikimetrics/templates/program_metrics_reports.html
19 files changed, 715 insertions(+), 145 deletions(-)

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



diff --git a/tests/test_controllers/test_reports.py 
b/tests/test_controllers/test_reports.py
index 8703186..509e7f7 100644
--- a/tests/test_controllers/test_reports.py
+++ b/tests/test_controllers/test_reports.py
@@ -2,7 +2,6 @@
 import celery
 import time
 import unittest
-import os.path
 from mock import Mock, MagicMock, patch
 from contextlib import contextmanager
 from flask import appcontext_pushed, g
@@ -19,7 +18,7 @@
 from wikimetrics.controllers.reports import (
 get_celery_task,
 )
-from wikimetrics.configurables import app, get_absolute_path, db, queue
+from wikimetrics.configurables import app, queue
 
 
 @contextmanager
@@ -788,3 +787,56 @@
 mock_report = ReportStore()
 failure = mock_report.get_result_safely('')
 assert_equal(failure['failure'], 'result not available')
+
+
+class ProgramMetricsReportControllerTest(ControllerAsyncTest):
+
+def setUp(self):
+ControllerAsyncTest.setUp(self)
+
+def test_report_fails_with_invalid_cohort(self):
+response = self.client.post('/reports/program-global-metrics', 
data=dict(
+name='TestCohort1',
+project='wiki',
+centralauth=True,
+validate_as_user_ids=False,
+paste_ids_or_names='test-specific-0\ntest-specific-1',
+start_date='2015-11-01 00:00:00',
+end_date='2015-11-30 00:00:00',
+))
+
+assert_equal(response.status_code, 302)
+assert_true(response.data.find('/reports/') >= 0)
+
+# Wait for the task to get processed
+time.sleep(3)
+
+response = self.client.get('/reports/list/')
+parsed = json.loads(response.data)
+result_key = parsed['reports'][-1]['result_key']
+task, report = get_celery_task(result_key)
+assert_true(task is not None)
+
+def test_report_create_and_result(self):
+
+response = self.client.post('/reports/program-global-metrics', 
data=dict(
+name='TestCohort2',
+project='wiki',
+centralauth=True,
+validate_as_user_ids=False,
+paste_ids_or_names='Editor test-specific-0\nEditor 
test-specific-1',
+start_date='2015-11-01 00:00:00',
+end_date='2015-11-30 00:00:00',
+))
+
+assert_equal(response.status_code, 302)
+assert_true(response.data.find('/reports/') >= 0)
+
+# Wait for the task to get processed
+time.sleep(3)
+
+response = self.client.get('/reports/list/')
+parsed = json.loads(response.data)
+result_key = parsed['reports'][-1]['result_key']
+task, report = get_celery_task(result_key)
+assert_true(task is not None)
diff --git a/tests/test_models/test_run_program_metrics_report.py 
b/tests/test_models/test_run_program_metrics_report.py
new file mode 100644
index 000..3b5206f
--- /dev/null
+++ b/tests/test_models/test_run_program_metrics_report.py
@@ -0,0 +1,120 @@
+from nose.tools import assert_equals, raises, assert_true, assert_is_not_none
+
+from tests.fixtures import QueueDatabaseTest, d
+from wikimetrics.models import RunProgramMetricsReport, ReportStore, 
WikiUserStore
+from wikimetrics.utils import parse_pretty_date, format_pretty_date
+from wikimetrics.enums import Aggregation
+from wikimetrics.api import CohortService
+
+cohort_service = CohortService()
+
+
+def make_pending(report):
+report.status = 'PENDING'
+
+
+class 

[MediaWiki-commits] [Gerrit] Add missing API i18n messages - change (mediawiki...ParsoidBatchAPI)

[jenkins-bot (Code Review)]

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

Change subject: Add missing API i18n messages
..


Add missing API i18n messages

Change-Id: I8e016d02cefe3bd10dbd987eb76ae299ed42416a
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 2999de4..6487e77 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,7 @@
"Tim Starling"
]
},
-   "parsoidbatchapi-desc": "Batch API for Parsoid"
+   "parsoidbatchapi-desc": "Batch API for Parsoid",
+   "apihelp-parsoid-batch-description": "",
+   "apihelp-parsoid-batch-param-batch": ""
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 200ac32..6f27ba4 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,5 +4,7 @@
"Raimond Spekking"
]
},
-   "parsoidbatchapi-desc": 
"{{desc|name=ParsoidBatchAPI|url=https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI}};
+   "parsoidbatchapi-desc": 
"{{desc|name=ParsoidBatchAPI|url=https://www.mediawiki.org/wiki/Extension:ParsoidBatchAPI}};,
+   "apihelp-parsoid-batch-description": 
"{{doc-apihelp-description|parsoid-batch}}",
+   "apihelp-parsoid-batch-param-batch": 
"{{doc-apihelp-param|parsoid-batch|batch}}"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e016d02cefe3bd10dbd987eb76ae299ed42416a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParsoidBatchAPI
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] restbase: reprovision restbase1004 - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: reprovision restbase1004
..

restbase: reprovision restbase1004

Change-Id: I5cc51619b0fa42ec141a09e24b5cdff68095bcec
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/260418/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 6b4c05f..78a4864 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -117,7 +117,8 @@
pc100[1-3]) echo partman/mw.cfg ;; \
pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-6]) echo partman/mw.cfg ;; \
-   restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
+   restbase100[12356]) echo partman/cassandrahosts-3ssd.cfg ;; \
+   restbase1004) echo partman/cassandrahosts-3ssd-srv.cfg ;; \
restbase100[789]) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
restbase200[12]) echo partman/cassandrahosts-4ssd-srv.cfg ;; \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cc51619b0fa42ec141a09e24b5cdff68095bcec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Remove role::analytics::kafka::* - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Remove role::analytics::kafka::*
..


Remove role::analytics::kafka::*

Bug: T121659
Change-Id: Icd3ea5e7d99cfb1c50d12582b5e0637143aa3e6b
---
D manifests/role/analytics/kafka.pp
1 file changed, 0 insertions(+), 237 deletions(-)

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



diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
deleted file mode 100644
index d54dfac..000
--- a/manifests/role/analytics/kafka.pp
+++ /dev/null
@@ -1,237 +0,0 @@
-# role/analytics/kafka.pp
-#
-# Role classes for Analytics Kakfa nodes.
-# These role classes will configure Kafka properly in either
-# the Analytics labs or Analytics production environments.
-#
-# Usage:
-#
-# If you only need the Kafka package and configs to use the
-# Kafka client to talk to Kafka Broker Servers:
-#
-#   include role::analytics::kafka::client
-#
-# If you want to set up a Kafka Broker Server
-#   include role::analytics::kafka::server
-#
-class role::analytics::kafka::config {
-if ($::realm == 'labs') {
-# In labs, this can be set via hiera, or default to $::labsproject
-$kafka_cluster_name = 
hiera('role::analytics::kafka::config::kafka_cluster_name', $::labsproject)
-
-# Look up cluster config via hiera.
-# This will default to configuring a kafka cluster named
-# after $::labsproject with a single kafka broker
-# that is the current host
-$cluster_config = hiera(
-'role::analytics::kafka::config::cluster_config',
-{
-"${kafka_cluster_name}" => {
-"${::fqdn}" => { 'id' => 1 },
-},
-}
-)
-
-# labs only uses a single log_dir
-$log_dirs = ['/var/spool/kafka']
-
-# No ganglia in labs (?)
-$ganglia   = undef
-# TODO: use variables for statsd server from somewhere?
-$statsd = 'labmon1001.eqiad.wmnet:8125'
-
-# Use default ulimit for labs kafka
-$nofiles_ulimit = 8192
-}
-
-else {
-# Production only has one Kafka cluster in eqiad, so
-# hardcode the cluster name to 'eqiad'.
-$kafka_cluster_name = 'eqiad'
-
-# Production Kafka clusters are named by $::site.
-$cluster_config = {
-'eqiad'   => {
-'kafka1012.eqiad.wmnet' => { 'id' => 12 },  # Row A
-'kafka1013.eqiad.wmnet' => { 'id' => 13 },  # Row A
-'kafka1014.eqiad.wmnet' => { 'id' => 14 },  # Row C
-'kafka1018.eqiad.wmnet' => { 'id' => 18 },  # Row D
-'kafka1020.eqiad.wmnet' => { 'id' => 20 },  # Row D
-'kafka1022.eqiad.wmnet' => { 'id' => 22 },  # Row C
-},
-'ulsfo' => { },
-'esams' => { },
-}
-
-$log_dirs = [
-'/var/spool/kafka/a/data',
-'/var/spool/kafka/b/data',
-'/var/spool/kafka/c/data',
-'/var/spool/kafka/d/data',
-'/var/spool/kafka/e/data',
-'/var/spool/kafka/f/data',
-'/var/spool/kafka/g/data',
-'/var/spool/kafka/h/data',
-'/var/spool/kafka/i/data',
-'/var/spool/kafka/j/data',
-'/var/spool/kafka/k/data',
-'/var/spool/kafka/l/data',
-]
-# Ganglia diskstat plugin would like to know what disks to monitor
-$log_disks = ['sda',
-'sdb',
-'sdc',
-'sdd',
-'sde',
-'sdf',
-'sdg',
-'sdh',
-'sdi',
-'sdj',
-'sdk',
-'sdl',
-]
-
-# TODO: use variables from new ganglia module once it is finished.
-$ganglia   = '208.80.154.10:9694'
-# TODO: use variables for stats server from somewhere?
-$statsd  = 'statsd.eqiad.wmnet:8125'
-
-
-# Increase ulimit for production kafka.
-$nofiles_ulimit = 65536
-}
-
-$brokers  = $cluster_config[$kafka_cluster_name]
-if is_hash($brokers) {
-$brokers_array = keys($brokers)
-} else {
-$brokers_array = []
-}
-
-$jmx_port = 
-
-# jmxtrans renders hostname metrics with underscores and
-# suffixed with the jmx port.  Build a graphite
-# wildcard to match these.
-# E.g. kafka1012.eqiad.wmnet -> kafka1012_eqiad_wmnet_
-$brokers_graphite_wildcard = inline_template('{<%= 
@brokers_array.join("_#{@jmx_port},").tr(".","_") + "_#{@jmx_port}" %>}')
-
-$zookeeper_hosts  = keys(hiera('zookeeper_hosts'))
-$zookeeper_chroot = "/kafka/${kafka_cluster_name}"
-$zookeeper_url= inline_template("<%= @zookeeper_hosts.sort.join(',') 
%><%= 

[MediaWiki-commits] [Gerrit] Fix declension in grammar rules for Latin language - change (mediawiki/core)

[Ebe123 (Code Review)]

Ebe123 has uploaded a new change for review.

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

Change subject: Fix declension in grammar rules for Latin language
..

Fix declension in grammar rules for Latin language

On behalf of User:UV on la.wiki.

Bug: T122022
Change-Id: Icc24b29558947989dc35468ea0f6e1741824cb58
---
M languages/classes/LanguageLa.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/260426/1

diff --git a/languages/classes/LanguageLa.php b/languages/classes/LanguageLa.php
index e2dea1d..80cf694 100644
--- a/languages/classes/LanguageLa.php
+++ b/languages/classes/LanguageLa.php
@@ -53,7 +53,7 @@
'/u[ms]$/', # 2nd 
declension singular
'/ommunia$/',   # 3rd 
declension neuter plural (partly)
'/a$/', # 1st 
declension singular
-   '/libri$/', '/nuntii$/',# 2nd 
declension plural (partly)
+   '/libri$/', '/nuntii$/', '/datae$/', # 2nd 
declension plural (partly)
'/tio$/', '/ns$/', '/as$/', # 3rd 
declension singular (partly)
'/es$/' # 5th 
declension singular
);
@@ -61,7 +61,7 @@
'i',
'ommunium',
'ae',
-   'librorum', 'nuntiorum',
+   'librorum', 'nuntiorum', 'datorum',
'tionis', 'ntis', 'atis',
'ei'
);
@@ -72,7 +72,7 @@
'/u[ms]$/', # 2nd 
declension singular
'/a$/', # 1st 
declension singular
'/ommuniam$/',  # 3rd declension 
neuter plural (partly)
-   '/libri$/', '/nuntii$/',# 2nd 
declension plural (partly)
+   '/libri$/', '/nuntii$/', '/datam$/', # 2nd 
declension plural (partly)
'/tio$/', '/ns$/', '/as$/', # 3rd 
declension singular (partly)
'/es$/' # 5th 
declension singular
);
@@ -80,7 +80,7 @@
'um',
'am',
'ommunia',
-   'libros', 'nuntios',
+   'libros', 'nuntios', 'data',
'tionem', 'ntem', 'atem',
'em'
);
@@ -91,7 +91,7 @@
'/u[ms]$/', # 2nd 
declension singular
'/ommunia$/',   # 3rd 
declension neuter plural (partly)
'/a$/', # 1st 
declension singular
-   '/libri$/', '/nuntii$/',# 2nd 
declension plural (partly)
+   '/libri$/', '/nuntii$/', '/data$/', # 2nd 
declension plural (partly)
'/tio$/', '/ns$/', '/as$/', # 3rd 
declension singular (partly)
'/es$/' # 5th 
declension singular
);
@@ -99,7 +99,7 @@
'o',
'ommunibus',
'a',
-   'libris', 'nuntiis',
+   'libris', 'nuntiis', 'datis',
'tione', 'nte', 'ate',
'e'
);

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

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

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

[MediaWiki-commits] [Gerrit] Fix inheritance of ve.ui.MWSyntaxHighlightDialogTool - change (mediawiki...SyntaxHighlight_GeSHi)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Fix inheritance of ve.ui.MWSyntaxHighlightDialogTool
..

Fix inheritance of ve.ui.MWSyntaxHighlightDialogTool

From the description of the commit message[1] for WindowTool (which replaces
DialogTool) and FragmentWindowTool, the
ve.ui.MWSyntaxHighlightDialogTool should be a FragmentWindowTool,
and not a WindowTool/DialogTool.

In fact, the bug is caused by the missing isCompatibleWith method
in WindowTool.

[1] I3a0e761f0d6e942d503ec

Follow up: I676af9c50b09ef007926240eb2327d1a0fdd80f5

Bug: T121596
Change-Id: I0fa440d845c1dea34b623de0a36fb57cebf60f78
(cherry picked from commit 3203eaf554054a30770cca21dfce80e9a115ed6b)
---
M modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi 
refs/changes/29/260429/1

diff --git a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js 
b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
index 7a38705..8d5ad55 100644
--- a/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
+++ b/modules/ve-syntaxhighlight/ve.ui.MWSyntaxHighlightDialogTool.js
@@ -11,7 +11,7 @@
  * MediaWiki UserInterface syntax highlight tool.
  *
  * @class
- * @extends ve.ui.DialogTool
+ * @extends ve.ui.FragmentWindowTool
  * @constructor
  * @param {OO.ui.ToolGroup} toolGroup
  * @param {Object} [config] Configuration options
@@ -19,7 +19,7 @@
 ve.ui.MWSyntaxHighlightDialogTool = function VeUiMWSyntaxHighlightDialogTool() 
{
ve.ui.MWSyntaxHighlightDialogTool.super.apply( this, arguments );
 };
-OO.inheritClass( ve.ui.MWSyntaxHighlightDialogTool, ve.ui.DialogTool );
+OO.inheritClass( ve.ui.MWSyntaxHighlightDialogTool, ve.ui.FragmentWindowTool );
 ve.ui.MWSyntaxHighlightDialogTool.static.name = 'syntaxhighlightDialog';
 ve.ui.MWSyntaxHighlightDialogTool.static.group = 'object';
 ve.ui.MWSyntaxHighlightDialogTool.static.icon = 'alienextension';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fa440d845c1dea34b623de0a36fb57cebf60f78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: wmf/1.27.0-wmf.9
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Florianschmidtwelzow 

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

[MediaWiki-commits] [Gerrit] [WikiLexicalData] Register alias file - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [WikiLexicalData] Register alias file
..


[WikiLexicalData] Register alias file

https://gerrit.wikimedia.org/r/#/c/253323/

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 099a15d..9321def 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -2574,6 +2574,7 @@
 
 Wiki Lexical Data
 file = WikiLexicalData/i18n/lexicaldata/%CODE%.json
+aliasfile = WikiLexicalData/WikiLexicalData.i18n.alias.php
 descmsg = wikidata-desc
 optional = ow_editing_policy_url, ow_URL, prefs-omegawiki, ow-stat-percent
 

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

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

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

[MediaWiki-commits] [Gerrit] Move white-space:pre-wrap hack to ContentBranchNode - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Move white-space:pre-wrap hack to ContentBranchNode
..


Move white-space:pre-wrap hack to ContentBranchNode

This way it has less potential to break other nodes.

Bug: T121557
Change-Id: I293442a6b61016b78410c7589215239eb80d9f3f
(cherry picked from commit d1c5207ab474369d203f3612fb58ac79586a23a5)
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
A src/ce/styles/nodes/ve.ce.ContentBranchNode.css
M src/ce/styles/nodes/ve.ce.DocumentNode.css
M src/ce/ve.ce.BranchNode.js
M src/ce/ve.ce.ContentBranchNode.js
M tests/ce/ve.ce.Document.test.js
M tests/dm/ve.dm.example.js
9 files changed, 45 insertions(+), 20 deletions(-)

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



diff --git a/build/modules.json b/build/modules.json
index 7291615..ebfa122 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -494,6 +494,7 @@
"src/ce/styles/nodes/ve.ce.FocusableNode.css",
"src/ce/styles/nodes/ve.ce.AlienNode.css",
"src/ce/styles/nodes/ve.ce.BranchNode.css",
+   "src/ce/styles/nodes/ve.ce.ContentBranchNode.css",
"src/ce/styles/nodes/ve.ce.CommentNode.css",
"src/ce/styles/nodes/ve.ce.DocumentNode.css",
"src/ce/styles/nodes/ve.ce.GeneratedContentNode.css",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index e545cdf..302a383 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -31,6 +31,7 @@



+   



diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index ddadbe1..5d1eb70 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -31,6 +31,7 @@



+   



diff --git a/src/ce/styles/nodes/ve.ce.ContentBranchNode.css 
b/src/ce/styles/nodes/ve.ce.ContentBranchNode.css
new file mode 100644
index 000..aeef5f0
--- /dev/null
+++ b/src/ce/styles/nodes/ve.ce.ContentBranchNode.css
@@ -0,0 +1,14 @@
+/*!
+ * VisualEditor ContentEditable ContentBranchNode styles.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+/*
+ * So that we don't need to use  when rendering text with multiple 
consecutive spaces, and
+ * that the browser doesn't insert  when typing regular spaces, and that 
we can let the user
+ * input actual non-breaking spaces in the text without having to guess if 
they're really needed.
+ */
+.ve-ce-contentBranchNode {
+   white-space: pre-wrap;
+}
diff --git a/src/ce/styles/nodes/ve.ce.DocumentNode.css 
b/src/ce/styles/nodes/ve.ce.DocumentNode.css
index 4e911cb..1f4fd98 100644
--- a/src/ce/styles/nodes/ve.ce.DocumentNode.css
+++ b/src/ce/styles/nodes/ve.ce.DocumentNode.css
@@ -8,12 +8,6 @@
cursor: text;
/* 0.75/0.8, 1.5/0.8 */
padding: 0.9375em 1.875em;
-   /*
-* So that we don't need to use  when rendering text with 
multiple consecutive spaces, and
-* that the browser doesn't insert  when typing regular spaces, 
and that we can let the user
-* input actual non-breaking spaces in the text without having to guess 
if they're really needed.
-*/
-   white-space: pre-wrap;
 }
 
 /*
diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index 54220b0..31ffad2 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -108,7 +108,7 @@
  */
 ve.ce.BranchNode.prototype.onSetup = function () {
// Parent method
-   ve.ce.Node.prototype.onSetup.call( this );
+   ve.ce.BranchNode.super.prototype.onSetup.apply( this, arguments );
 
// DOM changes (duplicated from constructor in case this.$element is 
replaced)
this.$element.addClass( 've-ce-branchNode' );
diff --git a/src/ce/ve.ce.ContentBranchNode.js 
b/src/ce/ve.ce.ContentBranchNode.js
index 996b3b7..e354d25 100644
--- a/src/ce/ve.ce.ContentBranchNode.js
+++ b/src/ce/ve.ce.ContentBranchNode.js
@@ -28,6 +28,9 @@
 
this.onClickHandler = this.onClick.bind( this );
 
+   // DOM changes (keep in sync with #onSetup)
+   this.$element.addClass( 've-ce-contentBranchNode' );
+
// Events
this.connect( this, { childUpdate: 'onChildUpdate' } );
// Some browsers allow clicking links inside contenteditable, such as 
in iOS Safari when the
@@ -83,6 +86,17 @@
 /* Methods */
 
 /**
+ * @inheritdoc
+ */
+ve.ce.ContentBranchNode.prototype.onSetup = function () {
+   // Parent method
+   ve.ce.ContentBranchNode.super.prototype.onSetup.apply( this, arguments 
);
+
+   // DOM changes (duplicated from constructor in case this.$element is 
replaced)
+   

[MediaWiki-commits] [Gerrit] Use AfterBuildFeedLinks hook to disable all feed links - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

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

Change subject: Use AfterBuildFeedLinks hook to disable all feed links
..


Use AfterBuildFeedLinks hook to disable all feed links

This partially reverts Idfa6e92fe2bc39ca4dd12.

Bug: T121774
Change-Id: I5a6ba7b19fd8adf098c22fc7a2c18e18cf224827
Depends-On: If48bd07a0e7e67fd1c1a94ebaa28ca9dae146c55
---
M MobileFrontend.php
M includes/MobileFrontend.hooks.php
2 files changed, 14 insertions(+), 6 deletions(-)

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



diff --git a/MobileFrontend.php b/MobileFrontend.php
index 536d0c0..0cfdea7 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -148,6 +148,7 @@
 $wgHooks['ThumbnailBeforeProduceHTML'][] = 
'MobileFrontendHooks::onThumbnailBeforeProduceHTML';
 $wgHooks['ImageBeforeProduceHTML'][] = 
'MobileFrontendHooks::onImageBeforeProduceHTML';
 $wgHooks['PageRenderingHash'][] = 'MobileFrontendHooks::onPageRenderingHash';
+$wgHooks['AfterBuildFeedLinks'][] = 
'MobileFrontendHooks::onAfterBuildFeedLinks';
 
 $wgSpecialPages += array(
'History' => 'SpecialMobileHistory',
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index dfd1a00..e409282 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -688,7 +688,7 @@
 * @return bool
 */
public static function onBeforePageDisplay( &$out, &$sk ) {
-   global $wgFeed, $wgWPBSkinBlacklist, $wgWPBEnableDefaultBanner;
+   global $wgWPBSkinBlacklist, $wgWPBEnableDefaultBanner;
$context = MobileContext::singleton();
$config = $context->getMFConfig();
$mfEnableXAnalyticsLogging = $config->get( 
'MFEnableXAnalyticsLogging' );
@@ -773,11 +773,6 @@
// in mobile view: always add vary header
$out->addVaryHeader( 'Cookie' );
 
-   // T100377: By default hide RSS s
-   // FIXME: Overwriting the config variable doesn't seem 
to be the best solution,
-   // it should be able to omit the feed links by a hook 
or something else - bug T121774
-   $wgFeed = $config->get( 'MFRSSFeedLink' );
-
// Allow modifications in mobile only mode
Hooks::run( 'BeforePageDisplayMobile', array( &$out, 
&$sk ) );
}
@@ -786,6 +781,18 @@
}
 
/**
+* AfterBuildFeedLinks hook handler. Remove all feed links in mobile 
view.
+*
+* @param array &$tags Added feed links
+*/
+   public static function onAfterBuildFeedLinks( array &$tags ) {
+   $context = MobileContext::singleton();
+   if ( $context->shouldDisplayMobileView() && 
!$context->getMFConfig()->get( 'MFRSSFeedLink' ) ) {
+   $tags = array();
+   }
+   }
+
+   /**
 * CustomEditor hook handler
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/CustomEditor
 *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a6ba7b19fd8adf098c22fc7a2c18e18cf224827
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update VE core for I293442a6 - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Update VE core for I293442a6
..


Update VE core for I293442a6

Change-Id: Id0563a14366713e5cb6dac0991078433a71c9ae8
---
M .jsduck/eg-iframe.html
M extension.json
M lib/ve
3 files changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index 25c6100..7ab59bd 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -15,6 +15,7 @@



+   



diff --git a/extension.json b/extension.json
index 0b51478..8813f10 100644
--- a/extension.json
+++ b/extension.json
@@ -772,6 +772,7 @@

"lib/ve/src/ce/styles/nodes/ve.ce.FocusableNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.AlienNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.BranchNode.css",
+   
"lib/ve/src/ce/styles/nodes/ve.ce.ContentBranchNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.DocumentNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.GeneratedContentNode.css",

"lib/ve/src/ce/styles/nodes/ve.ce.HorizontalRuleNode.css",
diff --git a/lib/ve b/lib/ve
index 5fd7ed6..9d3def2 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 5fd7ed6e8b03ed21392938aa90bb923bd8910a7c
+Subproject commit 9d3def267ec7ccae466bb562899b8a2fa1c91039

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0563a14366713e5cb6dac0991078433a71c9ae8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.27.0-wmf.9
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
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 unused ganglia kafka views - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Remove unused ganglia kafka views
..

Remove unused ganglia kafka views

Bug: T121659
Change-Id: I063cdfe16a32963c9d9cfd33f00e923b074e52dc
---
M manifests/misc/monitoring.pp
M modules/role/manifests/zookeeper/client.pp
2 files changed, 1 insertion(+), 123 deletions(-)


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

diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index 7da3aae..9312c23 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -3,14 +3,6 @@
 # Ganglia views that should be
 # avaliable on ganglia.wikimedia.org
 class misc::monitoring::views {
-include role::analytics::kafka::config
-
-$kafka_log_disks_regex = 
join($::role::analytics::kafka::config::log_disks, '|')
-$kafka_broker_host_regex = 
join($::role::analytics::kafka::config::brokers_array, '|')
-misc::monitoring::view::kafka { 'kafka':
-kafka_broker_host_regex => $kafka_broker_host_regex,
-kafka_log_disks_regex   => $kafka_log_disks_regex,
-}
 misc::monitoring::view::varnishkafka { 'webrequest':
 topic_regex => 'webrequest_.+',
 }
@@ -119,120 +111,6 @@
 ]
 }
 }
-
-# == Define misc:monitoring::view::kafka
-# Installs a ganglia::web::view for a group of nodes
-# running kafka broker servers.  This is just a wrapper for
-# kafka specific metrics to include in kafka
-#
-# == Parameters:
-# $kafka_broker_host_regex   - regex matching kafka broker hosts
-# $log_disk_regex- regex matching disks that have Kafka log 
directories
-#
-define misc::monitoring::view::kafka($kafka_broker_host_regex, 
$kafka_log_disks_regex = '.+', $ensure = 'present') {
-ganglia::web::view { $name:
-ensure => $ensure,
-graphs => [
-# Messages In
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-MessagesInPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Bytes In
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-BytesInPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# BytesOut
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-BytesOutPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Produce Requests
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.network.RequestMetrics.Produce-RequestsPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Failed Produce Requests
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.BrokerTopicMetrics.+-FailedProduceRequestsPerSec.OneMinuteRate',
-'type' => 'stack',
-},
-
-# Replica Max Lag
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaFetcherManager.Replica-MaxLag.Value',
-'type' => 'line',
-},
-# Under Replicated Partitions
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaManager.UnderReplicatedPartitions.Value',
-'type' => 'line',
-},
-
-# ISR Shrinks
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaManager.ISRShrinks.FiveMinuteRate',
-'type' => 'line',
-},
-# ISR Expands
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
'kafka.server.ReplicaManager.ISRExpands.FiveMinuteRate',
-'type' => 'line',
-},
-# /proc/diskstat bytes written per second
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_write_bytes_per_sec",
-'type' => 'stack',
-},
-# /proc/diskstat bytes read per second
-{
-'host_regex'   => $kafka_broker_host_regex,
-'metric_regex' => 
"diskstat_(${kafka_log_disks_regex})_read_bytes_per_sec",
-'type' => 'stack',
-},
-# /proc/diskstat disk utilization %
-  

[MediaWiki-commits] [Gerrit] [DontationInternface] Add empty message to ignore - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [DontationInternface] Add empty message to ignore
..


[DontationInternface] Add empty message to ignore

https://gerrit.wikimedia.org/r/#/c/260398/

Change-Id: Ida46409ac938672d89d9c34183bfde818b4fd0ea
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 01343e7..4066fec 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -802,6 +802,9 @@
 file = DonationInterface/amazon_gateway/i18n/%CODE%.json
 id = ext-di-ag
 descmsg = amazon_gateway-desc
+ignored = apihelp-di_amazon_bill-description, 
apihelp-di_amazon_bill-param-amount, 
apihelp-di_amazon_bill-param-billingAgreementId
+ignored = apihelp-di_amazon_bill-param-currency_code, 
apihelp-di_amazon_bill-param-orderReferenceId, 
apihelp-di_amazon_bill-param-recurring
+ignored = apihelp-di_amazon_bill-param-token
 
 Donation Interface - Astro Gateway
 file = DonationInterface/astropay_gateway/i18n/%CODE%.json
@@ -852,6 +855,9 @@
 ignored = apihelp-di_wp_validate-param-street, 
apihelp-di_wp_validate-param-state
 ignored = apihelp-di_wp_validate-param-zip, 
apihelp-di_wp_validate-param-country
 ignored = apihelp-di_wp_validate-param-city, apihelp-di_wp_validate-param-cvc
+ignored = apihelp-di_wp_validate-param-email, 
apihelp-di_wp_validate-param-payment_submethod
+ignored = apihelp-di_wp_validate-param-token, 
apihelp-di_wp_validate-param-amount
+ignored = apihelp-di_wp_validate-param-ffname
 
 Double Wiki
 

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

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

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

[MediaWiki-commits] [Gerrit] Don't show WikidataPageBanner when printing - change (mediawiki...WikidataPageBanner)

[Scimonster (Code Review)]

Scimonster has uploaded a new change for review.

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

Change subject: Don't show WikidataPageBanner when printing
..

Don't show WikidataPageBanner when printing

IN-PROGRESS PATCHSET -- Google CodeIn task

Add a stylesheet for print that will reset the header to its default
state.
I can't get it to actually show up in the printable version though.

Bug: T110201
Change-Id: Id72a76eda2b8ad6adc4d0cbde202eb1848e5fee1
---
M extension.json
A 
resources/ext.WikidataPageBanner.print.styles/ext.WikidataPageBanner.print.less
M templates/banner.mustache
3 files changed, 22 insertions(+), 3 deletions(-)


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

diff --git a/extension.json b/extension.json
index 29a6886..51ea472 100644
--- a/extension.json
+++ b/extension.json
@@ -49,6 +49,13 @@
],
"position": "top"
},
+   "ext.WikidataPageBanner.print.styles": {
+   "styles": [
+   
"ext.WikidataPageBanner.print.styles/ext.WikidataPageBanner.print.less"
+   ],
+   "targets": ["print"],
+   "position": "top"
+   },
"ext.WikidataPageBanner.positionBanner": {
"scripts": [

"ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js"
diff --git 
a/resources/ext.WikidataPageBanner.print.styles/ext.WikidataPageBanner.print.less
 
b/resources/ext.WikidataPageBanner.print.styles/ext.WikidataPageBanner.print.less
new file mode 100644
index 000..ca26ebe
--- /dev/null
+++ 
b/resources/ext.WikidataPageBanner.print.styles/ext.WikidataPageBanner.print.less
@@ -0,0 +1,12 @@
+// I can't get this to work.
+// It just doesn't show up, even though i added it in extension.json as a 
printing style.
+
+.ext-wpb-pagebanner .wpb-topbanner .wpb-name {
+  position: initial;
+  margin: 0;
+  background: none;
+  color: initial;
+  padding: initial;
+  /* font-weight: 700; */
+  line-height: initial;
+}
diff --git a/templates/banner.mustache b/templates/banner.mustache
index 0a6bebc..ee97c25 100644
--- a/templates/banner.mustache
+++ b/templates/banner.mustache
@@ -1,7 +1,7 @@
-
+

{{#isHeadingOverrideEnabled}}{{title}}{{/isHeadingOverrideEnabled}}
-   
+   
{{#hasIcons}}

{{#icons}}
@@ -10,5 +10,5 @@

{{/hasIcons}}

-   {{{toc}}}
+   {{{toc}}}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id72a76eda2b8ad6adc4d0cbde202eb1848e5fee1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Scimonster 

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

[MediaWiki-commits] [Gerrit] cassandra: add restbase100[3456] instances - change (operations/dns)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: add restbase100[3456] instances
..


cassandra: add restbase100[3456] instances

Change-Id: I62844e4c8b722602b8081dd36eed4a690f277dd3
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 24 insertions(+), 0 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 0b73edc..6c8d827 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -854,6 +854,12 @@
 186 1H IN PTR   iridium-vcs.eqiad.wmnet.
 187 1H IN PTR   restbase1008-a.eqiad.wmnet.
 188 1H IN PTR   technetium.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
+189 1H IN PTR   restbase1003-a.eqiad.wmnet.
+190 1H IN PTR   restbase1003-b.eqiad.wmnet.
+191 1H IN PTR   restbase1003-c.eqiad.wmnet.
+192 1H IN PTR   restbase1004-a.eqiad.wmnet.
+193 1H IN PTR   restbase1004-b.eqiad.wmnet.
+194 1H IN PTR   restbase1004-c.eqiad.wmnet.
 
 201 1H IN PTR   d-i-test.eqiad.wmnet. ; VM on the 
ganeti01.svc.eqiad.wmnet cluster
 
@@ -1071,6 +1077,12 @@
 119 1H  IN PTR  elastic1006.eqiad.wmnet.
 120 1H  IN PTR  restbase1009-a.eqiad.wmnet.
 121 1H  IN PTR  auth1001.eqiad.wmnet.
+122 1H  IN PTR  restbase1005-a.eqiad.wmnet.
+123 1H  IN PTR  restbase1005-b.eqiad.wmnet.
+124 1H  IN PTR  restbase1005-c.eqiad.wmnet.
+125 1H  IN PTR  restbase1006-a.eqiad.wmnet.
+126 1H  IN PTR  restbase1006-b.eqiad.wmnet.
+127 1H  IN PTR  restbase1006-c.eqiad.wmnet.
 
 $ORIGIN 49.64.{{ zonename }}.
 1   1H IN PTR   vl1020-eth3.lvs1001.wikimedia.org.
diff --git a/templates/wmnet b/templates/wmnet
index f198fde..ced6b97 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -740,9 +740,21 @@
 restbase1002-b  1H  IN A10.64.0.228 ; cassandra instance
 restbase1002-c  1H  IN A10.64.0.229 ; cassandra instance
 restbase10031H  IN A10.64.32.159
+restbase1003-a  1H  IN A10.64.32.189 ; cassandra instance
+restbase1003-b  1H  IN A10.64.32.190 ; cassandra instance
+restbase1003-c  1H  IN A10.64.32.191 ; cassandra instance
 restbase10041H  IN A10.64.32.160
+restbase1004-a  1H  IN A10.64.32.192 ; cassandra instance
+restbase1004-b  1H  IN A10.64.32.193 ; cassandra instance
+restbase1004-c  1H  IN A10.64.32.194 ; cassandra instance
 restbase10051H  IN A10.64.48.99
+restbase1005-a  1H  IN A10.64.48.122 ; cassandra instance
+restbase1005-b  1H  IN A10.64.48.123 ; cassandra instance
+restbase1005-c  1H  IN A10.64.48.124 ; cassandra instance
 restbase10061H  IN A10.64.48.100
+restbase1006-a  1H  IN A10.64.48.125 ; cassandra instance
+restbase1006-b  1H  IN A10.64.48.126 ; cassandra instance
+restbase1006-c  1H  IN A10.64.48.127 ; cassandra instance
 restbase10071H  IN A10.64.0.223
 restbase1007-a  1H  IN A10.64.0.230 ; cassandra instance
 restbase10081H  IN A10.64.32.178

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

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

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

[MediaWiki-commits] [Gerrit] cassandra: add restbase100[3456] instances to seeds - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: add restbase100[3456] instances to seeds
..


cassandra: add restbase100[3456] instances to seeds

Change-Id: I7f4053b9b222c501c4b7baf76fba524440bd19af
---
M hieradata/role/common/cassandra.yaml
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
index 9012b3c..d73631c 100644
--- a/hieradata/role/common/cassandra.yaml
+++ b/hieradata/role/common/cassandra.yaml
@@ -14,9 +14,21 @@
 - restbase1002-b.eqiad.wmnet
 - restbase1002-c.eqiad.wmnet
 - restbase1003.eqiad.wmnet
+- restbase1003-a.eqiad.wmnet
+- restbase1003-b.eqiad.wmnet
+- restbase1003-c.eqiad.wmnet
 - restbase1004.eqiad.wmnet
+- restbase1004-a.eqiad.wmnet
+- restbase1004-b.eqiad.wmnet
+- restbase1004-c.eqiad.wmnet
 - restbase1005.eqiad.wmnet
+- restbase1005-a.eqiad.wmnet
+- restbase1005-b.eqiad.wmnet
+- restbase1005-c.eqiad.wmnet
 - restbase1006.eqiad.wmnet
+- restbase1006-a.eqiad.wmnet
+- restbase1006-b.eqiad.wmnet
+- restbase1006-c.eqiad.wmnet
 - restbase1007.eqiad.wmnet
 - restbase1007-a.eqiad.wmnet
 - restbase1008.eqiad.wmnet

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

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

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

[MediaWiki-commits] [Gerrit] Use new kafka role in role::logstash::eventlogging - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: Use new kafka role in role::logstash::eventlogging
..


Use new kafka role in role::logstash::eventlogging

Bug: T121659

Change-Id: I4763836fce6ff563be7cba7b00c2ebcba8e37bef
---
M manifests/role/logstash.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/manifests/role/logstash.pp b/manifests/role/logstash.pp
index 2f8da5f..e7278d5 100644
--- a/manifests/role/logstash.pp
+++ b/manifests/role/logstash.pp
@@ -388,14 +388,14 @@
 #
 class role::logstash::eventlogging {
 include ::role::logstash
-include ::role::analytics::kafka::config
+include ::role::kafka::analytics::config
 
 $topic = 'eventlogging_EventError'
 
 logstash::input::kafka { $topic:
 tags   => [$topic, 'kafka'],
 type   => 'eventlogging',
-zk_connect => $role::analytics::kafka::config::zookeeper_url,
+zk_connect => $role::kafka::analytics::config::zookeeper_url,
 }
 
 logstash::conf { 'filter_eventlogging':

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

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

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

[MediaWiki-commits] [Gerrit] Use new kafka role in role::cache::kafka - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Use new kafka role in role::cache::kafka
..

Use new kafka role in role::cache::kafka

Bug: T121659
Change-Id: I755e1422b35e8b0b04cbd9a6c4fbd9091f6c861f
---
M modules/role/manifests/cache/kafka.pp
1 file changed, 2 insertions(+), 13 deletions(-)


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

diff --git a/modules/role/manifests/cache/kafka.pp 
b/modules/role/manifests/cache/kafka.pp
index c93f8ff..bb7fb84 100644
--- a/modules/role/manifests/cache/kafka.pp
+++ b/modules/role/manifests/cache/kafka.pp
@@ -2,19 +2,8 @@
 # Base class for instances of varnishkafka on cache servers.
 #
 class role::cache::kafka {
-require role::analytics::kafka::config
-
-# Get a list of kafka brokers for the currently configured 
$kafka_cluster_name.
-# In production this will be 'eqiad' always, since we only have one Kafka 
cluster there.
-# Even though $kafka_cluster_name should hardcoded to 'eqiad' in 
...kafka::config,
-# we hardcode it again here, just to be sure it doesn't accidentally get 
changed
-# if we add new Kafka clusters later.
-$kafka_cluster_name = $::realm ? {
-'production' => 'eqiad',
-'labs'   => $role::analytics::kafka::config::kafka_cluster_name,
-}
-
-$kafka_brokers = 
keys($role::analytics::kafka::config::cluster_config[$kafka_cluster_name])
+require role::kafka::analytics::config
+$kafka_brokers = $::role::kafka::analytics::config::brokers_array
 
 # Make sure varnishkafka rsyslog file is in place properly.
 rsyslog::conf { 'varnishkafka':

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

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

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

[MediaWiki-commits] [Gerrit] restbase: reprovision restbase1004 - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged.

Change subject: restbase: reprovision restbase1004
..


restbase: reprovision restbase1004

Change-Id: I5cc51619b0fa42ec141a09e24b5cdff68095bcec
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 6b4c05f..78a4864 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -117,7 +117,8 @@
pc100[1-3]) echo partman/mw.cfg ;; \
pybal-test200[1-3]) echo partman/flat.cfg virtual.cfg;; \
rdb100[1-6]) echo partman/mw.cfg ;; \
-   restbase100[1-6]) echo partman/cassandrahosts-3ssd.cfg ;; \
+   restbase100[12356]) echo partman/cassandrahosts-3ssd.cfg ;; \
+   restbase1004) echo partman/cassandrahosts-3ssd-srv.cfg ;; \
restbase100[789]) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd-srv.cfg ;; \
restbase200[12]) echo partman/cassandrahosts-4ssd-srv.cfg ;; \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5cc51619b0fa42ec141a09e24b5cdff68095bcec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] mw_rc_irc: rename irc-echo to irc_echo - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: mw_rc_irc: rename irc-echo to irc_echo
..


mw_rc_irc: rename irc-echo to irc_echo

Puppet classes and defines should not contain
dash characters per lint and style guide and we only
have a handful of those left.

Change-Id: I11baf0f67fab2bc84e8324cc4aa048aa03710569
---
M manifests/role/mw_rc_irc.pp
R modules/mw_rc_irc/manifests/irc_echo.pp
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/role/mw_rc_irc.pp b/manifests/role/mw_rc_irc.pp
index ecd51e6..5db458a 100644
--- a/manifests/role/mw_rc_irc.pp
+++ b/manifests/role/mw_rc_irc.pp
@@ -7,7 +7,7 @@
 include passwords::udpmxircecho
 $udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
 
-class { '::mw_rc_irc::irc-echo':
+class { '::mw_rc_irc::irc_echo':
 ircpassword => $udpmxircecho_pass,
 }
 
diff --git a/modules/mw_rc_irc/manifests/irc-echo.pp 
b/modules/mw_rc_irc/manifests/irc_echo.pp
similarity index 96%
rename from modules/mw_rc_irc/manifests/irc-echo.pp
rename to modules/mw_rc_irc/manifests/irc_echo.pp
index 78b0580..3535c9f 100644
--- a/modules/mw_rc_irc/manifests/irc-echo.pp
+++ b/modules/mw_rc_irc/manifests/irc_echo.pp
@@ -1,6 +1,6 @@
 # A basic relay client that accept changes via udp and echo's them to an irc 
server
 
-class mw_rc_irc::irc-echo(
+class mw_rc_irc::irc_echo(
 $ircpassword,
 ) {
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11baf0f67fab2bc84e8324cc4aa048aa03710569
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
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] add wikimania2017, regular and .m. - change (operations/dns)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: add wikimania2017, regular and .m.
..

add wikimania2017, regular and .m.

Bug:T122062
Change-Id: Ic71eea25b791745d4d97f4dbfe4c88fa30ecfd29
---
M templates/wikimedia.org
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/31/260431/1

diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 4c32bf6..119c09e 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -318,6 +318,7 @@
 wikimania2014.m 600 IN DYNA geoip!mobile-addrs
 wikimania2015.m 600 IN DYNA geoip!mobile-addrs
 wikimania2016.m 600 IN DYNA geoip!mobile-addrs
+wikimania2017.m 600 IN DYNA geoip!mobile-addrs
 wikitech.m  600 IN DYNA geoip!mobile-addrs
 
 ; Networking
@@ -604,6 +605,7 @@
 wikimania2014600 IN DYNA geoip!text-addrs
 wikimania2015600 IN DYNA geoip!text-addrs
 wikimania2016600 IN DYNA geoip!text-addrs
+wikimania2017600 IN DYNA geoip!text-addrs
 wikimaniateam600 IN DYNA geoip!text-addrs
 www  600 IN DYNA geoip!text-addrs
 zero 600 IN DYNA geoip!text-addrs

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

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

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

[MediaWiki-commits] [Gerrit] [Parsoid Batch API] Add empty messages to ignore - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [Parsoid Batch API] Add empty messages to ignore
..

[Parsoid Batch API] Add empty messages to ignore

https://gerrit.wikimedia.org/r/#/c/260400/1/i18n/en.json,unified

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


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/33/260433/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 4066fec..099a15d 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1777,6 +1777,7 @@
 # Parsoid
 
 Parsoid Batch API
+ignored = apihelp-parsoid-batch-description, apihelp-parsoid-batch-param-batch
 
 # Incomplete message doc
 # Patroller

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

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

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

[MediaWiki-commits] [Gerrit] [Parsoid Batch API] Add empty messages to ignore - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [Parsoid Batch API] Add empty messages to ignore
..


[Parsoid Batch API] Add empty messages to ignore

https://gerrit.wikimedia.org/r/#/c/260400/1/i18n/en.json,unified

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

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



diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 4066fec..099a15d 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -1777,6 +1777,7 @@
 # Parsoid
 
 Parsoid Batch API
+ignored = apihelp-parsoid-batch-description, apihelp-parsoid-batch-param-batch
 
 # Incomplete message doc
 # Patroller

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

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

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

[MediaWiki-commits] [Gerrit] SpecialWatchlist: Avoid double space between checkbox and label - change (mediawiki/core)

[Gerrit Patch Uploader (Code Review)]

Gerrit Patch Uploader has uploaded a new change for review.

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

Change subject: SpecialWatchlist: Avoid double space between checkbox and label
..

SpecialWatchlist: Avoid double space between checkbox and label

Add a separate message 'wlshowhidecategorization' without parameter.

Change-Id: I02a302f90e5c275559118698e31a46237b4b1cb1
---
M includes/specials/SpecialWatchlist.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/39/260439/1

diff --git a/includes/specials/SpecialWatchlist.php 
b/includes/specials/SpecialWatchlist.php
index 68dc9ab..c894a79 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -444,7 +444,7 @@
);
 
if ( $this->getConfig()->get( 'RCWatchCategoryMembership' ) ) {
-   $filters['hidecategorization'] = 
'rcshowhidecategorization';
+   $filters['hidecategorization'] = 
'wlshowhidecategorization';
}
 
foreach ( $this->getCustomFilters() as $key => $params ) {
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 0c72d77..000b4ae 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1960,6 +1960,7 @@
"wlshowhideanons": "anonymous users",
"wlshowhidepatr": "patrolled edits",
"wlshowhidemine": "my edits",
+   "wlshowhidecategorization": "page categorization",
"watchlist-options": "Watchlist options",
"watching": "Watching...",
"unwatching": "Unwatching...",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 329e901..d21718e 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2135,6 +2135,7 @@
"wlshowhideanons": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhideanons}}.\n{{Identical|Anonymous user}}",
"wlshowhidepatr": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhidepatr}}.",
"wlshowhidemine": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhidemine}}.",
+   "wlshowhidecategorization": "Option text in [[Special:Watchlist]]. Cf. 
{{msg-mw|rcshowhidecategorization}}.",
"watchlist-options": "Legend of the fieldset of 
[[Special:Watchlist]]\n\nSee also:\n* {{msg-mw|Watchlist-details|watchlist 
header}}\n* {{msg-mw|Wlheader-enotif|watchlist header}}\n* {{msg-mw|enotif 
reset|Submit button text}}",
"watching": "Text displayed when clicked on the watch tab: 
{{msg-mw|Watch}}. It means the wiki is adding that page to your watchlist.",
"unwatching": "Text displayed when clicked on the unwatch tab: 
{{msg-mw|Unwatch}}. It means the wiki is removing that page from your 
watchlist.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02a302f90e5c275559118698e31a46237b4b1cb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

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

[MediaWiki-commits] [Gerrit] ores: Have the redises listen on 0.0.0.0 - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: ores: Have the redises listen on 0.0.0.0
..


ores: Have the redises listen on 0.0.0.0

Change-Id: I7d2015d8b737de979b550b27d3f9a9ba6245a282
---
M modules/ores/manifests/redis.pp
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/modules/ores/manifests/redis.pp b/modules/ores/manifests/redis.pp
index 4798f84..827f5fd 100644
--- a/modules/ores/manifests/redis.pp
+++ b/modules/ores/manifests/redis.pp
@@ -16,6 +16,7 @@
 # For the queue
 redis::instance { '6379':
 settings => {
+bind   => '0.0.0.0',
 dir=> '/srv/redis/queue',
 maxmemory  => $queue_maxmemory,
 tcp_keepalive  => 60,
@@ -26,6 +27,7 @@
 # For the cache
 redis::instance { '6380':
 settings => {
+bind   => '0.0.0.0',
 dir=> '/srv/redis/cache',
 maxmemory  => $cache_maxmemory,
 tcp_keepalive  => 60,

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 39d762e..dd85041 - change (mediawiki/extensions)

[Jenkins-mwext-sync (Code Review)]

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

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

Change subject: Syncronize VisualEditor: 39d762e..dd85041
..

Syncronize VisualEditor: 39d762e..dd85041

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/91/260491/1

diff --git a/VisualEditor b/VisualEditor
index 39d762e..dd85041 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 39d762e8448fa3b3146c8886ce9002ee4e79292c
+Subproject commit dd85041a297c4731ca56db504943e2a9c586ecad

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

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

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

[MediaWiki-commits] [Gerrit] [DontationInternface] Add empty message to ignore - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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

Change subject: [DontationInternface] Add empty message to ignore
..

[DontationInternface] Add empty message to ignore

https://gerrit.wikimedia.org/r/#/c/260398/

Change-Id: Ida46409ac938672d89d9c34183bfde818b4fd0ea
---
M groups/MediaWiki/mediawiki-extensions.txt
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/03/260403/1

diff --git a/groups/MediaWiki/mediawiki-extensions.txt 
b/groups/MediaWiki/mediawiki-extensions.txt
index 01343e7..4066fec 100644
--- a/groups/MediaWiki/mediawiki-extensions.txt
+++ b/groups/MediaWiki/mediawiki-extensions.txt
@@ -802,6 +802,9 @@
 file = DonationInterface/amazon_gateway/i18n/%CODE%.json
 id = ext-di-ag
 descmsg = amazon_gateway-desc
+ignored = apihelp-di_amazon_bill-description, 
apihelp-di_amazon_bill-param-amount, 
apihelp-di_amazon_bill-param-billingAgreementId
+ignored = apihelp-di_amazon_bill-param-currency_code, 
apihelp-di_amazon_bill-param-orderReferenceId, 
apihelp-di_amazon_bill-param-recurring
+ignored = apihelp-di_amazon_bill-param-token
 
 Donation Interface - Astro Gateway
 file = DonationInterface/astropay_gateway/i18n/%CODE%.json
@@ -852,6 +855,9 @@
 ignored = apihelp-di_wp_validate-param-street, 
apihelp-di_wp_validate-param-state
 ignored = apihelp-di_wp_validate-param-zip, 
apihelp-di_wp_validate-param-country
 ignored = apihelp-di_wp_validate-param-city, apihelp-di_wp_validate-param-cvc
+ignored = apihelp-di_wp_validate-param-email, 
apihelp-di_wp_validate-param-payment_submethod
+ignored = apihelp-di_wp_validate-param-token, 
apihelp-di_wp_validate-param-amount
+ignored = apihelp-di_wp_validate-param-ffname
 
 Double Wiki
 

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

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

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

[MediaWiki-commits] [Gerrit] eventlogging role now uses new kafka analytics role - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: eventlogging role now uses new kafka analytics role
..

eventlogging role now uses new kafka analytics role

Bug: T121659
Change-Id: I91df946dd59d49f4d0a3242d993e12a486f60d12
---
M manifests/role/eventlogging.pp
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index f396d61..62c9f53 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -28,7 +28,7 @@
 }
 
 # Infer Kafka cluster configuration from this class
-class { 'role::analytics::kafka::config': }
+class { 'role::kafka::analytics::config': }
 
 # Event data flows through several processes.
 # By default, all processing is performed
@@ -40,8 +40,8 @@
 # for beta cluster, set in 
https://wikitech.wikimedia.org/wiki/Hiera:Deployment-prep
 $statsd_host = hiera('eventlogging_statsd_host',  
'statsd.eqiad.wmnet')
 
-$kafka_brokers_array = $role::analytics::kafka::config::brokers_array
-$kafka_zookeeper_url = $role::analytics::kafka::config::zookeeper_url
+$kafka_brokers_array = $role::kafka::analytics::config::brokers_array
+$kafka_zookeeper_url = $role::kafka::analytics::config::zookeeper_url
 
 # By default, the EL Kafka writer writes events to
 # schema based topic names like eventlogging_SCHEMA,

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

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

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

[MediaWiki-commits] [Gerrit] Remove arbitrary newSequentialPerNodeIDs() $count limit - change (mediawiki/core)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove arbitrary newSequentialPerNodeIDs() $count limit
..

Remove arbitrary newSequentialPerNodeIDs() $count limit

The increment is done in one step, so there is no real reason
to limit this (e.g. performance). It simply makes errors that
can break things.

Bug: T122068
Change-Id: I3278b4ddfe862f8043b6788b3e82e90be730f68c
---
M includes/utils/UIDGenerator.php
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/260416/1

diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index e2de900..74aded6 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -334,7 +334,7 @@
 * @see UIDGenerator::newSequentialPerNodeID()
 * @param string $bucket Arbitrary bucket name (should be ASCII)
 * @param int $bits Bit size (16 to 48) of resulting numbers before 
wrap-around
-* @param int $count Number of IDs to return (1 to 1)
+* @param int $count Number of IDs to return
 * @param int $flags (supports UIDGenerator::QUICK_VOLATILE)
 * @return array Ordered list of float integer values
 * @since 1.23
@@ -350,7 +350,7 @@
 * @see UIDGenerator::newSequentialPerNodeID()
 * @param string $bucket Arbitrary bucket name (should be ASCII)
 * @param int $bits Bit size (16 to 48) of resulting numbers before 
wrap-around
-* @param int $count Number of IDs to return (1 to 1)
+* @param int $count Number of IDs to return
 * @param int $flags (supports UIDGenerator::QUICK_VOLATILE)
 * @return array Ordered list of float integer values
 * @throws RuntimeException
@@ -358,8 +358,6 @@
protected function getSequentialPerNodeIDs( $bucket, $bits, $count, 
$flags ) {
if ( $count <= 0 ) {
return array(); // nothing to do
-   } elseif ( $count > 1 ) {
-   throw new RuntimeException( "Number of requested IDs 
($count) is too high." );
} elseif ( $bits < 16 || $bits > 48 ) {
throw new RuntimeException( "Requested bit size ($bits) 
is out of range." );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3278b4ddfe862f8043b6788b3e82e90be730f68c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Log files as we upload them - change (wikimedia...tools)

[Awight (Code Review)]

Awight has uploaded a new change for review.

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

Change subject: Log files as we upload them
..

Log files as we upload them

Bug: T121415
Change-Id: I8c86b76c11059fcd5b7df9a26ca7151cbd84b9b4
---
M silverpop_export/export.py
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools 
refs/changes/20/260420/1

diff --git a/silverpop_export/export.py b/silverpop_export/export.py
index 607f56a..cd3ab48 100644
--- a/silverpop_export/export.py
+++ b/silverpop_export/export.py
@@ -104,6 +104,7 @@
 log.info("Uploading to silverpop")
 sftpc = SftpClient()
 for path in files:
+log.info("Putting file %s" % path)
 sftpc.put(path, os.path.basename(path))
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c86b76c11059fcd5b7df9a26ca7151cbd84b9b4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools
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] Use new kafka role in eventlogging alerts - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Use new kafka role in eventlogging alerts
..

Use new kafka role in eventlogging alerts

Bug: T121659
Change-Id: I258b008834854ca246136663480819af915a8e2d
---
M manifests/role/graphite.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/260419/1

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index b90c663..0f42f75 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -254,14 +254,14 @@
 #
 class role::graphite::alerts {
 # Infer Kafka cluster configuration from this class
-include ::role::analytics::kafka::config
+include ::role::kafka::analytics::config
 
 include ::mediawiki::monitoring::graphite
 include ::graphite::monitoring::graphite
 
 # Alerts for EventLogging metrics in Kafka.
 class { '::eventlogging::monitoring::graphite':
-kafka_brokers_graphite_wildcard =>  
$::role::analytics::kafka::config::brokers_graphite_wildcard
+kafka_brokers_graphite_wildcard =>  
$::role::kafka::analytics::config::brokers_graphite_wildcard
 }
 
 swift::monitoring::graphite_alerts { 'eqiad-prod': }

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

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

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

[MediaWiki-commits] [Gerrit] toollabs: Remove NFS dependency from proxies - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: toollabs: Remove NFS dependency from proxies
..

toollabs: Remove NFS dependency from proxies

Should just do manual deploys for tools.admin

Change-Id: I80b6d0054c1831664d23108dd23872f4095011b3
---
A modules/toollabs/files/favicon.ico
M modules/toollabs/manifests/proxy.pp
2 files changed, 0 insertions(+), 16 deletions(-)


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

diff --git a/modules/toollabs/files/favicon.ico 
b/modules/toollabs/files/favicon.ico
new file mode 100644
index 000..656d807
--- /dev/null
+++ b/modules/toollabs/files/favicon.ico
Binary files differ
diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 1e56fb4..6d820df 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -76,22 +76,6 @@
 desc   => 'Proxylistener port, open to just labs'
 }
 
-# Deploy root web.
-git::clone { 'labs/toollabs':
-ensure=> latest,
-directory => '/data/project/admin/toollabs',
-owner => "${::labsproject}.admin",
-group => "${::labsproject}.admin",
-mode  => '2755',
-}
-
-file { '/data/project/admin/public_html':
-ensure  => link,
-force   => true,
-target  => 'toollabs/www',
-require => Git::Clone['labs/toollabs'],
-}
-
 file { '/var/www/error/favicon.ico':
 ensure  => file,
 source  => '/data/project/admin/toollabs/www/favicon.ico',

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

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

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

[MediaWiki-commits] [Gerrit] tools: fix stupid typo - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: tools: fix stupid typo
..


tools: fix stupid typo

Change-Id: I65dda394be7c58302054554061764fe1968f13cd
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 469b9a2..966c444 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -78,7 +78,7 @@
 
 file { '/var/www/error/favicon.ico':
 ensure  => file,
-source  => 'puppet:///modules/toollabs/favico.ico',
+source  => 'puppet:///modules/toollabs/favicon.ico',
 require => File['/var/www/error'],
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Update VisualEditor for I9a47e5d6 & Id0563a14 - change (mediawiki/core)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Update VisualEditor for I9a47e5d6 & Id0563a14
..

Update VisualEditor for I9a47e5d6 & Id0563a14

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/92/260492/1

diff --git a/extensions/VisualEditor b/extensions/VisualEditor
index 8129794..6ff1b1d 16
--- a/extensions/VisualEditor
+++ b/extensions/VisualEditor
-Subproject commit 81297947dba712ca225989692f59c00772c6b543
+Subproject commit 6ff1b1ddcb79ea45db1f89c63d87fa1843891c1b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I772422c48104de628001989f8de81af981f61b13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.9
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] Fix globs in global and mw-selenium teardown scripts - change (integration/jenkins)

[Dduvall (Code Review)]

Dduvall has uploaded a new change for review.

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

Change subject: Fix globs in global and mw-selenium teardown scripts
..

Fix globs in global and mw-selenium teardown scripts

The * glob pattern was incorrectly quoted, resulting in no TMPDIR files
from actually being deleted during teardown.

Fixes regression in I7803395f7f1774d501b60df42e2d7b6628352738

Bug: T120824
Change-Id: I4edf7099acfeb0f06ea2042902bef03097137d6e
---
M bin/global-teardown.sh
M bin/mw-selenium-teardown.sh
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins 
refs/changes/07/260407/1

diff --git a/bin/global-teardown.sh b/bin/global-teardown.sh
index 6399f4d..329cc9d 100755
--- a/bin/global-teardown.sh
+++ b/bin/global-teardown.sh
@@ -13,5 +13,5 @@
 
 # Have bash '*' to expand dot files as well
 shopt -s dotglob
-rm -v -rf "${TMPDIR_FS}/*"
-rm -v -rf "${TMPDIR_REGULAR}/*"
+rm -v -rf "$TMPDIR_FS"/*
+rm -v -rf "$TMPDIR_REGULAR"/*
diff --git a/bin/mw-selenium-teardown.sh b/bin/mw-selenium-teardown.sh
index 4c48c68..3cde013 100755
--- a/bin/mw-selenium-teardown.sh
+++ b/bin/mw-selenium-teardown.sh
@@ -5,4 +5,4 @@
 # Have bash '*' to expand dot files as well.
 # We keep the directory see bin/global-teardown.sh and T120824
 shopt -s dotglob
-rm -v -rf "$TMPDIR/*"
+rm -v -rf "$TMPDIR"/*

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4edf7099acfeb0f06ea2042902bef03097137d6e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Dduvall 

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

[MediaWiki-commits] [Gerrit] Only update seenTime in the local API - change (mediawiki...Echo)

[Mooeypoo (Code Review)]

Mooeypoo has uploaded a new change for review.

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

Change subject: Only update seenTime in the local API
..

Only update seenTime in the local API

Do not send an update to 'seenTime' to remote wikis; only update
the items that are in the local API.

Bug: T121928
Change-Id: I291ecdb53364327dbdcb769c0d93512eeed3ab29
---
M modules/viewmodel/mw.echo.dm.NotificationsModel.js
1 file changed, 9 insertions(+), 2 deletions(-)


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

diff --git a/modules/viewmodel/mw.echo.dm.NotificationsModel.js 
b/modules/viewmodel/mw.echo.dm.NotificationsModel.js
index 4dfb691..1f53b44 100644
--- a/modules/viewmodel/mw.echo.dm.NotificationsModel.js
+++ b/modules/viewmodel/mw.echo.dm.NotificationsModel.js
@@ -314,7 +314,7 @@
 * @fires updateSeenTime
 */
mw.echo.dm.NotificationsModel.prototype.updateSeenTime = function ( 
type ) {
-   var i, len,
+   var i, len, promise,
items = this.unseenNotifications.getItems();
 
type = type || this.type;
@@ -325,7 +325,14 @@
}
this.emit( 'updateSeenTime' );
 
-   return this.getApi().updateSeenTime( type )
+   // Only update seenTime in the API locally
+   if ( !this.isExternal() ) {
+   promise = this.getApi().updateSeenTime( type );
+   } else {
+   promise = $.Deferred().resolve();
+   }
+
+   return promise
.then( this.setSeenTime.bind( this ) );
};
 

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

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

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

[MediaWiki-commits] [Gerrit] eventlogging role now uses new kafka analytics role - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged.

Change subject: eventlogging role now uses new kafka analytics role
..


eventlogging role now uses new kafka analytics role

Bug: T121659
Change-Id: I91df946dd59d49f4d0a3242d993e12a486f60d12
---
M manifests/role/eventlogging.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index f396d61..62c9f53 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -28,7 +28,7 @@
 }
 
 # Infer Kafka cluster configuration from this class
-class { 'role::analytics::kafka::config': }
+class { 'role::kafka::analytics::config': }
 
 # Event data flows through several processes.
 # By default, all processing is performed
@@ -40,8 +40,8 @@
 # for beta cluster, set in 
https://wikitech.wikimedia.org/wiki/Hiera:Deployment-prep
 $statsd_host = hiera('eventlogging_statsd_host',  
'statsd.eqiad.wmnet')
 
-$kafka_brokers_array = $role::analytics::kafka::config::brokers_array
-$kafka_zookeeper_url = $role::analytics::kafka::config::zookeeper_url
+$kafka_brokers_array = $role::kafka::analytics::config::brokers_array
+$kafka_zookeeper_url = $role::kafka::analytics::config::zookeeper_url
 
 # By default, the EL Kafka writer writes events to
 # schema based topic names like eventlogging_SCHEMA,

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

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

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

[MediaWiki-commits] [Gerrit] Remove role::analytics::kafka::* - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

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

Change subject: Remove role::analytics::kafka::*
..

Remove role::analytics::kafka::*

Bug: T121659
Change-Id: Icd3ea5e7d99cfb1c50d12582b5e0637143aa3e6b
---
D manifests/role/analytics/kafka.pp
1 file changed, 0 insertions(+), 237 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/260422/1

diff --git a/manifests/role/analytics/kafka.pp 
b/manifests/role/analytics/kafka.pp
deleted file mode 100644
index d54dfac..000
--- a/manifests/role/analytics/kafka.pp
+++ /dev/null
@@ -1,237 +0,0 @@
-# role/analytics/kafka.pp
-#
-# Role classes for Analytics Kakfa nodes.
-# These role classes will configure Kafka properly in either
-# the Analytics labs or Analytics production environments.
-#
-# Usage:
-#
-# If you only need the Kafka package and configs to use the
-# Kafka client to talk to Kafka Broker Servers:
-#
-#   include role::analytics::kafka::client
-#
-# If you want to set up a Kafka Broker Server
-#   include role::analytics::kafka::server
-#
-class role::analytics::kafka::config {
-if ($::realm == 'labs') {
-# In labs, this can be set via hiera, or default to $::labsproject
-$kafka_cluster_name = 
hiera('role::analytics::kafka::config::kafka_cluster_name', $::labsproject)
-
-# Look up cluster config via hiera.
-# This will default to configuring a kafka cluster named
-# after $::labsproject with a single kafka broker
-# that is the current host
-$cluster_config = hiera(
-'role::analytics::kafka::config::cluster_config',
-{
-"${kafka_cluster_name}" => {
-"${::fqdn}" => { 'id' => 1 },
-},
-}
-)
-
-# labs only uses a single log_dir
-$log_dirs = ['/var/spool/kafka']
-
-# No ganglia in labs (?)
-$ganglia   = undef
-# TODO: use variables for statsd server from somewhere?
-$statsd = 'labmon1001.eqiad.wmnet:8125'
-
-# Use default ulimit for labs kafka
-$nofiles_ulimit = 8192
-}
-
-else {
-# Production only has one Kafka cluster in eqiad, so
-# hardcode the cluster name to 'eqiad'.
-$kafka_cluster_name = 'eqiad'
-
-# Production Kafka clusters are named by $::site.
-$cluster_config = {
-'eqiad'   => {
-'kafka1012.eqiad.wmnet' => { 'id' => 12 },  # Row A
-'kafka1013.eqiad.wmnet' => { 'id' => 13 },  # Row A
-'kafka1014.eqiad.wmnet' => { 'id' => 14 },  # Row C
-'kafka1018.eqiad.wmnet' => { 'id' => 18 },  # Row D
-'kafka1020.eqiad.wmnet' => { 'id' => 20 },  # Row D
-'kafka1022.eqiad.wmnet' => { 'id' => 22 },  # Row C
-},
-'ulsfo' => { },
-'esams' => { },
-}
-
-$log_dirs = [
-'/var/spool/kafka/a/data',
-'/var/spool/kafka/b/data',
-'/var/spool/kafka/c/data',
-'/var/spool/kafka/d/data',
-'/var/spool/kafka/e/data',
-'/var/spool/kafka/f/data',
-'/var/spool/kafka/g/data',
-'/var/spool/kafka/h/data',
-'/var/spool/kafka/i/data',
-'/var/spool/kafka/j/data',
-'/var/spool/kafka/k/data',
-'/var/spool/kafka/l/data',
-]
-# Ganglia diskstat plugin would like to know what disks to monitor
-$log_disks = ['sda',
-'sdb',
-'sdc',
-'sdd',
-'sde',
-'sdf',
-'sdg',
-'sdh',
-'sdi',
-'sdj',
-'sdk',
-'sdl',
-]
-
-# TODO: use variables from new ganglia module once it is finished.
-$ganglia   = '208.80.154.10:9694'
-# TODO: use variables for stats server from somewhere?
-$statsd  = 'statsd.eqiad.wmnet:8125'
-
-
-# Increase ulimit for production kafka.
-$nofiles_ulimit = 65536
-}
-
-$brokers  = $cluster_config[$kafka_cluster_name]
-if is_hash($brokers) {
-$brokers_array = keys($brokers)
-} else {
-$brokers_array = []
-}
-
-$jmx_port = 
-
-# jmxtrans renders hostname metrics with underscores and
-# suffixed with the jmx port.  Build a graphite
-# wildcard to match these.
-# E.g. kafka1012.eqiad.wmnet -> kafka1012_eqiad_wmnet_
-$brokers_graphite_wildcard = inline_template('{<%= 
@brokers_array.join("_#{@jmx_port},").tr(".","_") + "_#{@jmx_port}" %>}')
-
-$zookeeper_hosts  = keys(hiera('zookeeper_hosts'))
-$zookeeper_chroot = "/kafka/${kafka_cluster_name}"
-$zookeeper_url= 

[MediaWiki-commits] [Gerrit] tools: fix stupid typo - change (operations/puppet)

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

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

Change subject: tools: fix stupid typo
..

tools: fix stupid typo

Change-Id: I65dda394be7c58302054554061764fe1968f13cd
---
M modules/toollabs/manifests/proxy.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/260427/1

diff --git a/modules/toollabs/manifests/proxy.pp 
b/modules/toollabs/manifests/proxy.pp
index 469b9a2..966c444 100644
--- a/modules/toollabs/manifests/proxy.pp
+++ b/modules/toollabs/manifests/proxy.pp
@@ -78,7 +78,7 @@
 
 file { '/var/www/error/favicon.ico':
 ensure  => file,
-source  => 'puppet:///modules/toollabs/favico.ico',
+source  => 'puppet:///modules/toollabs/favicon.ico',
 require => File['/var/www/error'],
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Move white-space:pre-wrap hack to ContentBranchNode - change (VisualEditor/VisualEditor)

[Alex Monk (Code Review)]

Alex Monk has uploaded a new change for review.

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

Change subject: Move white-space:pre-wrap hack to ContentBranchNode
..

Move white-space:pre-wrap hack to ContentBranchNode

This way it has less potential to break other nodes.

Bug: T121557
Change-Id: I293442a6b61016b78410c7589215239eb80d9f3f
(cherry picked from commit d1c5207ab474369d203f3612fb58ac79586a23a5)
---
M build/modules.json
M demos/ve/desktop.html
M demos/ve/mobile.html
A src/ce/styles/nodes/ve.ce.ContentBranchNode.css
M src/ce/styles/nodes/ve.ce.DocumentNode.css
M src/ce/ve.ce.BranchNode.js
M src/ce/ve.ce.ContentBranchNode.js
M tests/ce/ve.ce.Document.test.js
M tests/dm/ve.dm.example.js
9 files changed, 45 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/32/260432/1

diff --git a/build/modules.json b/build/modules.json
index 7291615..ebfa122 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -494,6 +494,7 @@
"src/ce/styles/nodes/ve.ce.FocusableNode.css",
"src/ce/styles/nodes/ve.ce.AlienNode.css",
"src/ce/styles/nodes/ve.ce.BranchNode.css",
+   "src/ce/styles/nodes/ve.ce.ContentBranchNode.css",
"src/ce/styles/nodes/ve.ce.CommentNode.css",
"src/ce/styles/nodes/ve.ce.DocumentNode.css",
"src/ce/styles/nodes/ve.ce.GeneratedContentNode.css",
diff --git a/demos/ve/desktop.html b/demos/ve/desktop.html
index e545cdf..302a383 100644
--- a/demos/ve/desktop.html
+++ b/demos/ve/desktop.html
@@ -31,6 +31,7 @@



+   



diff --git a/demos/ve/mobile.html b/demos/ve/mobile.html
index ddadbe1..5d1eb70 100644
--- a/demos/ve/mobile.html
+++ b/demos/ve/mobile.html
@@ -31,6 +31,7 @@



+   



diff --git a/src/ce/styles/nodes/ve.ce.ContentBranchNode.css 
b/src/ce/styles/nodes/ve.ce.ContentBranchNode.css
new file mode 100644
index 000..aeef5f0
--- /dev/null
+++ b/src/ce/styles/nodes/ve.ce.ContentBranchNode.css
@@ -0,0 +1,14 @@
+/*!
+ * VisualEditor ContentEditable ContentBranchNode styles.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+/*
+ * So that we don't need to use  when rendering text with multiple 
consecutive spaces, and
+ * that the browser doesn't insert  when typing regular spaces, and that 
we can let the user
+ * input actual non-breaking spaces in the text without having to guess if 
they're really needed.
+ */
+.ve-ce-contentBranchNode {
+   white-space: pre-wrap;
+}
diff --git a/src/ce/styles/nodes/ve.ce.DocumentNode.css 
b/src/ce/styles/nodes/ve.ce.DocumentNode.css
index 4e911cb..1f4fd98 100644
--- a/src/ce/styles/nodes/ve.ce.DocumentNode.css
+++ b/src/ce/styles/nodes/ve.ce.DocumentNode.css
@@ -8,12 +8,6 @@
cursor: text;
/* 0.75/0.8, 1.5/0.8 */
padding: 0.9375em 1.875em;
-   /*
-* So that we don't need to use  when rendering text with 
multiple consecutive spaces, and
-* that the browser doesn't insert  when typing regular spaces, 
and that we can let the user
-* input actual non-breaking spaces in the text without having to guess 
if they're really needed.
-*/
-   white-space: pre-wrap;
 }
 
 /*
diff --git a/src/ce/ve.ce.BranchNode.js b/src/ce/ve.ce.BranchNode.js
index 54220b0..31ffad2 100644
--- a/src/ce/ve.ce.BranchNode.js
+++ b/src/ce/ve.ce.BranchNode.js
@@ -108,7 +108,7 @@
  */
 ve.ce.BranchNode.prototype.onSetup = function () {
// Parent method
-   ve.ce.Node.prototype.onSetup.call( this );
+   ve.ce.BranchNode.super.prototype.onSetup.apply( this, arguments );
 
// DOM changes (duplicated from constructor in case this.$element is 
replaced)
this.$element.addClass( 've-ce-branchNode' );
diff --git a/src/ce/ve.ce.ContentBranchNode.js 
b/src/ce/ve.ce.ContentBranchNode.js
index 996b3b7..e354d25 100644
--- a/src/ce/ve.ce.ContentBranchNode.js
+++ b/src/ce/ve.ce.ContentBranchNode.js
@@ -28,6 +28,9 @@
 
this.onClickHandler = this.onClick.bind( this );
 
+   // DOM changes (keep in sync with #onSetup)
+   this.$element.addClass( 've-ce-contentBranchNode' );
+
// Events
this.connect( this, { childUpdate: 'onChildUpdate' } );
// Some browsers allow clicking links inside contenteditable, such as 
in iOS Safari when the
@@ -83,6 +86,17 @@
 /* Methods */
 
 /**
+ * @inheritdoc
+ */
+ve.ce.ContentBranchNode.prototype.onSetup = function () {
+   // Parent method
+   ve.ce.ContentBranchNode.super.prototype.onSetup.apply( this, arguments 
);
+
+   // DOM changes (duplicated from constructor in case 

[MediaWiki-commits] [Gerrit] cassandra: add restbase1004-a instance - change (operations/puppet)

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: add restbase1004-a instance
..

cassandra: add restbase1004-a instance

Change-Id: I319814807eca300f20262a76c7e8a83a8bcb5f4f
---
M hieradata/hosts/restbase1004.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/hosts/restbase1004.yaml 
b/hieradata/hosts/restbase1004.yaml
index 422643c..d49c8c9 100644
--- a/hieradata/hosts/restbase1004.yaml
+++ b/hieradata/hosts/restbase1004.yaml
@@ -1 +1,7 @@
 cassandra::rack: 'b'
+cassandra::instances:
+  a:
+jmx_port: 7189
+listen_address: 10.64.32.192
+rpc_address: 10.64.32.192
+rpc_interface: eth0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I319814807eca300f20262a76c7e8a83a8bcb5f4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] Remove pointless begin/commit calls - change (mediawiki...ReaderFeedback)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove pointless begin/commit calls
..

Remove pointless begin/commit calls

Change-Id: I7356387dd3002d0b99083aafe5efb33d4c89fd18
---
M specialpages/ReaderFeedback_body.php
1 file changed, 0 insertions(+), 3 deletions(-)


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

diff --git a/specialpages/ReaderFeedback_body.php 
b/specialpages/ReaderFeedback_body.php
index 3df5767..8550b49 100644
--- a/specialpages/ReaderFeedback_body.php
+++ b/specialpages/ReaderFeedback_body.php
@@ -165,14 +165,11 @@
 
$tallyTable = ReaderFeedback::getVoteAggregates( $form->page, 
31, $form->dims );

-   $dbw = wfGetDB( DB_MASTER );
-   $dbw->begin();
if( $bot ) {
$ok = self::REVIEW_ERROR; // don't submit for mindless 
drones
} else {
$ok = $form->submit();
}
-   $dbw->commit();
switch( $ok ) {
case self::REVIEW_OK:
return '' .

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7356387dd3002d0b99083aafe5efb33d4c89fd18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReaderFeedback
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] contint: rename git-daemon to git_daemon - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged.

Change subject: contint: rename git-daemon to git_daemon
..


contint: rename git-daemon to git_daemon

Puppet classes and defines should not contain
dash characters per lint and style guide and we only
have a handful of those left.

Change-Id: I581c832444c4b1f3bfe1bc28148ac5facc448ae9
---
R modules/contint/manifests/zuul/git_daemon.pp
M modules/role/manifests/zuul/merger.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/contint/manifests/zuul/git-daemon.pp 
b/modules/contint/manifests/zuul/git_daemon.pp
similarity index 96%
rename from modules/contint/manifests/zuul/git-daemon.pp
rename to modules/contint/manifests/zuul/git_daemon.pp
index 48a0099..88b513d 100644
--- a/modules/contint/manifests/zuul/git-daemon.pp
+++ b/modules/contint/manifests/zuul/git_daemon.pp
@@ -1,5 +1,5 @@
 # Class publishing the Zuul repositories with git-daemon
-class contint::zuul::git-daemon(
+class contint::zuul::git_daemon(
 $zuul_git_dir = '/var/lib/zuul/git'
 ) {
 
diff --git a/modules/role/manifests/zuul/merger.pp 
b/modules/role/manifests/zuul/merger.pp
index 39123bf..6cded40 100644
--- a/modules/role/manifests/zuul/merger.pp
+++ b/modules/role/manifests/zuul/merger.pp
@@ -22,7 +22,7 @@
 }
 
 # Serves Zuul git repositories
-class { 'contint::zuul::git-daemon':
+class { 'contint::zuul::git_daemon':
 zuul_git_dir => 
$role::zuul::configuration::merger[$::realm]['git_dir'],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I581c832444c4b1f3bfe1bc28148ac5facc448ae9
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
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] Allow client-side schemas to be registered in extension.json - change (mediawiki...EventLogging)

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review.

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

Change subject: Allow client-side schemas to be registered in extension.json
..

Allow client-side schemas to be registered in extension.json

Use the "attributes" feature of extension registration to allow
extensions to set "EventLoggingSchemas" as a top-level key in their
extension.json file.

The new precedence order is:
* 'EventLoggingSchemas' hook
* 'EventLoggingSchemas' attribute in extension.json
* $wgEventLoggingSchemas global

Also clean up the function documentation to use the normal doxygen tags
and add one for the new extension.json style.

Change-Id: I01aa2887a9b98c2ef52cacc3a892390a72b4a3ba
---
M includes/EventLoggingHooks.php
1 file changed, 15 insertions(+), 5 deletions(-)


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

diff --git a/includes/EventLoggingHooks.php b/includes/EventLoggingHooks.php
index df8fc10..70b67c2 100644
--- a/includes/EventLoggingHooks.php
+++ b/includes/EventLoggingHooks.php
@@ -53,21 +53,31 @@
 * hook simply never fires. To log events for schemas that have been
 * declared in this fashion, use mw#track.
 *
-* @example
-* 
+* @par Example using a hook
+* @code
 * $wgHooks[ 'EventLoggingRegisterSchemas' ][] = function ( &$schemas ) 
{
 * $schemas[ 'MultimediaViewerNetworkPerformance' ] = 7917896;
 * };
-* 
+* @endcode
+* @par Example using extension.json
+* @code
+* {
+* "EventLoggingSchemas": {
+* "MultimediaViewerNetworkPerformance": 7917896
+* }
+* }
+* @endcode
 *
 * @param ResourceLoader &$resourceLoader
 */
public static function onResourceLoaderRegisterModules( ResourceLoader 
&$resourceLoader ) {
global $wgEventLoggingSchemas;
 
-   $schemas = array();
+   $extRegistry = ExtensionRegistry::getInstance();
+
+   $schemas = $extRegistry->getAttribute( 'EventLoggingSchemas' ) 
+ $wgEventLoggingSchemas;
+
Hooks::run( 'EventLoggingRegisterSchemas', array( &$schemas ) );
-   $schemas = array_merge( $wgEventLoggingSchemas, $schemas );
 
$modules = array();
foreach ( $schemas as $schemaName => $rev ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01aa2887a9b98c2ef52cacc3a892390a72b4a3ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
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 a new hook AfterBuildFeedLinks to manipulate feed links - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add a new hook AfterBuildFeedLinks to manipulate feed links
..


Add a new hook AfterBuildFeedLinks to manipulate feed links

Some extensions may want to replace, remove or manipulate a specific
feed link after it was build. For this purpose: Add a new hook to enable
this. The hook isn't meant for adding new feed links, this is already
easily possible using OutputPage::addFeedLink().

Bug: T121774
Change-Id: If48bd07a0e7e67fd1c1a94ebaa28ca9dae146c55
---
M includes/OutputPage.php
1 file changed, 12 insertions(+), 3 deletions(-)

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



diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 67c54bb..78eb458 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3502,13 +3502,15 @@
 
# Feeds
if ( $config->get( 'Feed' ) ) {
+   $feedLinks = array();
+
foreach ( $this->getSyndicationLinks() as $format => 
$link ) {
# Use the page name for the title.  In 
principle, this could
# lead to issues with having the same name for 
different feeds
# corresponding to the same page, but we can't 
avoid that at
# this low a level.
 
-   $tags[] = $this->feedLink(
+   $feedLinks[] = $this->feedLink(
$format,
$link,
# Used messages: 'page-rss-feed' and 
'page-atom-feed' (for an easier grep)
@@ -3529,7 +3531,7 @@
if ( $config->get( 'OverrideSiteFeed' ) ) {
foreach ( $config->get( 'OverrideSiteFeed' ) as 
$type => $feedUrl ) {
// Note, this->feedLink escapes the url.
-   $tags[] = $this->feedLink(
+   $feedLinks[] = $this->feedLink(
$type,
$feedUrl,
$this->msg( 
"site-{$type}-feed", $sitename )->text()
@@ -3538,7 +3540,7 @@
} elseif ( !$this->getTitle()->isSpecial( 
'Recentchanges' ) ) {
$rctitle = SpecialPage::getTitleFor( 
'Recentchanges' );
foreach ( $config->get( 'AdvertisedFeedTypes' ) 
as $format ) {
-   $tags[] = $this->feedLink(
+   $feedLinks[] = $this->feedLink(
$format,
$rctitle->getLocalURL( array( 
'feed' => $format ) ),
# For grep: 'site-rss-feed', 
'site-atom-feed'
@@ -3546,6 +3548,13 @@
);
}
}
+
+   # Allow extensions to change the list pf feeds. This 
hook is primarily for changing,
+   # manipulating or removing existing feed tags. If you 
want to add new feeds, you should
+   # use OutputPage::addFeedLink() instead.
+   Hooks::run( 'AfterBuildFeedLinks', array( &$feedLinks ) 
);
+
+   $tags += $feedLinks;
}
 
# Canonical URL

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If48bd07a0e7e67fd1c1a94ebaa28ca9dae146c55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Substitute {{SITENAME}} in the title of dialogs - change (mediawiki...WikiEditor)

[jenkins-bot (Code Review)]

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

Change subject: Substitute {{SITENAME}} in the title of dialogs
..


Substitute {{SITENAME}} in the title of dialogs

Bug: T62695
Change-Id: I7e5378b37e66b8b35bb7b3aa2121eea3cbf1defd
---
M modules/jquery.wikiEditor.dialogs.js
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/jquery.wikiEditor.dialogs.js 
b/modules/jquery.wikiEditor.dialogs.js
index 2524807..5d2aa5c 100644
--- a/modules/jquery.wikiEditor.dialogs.js
+++ b/modules/jquery.wikiEditor.dialogs.js
@@ -135,7 +135,7 @@
if ( typeof configuration.modal === 'undefined' ) {
configuration.modal = true;
}
-   configuration.title = $.wikiEditor.autoMsg( module, 
'title' );
+   configuration.title = $.wikiEditor.autoMsg( module, 
'title' ).replace( /\{\{SITENAME\}\}/i, mw.config.get( 'wgSiteName' ) );
// Transform messages in keys
// Stupid JS won't let us do stuff like
// foo = { mw.msg( 'bar' ): baz }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e5378b37e66b8b35bb7b3aa2121eea3cbf1defd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: 2nd-player 
Gerrit-Reviewer: Aklapper 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Paladox 
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] Various PHPDoc and IDEA warning fixes - change (mediawiki...GlobalBlocking)

[Aaron Schulz (Code Review)]

Aaron Schulz has uploaded a new change for review.

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

Change subject: Various PHPDoc and IDEA warning fixes
..

Various PHPDoc and IDEA warning fixes

Change-Id: Idb4c8a84c12fc95927ce1db77f7c0f1042b2a901
---
M includes/GlobalBlocking.class.php
1 file changed, 9 insertions(+), 6 deletions(-)


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

diff --git a/includes/GlobalBlocking.class.php 
b/includes/GlobalBlocking.class.php
index ca51a74..22e5337 100644
--- a/includes/GlobalBlocking.class.php
+++ b/includes/GlobalBlocking.class.php
@@ -10,7 +10,8 @@
/**
 * @param $user User
 * @param $ip string
-* @return Array: empty or a message key with parameters
+* @return array: empty or a message key with parameters
+* @throws MWException
 */
static function getUserBlockErrors( $user, $ip ) {
global $wgLang, $wgRequest, $wgGlobalBlockingBlockXFF;
@@ -140,9 +141,9 @@
 
/**
 * Check an array of IPs for a block on any
-* @param Array $ips The Array of IP addresses to be checked
+* @param array $ips The Array of IP addresses to be checked
 * @param boolean $anon Get anon blocks only
-* @return Array of applicable blocks
+* @return array of applicable blocks
 */
static function checkIpsForBlock( $ips, $anon ) {
$dbr = GlobalBlocking::getGlobalBlockingDatabase( DB_SLAVE );
@@ -182,9 +183,9 @@
 * From a list of XFF ips, and list of blocks that apply, choose the 
block that will
 * be shown to the end user. Using the first block in the array for now.
 *
-* @param Array $ips The Array of IP addresses to be checked
-* @param Array $blocks The Array of blocks (db rows)
-* @return Array ($ip, $block) the chosen ip and block
+* @param array $ips The Array of IP addresses to be checked
+* @param array $blocks The Array of blocks (db rows)
+* @return array|null ($ip, $block) the chosen ip and block
 */
private static function getAppliedBlock( $ips, $blocks ) {
$block = array_shift( $blocks );
@@ -194,6 +195,8 @@
return array( $ip, $block );
}
}
+
+   return null;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb4c8a84c12fc95927ce1db77f7c0f1042b2a901
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
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)

[Cdentinger (Code Review)]

Cdentinger has uploaded a new change for review.

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

Change subject: update DonationInterface submodule
..

update DonationInterface submodule

Change-Id: Id6afd945b3bd2be864f7bbfa6d6847a51a3d3b08
---
M extensions/DonationInterface
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/05/260505/1

diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index aeb9a81..0b75c53 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit aeb9a8124efec1d96f56d2545cf0f4b816c43a04
+Subproject commit 0b75c534746e18d80a8beb35854fdd5eef344bc2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6afd945b3bd2be864f7bbfa6d6847a51a3d3b08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Cdentinger 

___
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)

[Cdentinger (Code Review)]

Cdentinger has submitted this change and it was merged.

Change subject: update DonationInterface submodule
..


update DonationInterface submodule

Change-Id: Id6afd945b3bd2be864f7bbfa6d6847a51a3d3b08
---
M extensions/DonationInterface
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index aeb9a81..0b75c53 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
-Subproject commit aeb9a8124efec1d96f56d2545cf0f4b816c43a04
+Subproject commit 0b75c534746e18d80a8beb35854fdd5eef344bc2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6afd945b3bd2be864f7bbfa6d6847a51a3d3b08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Cdentinger 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix problem with delete hook - change (mediawiki...MathSearch)

[jenkins-bot (Code Review)]

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

Change subject: Fix problem with delete hook
..


Fix problem with delete hook

Article must not be an article. It can also be a 
page.

Change-Id: I2672ce36798c7c98723f599800d0f5d385988d48
---
M MathSearch.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/MathSearch.hooks.php b/MathSearch.hooks.php
index 94dbf19..93599c6 100644
--- a/MathSearch.hooks.php
+++ b/MathSearch.hooks.php
@@ -306,7 +306,7 @@
}
 
static function onArticleDeleteComplete(
-   Article &$article, User &$user, $reason, $id, $content, 
$logEntry
+   &$article, User &$user, $reason, $id, $content, $logEntry
) {
$revId = $article->getTitle()->getLatestRevID();
$mathEngineBaseX = new MathEngineBaseX();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2672ce36798c7c98723f599800d0f5d385988d48
Gerrit-PatchSet: 3
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] Add $revision to TitleMoveCompleting for completeness - change (mediawiki/core)

[jenkins-bot (Code Review)]

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

Change subject: Add $revision to TitleMoveCompleting for completeness
..


Add $revision to TitleMoveCompleting for completeness

Follow up to 9cc2f62bf5ae.

Change-Id: Ibb48f6673b9be1863563262fff8bedc5aed7926c
---
M docs/hooks.txt
M includes/MovePage.php
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/docs/hooks.txt b/docs/hooks.txt
index 6afeab8..c928aae 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3040,7 +3040,7 @@
 $pageid: database ID of the page that's been moved
 $redirid: database ID of the created redirect
 $reason: reason for the move
-$revision: the revision created by the move
+$revision: the Revision created by the move
 
 'TitleMoveCompleting': After moving an article (title), pre-commit.
 $old: old title
@@ -3049,6 +3049,7 @@
 $pageid: database ID of the page that's been moved
 $redirid: database ID of the created redirect
 $reason: reason for the move
+$revision: the Revision created by the move
 
 'TitleQuickPermissions': Called from Title::checkQuickPermissions to add to
 or override the quick permissions check.
diff --git a/includes/MovePage.php b/includes/MovePage.php
index 936b94a..fb0ca8c 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -371,7 +371,8 @@
 
Hooks::run(
'TitleMoveCompleting',
-   array( $this->oldTitle, $this->newTitle, $user, 
$pageid, $redirid, $reason )
+   array( $this->oldTitle, $this->newTitle,
+   $user, $pageid, $redirid, $reason, 
$nullRevision )
);
 
$dbw->endAtomic( __METHOD__ );

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

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

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

[MediaWiki-commits] [Gerrit] Use mw.Message#text() instead of plain() in wikiEditor.autoM... - change (mediawiki...WikiEditor)

[Krinkle (Code Review)]

Krinkle has uploaded a new change for review.

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

Change subject: Use mw.Message#text() instead of plain() in wikiEditor.autoMsg()
..

Use mw.Message#text() instead of plain() in wikiEditor.autoMsg()

Also follow-up 6a73d06 by removing the hardcoded SITENAME regex.

Change-Id: I7f1b877710fb6baa45b83054d1e30a24979b37b4
---
M modules/jquery.wikiEditor.dialogs.js
M modules/jquery.wikiEditor.js
2 files changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/modules/jquery.wikiEditor.dialogs.js 
b/modules/jquery.wikiEditor.dialogs.js
index 5d2aa5c..2524807 100644
--- a/modules/jquery.wikiEditor.dialogs.js
+++ b/modules/jquery.wikiEditor.dialogs.js
@@ -135,7 +135,7 @@
if ( typeof configuration.modal === 'undefined' ) {
configuration.modal = true;
}
-   configuration.title = $.wikiEditor.autoMsg( module, 
'title' ).replace( /\{\{SITENAME\}\}/i, mw.config.get( 'wgSiteName' ) );
+   configuration.title = $.wikiEditor.autoMsg( module, 
'title' );
// Transform messages in keys
// Stupid JS won't let us do stuff like
// foo = { mw.msg( 'bar' ): baz }
diff --git a/modules/jquery.wikiEditor.js b/modules/jquery.wikiEditor.js
index ff2d61a..270fa3b 100644
--- a/modules/jquery.wikiEditor.js
+++ b/modules/jquery.wikiEditor.js
@@ -170,9 +170,9 @@
} else if ( property + 'Msg' in object ) {
p = object[ property + 'Msg' ];
if ( $.isArray( p ) && p.length >= 2 ) {
-   return mw.message.apply( mw.message, p 
).plain();
+   return mw.message.apply( mw.message, p ).text();
} else {
-   return mw.message( p ).plain();
+   return mw.message( p ).text();
}
} else {
return '';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f1b877710fb6baa45b83054d1e30a24979b37b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

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

[MediaWiki-commits] [Gerrit] add wikimania2017 wiki to db lists - change (operations/mediawiki-config)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

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

Change subject: add wikimania2017 wiki to db lists
..

add wikimania2017 wiki to db lists

Bug:T122062
Change-Id: I6e04d5dca1c9684d8a1765132e0e33fccf37ef8a
---
M dblists/all.dblist
M dblists/s3.dblist
M dblists/securepollglobal.dblist
M dblists/small.dblist
M dblists/special.dblist
M dblists/visualeditor-default.dblist
M dblists/wikimania.dblist
7 files changed, 8 insertions(+), 1 deletion(-)


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

diff --git a/dblists/all.dblist b/dblists/all.dblist
index 71f3eba..e0a6a7b 100644
--- a/dblists/all.dblist
+++ b/dblists/all.dblist
@@ -851,6 +851,7 @@
 wikimania2014wiki
 wikimania2015wiki
 wikimania2016wiki
+wikimania2017wiki
 wikimaniateamwiki
 wowiki
 wowikiquote
diff --git a/dblists/s3.dblist b/dblists/s3.dblist
index 104b01a..b07132b 100644
--- a/dblists/s3.dblist
+++ b/dblists/s3.dblist
@@ -815,6 +815,7 @@
 wikimania2014wiki
 wikimania2015wiki
 wikimania2016wiki
+wikimania2017wiki
 wikimaniateamwiki
 wowiki
 wowikiquote
diff --git a/dblists/securepollglobal.dblist b/dblists/securepollglobal.dblist
index 455e3ed..7a0ed1c 100644
--- a/dblists/securepollglobal.dblist
+++ b/dblists/securepollglobal.dblist
@@ -849,6 +849,7 @@
 wikimania2014wiki
 wikimania2015wiki
 wikimania2016wiki
+wikimania2017wiki
 wikimaniateamwiki
 wowiki
 wowikiquote
diff --git a/dblists/small.dblist b/dblists/small.dblist
index c28c93e..9305527 100644
--- a/dblists/small.dblist
+++ b/dblists/small.dblist
@@ -484,6 +484,7 @@
 wikimania2012wiki
 wikimania2013wiki
 wikimania2016wiki
+wikimania2017wiki
 wikimaniateamwiki
 wowiki
 wowikiquote
@@ -508,4 +509,4 @@
 zhwikivoyage
 zuwiki
 zuwikibooks
-zuwiktionary
\ No newline at end of file
+zuwiktionary
diff --git a/dblists/special.dblist b/dblists/special.dblist
index 4cfc8a9..7c7cb3e 100644
--- a/dblists/special.dblist
+++ b/dblists/special.dblist
@@ -58,5 +58,6 @@
 wikimania2014wiki
 wikimania2015wiki
 wikimania2016wiki
+wikimania2017wiki
 wikimaniateamwiki
 zerowiki
diff --git a/dblists/visualeditor-default.dblist 
b/dblists/visualeditor-default.dblist
index 5cf75f8..d776ba2 100644
--- a/dblists/visualeditor-default.dblist
+++ b/dblists/visualeditor-default.dblist
@@ -234,6 +234,7 @@
 # Wikimanias
 wikimania2015wiki
 wikimania2016wiki
+wikimania2017wiki
 # Wikimedias
 # Other wikis (e.g. Commons, Meta)
 labswiki
diff --git a/dblists/wikimania.dblist b/dblists/wikimania.dblist
index 988a057..9548bfd 100644
--- a/dblists/wikimania.dblist
+++ b/dblists/wikimania.dblist
@@ -10,3 +10,4 @@
 wikimania2014wiki
 wikimania2015wiki
 wikimania2016wiki
+wikimania2017wiki

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

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

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